Experimental removal of mozilla plugin when mozilla is not set.

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index 14fda3d973f5f7024c0c1d6615c4c493db5132d5..012edb0cba877d28caff53ae15a98ec0415d4e69 100644 (file)
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,11 +1,13 @@
 # ChangeLog for dev-java/blackdown-jdk
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.66 2004/12/23 12:14:06 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.67 2004/12/23 12:44:26 karltk Exp $
 
 *blackdown-jdk-1.4.2.01-r1 (23 Dec 2004)
 
-  23 Dec 2004; Karl Trygve Kalleberg <karltk@gentoo.org>  blackdown-jdk-1.4.2.01-r1.ebuild files/blackdown-jdk-1.4.2.01-r1 files/digest-blackdown-jdk-1.4.2.01-r1
-  # INSERT ENTRY HERE
+  23 Dec 2004; Karl Trygve Kalleberg <karltk@gentoo.org> 
+  blackdown-jdk-1.4.2.01-r1.ebuild files/blackdown-jdk-1.4.2.01-r1 
+  files/digest-blackdown-jdk-1.4.2.01-r1:
+  Experimental update that removes mozilla support if USE mozilla hasn't been specified.
 
   27 Nov 2004; Thomas Matthijs <axxo@gentoo.org>
   -files/blackdown-jdk-1.4.2_rc1, -blackdown-jdk-1.4.2_rc1.ebuild:

diff --git a/dev-java/blackdown-jdk/Manifest b/dev-java/blackdown-jdk/Manifest
index 631530a232c37a62d12c6dbd8228135bcc845bee..d774eb2b5c413d91d91bc022f78564d3ce2eebd1 100644 (file)
--- a/dev-java/blackdown-jdk/Manifest
+++ b/dev-java/blackdown-jdk/Manifest
@@ -1,23 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 38d1efcff8b79040f3cffcf5dd99944b blackdown-jdk-1.4.2.01-r1.ebuild 4320
 MD5 0052da924a28441c6378160ecf4a58f9 blackdown-jdk-1.3.1-r8.ebuild 2310
 MD5 d6f9d33ab37807e3feba5c7bdae209f3 blackdown-jdk-1.4.1-r1.ebuild 3773
 MD5 668dacd97dae55440bd0caf5818401f1 blackdown-jdk-1.4.2.01.ebuild 4231
 MD5 c3a1674a9be9f34f261b9e0613a76680 blackdown-jdk-1.3.1-r10.ebuild 2164
-MD5 d8033e770ee62a462e4325a52fbecad5 ChangeLog 11834
+MD5 8ed3ab542010df364aa02acf1d3c1559 ChangeLog 12136
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 b6ddfb041c9117cbbf4bbb32f226bb05 files/blackdown-jdk-1.4.2.01-r1 597
 MD5 fc3e5f204dcfe4d99ac75d70f55ab2c8 files/blackdown-jdk-1.4.2.01 592
 MD5 4180217fbbedc728995047569e9bd581 files/blackdown-jdk-1.3.1 594
 MD5 b553ff878f45505a9285c3a9612c7584 files/blackdown-jdk-1.4.1 589
+MD5 4e91fa8beedb2d7c135e05318b097702 files/digest-blackdown-jdk-1.4.2.01-r1 153
 MD5 729ed4be8a29fe7d7c3d946b8f14d8d4 files/digest-blackdown-jdk-1.3.1-r10 80
 MD5 f150863fcc96f4ca2d2bdd75f1c0a1c5 files/digest-blackdown-jdk-1.3.1-r8 243
 MD5 8009bc4bb09e243860795380d025f0e5 files/digest-blackdown-jdk-1.4.1-r1 167
 MD5 4e91fa8beedb2d7c135e05318b097702 files/digest-blackdown-jdk-1.4.2.01 153
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBqHIU/rLF9B432nYRAkGiAKClQOZLR48UKnHgaka73tMgQWe71QCfVDGz
-xDyf0YAQxOvgrrrN4X6BaC0=
-=Zf3P
------END PGP SIGNATURE-----

diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild
index 64a86eea3833683e21cdb04df91396870bfa189f..134f7cf11f12951bc1bfa8cd1234a62a63d02823 100644 (file)
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild,v 1.1 2004/12/23 12:14:06 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild,v 1.2 2004/12/23 12:44:26 karltk Exp $
 
 inherit java versionator
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.blackdown.org"
 
 SLOT="1.4.2"
 LICENSE="sun-bcla-java-vm"
-KEYWORDS="-* x86 amd64"
+KEYWORDS="-* ~x86 ~amd64"
 IUSE="doc mozilla"
 
 DEPEND="virtual/libc
@@ -104,6 +104,8 @@ src_install() {
                esac
 
                install_mozilla_plugin /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so
+       else
+               rm -f ${D}/opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so
        fi
 
        find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;