Cleanup ebuild and documentation installation and add a workaround for bug #158720.

Package-Manager: portage-2.1.2-r1

3 files changed, 33 insertions, 23 deletions

diff --git a/dev-java/commons-lang/ChangeLog b/dev-java/commons-lang/ChangeLog
index 8e45b78d041d..66ffedbd9fa8 100644
--- a/dev-java/commons-lang/ChangeLog
+++ b/dev-java/commons-lang/ChangeLog
@@ -1,6 +1,11 @@
 # 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.33 2007/01/11 13:20:55 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/ChangeLog,v 1.34 2007/01/24 16:50:27 betelgeuse Exp $
+
+  24 Jan 2007; Petteri Räty <betelgeuse@gentoo.org>
+  commons-lang-2.0-r2.ebuild:
+  Cleanup ebuild and documentation installation and add a workaround for bug
+  #158720.
 
   11 Jan 2007; Markus Rothe <corsair@gentoo.org> commons-lang-2.0-r2.ebuild:
   Stable on ppc64
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index cefb8bcad328..c935e44a352f 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -1,13 +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
 EBUILD commons-lang-2.0-r1.ebuild 1092 RMD160 b753115e61ca0a88cdedcacaa0524fbe8ecefc8b SHA1 40e6fecc3c4cae3168a0d5890931165cd3a1d1c0 SHA256 c40eeb98b97626fd29eb2a246e28648c2554fb9116823c6eff0a3751bdb3101e
 MD5 c48567087a38e2ff99220fb6b8419cfb commons-lang-2.0-r1.ebuild 1092
 RMD160 b753115e61ca0a88cdedcacaa0524fbe8ecefc8b commons-lang-2.0-r1.ebuild 1092
 SHA256 c40eeb98b97626fd29eb2a246e28648c2554fb9116823c6eff0a3751bdb3101e commons-lang-2.0-r1.ebuild 1092
-EBUILD commons-lang-2.0-r2.ebuild 1024 RMD160 1baa7c514b56ba7a2681feb71de80c2efb841638 SHA1 9fa3f649dfe4b410c778cfb4668cd73ab8fbd3ca SHA256 0341c26c1bb19869a93939206a4f49a842348ed833574bea182e45f39ab3760a
-MD5 1ef01e77e6f6fb87eacbfa44447a7cbe commons-lang-2.0-r2.ebuild 1024
-RMD160 1baa7c514b56ba7a2681feb71de80c2efb841638 commons-lang-2.0-r2.ebuild 1024
-SHA256 0341c26c1bb19869a93939206a4f49a842348ed833574bea182e45f39ab3760a commons-lang-2.0-r2.ebuild 1024
+EBUILD commons-lang-2.0-r2.ebuild 977 RMD160 65f862f910356f8e526149a6bd7f0957dee74c43 SHA1 d14021f1acd9f57855b32043c557de1fbfb98173 SHA256 9de648c501b0d5890db8d05995c3a9cb09fa8ff458bf431ea9766990978a8dea
+MD5 cd1b3cac75e3256651d03dd452717602 commons-lang-2.0-r2.ebuild 977
+RMD160 65f862f910356f8e526149a6bd7f0957dee74c43 commons-lang-2.0-r2.ebuild 977
+SHA256 9de648c501b0d5890db8d05995c3a9cb09fa8ff458bf431ea9766990978a8dea commons-lang-2.0-r2.ebuild 977
 EBUILD commons-lang-2.1-r1.ebuild 1003 RMD160 7934203646b45edafd77e615f797b2410e849d28 SHA1 426004bab755d6e4e8b650263e028c6208d9d02b SHA256 99b029497606fd0a2c6214ecd24e43b0623725cda5e51e7abc77350d34b1c81c
 MD5 49ebc51980917aa900676a724c9dd9ea commons-lang-2.1-r1.ebuild 1003
 RMD160 7934203646b45edafd77e615f797b2410e849d28 commons-lang-2.1-r1.ebuild 1003
