Added back dropped patch for javadoc building so that the doc use flag works again. Fixes bug #153706.

Package-Manager: portage-2.1.2_rc1-r3

3 files changed, 31 insertions, 10 deletions

diff --git a/app-misc/jbidwatcher/ChangeLog b/app-misc/jbidwatcher/ChangeLog
index e7fc6a7e0eba..e610fc64e3e2 100644
--- a/app-misc/jbidwatcher/ChangeLog
+++ b/app-misc/jbidwatcher/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/jbidwatcher
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jbidwatcher/ChangeLog,v 1.26 2006/09/28 03:00:38 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jbidwatcher/ChangeLog,v 1.27 2006/11/03 18:14:22 betelgeuse Exp $
+
+  03 Nov 2006; Petteri Räty <betelgeuse@gentoo.org> jbidwatcher-1.0.ebuild:
+  Added back dropped patch for javadoc building so that the doc use flag works
+  again. Fixes bug #153706.
 
 *jbidwatcher-1.0 (28 Sep 2006)
 
diff --git a/app-misc/jbidwatcher/Manifest b/app-misc/jbidwatcher/Manifest
index 246081fa2a39..b6456c4e061b 100644
--- a/app-misc/jbidwatcher/Manifest
+++ b/app-misc/jbidwatcher/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX jbidwatcher-0.9.8-build_xml.patch 2328 RMD160 c0237befef352f3ac1f7038fea984f88e2a67b58 SHA1 33e1970c7b63d65c9fea7057435eae97a77d5ec9 SHA256 9b3ded50f7d23a219c566e9b4d89bb2223cfd6ea583777d51149925b088c3148
 MD5 e4a099a9465fab9439db2f10b38539f8 files/jbidwatcher-0.9.8-build_xml.patch 2328
 RMD160 c0237befef352f3ac1f7038fea984f88e2a67b58 files/jbidwatcher-0.9.8-build_xml.patch 2328
@@ -26,18 +29,18 @@ EBUILD jbidwatcher-0.9.9.ebuild 1568 RMD160 ab1c41616add5fe13e2eca54c5d6ee336e8a
 MD5 658e67b76a26c5d162a8ec38e9ce05cc jbidwatcher-0.9.9.ebuild 1568
 RMD160 ab1c41616add5fe13e2eca54c5d6ee336e8afc71 jbidwatcher-0.9.9.ebuild 1568
 SHA256 f8ee0516bc87eb47e716af549f2c7ca540415b8a85691c0d61577a9c55477f75 jbidwatcher-0.9.9.ebuild 1568
-EBUILD jbidwatcher-1.0.ebuild 1081 RMD160 77e89734a453426ae31537a05355cde2a4319563 SHA1 7d3fca14e7800bc5d32c119048cd29469a693de5 SHA256 a616294bf7bb147642b4cece82e5954c6858d0ba7b453522091cd6ae0c3efd28
-MD5 762fe85e5c272c7009e87fb949c1f519 jbidwatcher-1.0.ebuild 1081
-RMD160 77e89734a453426ae31537a05355cde2a4319563 jbidwatcher-1.0.ebuild 1081
-SHA256 a616294bf7bb147642b4cece82e5954c6858d0ba7b453522091cd6ae0c3efd28 jbidwatcher-1.0.ebuild 1081
+EBUILD jbidwatcher-1.0.ebuild 1244 RMD160 69e8a0cc35d851642e07e97eceb3e5b07e74198b SHA1 f35c508638ab2ac250f26b19576e7e819b6db972 SHA256 2d59edf3ba449b54437015fc3f578c7bded43d2d1e6445a489670613aed54e42
+MD5 33aca7909db41eab3f9888f8ed45bb54 jbidwatcher-1.0.ebuild 1244
+RMD160 69e8a0cc35d851642e07e97eceb3e5b07e74198b jbidwatcher-1.0.ebuild 1244
+SHA256 2d59edf3ba449b54437015fc3f578c7bded43d2d1e6445a489670613aed54e42 jbidwatcher-1.0.ebuild 1244
 EBUILD jbidwatcher-1.0_pre6.ebuild 1088 RMD160 5666db22db7644d41e06fb8f47096df122e667c7 SHA1 22ce7b86730f7d9abfc645e12c4fd79c406209a6 SHA256 ded44d79a9e52bcdffae7e4f62e15ab3fa7bb57e8539a7334894b0ae256eae29
 MD5 8c16fa360e0be5592cdd99efa64b0b70 jbidwatcher-1.0_pre6.ebuild 1088
 RMD160 5666db22db7644d41e06fb8f47096df122e667c7 jbidwatcher-1.0_pre6.ebuild 1088
 SHA256 ded44d79a9e52bcdffae7e4f62e15ab3fa7bb57e8539a7334894b0ae256eae29 jbidwatcher-1.0_pre6.ebuild 1088
