summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository QA checks <repo-qa-checks@gentoo.org>2017-08-11 06:43:30 +0000
committerRepository QA checks <repo-qa-checks@gentoo.org>2017-08-11 06:43:30 +0000
commitc0914c0a56fbecc2d2c92b1f326580cdc201f814 (patch)
treed3bd69157bb374505c1bde37ff4940e04220645b
parentMerge updates from master (diff)
parentdev-java/glassfish-transaction-api: marked 1.1.2.2.04-r1 as stable to solve n... (diff)
downloadgentoo-c0914c0a56fbecc2d2c92b1f326580cdc201f814.tar.gz
gentoo-c0914c0a56fbecc2d2c92b1f326580cdc201f814.tar.bz2
gentoo-c0914c0a56fbecc2d2c92b1f326580cdc201f814.zip
Merge updates from master
-rw-r--r--dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild2
-rw-r--r--dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04.ebuild43
2 files changed, 1 insertions, 44 deletions
diff --git a/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild b/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild
index e9fe920b6327..9f87fc7ad5e6 100644
--- a/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild
+++ b/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://download.java.net/javaee5/${MAJOR}/promoted/source/${ZIP}"
LICENSE="|| ( CDDL GPL-2 )"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
RDEPEND=">=virtual/jre-1.6"
DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04.ebuild b/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04.ebuild
deleted file mode 100644
index ea2026b8d59c..000000000000
--- a/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-JAVA_PKG_IUSE="doc source"
-
-inherit versionator java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Transaction API"
-HOMEPAGE="https://glassfish.dev.java.net/"
-MAJOR=v$(get_version_component_range 3-4)
-MAJOR=$(replace_version_separator 1 ur ${MAJOR})
-MY_PV=${MAJOR}-b$(get_version_component_range 5)
-MY_PN=${PN/-//}
-ZIP="glassfish-${MY_PV}-src.zip"
-SRC_URI="http://download.java.net/javaee5/${MAJOR}/promoted/source/${ZIP}"
-
-LICENSE="|| ( CDDL GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip
- ${COMMON_DEP}"
-
-S=${WORKDIR}/${MY_PN}
-
-src_unpack() {
- unzip -q "${DISTDIR}/${ZIP}" "${MY_PN}/*" "glassfish/bootstrap/*" \
- || die "unpacking failed"
- einfo "${S}"
-}
-
-EANT_DOC_TARGET="javadocs"
-
-src_install() {
- java-pkg_dojar build/release/*.jar
- use doc && java-pkg_dojavadoc docs
- use source && java-pkg_dosrc src/java/javax
-}