@@ -16,10 +19,10 @@ EBUILD commons-lang-2.1.ebuild 1069 RMD160 89c150bedadfa9df8e27f4dd4d2fea289a328
 MD5 30c25ddee4a4d812330dc4d12a3ebe44 commons-lang-2.1.ebuild 1069
 RMD160 89c150bedadfa9df8e27f4dd4d2fea289a3285ee commons-lang-2.1.ebuild 1069
 SHA256 50d8f5c4d0eea61b9221e00d193169ec6fb4dcf8f3ece5b0b3d9545a60272d1a commons-lang-2.1.ebuild 1069
-MISC ChangeLog 4238 RMD160 38ab70293f130143f27d946928420710da4e2a99 SHA1 0f5cc64909ccc0c3fb699b2fda1389a87a358d3a SHA256 a36540cb97dc2088652cb0646b24891fc2bd164173b3ced3b08fa23196810432
-MD5 a366771d1993cd86f58ebc43b7e270bf ChangeLog 4238
-RMD160 38ab70293f130143f27d946928420710da4e2a99 ChangeLog 4238
-SHA256 a36540cb97dc2088652cb0646b24891fc2bd164173b3ced3b08fa23196810432 ChangeLog 4238
+MISC ChangeLog 4413 RMD160 013aacf87c7b9e7f4e043a7d4e7de08958ca6671 SHA1 84297428f023028b094d677ed4b6494a06278fe4 SHA256 9d7a953c39af361285cf1aba420d24c898576c29db59d860123a5957c72d7e23
+MD5 f1444823691f8f1b88bc6696b38a15bb ChangeLog 4413
+RMD160 013aacf87c7b9e7f4e043a7d4e7de08958ca6671 ChangeLog 4413
+SHA256 9d7a953c39af361285cf1aba420d24c898576c29db59d860123a5957c72d7e23 ChangeLog 4413
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -36,3 +39,10 @@ SHA256 6dbddf77941c9c80433583cf9f58d039d0599726698fd62fbb6ee49025bad1ef files/di
 MD5 0189415916c9f5ec4ecbe363fbe1ec6b files/digest-commons-lang-2.1-r1 262
 RMD160 ad110f74b0b4a2d95a250427bfb0aa77a48f5fab files/digest-commons-lang-2.1-r1 262
 SHA256 6dbddf77941c9c80433583cf9f58d039d0599726698fd62fbb6ee49025bad1ef files/digest-commons-lang-2.1-r1 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFt45ecxLzpIGCsLQRAizYAJ9ZOzzSnB8UQqnNSDOu3tPItC1kYgCcDZ2K
+qDUbXQ111D/un89t5EWEwCo=
+=kC9h
+-----END PGP SIGNATURE-----
diff --git a/dev-java/commons-lang/commons-lang-2.0-r2.ebuild b/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
index f4505e6eaf40..4d6c7c1e0c6d 100644
--- a/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
@@ -1,14 +1,17 @@
 # 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.0-r2.ebuild,v 1.4 2007/01/11 13:20:55 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/commons-lang-2.0-r2.ebuild,v 1.5 2007/01/24 16:50:27 betelgeuse 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.4"
+DEPEND="
+	!doc? ( >=virtual/jdk-1.4 )
+	doc? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) )
+	>=dev-java/ant-core-1.4
+	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.3"
 LICENSE="Apache-1.1"
 SLOT="0"
@@ -17,19 +20,11 @@ IUSE="doc source"
 
 S="${WORKDIR}/${P}-src"
 
-src_compile() {
-	local antflags="jar"
-	use doc && antflags="${antflags} javadoc"
-	eant ${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
+	dodoc RELEASE-NOTES.txt
+	java-pkg_dohtml DEVELOPERS-GUIDE.html PROPOSAL.html STATUS.html
+	use doc && java-pkg_dojavadoc dist/docs/api
 	use source && java-pkg_dosrc src/java/*
 }