Fix documentation installation and source use flag deps by using JAVA_PKG_IUSE.

Package-Manager: portage-2.1.2.7

3 files changed, 25 insertions, 21 deletions

diff --git a/dev-java/jcalendar/ChangeLog b/dev-java/jcalendar/ChangeLog
index 7ccb4cb82869..042f20110f09 100644
--- a/dev-java/jcalendar/ChangeLog
+++ b/dev-java/jcalendar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jcalendar
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcalendar/ChangeLog,v 1.8 2007/01/21 18:05:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcalendar/ChangeLog,v 1.9 2007/05/30 16:48:45 betelgeuse Exp $
+
+  30 May 2007; Petteri Räty <betelgeuse@gentoo.org> jcalendar-1.3.2.ebuild:
+  Fix documentation installation and source use flag deps by using JAVA_PKG_IUSE.
 
   21 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> jcalendar-1.3.2.ebuild:
   Add ~x86-fbsd keyword (see the various bugs for netbeans 5.5-r2).
diff --git a/dev-java/jcalendar/Manifest b/dev-java/jcalendar/Manifest
index c19c41a6463e..b090ed4e4d23 100644
--- a/dev-java/jcalendar/Manifest
+++ b/dev-java/jcalendar/Manifest
@@ -11,14 +11,14 @@ EBUILD jcalendar-1.2.2.ebuild 1114 RMD160 611fab12bb10e0ed2f1e62ea33a1feb32c59b7
 MD5 400f957fadcb351ec9326b8b3994790c jcalendar-1.2.2.ebuild 1114
 RMD160 611fab12bb10e0ed2f1e62ea33a1feb32c59b764 jcalendar-1.2.2.ebuild 1114
 SHA256 44bde1d3e8c533a95980360ff4ad194e1fc285d0c96bbdfa8d687e4a51ecbc92 jcalendar-1.2.2.ebuild 1114
-EBUILD jcalendar-1.3.2.ebuild 1282 RMD160 88ae293417fde6526a3e1c08da92444ea1801319 SHA1 97a760b33f867c4258112097efef7f02632e780f SHA256 3a1d1f1f2791a66b3a3232beac6c79fdec4b3522453d5c54a04416f016ccf0ac
-MD5 45a74ffcdd50aa16062accf8580a8522 jcalendar-1.3.2.ebuild 1282
-RMD160 88ae293417fde6526a3e1c08da92444ea1801319 jcalendar-1.3.2.ebuild 1282
-SHA256 3a1d1f1f2791a66b3a3232beac6c79fdec4b3522453d5c54a04416f016ccf0ac jcalendar-1.3.2.ebuild 1282
-MISC ChangeLog 1390 RMD160 1d57caaee9c1a929d74f0037ffc5f19ae748d4b9 SHA1 577b8bc2098d71acafcc6189c5a578adfb2e57cf SHA256 4bfa414c30b00d1263798f73b73613832f9706850400a7eccf14c311dfdc1867
-MD5 67ffca3643c0b60db4d1c2ba606ec891 ChangeLog 1390
-RMD160 1d57caaee9c1a929d74f0037ffc5f19ae748d4b9 ChangeLog 1390
-SHA256 4bfa414c30b00d1263798f73b73613832f9706850400a7eccf14c311dfdc1867 ChangeLog 1390
+EBUILD jcalendar-1.3.2.ebuild 1284 RMD160 6914f7e3e63933a00df5021a09f11bfc7d0a5cde SHA1 f635c903b37b4de51ea344b3b4486e504946e898 SHA256 4e48ceaafb3295c1611fb6de0097968907718babe5394cebc895a77d86570c13
+MD5 5b9881802db5f63bfb1d4a20bbb3a1a0 jcalendar-1.3.2.ebuild 1284
+RMD160 6914f7e3e63933a00df5021a09f11bfc7d0a5cde jcalendar-1.3.2.ebuild 1284
+SHA256 4e48ceaafb3295c1611fb6de0097968907718babe5394cebc895a77d86570c13 jcalendar-1.3.2.ebuild 1284
+MISC ChangeLog 1551 RMD160 c7209c7ab236d8fd0b239d0aece378c8d11d72ab SHA1 db6549ce25f42e6093815a8fee3c15000ba8363b SHA256 e3894745c45d9095012edd408e909a3763db5d1ef6a05ce96581bd9c91eb72a7
+MD5 7d3286d0c274cec749f28a72c5c92b23 ChangeLog 1551
+RMD160 c7209c7ab236d8fd0b239d0aece378c8d11d72ab ChangeLog 1551
+SHA256 e3894745c45d9095012edd408e909a3763db5d1ef6a05ce96581bd9c91eb72a7 ChangeLog 1551
 MISC metadata.xml 568 RMD160 ff328933816d06034086613f256ae79d5ace5c03 SHA1 eddfaf9cdaeada2afda3e97fe7388aaace73281b SHA256 d64b1a1a2ea768be32d5e97966558993b46facea8796ff29d986689e918350e2
 MD5 df4fb07d939486e4decce98ffe33ea47 metadata.xml 568
 RMD160 ff328933816d06034086613f256ae79d5ace5c03 metadata.xml 568
