and source useflag support, some cleanups

(Portage version: 2.0.51.22-r1)

5 files changed, 57 insertions, 68 deletions

diff --git a/dev-java/jdepend/ChangeLog b/dev-java/jdepend/ChangeLog
index 0defd211ca28..6881ab265615 100644
--- a/dev-java/jdepend/ChangeLog
+++ b/dev-java/jdepend/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jdepend
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdepend/ChangeLog,v 1.25 2005/04/15 14:42:03 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdepend/ChangeLog,v 1.26 2005/07/09 16:04:16 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> jdepend-2.6-r1.ebuild,
+  jdepend-2.8-r1.ebuild, jdepend-2.8.1.ebuild:
+  and source useflag support, some cleanups
 
   15 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> jdepend-2.8.1.ebuild:
   Stable on sparc
diff --git a/dev-java/jdepend/Manifest b/dev-java/jdepend/Manifest
index 6de8a7fd0c03..0bd0eed9997a 100644
--- a/dev-java/jdepend/Manifest
+++ b/dev-java/jdepend/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ca9a24a74e228c93f9cb9809303eed73 ChangeLog 2728
-MD5 b4575f41d5a067c4609f9cefae4319a1 jdepend-2.6-r1.ebuild 1425
-MD5 5d38da81eb59db8f418993072db96a9f jdepend-2.8-r1.ebuild 1403
-MD5 fac63d447d5cf89bbcbbb9941acd6a08 jdepend-2.8.1.ebuild 1413
+MD5 3dbc3b3819f28f1875485f9ea80f36b5 jdepend-2.8.1.ebuild 1368
+MD5 a2bd91fc9f966a3f6eafd4405a109e78 jdepend-2.6-r1.ebuild 1366
+MD5 ab3a1a1518f0c682d2e8cbd7cf84558b jdepend-2.8-r1.ebuild 1358
+MD5 22a36edfbb38f03f0c130d9045b0cabe ChangeLog 2892
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 8cd6656b239dc4bda362ab10efe868b4 files/digest-jdepend-2.8.1 62
 MD5 8edc146649c8fbc403b70d2bce7702f5 files/digest-jdepend-2.6-r1 60
 MD5 bff97b12035abbf9e1411b1b40b87cfa files/digest-jdepend-2.8-r1 60
-MD5 8cd6656b239dc4bda362ab10efe868b4 files/digest-jdepend-2.8.1 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCX9LNKRy60XGEcJIRArceAJ9Jd01rcnVSKMk1RRy+vv3yImiEQwCfV97D
-9viWNMaKdz74mlodk4Z3NFU=
-=zCzp
------END PGP SIGNATURE-----
diff --git a/dev-java/jdepend/jdepend-2.6-r1.ebuild b/dev-java/jdepend/jdepend-2.6-r1.ebuild
index ea6ceac8e689..dd10982f0fae 100644
--- a/dev-java/jdepend/jdepend-2.6-r1.ebuild
+++ b/dev-java/jdepend/jdepend-2.6-r1.ebuild
@@ -1,44 +1,39 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdepend/jdepend-2.6-r1.ebuild,v 1.5 2005/01/26 21:22:31 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdepend/jdepend-2.6-r1.ebuild,v 1.6 2005/07/09 16:04:16 axxo Exp $
 
 inherit java-pkg
 
 DESCRIPTION="JDepend traverses Java class file directories and generates design quality metrics for each Java package."
 HOMEPAGE="http://www.clarkware.com/software/JDepend.html"
-SRC_URI="http://www.clarkware.com/software/${PN}-${PV}.zip"
+SRC_URI="http://www.clarkware.com/software/${P}.zip"
 
 LICENSE="jdepend"
 SLOT="0"
 KEYWORDS="x86 amd64 ppc sparc"
-IUSE="doc jikes"
+IUSE="doc jikes source"
 
 DEPEND=">=virtual/jdk-1.3
 		>=app-arch/unzip-5.50-r1
 		>=dev-java/ant-core-1.4
