Revision bump; fixed junit dependency to be test USE flag conditional, fixed tests, EAPI 5.

Package-Manager: portage-2.1.12.5/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 98 insertions, 5 deletions

diff --git a/dev-java/qdox/ChangeLog b/dev-java/qdox/ChangeLog
index c196d8e6513c..67742f0526b8 100644
--- a/dev-java/qdox/ChangeLog
+++ b/dev-java/qdox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/qdox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qdox/ChangeLog,v 1.33 2013/06/14 19:47:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qdox/ChangeLog,v 1.34 2013/06/17 07:38:15 tomwij Exp $
+
+*qdox-1.12-r1 (17 Jun 2013)
+
+  17 Jun 2013; Tom Wijsman <TomWij@gentoo.org> +qdox-1.12-r1.ebuild:
+  Revision bump; fixed junit dependency to be test USE flag conditional, fixed
+  tests, EAPI 5.
 
   14 Jun 2013; Alexis Ballier <aballier@gentoo.org> qdox-1.6.3.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index 61ffbc94fef3..93ba7adb8585 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -3,14 +3,19 @@ Hash: SHA256
 
 DIST qdox-1.12-20100531.205010-5-project.tar.gz 519732 SHA256 7ec2a48498f996e35c6bfdbff1dbbb061e51ff16862c4f3c3f12235d30857cca SHA512 b549704c941ac6333f4d96a880c4c05af6793043ad5f3d8adf6352c285507f7748905c57c91261c4171b1e6c3b11bb8e2ecad68a413a5297eebd92ac2d671809 WHIRLPOOL bd560572d5d41f39918237519e7d201bfde30e27e6d4d5d55f543681d833380553df8b062ca3392f9b9b3d185e48ac689dd7492796e9211ef9b21797129d3017
 DIST qdox-1.6.3-sources.jar 63731 SHA256 7ddb3a75c1ab415c631ae39660679630653bbbed84895e5ed4b4775ce5327846 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965 WHIRLPOOL a57aecd3ccf7537af450dc54da65eb9b49b87b461b5929e36c49f5f40a5344fd84625afda47f6ea2860d65a200b34b7abc751ba377ad4404de4f9ca8a55bc36d
+EBUILD qdox-1.12-r1.ebuild 2276 SHA256 764655d4ed0894aed0f44b9962b6e93eae7b07729c5fd58c9dec5759950eefc2 SHA512 a5009ce4dd2caa5d0311054f3f837b7d1573f18ebb44ae11c610b31d2314cf574b09431541613831eb7c8986c48b70be7aec4ed147fa6db1d76998b158da378b WHIRLPOOL fac867d5887786a5b70e0c38d2201efa357ac58677e471523fadbb0ed6cfc9456d32288933265b08bd6a8f40833327eaca5e569c83a98afc5eb148cb1f07ec5b
 EBUILD qdox-1.12.ebuild 1779 SHA256 31b9fe08984dab1c8dd6d56c49ec1cabe4c4f50ccc9fbdb9980898146fcd99fb SHA512 d3e21c1b2c55eca12af3b588bc52e0fc795ce4a8bbf75b877aeb31b27d3fda6ef7c0f59f5e774e86b627c1d7a8ac612fec090d6ae245fd45220a6254c3e10ec8 WHIRLPOOL 9c4dae2af0b300aa1098c28ed6ba13745eb7af68b555af3efa4a6cf6e0f73b1d101432e5411df192e887ede515ab87ae9aad10b7cabf2534682837f2ce75aa48
 EBUILD qdox-1.6.3.ebuild 1420 SHA256 c20b57a96d68f5c88eae57fbac66ab9a663f1050d621269dc0d8704dad8a0046 SHA512 37eb7f142f920f62ee9439fd812b92b218ad7d0f2b9019251f308a3309f6744afea839f7bb043a4e6d6223f83c2ba9663fc5abe29aa9922cac2f7d8a978a2324 WHIRLPOOL a900347d2762c7df097a6e3f2b85647f8519a993613a94f10db5275d5cc81e2aa354bc26d34a7fa8ea412b2fd06471b14d3282f4b62d037ec59cff62d43c4401
