Simplified src_compile using a patch submitted by <nathanegge@yahoo.com> in bug #143227.

Package-Manager: portage-2.1.1_pre4-r2

3 files changed, 20 insertions, 17 deletions

diff --git a/dev-java/concurrent-util/ChangeLog b/dev-java/concurrent-util/ChangeLog
index 622b649fa69d..222f7f7db039 100644
--- a/dev-java/concurrent-util/ChangeLog
+++ b/dev-java/concurrent-util/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/concurrent-util
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/concurrent-util/ChangeLog,v 1.11 2006/07/20 11:23:33 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/concurrent-util/ChangeLog,v 1.12 2006/08/08 19:15:35 betelgeuse Exp $
+
+  08 Aug 2006; Petteri Räty <betelgeuse@gentoo.org>
+  concurrent-util-1.3.4-r1.ebuild:
+  Simplified src_compile using a patch submitted by <nathanegge@yahoo.com> in
+  bug #143227.
 
 *concurrent-util-1.3.4-r1 (20 Jul 2006)
 
diff --git a/dev-java/concurrent-util/Manifest b/dev-java/concurrent-util/Manifest
index 0167b4cbd7cf..0ee97571a215 100644
--- a/dev-java/concurrent-util/Manifest
+++ b/dev-java/concurrent-util/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA1
 
 DIST gentoo-concurrent-util-1.3.4.tar.bz2 136648 RMD160 ebf8dd66a5ba43b7a6da69f4c8c74c1ee768bc3b SHA1 250a4aed80059e31cfc94d030f9456c48e4ee62c SHA256 3cf419c3eeb6623fd189c24d005c61edde4d7f6350599e5837de879a0fd95f62
-EBUILD concurrent-util-1.3.4-r1.ebuild 1116 RMD160 e3cd038f9fac59375de2be243f49e828e1d0eae3 SHA1 63c08f41b1280871ba8ce917a40e2c8beb61f157 SHA256 18a4c62cdd7b4c024d37bd3441c13f5dd4804b83a8d4ee9e8930bce29e9e5dbc
-MD5 5bd5aa7b0620e82036393022fdaa711c concurrent-util-1.3.4-r1.ebuild 1116
-RMD160 e3cd038f9fac59375de2be243f49e828e1d0eae3 concurrent-util-1.3.4-r1.ebuild 1116
-SHA256 18a4c62cdd7b4c024d37bd3441c13f5dd4804b83a8d4ee9e8930bce29e9e5dbc concurrent-util-1.3.4-r1.ebuild 1116
+EBUILD concurrent-util-1.3.4-r1.ebuild 1039 RMD160 ce0b4d34876ff27178d7105e336bc41ef2e92a85 SHA1 b15ff146e19921d39cebf5c07def12e4f0c415d3 SHA256 806f7a13c524bdfc8a56cc2c54aaac0afb7f9f1767cbdc78450490ff2ef9b652
+MD5 48dfe9c65c6c30ef7d50371871da28ed concurrent-util-1.3.4-r1.ebuild 1039
+RMD160 ce0b4d34876ff27178d7105e336bc41ef2e92a85 concurrent-util-1.3.4-r1.ebuild 1039
+SHA256 806f7a13c524bdfc8a56cc2c54aaac0afb7f9f1767cbdc78450490ff2ef9b652 concurrent-util-1.3.4-r1.ebuild 1039
 EBUILD concurrent-util-1.3.4.ebuild 1186 RMD160 c9834a8d3e9aa8fc1ca225de0644911e33ca52c2 SHA1 8173fd7c5d6d2a51b83ac6ef001d567af2ad8203 SHA256 3d7d79a54cb8a9052d07d753e625eee051adb372eec04fb8fa5c68210556a11e
 MD5 6dd096cf930181597388f0fdf3679b6f concurrent-util-1.3.4.ebuild 1186
 RMD160 c9834a8d3e9aa8fc1ca225de0644911e33ca52c2 concurrent-util-1.3.4.ebuild 1186
 SHA256 3d7d79a54cb8a9052d07d753e625eee051adb372eec04fb8fa5c68210556a11e concurrent-util-1.3.4.ebuild 1186
-MISC ChangeLog 1549 RMD160 73c7fc9d8a897c844d4b294cf857d875c92c6d32 SHA1 3be51a4f4a4933247e5980f49d8a594540dc0fdd SHA256 8ab0cd145d44f4f7a005115c4af2c3707aa9a38a12ff5f6cd545e743f9f1447f
-MD5 2599aacb7a508de2fbc1e9e940b8cf19 ChangeLog 1549
-RMD160 73c7fc9d8a897c844d4b294cf857d875c92c6d32 ChangeLog 1549
-SHA256 8ab0cd145d44f4f7a005115c4af2c3707aa9a38a12ff5f6cd545e743f9f1447f ChangeLog 1549
+MISC ChangeLog 1733 RMD160 58fb1be940b3d261510e128a188860e3bf695e56 SHA1 66a020f4a6b47d4fba4d5e1e80dc022ed1d2fb68 SHA256 eb6468169aa59d8f217003321f8a94dc0a5d7ec619bab99e58adbc4527fc28e2
+MD5 c42e437defc010af7f1e7ad264ed6f5a ChangeLog 1733
+RMD160 58fb1be940b3d261510e128a188860e3bf695e56 ChangeLog 1733
+SHA256 eb6468169aa59d8f217003321f8a94dc0a5d7ec619bab99e58adbc4527fc28e2 ChangeLog 1733
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -25,9 +25,9 @@ MD5 51dac9e06e19b53c53e2ed22477e69cc files/digest-concurrent-util-1.3.4-r1 289
 RMD160 96dd87fc347e12d98efe32f43201e59b02dfd65f files/digest-concurrent-util-1.3.4-r1 289
 SHA256 20006e34c8497d61027a171d7f021401e6b94103a2b09096bf0b293302d7eeea files/digest-concurrent-util-1.3.4-r1 289
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEv2fLgo/w9rxVVVERArzVAJ9tV8Qs7AlD9VkoOQ03al9YU7Ql4QCgiK5h
-csOlLBQuEN344705PxBd1us=
-=/6TP
+iD8DBQFE2OLicxLzpIGCsLQRAqo5AJsFNuORj5mcO5kLIQPkPzhlZBICoQCfV75m
+cCL9T1NYS1fQjvdtAp9RQso=
+=Rf4D
 -----END PGP SIGNATURE-----
diff --git a/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild b/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild
index ef396f694dc6..1ea9db3df5e5 100644
--- a/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild
+++ b/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild,v 1.1 2006/07/20 11:23:33 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild,v 1.2 2006/08/08 19:15:35 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -17,9 +17,7 @@ DEPEND=">=virtual/jdk-1.2
 IUSE="doc source"
 
 src_compile() {
-	local antflags="jar"
-	use doc && antflags="${antflags} doc"
-	eant ${antflags} || die "failed to build"
+	eant $(use_doc doc) jar
 }
 
 src_install() {