Fix the deps, improve style, add examples USE flag.

Package-Manager: portage-2.1.2.7

3 files changed, 28 insertions, 46 deletions

diff --git a/dev-java/commons-validator/ChangeLog b/dev-java/commons-validator/ChangeLog
index 6d1f38245ebf..40754249210f 100644
--- a/dev-java/commons-validator/ChangeLog
+++ b/dev-java/commons-validator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-validator
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.38 2007/03/13 22:54:02 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.39 2007/05/07 15:44:07 caster Exp $
+
+  07 May 2007; Vlastimil Babka <caster@gentoo.org>
+  commons-validator-1.1.4-r1.ebuild:
+  Fix the deps, improve style, add examples USE flag.
 
   13 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
   -commons-validator-1.1.3-r1.ebuild:
diff --git a/dev-java/commons-validator/Manifest b/dev-java/commons-validator/Manifest
index daa2544d6ed8..bb8e4a5b7dab 100644
--- a/dev-java/commons-validator/Manifest
+++ b/dev-java/commons-validator/Manifest
@@ -1,16 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST commons-validator-1.1.4-gentoo-missingfiles.tar.bz2 4161 RMD160 cde4c6187078fbae86d0d05ccd2d15561efcf55c SHA1 c50c5e0c6c864e9c21a75e3553449a513098014a SHA256 40e6ec6f1856e2340bf86f331d4a628c0045f025645ba79dc2ce660132fab1bc
 DIST commons-validator-1.1.4-src.tar.gz 181446 RMD160 d9067980087e963083f96506319fb5f1a53549dd SHA1 1f8230619d30afe7c03e9fbd19eb0e9f2dfe1003 SHA256 02a46f9f3cd654d68471a62094b3bf1edc26f43e7fd4a2174fbcd30d49676844
-EBUILD commons-validator-1.1.4-r1.ebuild 2396 RMD160 b907c320741d89e1ddbed656db254955d0d68a1a SHA1 dbab0346a3e417fbf72ea989fd644c8dda101eb5 SHA256 807408be389a1eead4b288c30b069208bb6b82c6b49aacee5e190427844a9136
-MD5 9c85f3262ce690085c2f3e2e222836f2 commons-validator-1.1.4-r1.ebuild 2396
-RMD160 b907c320741d89e1ddbed656db254955d0d68a1a commons-validator-1.1.4-r1.ebuild 2396
-SHA256 807408be389a1eead4b288c30b069208bb6b82c6b49aacee5e190427844a9136 commons-validator-1.1.4-r1.ebuild 2396
-MISC ChangeLog 6247 RMD160 7e393e5adc10665ae8607d5571f307349d3e6c27 SHA1 2c087dbe42df3455216a194384b77a486555e3a8 SHA256 2465db044851d55fc5e2ff8ea856fa3bd4dcf44b18e339dd01ef048c21abd191
-MD5 dae0cd688105e1d7644e554abf6f3c2c ChangeLog 6247
-RMD160 7e393e5adc10665ae8607d5571f307349d3e6c27 ChangeLog 6247
-SHA256 2465db044851d55fc5e2ff8ea856fa3bd4dcf44b18e339dd01ef048c21abd191 ChangeLog 6247
+EBUILD commons-validator-1.1.4-r1.ebuild 2072 RMD160 2f9cd2b70bc7105c9d1d5018081568a591c2355a SHA1 f93e45101c57e0963715cd24d9ae3be348252661 SHA256 e0c96c586359a113d65f308d1b7fb7fa243b07d4fe65537e09c4427822a08be0
+MD5 dac934f9adf83cdddd82e1ad5ae7b078 commons-validator-1.1.4-r1.ebuild 2072
+RMD160 2f9cd2b70bc7105c9d1d5018081568a591c2355a commons-validator-1.1.4-r1.ebuild 2072
+SHA256 e0c96c586359a113d65f308d1b7fb7fa243b07d4fe65537e09c4427822a08be0 commons-validator-1.1.4-r1.ebuild 2072
+MISC ChangeLog 6386 RMD160 cbba9089c4a1397e66eaa39e3646ce0d818526e1 SHA1 c9938cc1b4348740562cc973f4941d3b9ac6d2c6 SHA256 2d4128614e64fd5e79ff592dd76a49f591872ac5fbef966d20b7ba652411ca89
+MD5 52641464f7cc078c742c6c17cea38b99 ChangeLog 6386
+RMD160 cbba9089c4a1397e66eaa39e3646ce0d818526e1 ChangeLog 6386
+SHA256 2d4128614e64fd5e79ff592dd76a49f591872ac5fbef966d20b7ba652411ca89 ChangeLog 6386
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -18,10 +15,3 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 ec112b32d55b7a6f301d8dc4cfbebd1b files/digest-commons-validator-1.1.4-r1 611
 RMD160 42e07d238ccdb64148025b4fbbb11942a584a27d files/digest-commons-validator-1.1.4-r1 611
 SHA256 4be65ab793d05def54d7f185ab41e065fd57b9aebde653b21c86542f5a427713 files/digest-commons-validator-1.1.4-r1 611
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF9yuScxLzpIGCsLQRAotmAKCCur6OuqT2hdVZqDJmhYI7rLpmVACfRlsa
-RSjktuY1xyz11hM+lzSPj10=
-=LgcX
------END PGP SIGNATURE-----
diff --git a/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild b/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild
index 965b04cbe6fe..c6397f65c066 100644
--- a/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild,v 1.6 2006/12/09 09:16:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild,v 1.7 2007/05/07 15:44:07 caster Exp $
 
+JAVA_PKG_IUSE="doc examples source"
 inherit java-pkg-2 java-ant-2
 
-MY_P=${P}-src
+MY_P="${P}-src"
 DESCRIPTION="Jakarta component to validate user input, or data input"
 HOMEPAGE="http://jakarta.apache.org/commons/validator/"
 SRC_URI="mirror://apache/jakarta/commons/validator/source/${MY_P}.tar.gz
@@ -14,28 +15,23 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-fbsd"
 
-IUSE="doc examples source"
+IUSE=""
 
-# Was not able to test on 1.3 jdk at this point. Feel free to to lower this
-# back to 1.3 if you have tested it on one and proved working. Then you
-# probably need to bring the xerces dependency back.
-
-RDEPEND=">=virtual/jre-1.4
-	=dev-java/jakarta-oro-2.0*
+CDEPEND="=dev-java/jakarta-oro-2.0*
 	>=dev-java/commons-digester-1.5
 	>=dev-java/commons-collections-3.1
 	>=dev-java/commons-logging-1.0.3
 	=dev-java/commons-beanutils-1.6*"
-
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
 DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-1.4
-	${RDEPEND}
-	source? ( app-arch/zip )"
+	${CDEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	rm *.jar
+	cd "${S}"
+	rm -v *.jar || die
+
 	#dirty hack
 	sed -e 's:target name="compile" depends="static":target name="compile" depends="prepare":' -i build.xml \
 		|| die "Failed to sed build.xml"
@@ -62,15 +58,7 @@ src_compile() {
 src_install() {
 	java-pkg_dojar ${PN}.jar
 
-	if use doc; then
-		java-pkg_dohtml -r dist/docs/
-		java-pkg_dohtml PROPOSAL.html STATUS.html
-	fi
-
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		cp -r src/example/* ${D}/usr/share/doc/${PF}/examples
-	fi
-
-	use source && java-pkg_dosrc src/share/*
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use examples && java-pkg_doexamples src/example
+	use source && java-pkg_dosrc src/share/org
 }