dev-java/gluegen: Bump to EAPI=5; drop old

Package-Manager: portage-2.2.14

6 files changed, 18 insertions, 104 deletions

diff --git a/dev-java/gluegen/ChangeLog b/dev-java/gluegen/ChangeLog
index 3eee9bc95..df8ea936c 100644
--- a/dev-java/gluegen/ChangeLog
+++ b/dev-java/gluegen/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Nov 2014; Justin Lecher <jlec@gentoo.org> gluegen-1_p20080421.ebuild,
+  gluegen-2.0_rc8.ebuild, -gluegen-2.1.2.ebuild, gluegen-2.1.4.ebuild:
+  Bump to EAPI=5; drop old
+
 *gluegen-2.1.4 (12 Feb 2014)
 
   12 Feb 2014; Guillaume Horel <guillaume.horel@gmail.com>
diff --git a/dev-java/gluegen/Manifest b/dev-java/gluegen/Manifest
index 2a3bb3202..9c3455f9f 100644
--- a/dev-java/gluegen/Manifest
+++ b/dev-java/gluegen/Manifest
@@ -1,4 +1,3 @@
 DIST gluegen-2.1.4.tar.gz 42235490 SHA256 18826c58b136dc44089346791e6ed57c7e2828a1ee4d6279d15e26cb12c2b926 SHA512 196478de92686b168d6f35e2e7141a31f682d22a7f96b5bc84d46905c42eb5bf25bacd74ccc51975fc7894e2e0ba2e236a4a68c101bbabaaa5193e4bdc50f607 WHIRLPOOL c05e723d85021f464d49b48fc2a0f11e5979d42355e6ac0d7437c40407d34829d5a531bf2687d47fa29cd8affd14d400a333fe90624a7ecda832a1cf76696440
 DIST gluegen-20080421.tar.bz2 1044951 SHA256 15ef8f499afc2256615bf453b318fbc22fbe146293ca4c6ca87c98577bf5a026 SHA512 3bffb55ec8723ac452b38d41f1bc596ee3065b1f791b8c7aec06d8acffdfd83d81553d9090fc273b56fa748b501f3a25f8dc4736bad291bc77f15d211957470d WHIRLPOOL 6171345011955517e84c9b82d187e2fe0c96fc1733ee6427248159fd8456472ea15c9cd223bd784a33478a4cfc568ddcfd73ea0addd13daa1b483b7a8cfe66c1
 DIST gluegen-v2.0-rc8.tar.7z 35196696 SHA256 8cae313dfe03d13cdd165aa7d9e698897affae290e7ce7c4a27479fe6522c0dc SHA512 9845246f9776139cd205f197203349eba28150d5018bd086e6f7484df765b4cd122d78fbf836780a10b0d6395c645eb8ec7a256b8f832453c0b20155a11b3a0f WHIRLPOOL 427d6ef990a0702b81a4f62a74dce628594144507392cb8d25b5af5cbeca186faef987c809eeb1faf5d99b8f867213c7786d43f4418f85d04ac68d96595b83b3
-DIST gluegen-v2.1.2.tar.7z 38625189 SHA256 6b84a60cbcf2db8082b37d8591d7a883144d07b672e8a754a407f246cfc10915 SHA512 a7c9e9c0c3850ba2be609ba0130ab42074632c5b4fdd2ff6597b2b43143f496103e762073c2f1a55e4f40a33bc13c2a82b3099d022895b85dd2dda19c9a0dc35 WHIRLPOOL eaa6a1c443c12b0b04eca86e82d5b171b9123ae760051ce4f3b7d066177553286abe7b3cca88ce3f62e3fe96dad55836ea1f08150caf235c0386853120e05398
diff --git a/dev-java/gluegen/gluegen-1_p20080421.ebuild b/dev-java/gluegen/gluegen-1_p20080421.ebuild
index eb39aa103..da5536a02 100644
--- a/dev-java/gluegen/gluegen-1_p20080421.ebuild
+++ b/dev-java/gluegen/gluegen-1_p20080421.ebuild
@@ -2,33 +2,33 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
-
-# svn export -r "{2009-05-09}" https://gluegen.dev.java.net/svn/gluegen/trunk
-# gluegen --username xxx --password xxx
+EAPI=5
 
 WANT_ANT_TASKS="ant-antlr"
 JAVA_PKG_IUSE=""
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="GlueGen is a tool which automatically generates the Java and JNI
-code necessary to call C libraries"
-HOMEPAGE="https://gluegen.dev.java.net"
+DESCRIPTION="Automatically generate the JNI code necessary to call C libraries"
+HOMEPAGE="http://jogamp.org/gluegen/www/"
+# svn export -r "{2009-05-09}" https://gluegen.dev.java.net/svn/gluegen/trunk
+# gluegen --username xxx --password xxx
 SRC_URI="http://dev.gentoo.org/~ali_bush/distfiles/${PN}-${PV#1_p}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE=""
 
-RDEPEND=">=virtual/jre-1.4
+RDEPEND="
+	>=virtual/jre-1.4
 	dev-java/antlr:0"
 
