Fix commons-validator dependencies to not only match a subset of slot 0. Use java-pkg_doexamples. Fixes bug 217624.

Package-Manager: portage-2.1.5_rc3

3 files changed, 20 insertions, 9 deletions

diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index 974d581cd6c0..cf10daaaea03 100644
--- a/dev-java/struts/ChangeLog
+++ b/dev-java/struts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/struts
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.38 2008/03/22 21:36:01 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.39 2008/04/14 13:07:02 betelgeuse Exp $
+
+  14 Apr 2008; Petteri Räty <betelgeuse@gentoo.org> struts-1.2.9-r2.ebuild:
+  Fix commons-validator dependencies to not only match a subset of slot 0. Use
+  java-pkg_doexamples. Fixes bug 217624.
 
 *struts-1.2.9-r2 (22 Mar 2008)
 
diff --git a/dev-java/struts/Manifest b/dev-java/struts/Manifest
index ae817d85cca6..fe651d1a1568 100644
--- a/dev-java/struts/Manifest
+++ b/dev-java/struts/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST struts-1.2.9-src.tar.gz 5754377 RMD160 da420cc0991a3f9056005d977ce1c46325aa9ea9 SHA1 2f461536eab7246c7ef3d647b142860b19bfd99d SHA256 7354437d04b666fc6d302b0fd14a3bb971a6389085d9f7a5ea4b25eed289400e
 EBUILD struts-1.2.9-r1.ebuild 2641 RMD160 4ae0f9e53f572b61f533e06c4f56b0598bf053ca SHA1 08b60629c7d12a6e55d01be1ec8d99e236e3cd98 SHA256 72f9c564fe70589911b15e15c83cd9cdd919aad479e73c4df1e8b279b06f69cd
-EBUILD struts-1.2.9-r2.ebuild 2650 RMD160 d78d431a95f390797e5ccc2d864e9dd1a7e5b2c9 SHA1 8ad3687cdfe30e1c14218471272bab90f535d024 SHA256 1ddb3c6f702fe5d516d4907101f04162c2c0905a671ff5cd44a92e0108283b23
-MISC ChangeLog 6301 RMD160 5b9ccb9d8ef5935fec44d8326e337003b5d84987 SHA1 5e6d9812ee52db57cb3c8917dabe519526c56540 SHA256 c0ca055d969a5abd19f337c65c09598ca4b3b430dcec8c4c60bc829c8b40b7c8
+EBUILD struts-1.2.9-r2.ebuild 2584 RMD160 8a0a5ff3c512553c4aa872aaf01fdd6cee764f33 SHA1 1ae17bd1002263192f5b95095971013f55b70a64 SHA256 8b023bf99ed3d5010992aff0c607ae142d45039551bf889772b6fbbd864eeae5
+MISC ChangeLog 6504 RMD160 1b96dff662e316b692c745b93b36d354c2f17b3b SHA1 1cae7c2796777c1f69458da367f6f98542e6b08f SHA256 da46f50ba872f5127c32c05cfe403af6cd6dfb1c69bda8fe244f6a0c3499e842
 MISC metadata.xml 446 RMD160 cef996f6ba3e4f162c7c3cb01f767fbf140fb77c SHA1 23aa61ce80aba8d36a44ab8b5716d2f938736f94 SHA256 ec0f1085c4de877f6864625a8a5d94aa7fb8589d1329c3113600210770e65c33
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgDVvYACgkQcxLzpIGCsLTeWgCgk8E3XQDCtgyDVYr6UCJTo5yV
+PxQAn2uzzfJWnaFULRdviq6s07aBtlEN
+=lkOu
+-----END PGP SIGNATURE-----
diff --git a/dev-java/struts/struts-1.2.9-r2.ebuild b/dev-java/struts/struts-1.2.9-r2.ebuild
index d84a4d6f5ae8..f046ae67b209 100644
--- a/dev-java/struts/struts-1.2.9-r2.ebuild
+++ b/dev-java/struts/struts-1.2.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.9-r2.ebuild,v 1.1 2008/03/22 21:36:01 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.9-r2.ebuild,v 1.2 2008/04/14 13:07:02 betelgeuse Exp $
 
 EAPI=1
 JAVA_PKG_IUSE="doc examples source"
@@ -21,7 +21,7 @@ COMMON_DEPS="
 	>=dev-java/commons-digester-1.5
 	>=dev-java/commons-fileupload-1.0
 	>=dev-java/commons-logging-1.0.4
-	~dev-java/commons-validator-1.1.4
+	>=dev-java/commons-validator-1.1.4:0
 	dev-java/jakarta-oro:2.0
 	java-virtuals/servlet-api:2.3"
 RDEPEND=">=virtual/jre-1.4
@@ -75,9 +75,6 @@ src_install() {
 
 	dodoc README STATUS.txt || die
 	use doc && java-pkg_dohtml -r target/documentation/
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		cp -r src/example*/* "${D}/usr/share/doc/${PF}/examples"
-	fi
+	use examples && java-pkg_doexamples src/example*
 	use source && java-pkg_dosrc src/share/*
 }