[gentoo-commits] proj/sci:master commit in: dev-java/gluegen/

["Justin Lecher" <jlec@gentoo.org>]

commit:     395c756f31b87573938f0836d85134c2dbd568a2
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  3 07:56:05 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov  3 07:56:05 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=395c756f

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

Package-Manager: portage-2.2.14

---
 dev-java/gluegen/ChangeLog                  |  4 ++
 dev-java/gluegen/gluegen-1_p20080421.ebuild | 22 ++++----
 dev-java/gluegen/gluegen-2.0_rc8.ebuild     |  9 +---
 dev-java/gluegen/gluegen-2.1.2.ebuild       | 83 -----------------------------
 dev-java/gluegen/gluegen-2.1.4.ebuild       |  3 +-
 5 files changed, 18 insertions(+), 103 deletions(-)

diff --git a/dev-java/gluegen/ChangeLog b/dev-java/gluegen/ChangeLog
index 3eee9bc..df8ea93 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/gluegen-1_p20080421.ebuild b/dev-java/gluegen/gluegen-1_p20080421.ebuild
index eb39aa1..da5536a 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 37ccf3b..7d57ea7 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 97f1d6f..0000000
--- 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 a11f999..ee61583 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"