-DEPEND=">=virtual/jdk-1.4
+DEPEND="
+	>=virtual/jdk-1.4
 	dev-java/ant-core:0
 	dev-java/antlr:0
 	dev-java/cpptasks:0"
-IUSE=""
 
 S="${WORKDIR}/${PN}-${PV#1_p}"
 
@@ -53,7 +53,7 @@ src_install() {
 
 	#build copies system antlr.jar here.
 	#So we just need to replace it.
-	rm "${PN}-rt-natives"*.jar
+	rm "${PN}-rt-natives"*.jar || die
 	java-pkg_dojar *.jar
 	java-pkg_doso obj/*.so
 
diff --git a/dev-java/gluegen/gluegen-2.0_rc8.ebuild b/dev-java/gluegen/gluegen-2.0_rc8.ebuild
index 37ccf3b20..7d57ea7df 100644
--- a/dev-java/gluegen/gluegen-2.0_rc8.ebuild
+++ b/dev-java/gluegen/gluegen-2.0_rc8.ebuild
@@ -2,11 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-###############################################################################
-# WARNING: don't add to main tree without fixing QA issues first!
-###############################################################################
-
-EAPI="4"
+EAPI=5
 
 JAVA_PKG_IUSE="doc source"
 
@@ -15,8 +11,7 @@ inherit java-pkg-2 java-ant-2
 MY_PV=v${PV/_/-}
 MY_P=${PN}-${MY_PV}
 
-DESCRIPTION="GlueGen is a tool which automatically generates the Java and JNI
-code necessary to call C libraries"
+DESCRIPTION="Automatically generate the JNI code necessary to call C libraries"
 HOMEPAGE="http://jogamp.org/gluegen/www/"
 SRC_URI="http://jogamp.org/deployment/${MY_PV}/archive/Sources/${MY_P}.tar.7z"
 
diff --git a/dev-java/gluegen/gluegen-2.1.2.ebuild b/dev-java/gluegen/gluegen-2.1.2.ebuild
deleted file mode 100644
index 97f1d6f94..000000000
--- a/dev-java/gluegen/gluegen-2.1.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-###############################################################################
-# WARNING: don't add to main tree without fixing QA issues first!
-###############################################################################
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-MY_PV=v"${PV}"
-MY_P="${PN}"-"${MY_PV}"
-
-DESCRIPTION="GlueGen is a tool which automatically generates the Java and JNI
-code necessary to call C libraries"
-HOMEPAGE="http://jogamp.org/gluegen/www/"
-SRC_URI="http://jogamp.org/deployment/archive/rc/${MY_PV}/archive/Sources/${MY_P}.tar.7z"
-
-LICENSE="BSD"
-SLOT="2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/ant-core:0
-	dev-java/antlr:0"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	app-arch/p7zip
-	dev-java/ant-antlr:0
-	dev-java/ant-contrib:0
-	dev-java/ant-nodeps:0
-	dev-java/cpptasks:0
-	dev-java/junit:4"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	default
-	unpack ./${MY_P}.tar
-}
-
-java_prepare() {
-	rm -rf make/lib
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_BUILD_XML="make/build.xml"
-EANT_BUILD_TARGET="all"
-EANT_DOC_TARGET=""
-EANT_GENTOO_CLASSPATH="antlr,ant-core"
-EANT_NEEDS_TOOLS="yes"
-EANT_ANT_TASKS="ant-antlr ant-contrib ant-nodeps cpptasks"
-src_compile() {
-	# FIXME don't copy around jars
-	EANT_EXTRA_ARGS+=" -Dantlr.jar=\"$(java-pkg_getjar --build-only antlr antlr.jar)\""
-	# FIXME don't build tests just yet
-	EANT_EXTRA_ARGS+=" -Djunit.jar=\"$(java-pkg_getjar --build-only junit-4 junit.jar)\""
-
-	java-pkg-2_src_compile
-}
-
-# FIXME src_test
-
-src_install() {
-	java-pkg_dojar build/${PN}{,-rt}.jar
-	java-pkg_doso build/obj/*.so
-
-	use doc && dohtml -r doc/manual
-	use source && java-pkg_dosrc src/java/*
-
-	# for building jogl
-	insinto /usr/share/${PN}-${SLOT}/make
-	doins -r make/*
-	insinto /usr/share/${PN}-${SLOT}/build
-	doins build/artifact.properties
-}
diff --git a/dev-java/gluegen/gluegen-2.1.4.ebuild b/dev-java/gluegen/gluegen-2.1.4.ebuild
index a11f99918..ee6158301 100644
--- a/dev-java/gluegen/gluegen-2.1.4.ebuild
+++ b/dev-java/gluegen/gluegen-2.1.4.ebuild
@@ -9,7 +9,7 @@ WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="A tool which automatically generates the JNI code necessary to call C libraries"
+DESCRIPTION="Automatically generate the JNI code necessary to call C libraries"
 HOMEPAGE="http://jogamp.org/gluegen/www/"
 SRC_URI="https://github.com/sgothel/gluegen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -21,7 +21,6 @@ IUSE=""
 COMMON_DEP="
 	dev-java/ant-core:0
 	dev-java/antlr:0"
-
 RDEPEND="${COMMON_DEP}
 	>=virtual/jre-1.5"