[gentoo-commits] repo/gentoo:master commit in: dev-java/glassfish-transaction-api/

[Miroslav Šulc]

commit:     658755be427eb70d923b8deb597d914e2486307c
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 06:10:38 2017 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 06:10:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=658755be

dev-java/glassfish-transaction-api: marked 1.1.2.2.04-r1 as stable to solve netbeans-java issue due to renaming of the jar in this ebuild

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 .../glassfish-transaction-api-1.1.2.2.04-r1.ebuild |  2 +-
 .../glassfish-transaction-api-1.1.2.2.04.ebuild    | 43 ----------------------
 2 files changed, 1 insertion(+), 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 e9fe920b632..9f87fc7ad5e 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 ea2026b8d59..00000000000
--- 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
-}