-MISC ChangeLog 3424 RMD160 c3754c526b6661e8f27404e46f57839726e34361 SHA1 cb99ffc2c238e1c38a3b47d4f7636c6e01ae25c2 SHA256 186ebc769079d6279fd373ef5ec15884dfc9298ece794e4847176e45d14ef776
-MD5 41ae04dbc371e12428257da35d4a582b ChangeLog 3424
-RMD160 c3754c526b6661e8f27404e46f57839726e34361 ChangeLog 3424
-SHA256 186ebc769079d6279fd373ef5ec15884dfc9298ece794e4847176e45d14ef776 ChangeLog 3424
+MISC ChangeLog 3613 RMD160 9ef4f02972a604c62964b30f3ad2ac0361089e3c SHA1 8d9d54c663176d08aa5e33151befea3cd63a84d5 SHA256 c159beb005490b94a5f078e3075c9ab9707f9a229d8b5afec35d136ec533ca5c
+MD5 57b67ec201da12646d2250e71c5f5703 ChangeLog 3613
+RMD160 9ef4f02972a604c62964b30f3ad2ac0361089e3c ChangeLog 3613
+SHA256 c159beb005490b94a5f078e3075c9ab9707f9a229d8b5afec35d136ec533ca5c ChangeLog 3613
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -54,3 +57,10 @@ SHA256 5b572d04991bb921f7cd902fcfea7ba8803e61471f685e5364a1b29a19ca57b6 files/di
 MD5 c048efc7543ae89149248e94c63909cd files/digest-jbidwatcher-1.0_pre6 259
 RMD160 c7c0b0e69b7fc9ea01bc5157a875870231ddbdeb files/digest-jbidwatcher-1.0_pre6 259
 SHA256 dd72657ad24831227e135d25557d104e972c7c7ef4ee20bff0493985918bddcf files/digest-jbidwatcher-1.0_pre6 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFS4cIcxLzpIGCsLQRAv8wAJ4qa3zBoDNioH1U+JdQZ7RE6CUfRgCeLRKc
+3NIdTvaX9t2VrMYj//QfaOg=
+=/qF2
+-----END PGP SIGNATURE-----
diff --git a/app-misc/jbidwatcher/jbidwatcher-1.0.ebuild b/app-misc/jbidwatcher/jbidwatcher-1.0.ebuild
index d680a5cfa15a..a92f3191934c 100644
--- a/app-misc/jbidwatcher/jbidwatcher-1.0.ebuild
+++ b/app-misc/jbidwatcher/jbidwatcher-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jbidwatcher/jbidwatcher-1.0.ebuild,v 1.1 2006/09/28 03:00:38 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jbidwatcher/jbidwatcher-1.0.ebuild,v 1.2 2006/11/03 18:14:22 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -14,6 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
+
 IUSE="doc"
 
 DEPEND=">=virtual/jdk-1.4
@@ -28,6 +29,12 @@ src_unpack() {
 
 	# Fix bad build.xml (used to be the sed)
 	epatch "${FILESDIR}/${P}-build_xml.patch"
+	epatch "${FILESDIR}/${PN}-0.9.8-javadoc.patch"
+	# jdictrayapi and tritonus are here
+	#rm -fr org
+	# apple stuff and pat stuff
+	#rm -rf com
+	#rm -fr javazoom
 }
 
 src_compile() {