Use java-pkg_dojavadoc and java-pkg_doexamples.

Package-Manager: portage-2.1.2.9

3 files changed, 25 insertions, 24 deletions

diff --git a/dev-java/prefuse/ChangeLog b/dev-java/prefuse/ChangeLog
index 011d4314c6e2..14cdd405da2e 100644
--- a/dev-java/prefuse/ChangeLog
+++ b/dev-java/prefuse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/prefuse
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/prefuse/ChangeLog,v 1.9 2007/05/23 17:27:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/prefuse/ChangeLog,v 1.10 2007/06/09 10:28:25 betelgeuse Exp $
+
+  09 Jun 2007; Petteri Räty <betelgeuse@gentoo.org>
+  prefuse-20060715_beta.ebuild:
+  Use java-pkg_dojavadoc and java-pkg_doexamples.
 
   23 May 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Add ~x86-fbsd keyword. Bug #176906.
diff --git a/dev-java/prefuse/Manifest b/dev-java/prefuse/Manifest
index de92857abce1..99ad8a32e24a 100644
--- a/dev-java/prefuse/Manifest
+++ b/dev-java/prefuse/Manifest
@@ -12,14 +12,14 @@ EBUILD prefuse-20050401_alpha.ebuild 1090 RMD160 5191337d63f22862e18b9d42ad0d196
 MD5 a67684ea13cd113ee96f93ea8844161d prefuse-20050401_alpha.ebuild 1090
 RMD160 5191337d63f22862e18b9d42ad0d196deeaeefc7 prefuse-20050401_alpha.ebuild 1090
 SHA256 bdfaeda10c51f901584301ded23da99b904c52d0afe32d989d527e5d9e191bee prefuse-20050401_alpha.ebuild 1090
-EBUILD prefuse-20060715_beta.ebuild 1327 RMD160 438c92567ec4f6530b4c0f4908ce2f53301aadd0 SHA1 815970d9a2507f980e46a19f1b668356e5a43290 SHA256 28c8abdefccebf844fc756e90c427ed6ef5a1c1541f5c5869fe3a2180129668a
-MD5 df9ea176d061312e35cd8014eeff08f3 prefuse-20060715_beta.ebuild 1327
-RMD160 438c92567ec4f6530b4c0f4908ce2f53301aadd0 prefuse-20060715_beta.ebuild 1327
-SHA256 28c8abdefccebf844fc756e90c427ed6ef5a1c1541f5c5869fe3a2180129668a prefuse-20060715_beta.ebuild 1327
-MISC ChangeLog 1502 RMD160 d8192141c51964ad44cac0c29e7360fb04400d7e SHA1 257baf7e9505dc635cac2608248321b06f594115 SHA256 f71b003944b4a8ae599931f45df65998e070e72b4991e3e532da98eea7429d1f
-MD5 9d85c9cfdabd419c3649c32fe2a90e92 ChangeLog 1502
-RMD160 d8192141c51964ad44cac0c29e7360fb04400d7e ChangeLog 1502
-SHA256 f71b003944b4a8ae599931f45df65998e070e72b4991e3e532da98eea7429d1f ChangeLog 1502
+EBUILD prefuse-20060715_beta.ebuild 1262 RMD160 f234a06ee575dc3c2df749e3e9ad6d4e848a5221 SHA1 c605da6e85d9840a727f26ea94c807f6da8ca986 SHA256 ac4ea3cf62d290316352f2930f1471a07a0309f9e9d2e8006780ea36e54df9ac
+MD5 df664080fb9a9a249d1abab9060ca790 prefuse-20060715_beta.ebuild 1262
+RMD160 f234a06ee575dc3c2df749e3e9ad6d4e848a5221 prefuse-20060715_beta.ebuild 1262
+SHA256 ac4ea3cf62d290316352f2930f1471a07a0309f9e9d2e8006780ea36e54df9ac prefuse-20060715_beta.ebuild 1262
+MISC ChangeLog 1640 RMD160 1004b32963ec7c4f7add1d1618faefa405ee88ee SHA1 cc8999f78826ce0be60eaf78136d90c1323ec240 SHA256 cadbd20ff242e119babfcf43db750472660b7ef1c55742c502ab5d109b99cc60
+MD5 332636f932704b8729fbcc6dbb9b009e ChangeLog 1640
+RMD160 1004b32963ec7c4f7add1d1618faefa405ee88ee ChangeLog 1640
+SHA256 cadbd20ff242e119babfcf43db750472660b7ef1c55742c502ab5d109b99cc60 ChangeLog 1640
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -36,7 +36,7 @@ SHA256 b04ba5311083e7da17912dcbb2a225048d9223eb08c86316a3a15dca0c7f2668 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGVHmmAiZjviIA2XgRAtCPAKCzroRzjCQ8ZAqWhttRgT25Ph1kdQCfdKr/
-FbWXOXduUvaIvVm3ANqQC9k=
-=aUVw
+iD8DBQFGaoDOcxLzpIGCsLQRAnX8AJ92O7U+qqu9NZSewG+LuKU8E/GwXgCcDN/S
+VnmsnIl2x+nXtqxrOtm2E7I=
+=cTwL
 -----END PGP SIGNATURE-----
diff --git a/dev-java/prefuse/prefuse-20060715_beta.ebuild b/dev-java/prefuse/prefuse-20060715_beta.ebuild
index 3dd89b32622e..088e6b9a46a4 100644
--- a/dev-java/prefuse/prefuse-20060715_beta.ebuild
+++ b/dev-java/prefuse/prefuse-20060715_beta.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/prefuse/prefuse-20060715_beta.ebuild,v 1.4 2007/04/28 22:19:06 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/prefuse/prefuse-20060715_beta.ebuild,v 1.5 2007/06/09 10:28:25 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc examples source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -12,15 +14,13 @@ HOMEPAGE="http://prefuse.org"
 LICENSE="BSD"
 SLOT="2006"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="doc examples source"
+IUSE=""
 
 COMMON_DEP="=dev-java/lucene-1*"
 
 DEPEND=">=virtual/jdk-1.4
 	${COMMON_DEP}
-	>=dev-java/ant-core-1.4
-	>=app-arch/unzip-5.50-r1
-	source? ( app-arch/zip )"
+	>=app-arch/unzip-5.50-r1"
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
 
@@ -28,7 +28,7 @@ S=${WORKDIR}/${PN}-beta
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	find lib/ -name "*.jar" | xargs rm -v
 }
@@ -44,11 +44,8 @@ src_compile() {
 src_install() {
 	java-pkg_dojar build/*.jar
 
-	dodoc readme.txt
-	use doc && java-pkg_dohtml -r doc/api
+	dodoc readme.txt || die
+	use doc && java-pkg_dojavadoc doc/api
 	use source && java-pkg_dosrc src/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r demos/*
-	fi
+	use examples && java-pkg_doexamples demos/*
 }