summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Trygve Kalleberg <karltk@gentoo.org>2004-12-23 12:44:26 +0000
committerKarl Trygve Kalleberg <karltk@gentoo.org>2004-12-23 12:44:26 +0000
commit4ab7abc5d0f5ffc7b66dc9afedf2a2d084c02df4 (patch)
tree7bf57641ff30bd31eeacfbeb125e2345b1701872 /dev-java
parentBacked out ~alpha (Manifest recommit) (diff)
downloadgentoo-2-4ab7abc5d0f5ffc7b66dc9afedf2a2d084c02df4.tar.gz
gentoo-2-4ab7abc5d0f5ffc7b66dc9afedf2a2d084c02df4.tar.bz2
gentoo-2-4ab7abc5d0f5ffc7b66dc9afedf2a2d084c02df4.zip
Experimental removal of mozilla plugin when mozilla is not set.
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/blackdown-jdk/ChangeLog8
-rw-r--r--dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild6
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index 14fda3d973f5..012edb0cba87 100644
--- 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/blackdown-jdk-1.4.2.01-r1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild
index 64a86eea3833..134f7cf11f12 100644
--- 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 \{\} \;