Fix building qdox.

Package-Manager: portage-2.1.2.7

3 files changed, 40 insertions, 21 deletions

diff --git a/dev-java/qdox/ChangeLog b/dev-java/qdox/ChangeLog
index dd32824273e0..c008e0e22db9 100644
--- a/dev-java/qdox/ChangeLog
+++ b/dev-java/qdox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/qdox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qdox/ChangeLog,v 1.8 2007/04/20 14:44:47 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qdox/ChangeLog,v 1.9 2007/05/13 18:23:19 nelchael Exp $
+
+  13 May 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  qdox-20050104-r1.ebuild:
+  Fix building qdox.
 
   20 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
   qdox-20050104-r1.ebuild:
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index f2ef4088987f..2f8976857e5b 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA1
 
 DIST qdox-20050104.tar.bz2 35492 RMD160 bc09eddd4a7fb1cff42442e25430091f0eb483fe SHA1 582a7965de1339c4ad5f2bc9c3045cc38b3d1f38 SHA256 5c3a8778ca7d775fde805b324a625b165bbe7e70dc78ff961aec890699487437
-EBUILD qdox-20050104-r1.ebuild 973 RMD160 eda7d154cf69961e547bcbf634b88a2631c26794 SHA1 f159a3ae42f895239948cf1185ead8677bbea9d5 SHA256 dabb0c142e90b7bca69d5c318b735c3fd8ef4d82de80c4fa2fc1900e0dc2c85f
-MD5 a8402645c8ff5d32b9d04500d5be04df qdox-20050104-r1.ebuild 973
-RMD160 eda7d154cf69961e547bcbf634b88a2631c26794 qdox-20050104-r1.ebuild 973
-SHA256 dabb0c142e90b7bca69d5c318b735c3fd8ef4d82de80c4fa2fc1900e0dc2c85f qdox-20050104-r1.ebuild 973
+EBUILD qdox-20050104-r1.ebuild 1059 RMD160 1662cc5793b5d13eb3ce09b6f6d7776a2b19c028 SHA1 c6bc4e371f39f3560a71dc017bd625e59ecd5d43 SHA256 cfd79d33d908d960fa9f0d484c618dbfa37c0d77963051518aed390016c22462
+MD5 d0c26b1676d3e4c04c21ef947fd1da3d qdox-20050104-r1.ebuild 1059
+RMD160 1662cc5793b5d13eb3ce09b6f6d7776a2b19c028 qdox-20050104-r1.ebuild 1059
+SHA256 cfd79d33d908d960fa9f0d484c618dbfa37c0d77963051518aed390016c22462 qdox-20050104-r1.ebuild 1059
 EBUILD qdox-20050104.ebuild 972 RMD160 8e2325421edda2afd304a8391095ef0dde3f8188 SHA1 672faff45cb691ae80af7e5c0d196aeb7743138c SHA256 5db14b35f95b1b552a31d557c3e29dadb56f8b1f8b909449e87c44220e83d4c8
 MD5 e7fd71f3022032710ce79f77170cb93f qdox-20050104.ebuild 972
 RMD160 8e2325421edda2afd304a8391095ef0dde3f8188 qdox-20050104.ebuild 972
 SHA256 5db14b35f95b1b552a31d557c3e29dadb56f8b1f8b909449e87c44220e83d4c8 qdox-20050104.ebuild 972
-MISC ChangeLog 1360 RMD160 b1a8c58c21b7e3b6232c973e879be2ea880bca03 SHA1 70a58a0061d8e1729b5c6c342cfe22413460eeb8 SHA256 d2f46c1a5c7cb069937f5c0cd48a62b8d68950340205f1ac558fffc089b8c988
-MD5 352d68975ec087798d9da8faeadcef46 ChangeLog 1360
-RMD160 b1a8c58c21b7e3b6232c973e879be2ea880bca03 ChangeLog 1360
-SHA256 d2f46c1a5c7cb069937f5c0cd48a62b8d68950340205f1ac558fffc089b8c988 ChangeLog 1360
+MISC ChangeLog 1460 RMD160 c1772e162829a2de58764a5266a177e1d10e8e41 SHA1 7bd17e8aa6535fd205f36ad3d65dbe838b1d5813 SHA256 004f78bc347f89b5ebbbbf8c170cfa57028cc1c1c8370be6a20be90989b5a1dd
+MD5 ed489508294aa7eca8b26acef7a75824 ChangeLog 1460
+RMD160 c1772e162829a2de58764a5266a177e1d10e8e41 ChangeLog 1460
+SHA256 004f78bc347f89b5ebbbbf8c170cfa57028cc1c1c8370be6a20be90989b5a1dd ChangeLog 1460
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -25,9 +25,9 @@ MD5 ad8573e9ae4440ab17fe6670070a78b4 files/digest-qdox-20050104-r1 241
 RMD160 c4f31be525b1449b2b81d30c8063e34ef9b2adec files/digest-qdox-20050104-r1 241
 SHA256 b4d875cd6bbc66550e5391c3640314a7c1e2fb2ec3cd4cf9724575c3fdb65595 files/digest-qdox-20050104-r1 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGKNHjcxLzpIGCsLQRAtmKAJ9talBmEo4xasJra8CgarRW8f4QaQCdGHvc
-gBerwQgzsOa4mIMHl2nDR4E=
-=iTXU
+iD8DBQFGR1fego/w9rxVVVERAvQuAJ93kZMxABdxrUTMexQVq//VHUPqNQCgtLwO
+GBx5bzpECEvuLfP5VvWDkqo=
+=8d+b
 -----END PGP SIGNATURE-----
diff --git a/dev-java/qdox/qdox-20050104-r1.ebuild b/dev-java/qdox/qdox-20050104-r1.ebuild
index 55e3ae14124e..25c8ae567352 100644
--- a/dev-java/qdox/qdox-20050104-r1.ebuild
+++ b/dev-java/qdox/qdox-20050104-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qdox/qdox-20050104-r1.ebuild,v 1.4 2007/04/20 14:44:47 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qdox/qdox-20050104-r1.ebuild,v 1.5 2007/05/13 18:23:19 nelchael Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -11,25 +13,38 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="Apache-1.1"
 SLOT="1.6" # it's the 1.6 codebase
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc source"
+IUSE=""
+
+COMMON_DEP="dev-java/junit
+	dev-java/ant-core"
 
-COMMON_DEP="
-	dev-java/junit
-	>=dev-java/ant-core-1.4"
 DEPEND=">=virtual/jdk-1.4
 	${COMMON_DEP}"
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
 
-src_compile() {
+src_unpack() {
+
+	unpack ${A}
 	java-ant_rewrite-classpath "${S}/build.xml"
-	eant -Dgentoo.classpath=$(java-pkg_getjars junit,ant-core) jar $(use_doc docs)
+
+}
+
+EANT_DOC_TARGET="docs"
+
+src_compile() {
+
+	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjars junit,ant-core)"
+	java-pkg-2_src_compile
+
 }
 
 src_install() {
+
 	java-pkg_dojar dist/${PN}.jar
 	dodoc README.txt
 
-	use doc	&& java-pkg_dohtml -r doc/*
+	use doc	&& java-pkg_dojavadoc docs
 	use source && java-pkg_dosrc src/java/*
+
 }