-MISC ChangeLog 4296 SHA256 03d4f9c4201c5b7396c4ef15c84b79f5091f7f9e18c990bdfb0c7c73598697a0 SHA512 be350fabe2b7a1d6d3268a26207dba47f100682f0e2496eb21ddce052538f72aa766634d73129d90b9d3acfccf09dd2bc619e1574e6fbd2057c62a2d45839202 WHIRLPOOL 873decdcd32885a78104bc14e2f1f01bfaa57e76ebba3953beea851ed959f5652e435d3738f5169a0aba9421a19486f76e453c0fff1f0ee5228c587704a0dc46
+MISC ChangeLog 4489 SHA256 d4512d7eab2830e3263e4a16891d80a9372c8531f42ee47995f0987a7654aa02 SHA512 b966948af51deb9891b6eaa142e84d9193ef29b8f4fe96f96462269aba816fec675e491d5abd11de5e0c0edf6ce27ba9528d689946dc161f75e42ee84bf95dd9 WHIRLPOOL 835b8aea811ff4fba0423523da1f3f3612aa31fb1c765519a5f4437ac43e3bafa9382f63d3effffb97969fcdeac638bb481c6293ebbd0e9faff2bb3a6ff21659
 MISC metadata.xml 365 SHA256 d4d64646fc29e898f3fdc549b767cae8027f0b6c9018b349530673a666efde21 SHA512 3515588e9ebeba0ccae0d22a4711928143c505c0ca607fb5a1ba76f3f66588305f3558b328e6463b89c8c664ccccf393725a4ff5215ecfd63130d6da10d1ef04 WHIRLPOOL 7d423bdda66b2d5f2f57c1066354b020dc8578410aa6f7115a9cdea822a0c1d9e2bbe0b85e67dd8bb32744493e8d96625a7d08fca6775dc838cd9dcf99c5e88a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG7c1YACgkQvFcC4BYPU0r5LQCglFCubtV1JMlE4nPTzws1nQxp
-aBkAn1fMNITK5AyJGhrbVt5+QARioi1h
-=v2/5
+iQEcBAEBCAAGBQJRvrxSAAoJEJWyH81tNOV9UdUH/iYs0iYgjb2nXQCOjPrFUxfG
+i5eMCpc8LRB0a67SGj9KdjmsyJvoszsuANf+IyypA/Odm2Y01cy6XOaDtuNKuR+U
+burFR0XSCFZpfQ+wFxv8SDuMfY4evgFjcoPNQPGBZo2k/0eMqYGTojv6518dce5/
+JEfle5yBq/MCfomQh/HZ0KT4HFUcLSZiXqkIk5LKV7I5ZHa2H5TyIYGXK0OowCdi
+p1hQxyhpmwduHz/AJugCNXTDKbxU8VIDP+aEX/1q96aE7d8fkzCfT72ox13mxHy0
+ssw8FpI98fzl/pcnzJMwf8kP7+7+SQqNgdGEKJDUrUdcmyO/jiTHHvL2YKCnmFc=
+=puuz
 -----END PGP SIGNATURE-----
diff --git a/dev-java/qdox/qdox-1.12-r1.ebuild b/dev-java/qdox/qdox-1.12-r1.ebuild
new file mode 100644
index 000000000000..09de5d7a7a8b
--- /dev/null
+++ b/dev-java/qdox/qdox-1.12-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qdox/qdox-1.12-r1.ebuild,v 1.1 2013/06/17 07:38:15 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Parser for extracting class/interface/method definitions"
+HOMEPAGE="http://qdox.codehaus.org/"
+SRC_URI="http://snapshots.repository.codehaus.org/com/thoughtworks/qdox/qdox/1.12-SNAPSHOT/qdox-1.12-20100531.205010-5-project.tar.gz  "
+
+LICENSE="Apache-2.0"
+SLOT="1.12"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${PN}-${PV}-SNAPSHOT"
+
+CDEPEND="dev-java/ant-core:0"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip:0
+	dev-java/byaccj:0
+	>=dev-java/jflex-1.4.3:0
+	dev-java/jmock:1.0
+	test? ( dev-java/junit:0 )
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+java_prepare() {
+	if ! use test ; then
+		rm src/main/com/thoughtworks/qdox/tools/QDoxTester.java
+		rm -rf src/java/com/thoughtworks/qdox/junit
+		rm -rf src/test
+	fi
+}
+
+src_compile() {
+	jflex src/grammar/lexer.flex --skel src/grammar/skeleton.inner -d src/java/com/thoughtworks/qdox/parser/impl/ || die
+	byaccj -v -Jnorun -Jnoconstruct -Jclass=Parser -Jsemantic=Value -Jpackage=com.thoughtworks.qdox.parser.impl src/grammar/parser.y || die
+	mv Parser.java src/java/com/thoughtworks/qdox/parser/impl/ || die
+
+	# create jar
+	mkdir -p build/classes || die
+
+	local cp="$(java-pkg_getjars --build-only ant-core,jmock-1.0)"
+
+	if use test ; then
+		cp="${cp}:$(java-pkg_getjars --build-only junit)"
+	fi
+
+	ejavac -sourcepath . -d build/classes -classpath "${cp}" \
+		$(find . -name "*.java") || die "Cannot compile sources"
+
+	mkdir dist || die
+	cd build/classes || die
+	jar -cvf "${S}"/dist/${PN}.jar com || die "Cannot create JAR"
+
+	# generate javadoc
+	if use doc ; then
+		cd "${S}"
+		mkdir javadoc || die
+		javadoc -d javadoc -sourcepath src/java -subpackages com -classpath "${cp}"
+	fi
+}
+
+src_test() {
+	java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant-core,junit,jmock-1.0) \
+		com.thoughtworks.qdox.tools.QDoxTester src || die "Tests failed!"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_register-ant-task
+
+	use source && java-pkg_dosrc src/java/com
+	use doc && java-pkg_dojavadoc javadoc
+}