Add src_test as RESTRICT=test until the needed deps are keyworded.

Package-Manager: portage-2.1.3_rc6

3 files changed, 41 insertions, 18 deletions

diff --git a/dev-java/xstream/ChangeLog b/dev-java/xstream/ChangeLog
index 9e353f5de603..1efbf7d13007 100644
--- a/dev-java/xstream/ChangeLog
+++ b/dev-java/xstream/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/xstream
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.6 2007/05/26 17:36:39 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.7 2007/07/11 17:41:39 betelgeuse Exp $
+
+  11 Jul 2007; Petteri Räty <betelgeuse@gentoo.org> xstream-1.2.ebuild:
+  Add src_test as RESTRICT=test until the needed deps are keyworded.
 
   26 May 2007; Krzysiek Pawlik <nelchael@gentoo.org> xstream-1.2.ebuild:
   Add ~ppc.
diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
index c84dbb03c15c..4eff0117e430 100644
--- a/dev-java/xstream/Manifest
+++ b/dev-java/xstream/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST xstream-1.2.zip 5488349 RMD160 1f55cf75c8ed2cf2746727e3435b119c5caa1eff SHA1 e0713b355dea36be4951299e441ffd510eee6d19 SHA256 7536d9b1f2bf1c1b235d1a1114dbdae08a8ed5953b1fe7a2c760bf807770e26d
-EBUILD xstream-1.2.ebuild 1498 RMD160 dad8aceeff003ed5c0c853c7ac5f6b87b45d3ec8 SHA1 3ba0b5e021840c2675055a82a11790cb9d873e84 SHA256 644bc9888cbc0a8336f8e2d1e68b3633c03a466ebfcbf60576df3957039030bd
-MD5 182fdba9e424202f18cf99e8c410407a xstream-1.2.ebuild 1498
-RMD160 dad8aceeff003ed5c0c853c7ac5f6b87b45d3ec8 xstream-1.2.ebuild 1498
-SHA256 644bc9888cbc0a8336f8e2d1e68b3633c03a466ebfcbf60576df3957039030bd xstream-1.2.ebuild 1498
-MISC ChangeLog 1111 RMD160 5770f97f50b123284db45bb57bfcf6303f7287bb SHA1 b97cb1bafe6efbce4b5febeae5d57a24ef601fcb SHA256 4c732dd9db55910f09f20db9bfc7de100dac4bcd8acbd23db84ba62a1608a9e8
-MD5 877514a6a3c517e84a2d843cb072ee8c ChangeLog 1111
-RMD160 5770f97f50b123284db45bb57bfcf6303f7287bb ChangeLog 1111
-SHA256 4c732dd9db55910f09f20db9bfc7de100dac4bcd8acbd23db84ba62a1608a9e8 ChangeLog 1111
+EBUILD xstream-1.2.ebuild 1878 RMD160 0911846d87bfdd53b4b660cf949203b34427b60a SHA1 03d86619cb3db86b023854fda7a9f320428e4b02 SHA256 1a173e9144b8b61a6b2c484811921c25358c9d5203d746c4f55d3cac90af70bd
+MD5 c71f754334c8bf3167d252584f2c567a xstream-1.2.ebuild 1878
+RMD160 0911846d87bfdd53b4b660cf949203b34427b60a xstream-1.2.ebuild 1878
+SHA256 1a173e9144b8b61a6b2c484811921c25358c9d5203d746c4f55d3cac90af70bd xstream-1.2.ebuild 1878
+MISC ChangeLog 1256 RMD160 5ec121141beb7bf1322cc2cbad9844020262bd45 SHA1 3f707843944701e876c4f9df05eae4daeef529ee SHA256 fd63c6842d0f61d4ba46f9a413b19522f257d066d3df5e343e3a2256f9306097
+MD5 8e000dc8c1a083c376a6f4e7bfa0bd72 ChangeLog 1256
+RMD160 5ec121141beb7bf1322cc2cbad9844020262bd45 ChangeLog 1256
+SHA256 fd63c6842d0f61d4ba46f9a413b19522f257d066d3df5e343e3a2256f9306097 ChangeLog 1256
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -20,7 +20,7 @@ SHA256 0e41d935f72c2fdf5a134ce035cb5da96c42f26777e1df3e2f6b8559d3676bc0 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGWHB6go/w9rxVVVERArkSAJ9uILgj41UnSp5aSYa//3bQmG5ZFgCcD8Jx
-+1cjYRJCPcGVjtKOBIBXsfg=
-=tadw
+iD8DBQFGlRZPcxLzpIGCsLQRAhBqAJsH6Iz2sp0+Amg9uHxnKhHebX3IBQCfXtGd
+S96uM6aTbEYZp2oL7niUg9M=
+=FSEI
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xstream/xstream-1.2.ebuild b/dev-java/xstream/xstream-1.2.ebuild
index 474a223dac2f..4b01dd2da135 100644
--- a/dev-java/xstream/xstream-1.2.ebuild
+++ b/dev-java/xstream/xstream-1.2.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/xstream/xstream-1.2.ebuild,v 1.6 2007/05/26 17:36:39 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/xstream-1.2.ebuild,v 1.7 2007/07/11 17:41:39 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc examples java5 source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -11,7 +13,7 @@ SRC_URI="http://dist.codehaus.org/xstream/distributions/${P}.zip"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc examples java5 source"
+IUSE=""
 
 COMMON_DEPS="
 	=dev-java/commons-lang-2.1*
@@ -25,10 +27,16 @@ COMMON_DEPS="
 	>=dev-java/xpp3-1.1.3.4
 	=dev-java/xml-commons-external-1.3*
 "
+#test? (
+#		dev-java/ant-junit
+#		dev-java/ant-trax
+#		dev-java/xml-writer
+#		dev-java/stax
+#	)
+
 DEPEND="java5? ( >=virtual/jdk-1.5 )
 	!java5? ( =virtual/jdk-1.4* )
 	app-arch/unzip
-	source? ( app-arch/zip )
 	${COMMON_DEPS}"
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEPS}"
@@ -37,8 +45,11 @@ JAVA_PKG_BSFIX="off"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/lib
-	rm *.jar
+	cd "${S}"
+	rm -v *.jar || die
+	rm -v lib/jdk1.3/*.jar || die
+	cd "${S}/lib"
+	rm -v *.jar
 	java-pkg_jar-from xml-commons-external-1.3
 	java-pkg_jar-from jsr173
 	java-pkg_jar-from cglib-2.1
@@ -51,11 +62,20 @@ src_unpack() {
 	java-pkg_jar-from xpp3
 }
 
+# Restricted until we get keywords for deps. See:
+# https://bugs.gentoo.org/show_bug.cgi?id=184234
+RESTRICT="test"
+
+src_test() {
+	java-pkg_jar-from --into lib junit,xml-writer,stax
+	ANT_TASKS="ant-junit ant-trax" eant test
+}
+
 src_install() {
 	java-pkg_newjar ${P}.jar
 
 	if use doc; then
-		java-pkg_dohtml *.html
+		html *.html || die
 		java-pkg_dohtml -r docs/
 	fi
 	use source && java-pkg_dosrc src/java/com