-		jikes? ( >=dev-java/jikes-1.17 )"
-RDEPEND=">=virtual/jdk-1.3"
+		jikes? ( >=dev-java/jikes-1.17 )
+		source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.3"
 
 #TODO Do junit testing but resolve the circular dependency we have with ant.
 src_compile() {
-	local myc
+	local antflags="jar"
 
-	if use jikes ; then
-		myc="${myc} -Dbuild.compiler=jikes"
-	fi
-
-#	use junit && export CLASSPATH=$CLASSPATH:`java-config --classpath=junit`
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+#	use junit && antflags="${antflags} test"
 
-	ANT_OPTS=${myc} ant jar || die "Failed Compiling"
+	ant ${antflags} || die "Failed Compiling"
 
-#	if use junit ; then
-#		ant test || die "Failed Testing Packages Integrity"
-#	fi
 }
 
 src_install() {
 	java-pkg_dojar lib/jdepend.jar || die "Failed Installing"
-	dodoc LICENSE README
+	dodoc README
 
 	dodir /usr/share/ant-core/lib
 	dosym /usr/share/jdepend/lib/jdepend.jar /usr/share/ant-core/lib
@@ -48,4 +43,6 @@ src_install() {
 		cp -r docs/api ${D}/usr/share/doc/${PF}/html
 		cp -r docs/images ${D}/usr/share/doc/${PF}/html
 	fi
+
+	use source && java-pkg_dosrc src/*
 }
diff --git a/dev-java/jdepend/jdepend-2.8-r1.ebuild b/dev-java/jdepend/jdepend-2.8-r1.ebuild
index 2c62bb602093..0d55d08e1677 100644
--- a/dev-java/jdepend/jdepend-2.8-r1.ebuild
+++ b/dev-java/jdepend/jdepend-2.8-r1.ebuild
@@ -1,42 +1,39 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdepend/jdepend-2.8-r1.ebuild,v 1.5 2005/01/26 21:22:31 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdepend/jdepend-2.8-r1.ebuild,v 1.6 2005/07/09 16:04:16 axxo Exp $
 
 inherit java-pkg
 
 DESCRIPTION="JDepend traverses Java class file directories and generates design quality metrics for each Java package."
 HOMEPAGE="http://www.clarkware.com/software/JDepend.html"
-SRC_URI="http://www.clarkware.com/software/${PN}-${PV}.zip"
+SRC_URI="http://www.clarkware.com/software/${P}.zip"
+
 LICENSE="jdepend"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="doc jikes"
+IUSE="doc jikes source"
+
 DEPEND=">=virtual/jdk-1.3
-	>=app-arch/unzip-5.50-r1
-	>=dev-java/ant-core-1.4
-	jikes? ( >=dev-java/jikes-1.17 )"
-RDEPEND=">=virtual/jdk-1.3"
+		>=app-arch/unzip-5.50-r1
+		>=dev-java/ant-core-1.4
+		source? ( app-arch/zip )
+		jikes? ( >=dev-java/jikes-1.17 )"
+RDEPEND=">=virtual/jre-1.3"
 
 #TODO Do junit testing but resolve the circular dependency we have with ant.
 src_compile() {
-	local myc
+	local antflags="jar"
 
-	if use jikes ; then
-		myc="${myc} -Dbuild.compiler=jikes"
-	fi
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+#	use junit && antflags="${antflags} test"
 
-#	use junit && export CLASSPATH=$CLASSPATH:`java-config --classpath=junit`
+	ant ${antflags} || die "Failed Compiling"
 
-	ant ${myc} jar || die "Failed Compiling"
-
-#	if use junit ; then
-#		ant test || die "Failed Testing Packages Integrity"
-#	fi
 }
 
 src_install() {
 	java-pkg_dojar lib/jdepend.jar || die "Failed Installing"
-	dodoc LICENSE README
+	dodoc README
 
 	dodir /usr/share/ant-core/lib
 	dosym /usr/share/jdepend/lib/jdepend.jar /usr/share/ant-core/lib
@@ -46,4 +43,6 @@ src_install() {
 		cp -r docs/api ${D}/usr/share/doc/${PF}/html
 		cp -r docs/images ${D}/usr/share/doc/${PF}/html
 	fi
+
+	use source && java-pkg_dosrc src/*
 }
diff --git a/dev-java/jdepend/jdepend-2.8.1.ebuild b/dev-java/jdepend/jdepend-2.8.1.ebuild
index f3c27416eccf..fb9a535e4a79 100644
--- a/dev-java/jdepend/jdepend-2.8.1.ebuild
+++ b/dev-java/jdepend/jdepend-2.8.1.ebuild
@@ -1,42 +1,39 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdepend/jdepend-2.8.1.ebuild,v 1.8 2005/04/15 14:42:03 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdepend/jdepend-2.8.1.ebuild,v 1.9 2005/07/09 16:04:16 axxo Exp $
 
 inherit java-pkg
 
 DESCRIPTION="JDepend traverses Java class file directories and generates design quality metrics for each Java package."
 HOMEPAGE="http://www.clarkware.com/software/JDepend.html"
-SRC_URI="http://www.clarkware.com/software/${PN}-${PV}.zip"
+SRC_URI="http://www.clarkware.com/software/${P}.zip"
+
 LICENSE="jdepend"
 SLOT="0"
 KEYWORDS="x86 amd64 ppc64 sparc"
-IUSE="doc jikes"
+IUSE="doc jikes source"
+
 DEPEND=">=virtual/jdk-1.3
-	>=app-arch/unzip-5.50-r1
-	>=dev-java/ant-core-1.4
-	jikes? ( >=dev-java/jikes-1.17 )"
-RDEPEND=">=virtual/jdk-1.3"
+		>=app-arch/unzip-5.50-r1
+		>=dev-java/ant-core-1.4
+		source? ( app-arch/zip )
+		jikes? ( >=dev-java/jikes-1.17 )"
+RDEPEND=">=virtual/jre-1.3"
 
 #TODO Do junit testing but resolve the circular dependency we have with ant.
 src_compile() {
-	local myc
+	local antflags="jar"
 
-	if use jikes ; then
-		myc="${myc} -Dbuild.compiler=jikes"
-	fi
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+#	use junit && antflags="${antflags} test"
 
-#	use junit && export CLASSPATH=$CLASSPATH:`java-config --classpath=junit`
+	ant ${antflags} || die "Failed Compiling"
 
-	ant ${myc} jar || die "Failed Compiling"
-
-#	if use junit ; then
-#		ant test || die "Failed Testing Packages Integrity"
-#	fi
 }
 
 src_install() {
 	java-pkg_dojar lib/jdepend.jar || die "Failed Installing"
-	dodoc LICENSE README
+	dodoc README
 
 	dodir /usr/share/ant-core/lib
 	dosym /usr/share/jdepend/lib/jdepend.jar /usr/share/ant-core/lib
@@ -46,4 +43,6 @@ src_install() {
 		cp -r docs/api ${D}/usr/share/doc/${PF}/html
 		cp -r docs/images ${D}/usr/share/doc/${PF}/html
 	fi
+
+	use source && java-pkg_dosrc src/*
 }