Restrict build to <jdk7. #423519

Fix source zip and make better use of eclasses.
Remove old.

(Portage version: 2.1.10.65/cvs/Linux x86_64)

6 files changed, 68 insertions, 228 deletions

diff --git a/dev-java/dsiutils/ChangeLog b/dev-java/dsiutils/ChangeLog
index a303682b92b0..71a92993642b 100644
--- a/dev-java/dsiutils/ChangeLog
+++ b/dev-java/dsiutils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/dsiutils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dsiutils/ChangeLog,v 1.14 2012/04/13 18:05:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dsiutils/ChangeLog,v 1.15 2012/06/30 21:50:40 sera Exp $
+
+*dsiutils-1.0.10-r2 (30 Jun 2012)
+
+  30 Jun 2012; Ralph Sennhauser <sera@gentoo.org> -dsiutils-1.0.4.ebuild,
+  -dsiutils-1.0.5.ebuild, -dsiutils-1.0.7.ebuild, -dsiutils-1.0.10.ebuild,
+  +dsiutils-1.0.10-r2.ebuild:
+  Restrict build to <jdk7. #423519
+  Fix source zip and make better use of eclasses.
+  Remove old.
 
   13 Apr 2012; Ulrich Müller <ulm@gentoo.org> dsiutils-1.0.4.ebuild,
   dsiutils-1.0.5.ebuild, dsiutils-1.0.7.ebuild, dsiutils-1.0.10.ebuild,
