Add dependencies needed for examples and use java-pkg_doexamples.

Package-Manager: portage-2.1.3_rc8

3 files changed, 39 insertions, 22 deletions

diff --git a/dev-java/jgoodies-animation/ChangeLog b/dev-java/jgoodies-animation/ChangeLog
index 4977a4d6454a..8f815299cc8d 100644
--- a/dev-java/jgoodies-animation/ChangeLog
+++ b/dev-java/jgoodies-animation/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jgoodies-animation
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-animation/ChangeLog,v 1.6 2007/05/27 00:07:08 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-animation/ChangeLog,v 1.7 2007/07/21 10:08:45 betelgeuse Exp $
+
+  21 Jul 2007; Petteri Räty <betelgeuse@gentoo.org>
+  jgoodies-animation-1.2.0.ebuild:
+  Add dependencies needed for examples and use java-pkg_doexamples.
 
   27 May 2007; Vlastimil Babka <caster@gentoo.org>
   jgoodies-animation-1.2.0.ebuild:
diff --git a/dev-java/jgoodies-animation/Manifest b/dev-java/jgoodies-animation/Manifest
index f02274b9db2e..b0b1b4c6f621 100644
--- a/dev-java/jgoodies-animation/Manifest
+++ b/dev-java/jgoodies-animation/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX build.xml 2276 RMD160 ec53320fc96a6322024dbd6db2e5e9318a18272d SHA1 0319e90090b5b9e3fb3398826cb28b696666ca11 SHA256 eec616f71e8108b5fcb64d6c37d06f6f889372424e8b6009d3dff62e393d57ff
 MD5 10eed29030757ce0187080b12e9923c6 files/build.xml 2276
 RMD160 ec53320fc96a6322024dbd6db2e5e9318a18272d files/build.xml 2276
@@ -8,14 +11,14 @@ EBUILD jgoodies-animation-1.1.3.ebuild 1265 RMD160 99d3e422a3d3767962fa6f1f70cac
 MD5 3e7a477ef61f94e4b212473e374182b7 jgoodies-animation-1.1.3.ebuild 1265
 RMD160 99d3e422a3d3767962fa6f1f70cac2b85206f14b jgoodies-animation-1.1.3.ebuild 1265
 SHA256 afc2097e9ba1f6b084a2dfdc3fc51dc97414c6b9ba817c04547e810b397dc8e7 jgoodies-animation-1.1.3.ebuild 1265
-EBUILD jgoodies-animation-1.2.0.ebuild 1368 RMD160 68a8c8c7190e39346d9c26a6d92c6f23e252ebaf SHA1 7e0501be52117705c56a507b057a85d5771ffd58 SHA256 d117ba32fac43fdb3143d03c19e56d3791b1c2f9ecfbf3cce423cacbb15ac7c9
-MD5 97508e54d4aa9df4e6ccfe1b0b99a645 jgoodies-animation-1.2.0.ebuild 1368
-RMD160 68a8c8c7190e39346d9c26a6d92c6f23e252ebaf jgoodies-animation-1.2.0.ebuild 1368
-SHA256 d117ba32fac43fdb3143d03c19e56d3791b1c2f9ecfbf3cce423cacbb15ac7c9 jgoodies-animation-1.2.0.ebuild 1368
-MISC ChangeLog 1214 RMD160 3b3a6761746c8a843f782a8601b08fe72f5c7455 SHA1 b2380807cc7ab8d118dd889bd8bf895a97df678e SHA256 feb8d41f8a21f48ddfae16497cc9a1bcc234091b161d510d2221ca219e3ff48e
-MD5 d2a8bb5f3297716b0e9c129c1a91b8b5 ChangeLog 1214
-RMD160 3b3a6761746c8a843f782a8601b08fe72f5c7455 ChangeLog 1214
-SHA256 feb8d41f8a21f48ddfae16497cc9a1bcc234091b161d510d2221ca219e3ff48e ChangeLog 1214
+EBUILD jgoodies-animation-1.2.0.ebuild 1482 RMD160 32ab4dafb1f7c1da528084519d643e757ae70299 SHA1 99ede887db8ff202fec9e2a02e4f7def7b4d10c6 SHA256 48c088e964c12f20694f538ce953438797d20d905f16731d2bca595194ba1895
+MD5 875013cd35ac2370680d97eb444fd849 jgoodies-animation-1.2.0.ebuild 1482
+RMD160 32ab4dafb1f7c1da528084519d643e757ae70299 jgoodies-animation-1.2.0.ebuild 1482
+SHA256 48c088e964c12f20694f538ce953438797d20d905f16731d2bca595194ba1895 jgoodies-animation-1.2.0.ebuild 1482
+MISC ChangeLog 1375 RMD160 c400b0d0e0f7c2246364b8099c000c4d744b0b5b SHA1 bd2d3a5026ed69287bb69e441819a403d7da77d5 SHA256 4deb4b2eaa4e4f96c29de691ed0f169e0d3058104b5f1ab865910242507986be
+MD5 03e66e715b7ea3d3c216ae310fe9e42e ChangeLog 1375
+RMD160 c400b0d0e0f7c2246364b8099c000c4d744b0b5b ChangeLog 1375
+SHA256 4deb4b2eaa4e4f96c29de691ed0f169e0d3058104b5f1ab865910242507986be ChangeLog 1375
 MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b
 MD5 e0dae696516c90f5df2d9b63d2fde252 metadata.xml 159
 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 metadata.xml 159
