Fix to work with generic src_test that will be soon added.

Package-Manager: portage-2.1.4.4

4 files changed, 28 insertions, 43 deletions

diff --git a/dev-java/commons-lang/ChangeLog b/dev-java/commons-lang/ChangeLog
index f356d95f3e20..e6f22f0ba70f 100644
--- a/dev-java/commons-lang/ChangeLog
+++ b/dev-java/commons-lang/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/commons-lang
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/ChangeLog,v 1.49 2007/11/25 10:08:06 nelchael Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/ChangeLog,v 1.50 2008/03/05 17:25:17 betelgeuse Exp $
+
+  05 Mar 2008; Petteri Räty <betelgeuse@gentoo.org>
+  -commons-lang-2.1-r1.ebuild, commons-lang-2.3.ebuild:
+  Fix to work with generic src_test that will be soon added.
+
+  27 Jan 2008; Petteri Räty <betelgeuse@gentoo.org>
+  -commons-lang-2.1-r1.ebuild:
+  Delete old version.
 
   25 Nov 2007; Krzysiek Pawlik <nelchael@gentoo.org>
   commons-lang-2.3.ebuild:
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index 1defe15f2c15..9f09af418f5a 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -1,8 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST commons-lang-2.0-src.tar.gz 440989 RMD160 ad1fe25af86ad838441a7f3020200cdfc9b142c2 SHA1 a7b3118f956e62cc505624bba430f39b0bc53794 SHA256 40e159aa08b4561472056d369c1b4e347f251fd088a3045999e57f4ab50f34f2
-DIST commons-lang-2.1-src.tar.gz 373908 RMD160 b236492f0a7a99f8abf01cf1bd6a41461fd99dfd SHA1 d21c167c0cc4bc18a975ee085a3fd86826cff10a SHA256 945ddc3cd7bb2fdc508cbb896734874883545597f549ddc301b4749caefa86e9
 DIST commons-lang-2.3-src.tar.gz 474681 RMD160 d1409b72dcad8552935dabd6fe3f7fad22aeb568 SHA1 efc1ab026e8e9ac4cd150cb4cf1b7e4663cddc84 SHA256 9775f8db678e15e9a482bbbf00b35c38da8bfc51c6dafa4531c6dd16225602fd
 EBUILD commons-lang-2.0-r2.ebuild 883 RMD160 852742925c6c254df2d6f6e27a2f244450e28ac9 SHA1 c96917fd90eb26aae03634a09b3d6b774eecedf8 SHA256 498d11763f5cc9c9fb363ab4825dc4cc6953db17e533fd0334ebca6914c8f7b6
-EBUILD commons-lang-2.1-r1.ebuild 997 RMD160 a6861cf66767fb569ce5ff48ae711a0dd3b92ae6 SHA1 e6ccedd25b288fd967473b586fefd48b9b5ab57d SHA256 df4c1a08453a16bce759897de59f34a295faf5006b90753474d3408a774fe567
-EBUILD commons-lang-2.3.ebuild 850 RMD160 7845abeff743172e29e12b288b6d937a091f4939 SHA1 2c4151a20dab1160eca7c7c82bc4f22d69dc13d8 SHA256 ef332fe0a9273d239bedcb60f56049446420cd3b8f9c6fe952b58016d95443c7
-MISC ChangeLog 6131 RMD160 3be30f56b15323879cb5fb9cf3917017a40fd01d SHA1 a77e4b5b347c40b18980e254aa58a7d364e10d53 SHA256 7eadc78a543b93e554c803b8443d6032613b4dfbed16dc2da2893c3ff3c6880a
+EBUILD commons-lang-2.3.ebuild 896 RMD160 d679e2d1e0e42b7afff687e9d5461dd965592d63 SHA1 11f7f7ad94e80fca95f1c58b43e6cf7c87c49779 SHA256 a28ef187b688dd5f508a3040a1528a2c2a7a745bd5e6215f5851e9fe4ff56847
+MISC ChangeLog 6411 RMD160 18e8b49a2c153a15d679d42db2e946658300e70b SHA1 013f52a61e4f15be9e9cd5b9a44d76e522e67aa0 SHA256 1341bafa065a435583b5217b69a6c9e9880487a30f837ac61bd1a36c252bd4ac
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHztd8cxLzpIGCsLQRAtxDAJ4my7yMbMRAETxRgqlpdipq9PqYBwCfavmx
+I7B9qOoJRSZN5bSnigqCjNQ=
+=tw5o
+-----END PGP SIGNATURE-----
diff --git a/dev-java/commons-lang/commons-lang-2.1-r1.ebuild b/dev-java/commons-lang/commons-lang-2.1-r1.ebuild
deleted file mode 100644
index f7a95534cb6f..000000000000
--- a/dev-java/commons-lang/commons-lang-2.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/commons-lang-2.1-r1.ebuild,v 1.7 2007/03/15 17:46:09 corsair Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Jakarta components to manipulate core java classes"
-HOMEPAGE="http://jakarta.apache.org/commons/lang/"
-SRC_URI="mirror://apache/jakarta/commons/lang/source/${P}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-core-1.6"
-RDEPEND=">=virtual/jre-1.3"
-LICENSE="Apache-2.0"
-SLOT="2.1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="doc source"
-
-src_compile() {
-	local antflags="jar"
-	use doc && antflags="${antflags} javadoc"
-	ant ${antflags} || die "compilation failed"
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-
-	if use doc; then
-		dodoc RELEASE-NOTES.txt
-		java-pkg_dohtml DEVELOPERS-GUIDE.html PROPOSAL.html STATUS.html
-		java-pkg_dohtml -r dist/docs/
-	fi
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-lang/commons-lang-2.3.ebuild b/dev-java/commons-lang/commons-lang-2.3.ebuild
index 51729ec59546..38239d892b00 100644
--- a/dev-java/commons-lang/commons-lang-2.3.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/commons-lang-2.3.ebuild,v 1.5 2007/11/25 10:08:06 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/commons-lang-2.3.ebuild,v 1.6 2008/03/05 17:25:17 betelgeuse Exp $
 
-JAVA_PKG_IUSE="doc source"
+EAPI=1
+JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2
 
@@ -11,7 +12,8 @@ HOMEPAGE="http://jakarta.apache.org/commons/lang/"
 SRC_URI="mirror://apache/jakarta/commons/lang/source/${P}-src.tar.gz"
 IUSE=""
 
-DEPEND=">=virtual/jdk-1.4"
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/ant-junit:0 )"
 RDEPEND=">=virtual/jre-1.4"
 
 LICENSE="Apache-2.0"