diff --git a/dev-java/dsiutils/dsiutils-1.0.10-r2.ebuild b/dev-java/dsiutils/dsiutils-1.0.10-r2.ebuild
new file mode 100644
index 000000000000..0225e8679f0e
--- /dev/null
+++ b/dev-java/dsiutils/dsiutils-1.0.10-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dsiutils/dsiutils-1.0.10-r2.ebuild,v 1.1 2012/06/30 21:50:40 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Mish Mash of classes that were initially distributed with mg4j (amount others)."
+HOMEPAGE="http://dsiutils.dsi.unimi.it/"
+SRC_URI="http://dsiutils.dsi.unimi.it/${P}-src.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/commons-io:1
+	dev-java/jsap:0
+	dev-java/log4j:0
+	dev-java/commons-collections:0
+	dev-java/colt:0
+	dev-java/fastutil:5.0
+	dev-java/commons-configuration:0
+	dev-java/commons-lang:2.1
+	dev-java/junit:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+# Failes to build with jdk7 #423519
+DEPEND="${COMMON_DEP}
+	|| ( virtual/jdk:1.6 virtual/jdk:1.5 )
+	test? (
+		dev-java/emma:0
+		dev-java/ant-junit:0
+		dev-java/ant-trax:0
+	)"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_GENTOO_CLASSPATH="commons-io-1,jsap,log4j,commons-collections,colt,fastutil-5.0,commons-configuration,commons-lang-2.1,junit"
+
+EANT_TEST_TARGET="junit"
+EANT_TEST_ANT_TASKS="ant-trax"
+EANT_TEST_EXTRA_ARGS="-Djar.base=/usr/share/emma/lib"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "${P}.jar"
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc src/it
+}
diff --git a/dev-java/dsiutils/dsiutils-1.0.10.ebuild b/dev-java/dsiutils/dsiutils-1.0.10.ebuild
deleted file mode 100644
index 99df5f373ec0..000000000000
--- a/dev-java/dsiutils/dsiutils-1.0.10.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dsiutils/dsiutils-1.0.10.ebuild,v 1.2 2012/04/13 18:05:15 ulm Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source test"
-JAVA_ANT_CLASSPATH_TAGS="javac xjavac junit"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Mish Mash of classes that were initially distributed with mg4j (amount others)."
-HOMEPAGE="http://dsiutils.dsi.unimi.it/"
-SRC_URI="http://dsiutils.dsi.unimi.it/${P}-src.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE=""
-
-COMMON_DEP="dev-java/commons-io:1
-			dev-java/jsap:0
-			dev-java/log4j:0
-			dev-java/commons-collections:0
-			dev-java/colt:0
-			dev-java/fastutil:5.0
-			dev-java/commons-configuration:0
-			dev-java/commons-lang:2.1
-			dev-java/junit:0"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	test? (
-		dev-java/emma:0
-		dev-java/ant-junit:0
-		dev-java/ant-trax:0
-	)
-	${COMMON_DEP}"
-
-java_prepare() {
-	java-ant_rewrite-classpath
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="1"
-EANT_GENTOO_CLASSPATH="commons-io:1,jsap,log4j,commons-collections,colt,fastutil:5.0,commons-configuration,commons-lang:2.1,junit"
-
-src_install() {
-	java-pkg_newjar "${P}.jar"
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc src
-}
-
-src_test() {
-	ANT_TASKS="ant-junit,ant-trax" eant \
-		-Djar.base=/usr/share/emma/lib \
-		-Dgentoo.classpath="$(java-pkg_getjars --build-only ${EANT_GENTOO_CLASSPATH})" \
-		junit
-}
diff --git a/dev-java/dsiutils/dsiutils-1.0.4.ebuild b/dev-java/dsiutils/dsiutils-1.0.4.ebuild
deleted file mode 100644
index 0f9a4d6b76b6..000000000000
--- a/dev-java/dsiutils/dsiutils-1.0.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dsiutils/dsiutils-1.0.4.ebuild,v 1.2 2012/04/13 18:05:15 ulm Exp $
-
-EAPI="1"
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Mish Mash of classes that were initially distributed with mg4j (amount others)."
-HOMEPAGE="http://dsiutils.dsi.unimi.it/"
-SRC_URI="http://dsiutils.dsi.unimi.it/${P}-src.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE=""
-
-COMMON_DEP="dev-java/commons-io:1
-			=dev-java/jsap-2*
-			dev-java/log4j
-			dev-java/commons-collections
-			dev-java/colt
-			=dev-java/fastutil-5.1*
-			dev-java/commons-configuration
-			dev-java/commons-lang:2.1
-			=dev-java/junit-3*"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	test? ( dev-java/emma )
-	${COMMON_DEP}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	java-ant_rewrite-classpath
-}
-
-EANT_GENTOO_CLASSPATH="commons-io:1,jsap,log4j,commons-collections,colt,fastutil:5.0,commons-configuration,commons-lang:2.1,junit"
-
-src_install() {
-	java-pkg_newjar "${P}.jar"
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc src
-}
-
-#emma configuration files are currently not distributed with
-#source.  therefore tests fail before even run.
-RESTRICT="test"
-
-src_test() {
-	eant -Djar.base=/usr/share/emma/lib junit
-}
diff --git a/dev-java/dsiutils/dsiutils-1.0.5.ebuild b/dev-java/dsiutils/dsiutils-1.0.5.ebuild
deleted file mode 100644
index c20c582ec631..000000000000
--- a/dev-java/dsiutils/dsiutils-1.0.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dsiutils/dsiutils-1.0.5.ebuild,v 1.2 2012/04/13 18:05:15 ulm Exp $
-
-EAPI="1"
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Mish Mash of classes that were initially distributed with mg4j (amount others)."
-HOMEPAGE="http://dsiutils.dsi.unimi.it/"
-SRC_URI="http://dsiutils.dsi.unimi.it/${P}-src.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE=""
-
-COMMON_DEP="dev-java/commons-io:1
-			=dev-java/jsap-2*
-			dev-java/log4j
-			dev-java/commons-collections
-			dev-java/colt
-			=dev-java/fastutil-5.1*
-			dev-java/commons-configuration
-			dev-java/commons-lang:2.1
-			=dev-java/junit-3*"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	test? ( dev-java/emma )
-	${COMMON_DEP}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	java-ant_rewrite-classpath
-}
-
-EANT_GENTOO_CLASSPATH="commons-io:1,jsap,log4j,commons-collections,colt,fastutil:5.0,commons-configuration,commons-lang:2.1,junit"
-
-src_install() {
-	java-pkg_newjar "${P}.jar"
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc src
-}
-
-#emma configuration files are currently not distributed with
-#source.  therefore tests fail before even run.
-RESTRICT="test"
-
-src_test() {
-	eant -Djar.base=/usr/share/emma/lib junit
-}
diff --git a/dev-java/dsiutils/dsiutils-1.0.7.ebuild b/dev-java/dsiutils/dsiutils-1.0.7.ebuild
deleted file mode 100644
index 93a40101b921..000000000000
--- a/dev-java/dsiutils/dsiutils-1.0.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dsiutils/dsiutils-1.0.7.ebuild,v 1.2 2012/04/13 18:05:15 ulm Exp $
-
-EAPI="1"
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Mish Mash of classes that were initially distributed with mg4j (amount others)."
-HOMEPAGE="http://dsiutils.dsi.unimi.it/"
-SRC_URI="http://dsiutils.dsi.unimi.it/${P}-src.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE=""
-
-COMMON_DEP="dev-java/commons-io:1
-			=dev-java/jsap-2*
-			dev-java/log4j
-			dev-java/commons-collections
-			dev-java/colt
-			=dev-java/fastutil-5.1*
-			dev-java/commons-configuration
-			dev-java/commons-lang:2.1
-			=dev-java/junit-3*"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	test? ( dev-java/emma )
-	${COMMON_DEP}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	java-ant_rewrite-classpath
-}
-
-EANT_GENTOO_CLASSPATH="commons-io:1,jsap,log4j,commons-collections,colt,fastutil:5.0,commons-configuration,commons-lang:2.1,junit"
-
-src_install() {
-	java-pkg_newjar "${P}.jar"
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc src
-}
-
-#emma configuration files are currently not distributed with
-#source.  therefore tests fail before even run.
-RESTRICT="test"
-
-src_test() {
-	eant -Djar.base=/usr/share/emma/lib junit
-}