@@ -26,3 +29,10 @@ SHA256 10ae899fa0ca5057a16a6de682ea46506a2296e636e57213590e5f8070fb0fc3 files/di
 MD5 c171741c59d69f15144d5342082ed0f1 files/digest-jgoodies-animation-1.2.0 238
 RMD160 5f70b147722afe23d2f7bec9297d82e1231e6728 files/digest-jgoodies-animation-1.2.0 238
 SHA256 8ac73bb134010de6468c3902d24d5a60e1d817d599dd810457e64e3532db5b8b files/digest-jgoodies-animation-1.2.0 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGodsrcxLzpIGCsLQRAhZ3AJ9fO/StH1y/D0eAgBwRblujcf+9awCfSIQ/
+SO5uyxNoGXdWs38IWG54ei0=
+=XpQn
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild
index dd2d7f2f57fd..07ea2c4a1650 100644
--- a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild
+++ b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild,v 1.2 2007/05/27 00:07:08 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild,v 1.3 2007/07/21 10:08:45 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc examples source test"
 
@@ -18,14 +18,20 @@ IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
 	app-arch/unzip
-	test? ( =dev-java/junit-3* dev-java/ant-junit )"
-RDEPEND=">=virtual/jre-1.4"
+	test? ( dev-java/ant-junit )"
+# Remove x86 when https://bugs.gentoo.org/show_bug.cgi?id=186081
+# is done
+RDEPEND=">=virtual/jre-1.4
+	examples? ( x86? (
+		>=dev-java/jgoodies-binding-1.1
+		>=dev-java/jgoodies-forms-1.0
+	) )"
 
 S="${WORKDIR}/animation-${PV}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Remove the packaged jar
 	rm -v lib/*.jar *.jar || die
@@ -34,9 +40,9 @@ src_unpack() {
 	java-ant_xml-rewrite -f build.xml -d -e javac -a bootclasspath \
 		|| die "Failed to fix bootclasspath"
 }
-src_compile() {
-	eant jar # precompiled javadocs
-}
+
+# precompiled javadocs
+EANT_DOC_TARGET=""
 
 src_test() {
 	eant test -Djunit.jar.present=true \
@@ -46,12 +52,9 @@ src_test() {
 src_install() {
 	java-pkg_dojar build/animation.jar
 
-	dodoc RELEASE-NOTES.txt
-	dohtml README.html
+	dodoc RELEASE-NOTES.txt || die
+	dohtml README.html || die
 	use doc && java-pkg_dohtml -r docs/*
 	use source && java-pkg_dosrc src/core/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r src/tutorial/com
-	fi
+	use examples && java-pkg_doexamples src/tutorial
 }