@@ -33,9 +33,9 @@ MD5 1fac8074d8f4465b6abda6ee7900857d files/digest-jcalendar-1.3.2 238
 RMD160 029a8e9af8adb75150f0324b3f609598df8d0f10 files/digest-jcalendar-1.3.2 238
 SHA256 dcb4301f54fab04d35ef2a11437df1b5c98290738c3d68c85714e62b63991bee files/digest-jcalendar-1.3.2 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFFs6t9AiZjviIA2XgRAp5aAJsHL75AXtFVe6sWhWXFascn1+LGMQCgzr9q
-VK4nnejzUH6SqXlf9Va9Yr0=
-=enA4
+iD8DBQFGXarucxLzpIGCsLQRAmGCAJ0eAXWzKkqdkjruTXYhvUzB/P0vjwCfZKVx
+9CEPj/TOML1r2KxbSrMkbFw=
+=JQWT
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jcalendar/jcalendar-1.3.2.ebuild b/dev-java/jcalendar/jcalendar-1.3.2.ebuild
index ca50fcb6bee6..648ec23399d5 100644
--- a/dev-java/jcalendar/jcalendar-1.3.2.ebuild
+++ b/dev-java/jcalendar/jcalendar-1.3.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/jcalendar/jcalendar-1.3.2.ebuild,v 1.2 2007/01/21 18:05:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcalendar/jcalendar-1.3.2.ebuild,v 1.3 2007/05/30 16:48:45 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -10,12 +12,11 @@ HOMEPAGE="http://www.toedter.com/en/jcalendar/"
 LICENSE="LGPL-2.1"
 SLOT="1.2"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="doc source"
+IUSE=""
 COMMON_DEPEND="=dev-java/jgoodies-looks-1.2*"
 RDEPEND=">=virtual/jdk-1.4
 	${COMMON_DEPEND}"
 DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.4
 	>=app-arch/unzip-5.50-r1
 	${COMMON_DEPEND}"
 
@@ -26,8 +27,8 @@ S=${WORKDIR}
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}/lib
-	rm -f *.jar
+	cd "${S}/lib"
+	rm -v *.jar || die
 	java-pkg_jar-from jgoodies-looks-1.2 looks.jar looks-1.2.2.jar
 }
 
@@ -44,9 +45,9 @@ src_compile() {
 }
 
 src_install() {
-	java-pkg_newjar lib/${P}.jar ${PN}.jar
+	java-pkg_newjar lib/${P}.jar
 
-	dodoc readme.txt
-	use doc && java-pkg_dojavadoc doc
+	dodoc readme.txt || die
+	use doc && java-pkg_dohtml -r doc/*
 	use source && java-pkg_dosrc src/com
 }