applying java patch needs to be conditional on java useflag (Bug #144548)

Package-Manager: portage-2.1-r1

3 files changed, 27 insertions, 12 deletions

diff --git a/media-libs/ming/ChangeLog b/media-libs/ming/ChangeLog
index ad65d041f1b3..ecb001b367fc 100644
--- a/media-libs/ming/ChangeLog
+++ b/media-libs/ming/ChangeLog
@@ -1,13 +1,16 @@
 # ChangeLog for media-libs/ming
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.22 2006/08/20 13:17:22 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.23 2006/08/20 20:32:19 wormo Exp $
+
+  20 Aug 2006; Stephanie Lockwood-Childs <wormo@gentoo.org> ming-0.3.0.ebuild:
+  applying java patch needs to be conditional on java useflag (Bug #144548)
 
   20 Aug 2006; Bryan Østergaard <kloeri@gentoo.org> ming-0.3.0.ebuild:
   Fix python dependency.
 
 *ming-0.3.0 (22 Aug 2006)
 
-  22 Aug 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  20 Aug 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
   +ming-0.3.0.ebuild:
   version bump including php and perl bindings added -- ebuild courtesy 
   of Adam Penser (Bug #121716)
diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest
index ac1cdc3302a6..3434cd4a6fc6 100644
--- a/media-libs/ming/Manifest
+++ b/media-libs/ming/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ming-0.2a-fpic.patch 1814 RMD160 b033493ac9c522774acaa81b2ddd68a46b995a9e SHA1 7c3144646a27c5b4474bce6c8efd26f8e86b3636 SHA256 54b7a3492a9136eb91b09dd36b07049db38adb110d08a2f734c752bfda2d815b
 MD5 0d2b63f032d402518c9384d5db4404b1 files/ming-0.2a-fpic.patch 1814
 RMD160 b033493ac9c522774acaa81b2ddd68a46b995a9e files/ming-0.2a-fpic.patch 1814
@@ -36,14 +39,14 @@ EBUILD ming-0.2a.ebuild 1163 RMD160 1a46af5263a1e1e1d546ba3948e84cb5c9f6bb0a SHA
 MD5 6e8e25682a0a27c2f29a89dcfc12a201 ming-0.2a.ebuild 1163
 RMD160 1a46af5263a1e1e1d546ba3948e84cb5c9f6bb0a ming-0.2a.ebuild 1163
 SHA256 698243eefa4720d891d8c4f460ab0596f7bd175c68e5d02a5eb5c6a5b91b27bc ming-0.2a.ebuild 1163
-EBUILD ming-0.3.0.ebuild 2994 RMD160 5fd509e39b22f523dd46f0448ccf81618d2eca1e SHA1 21ac57deb9c22b54ced94d165a3d54e1d89b48f2 SHA256 f9fba34c6d7a7457086c02e93ec23b5758605a04d37dbddd870ef9510907900e
-MD5 1f24b336918070150fa405f14715906a ming-0.3.0.ebuild 2994
-RMD160 5fd509e39b22f523dd46f0448ccf81618d2eca1e ming-0.3.0.ebuild 2994
-SHA256 f9fba34c6d7a7457086c02e93ec23b5758605a04d37dbddd870ef9510907900e ming-0.3.0.ebuild 2994
-MISC ChangeLog 2837 RMD160 58281601d0c7c30fe435f676b382b91eace93eaa SHA1 02d39bd6113f7efa37bf7d94bc6e674661c56670 SHA256 7dd08f8100d0f51c54b1e80ff65915a0e4012e83c97e9cfc6199079521604ce8
-MD5 aa0e4bff5375660eee3960107d554ead ChangeLog 2837
-RMD160 58281601d0c7c30fe435f676b382b91eace93eaa ChangeLog 2837
-SHA256 7dd08f8100d0f51c54b1e80ff65915a0e4012e83c97e9cfc6199079521604ce8 ChangeLog 2837
+EBUILD ming-0.3.0.ebuild 3017 RMD160 f79e748d4321ee3db0f38074ec9e288169c4feed SHA1 559b3249e88ad05aa30cba362aa2410cdae5cd2e SHA256 5a84cc950da4260adaac9183da4be3346bf1528bb9f0aba966152626744525a8
+MD5 c3f20271f2cbbbddd0f11502b3fee2c3 ming-0.3.0.ebuild 3017
+RMD160 f79e748d4321ee3db0f38074ec9e288169c4feed ming-0.3.0.ebuild 3017
+SHA256 5a84cc950da4260adaac9183da4be3346bf1528bb9f0aba966152626744525a8 ming-0.3.0.ebuild 3017
+MISC ChangeLog 2992 RMD160 99fa7ddb728437192aab8cab63a257749da41185 SHA1 d996aacbf716f37d2d55b3d3e146f7ea07f3bbe9 SHA256 2547d47cd5c58d7861bbef807d8fd349591ebcd7cb22437a1450b6eb9d1420f5
+MD5 dce65426698d6d813f4645b8835e5eae ChangeLog 2992
+RMD160 99fa7ddb728437192aab8cab63a257749da41185 ChangeLog 2992
+SHA256 2547d47cd5c58d7861bbef807d8fd349591ebcd7cb22437a1450b6eb9d1420f5 ChangeLog 2992
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
 MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
@@ -63,3 +66,10 @@ SHA256 b0328341f2c6f6e615797cd458acb6d74bec8913fce578ece50bf1e0dd069ed6 files/di
 MD5 3a8cedb2efd4015742bfc46e90d96370 files/digest-ming-0.3.0 1199
 RMD160 35c44f40f0b7b1525c110842e55c714e5f3a6ace files/digest-ming-0.3.0 1199
 SHA256 836c548dca16c6e878fc6f93612e2aea678620aedc264ed5f94fe74bb810cafa files/digest-ming-0.3.0 1199
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFE63Kt/NoSW7FuNV8RAip4AKCUiMldscFUlibawXJIuYPJVStDWwCbB4wJ
+r1OgrJgCVWsmEuLQLKvDMUU=
+=6k3C
+-----END PGP SIGNATURE-----
diff --git a/media-libs/ming/ming-0.3.0.ebuild b/media-libs/ming/ming-0.3.0.ebuild
index 4b551d310386..74d24ec2899a 100644
--- a/media-libs/ming/ming-0.3.0.ebuild
+++ b/media-libs/ming/ming-0.3.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/media-libs/ming/ming-0.3.0.ebuild,v 1.2 2006/08/20 13:17:22 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.3.0.ebuild,v 1.3 2006/08/20 20:32:19 wormo Exp $
 
 PHP_EXT_NAME="php_ming"
 inherit eutils toolchain-funcs java-pkg perl-module php-ext-source-r1 python distutils
@@ -33,7 +33,9 @@ RDEPEND="java? ( virtual/jre )
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch "${FILESDIR}/${P}-java-compiler.patch"
+	if use java; then
+		epatch "${FILESDIR}/${P}-java-compiler.patch"
+	fi
 }
 
 src_compile() {