diff options
Diffstat (limited to 'dev-java/blackdown-jre')
| -rw-r--r-- | dev-java/blackdown-jre/ChangeLog | 290 | ||||
| -rw-r--r-- | dev-java/blackdown-jre/Manifest | 35 | ||||
| -rw-r--r-- | dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild | 95 | ||||
| -rw-r--r-- | dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild | 34 | ||||
| -rw-r--r-- | dev-java/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild | 24 | ||||
| -rw-r--r-- | dev-java/blackdown-jre/blackdown-jre-1.4.2.02-r1.ebuild | 17 | ||||
| -rw-r--r-- | dev-java/blackdown-jre/blackdown-jre-1.4.2.02.ebuild | 24 | ||||
| -rw-r--r-- | dev-java/blackdown-jre/files/blackdown-jre-1.3.1 | 19 | ||||
| -rw-r--r-- | dev-java/blackdown-jre/files/blackdown-jre-1.4.1 | 11 | ||||
| -rw-r--r-- | dev-java/blackdown-jre/files/blackdown-jre-1.4.2.01 | 2 | ||||
| -rw-r--r-- | dev-java/blackdown-jre/files/blackdown-jre-1.4.2.02 | 2 |
11 files changed, 433 insertions, 120 deletions
diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog index 10c16f4175ec..7bb344fc7081 100644 --- a/dev-java/blackdown-jre/ChangeLog +++ b/dev-java/blackdown-jre/ChangeLog @@ -1,13 +1,287 @@ # ChangeLog for dev-java/blackdown-jre -# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.1.1.1 2005/11/30 09:47:06 chriswhite Exp $ + + 18 Oct 2005; Aron Griffis <agriffis@gentoo.org> + blackdown-jre-1.3.1-r9.ebuild, blackdown-jre-1.4.1-r1.ebuild, + blackdown-jre-1.4.2.01-r1.ebuild, blackdown-jre-1.4.2.02.ebuild, + blackdown-jre-1.4.2.02-r1.ebuild: + Warn about deprecated browserplugin useflag + + 18 Oct 2005; Aron Griffis <agriffis@gentoo.org> + blackdown-jre-1.3.1-r9.ebuild, blackdown-jre-1.4.1-r1.ebuild, + blackdown-jre-1.4.2.01-r1.ebuild, blackdown-jre-1.4.2.02.ebuild, + blackdown-jre-1.4.2.02-r1.ebuild: + Respect the global USE=nsplugin instead of the local USE=browserplugin + +*blackdown-jre-1.4.2.02-r1 (06 Oct 2005) + + 06 Oct 2005; Petteri Räty <betelgeuse@gentoo.org> + +blackdown-jre-1.4.2.02-r1.ebuild: + Fixed the installation of the icon and the desktop entry reported in bug + #108212. Thanks to Dave Shanker <dshanker@gmail.com> for reporting. + + 26 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> + blackdown-jre-1.4.2.02.ebuild: + Fix cp -a usage for Gentoo/FreeBSD. + + 11 Jul 2005; Thomas Matthijs <axxo@gentoo.org> + blackdown-jre-1.3.1-r9.ebuild, blackdown-jre-1.4.1-r1.ebuild, + blackdown-jre-1.4.2.01-r1.ebuild, blackdown-jre-1.4.2.02.ebuild: + bug 94056: useflag rename mozilla -> browserplugin + + 20 Jun 2005; Thomas Matthijs <axxo@gentoo.org> + blackdown-jre-1.4.2.02.ebuild: + stable for security' + +*blackdown-jre-1.4.2.02 (16 Jun 2005) + + 16 Jun 2005; Thomas Matthijs <axxo@gentoo.org> + +blackdown-jre-1.4.2.02.ebuild: + version bump + + 06 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> + blackdown-jre-1.4.1-r1.ebuild, blackdown-jre-1.4.2.01-r1.ebuild: + dropping libcompat dependency + + 18 May 2005; Thomas Matthijs <axxo@gentoo.org> + blackdown-jre-1.3.1-r9.ebuild, blackdown-jre-1.4.1-r1.ebuild, + blackdown-jre-1.4.2.01-r1.ebuild: + remove obsolete java-scheme virtual. remove versions from provide: bug 93028 + + 16 May 2005; Jan Brinkmann <luckyduck@gentoo.org> + blackdown-jre-1.4.1-r1.ebuild, blackdown-jre-1.4.2.01-r1.ebuild: + sys-libs/lib-compat added to rdepend, see #89589 + + 15 May 2005; Jan Brinkmann <luckyduck@gentoo.org> + blackdown-jre-1.3.1-r9.ebuild, blackdown-jre-1.4.1-r1.ebuild: + inherit the toolchain-funcs eclass instead of the gcc one + +*blackdown-jre-1.4.2.01-r1 (25 Mar 2005) + + 25 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> + +blackdown-jre-1.4.2.01-r1.ebuild, -blackdown-jre-1.4.2.01.ebuild: + applied patch to fix insecure temporary file handling, see #86585 + + 05 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> + blackdown-jre-1.4.2.01.ebuild: + tweaked unpacking options for tar to fix #77748 + + 12 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> + blackdown-jre-1.4.1-r1.ebuild: + migrated from amd64? to emul-linux-x86? dependency. + + 31 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> + blackdown-jre-1.4.1-r1.ebuild, blackdown-jre-1.4.2.01.ebuild: + sparc64-multilib fixes. + +*blackdown-jre-1.4.1-r1 (29 Nov 2004) + + 29 Nov 2004; Thomas Matthijs <axxo@gentoo.org> + +blackdown-jre-1.4.1-r1.ebuild: + give sparc there jre back, no longer installs the mozilla plugin, security + vuln #72221 + + 27 Nov 2004; Thomas Matthijs <axxo@gentoo.org> + -files/blackdown-jre-1.4.2_rc1, -blackdown-jre-1.4.2_rc1-r2.ebuild: + remove older vulnerable versions + + 26 Nov 2004; Travis Tilley <lv@gentoo.org> blackdown-jre-1.4.2.01.ebuild: + stable on amd64 + + 24 Nov 2004; Thomas Matthijs <axxo@gentoo.org> -files/blackdown-jre-1.4.1, + -files/blackdown-jre-1.4.2, -files/blackdown-jre-1.4.2_rc1-r1, + -blackdown-jre-1.4.1.ebuild, -blackdown-jre-1.4.2.ebuild, + -blackdown-jre-1.4.2_rc1-r1.ebuild: + remove older vulnerable versions + +*blackdown-jre-1.4.2.01 (24 Nov 2004) + + 24 Nov 2004; Thomas Matthijs <axxo@gentoo.org> + +files/blackdown-jre-1.4.2.01, +blackdown-jre-1.4.2.01.ebuild: + security version bump #72221, keyword x86 + +*blackdown-jre-1.4.2 (09 Oct 2004) + + 09 Oct 2004; Thomas Matthijs <axxo@gentoo.org> +files/blackdown-jre-1.4.2, + +blackdown-jre-1.4.2.ebuild: + Version bump + +*blackdown-jre-1.4.2_rc1-r2 (05 Oct 2004) + + 05 Oct 2004; Thomas Matthijs <axxo@gentoo.org> + +blackdown-jre-1.4.2_rc1-r2.ebuild: + Fixed bug 54242, and enabled the mozilla plugin again, it does have it! + Direct to amd64 since the previous version was plain broken. + + 02 Oct 2004; Travis Tilley <lv@gentoo.org> + blackdown-jre-1.4.2_rc1-r1.ebuild: + made the ebuild stop trying to install a plugin on amd64, we dont have one in + the jre. this should make blackdown-jre installable on amd64 again. + + 29 Sep 2004; Thomas Matthijs <axxo@gentoo.org> + blackdown-jre-1.3.1-r9.ebuild, blackdown-jre-1.4.1.ebuild, + blackdown-jre-1.4.2_rc1-r1.ebuild: + Cleaned up plugin instalation, Moved some messages to the eclass, see #22395 + for more information + + 31 Jul 2004; Daniel Black <dragonheart@gentoo.org> + blackdown-jre-1.4.1.ebuild: + SRC_URI changed due to closure of previous mirror + + 14 Jul 2004; Thomas Matthijs <axxo@gentoo.org> + blackdown-jre-1.3.1-r9.ebuild: + fix unpack, no need to check for gcc 3., since it DEPENDS on it, closes 56649 + + 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> + blackdown-jre-1.3.1-r9.ebuild, blackdown-jre-1.4.1.ebuild, + blackdown-jre-1.4.2_rc1-r1.ebuild: + virtual/glibc -> virtual/libc + + 29 Jun 2004; Aron Griffis <agriffis@gentoo.org> + blackdown-jre-1.3.1-r9.ebuild: + kill sparc64 use flag + +*blackdown-jre-1.4.2_rc1-r1 (21 Jun 2004) + + 21 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org> + blackdown-jre-1.4.2_rc1-r1.ebuild: Added proper symlink to mozilla + plugin, thanks to Elie De Brauwer <elie@de-brauwer.be> and Andy Daniels + <danielsa@uwstout.edu>. Fixes #52876. Removed old revision. + + 18 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org> + blackdown-jre-1.4.1.ebuild: Regen'ed digest for 2.95.bin, fixes #53657. + + 10 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> + blackdown-jre-1.4.2_rc1.ebuild: + Added missing DISTDIR to unpack. + + 06 Jun 2004; Aron Griffis <agriffis@gentoo.org> + blackdown-jre-1.3.1-r9.ebuild, blackdown-jre-1.4.1.ebuild, + blackdown-jre-1.4.2_rc1.ebuild: + Fix QA violations and clean up + + 03 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org> + blackdown-jdk-1.3.1-r9.ebuild, blackdown-jdk-1.4.1.ebuild, + blackdown-jdk-1.4.2_rc1.ebuild: Added check in pkg_postinst to + only install as default system VM if no JDK is found, partly fixes + #9289. + + 13 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> + blackdown-jre-1.3.1-r9.ebuild: + remove bogus sourcing of inherit.eclass + + 18 Mar 2004; Chris Aniszczyk <zx@gentoo.org> blackdown-jre-1.3.1-r7.ebuild, + blackdown-jre-1.3.1-r8.ebuild, blackdown-jre-1.3.1-r9.ebuild, + blackdown-jre-1.4.1.ebuild, blackdown-jre-1.4.2_rc1.ebuild: + Clean up :) + + 01 Mar 2004; <mkennedy@gentoo.org> files/blackdown-jre-1.3.1, + files/blackdown-jre-1.4.1, files/blackdown-jre-1.4.2_rc1: + Remove CLASSPATH from environment variable list. + + 20 Feb 2004; <zx@gentoo.org> blackdown-jre-1.4.2_rc1.ebuild: + Bug fix, #40433 + +*blackdown-jre-1.4.2_rc1 (23 Dec 2003) + + 23 Dec 2003; Brad House <brad_mssw@gentoo.org> + blackdown-jre-1.4.2_rc1.ebuild, files/blackdown-jre-1.4.2_rc1: + bump version to 1.4.2_rc1 + + 06 Dec 2003; Adrian Almenar <strider@gentoo.org> blackdown-jre-1.3.1-r7.ebuild, + blackdown-jre-1.3.1-r8.ebuild, blackdown-jre-1.3.1-r9.ebuild: + Fixes bug #35127 + + 15 Oct 2003; Brad House <brad_mssw@gentoo.org> blackdown-jre-1.4.1.ebuild: + stable on amd64 + + 04 Oct 2003; Brad House <brad_mssw@gentoo.org> blackdown-jre-1.4.1.ebuild: + Allow amd64 to use java with dependancy on emul-linux-x86-baselibs + + 06 Sep 2003; Hanno Boeck <hanno@gentoo.org> blackdown-jre-1.3.1-r7.ebuild, + blackdown-jre-1.3.1-r8.ebuild, blackdown-jre-1.3.1-r9.ebuild, + blackdown-jre-1.4.1.ebuild: + Fix for new tail syntax. + + 01 Sep 2003; Jason Wever <weeve@gentoo.org> blackdown-jre-1.4.1.ebuild: + Added fix for bug #26629. + + 30 May 2003; Jason Wever <weeve@gentoo.org> files/digest-blackdown-jre-1.4.1: + Added digest for blackdown-jre-1.4.1 for sparc. + + 24 May 2003; Dylan Carlson <absinthe@gentoo.org> + blackdown-jre-1.3.1-r7.ebuild, blackdown-jre-1.3.1-r8.ebuild, + blackdown-jre-1.3.1-r9.ebuild, blackdown-jre-1.4.1.ebuild: + + License fixes. + +*blackdown-jre-1.4.1 (18 Feb 2003) + + 14 Apr 2003; Stefan Jones <gerk@gentoo.org> : blackdown-jre-1.4.1.ebuild, + Moved to stable, java will now work! + + 18 Feb 2003; Stefan Jones <gerk@gentoo.org> : blackdown-jre-1.4.1.ebuild, + New version for all ya java fans, now supports gcc3.2 for mozilla plugin. + +*blackdown-jre-1.3.1-r9 (27 Jan 2003) + 27 Jan 2003; Mark Guertin <gerk@gentoo.org> : blackdown-jre-1.3.1-r9.ebuild, + files/digest-blackdown-jre-1.3.1-r9 : + New version, set only as ppc for now. There are no other arches supported yet + for this revision, but it was desperately needed for ppc users using gcc 3.2. + Due to this promoting directly to stable and locking down older ones in 1.0 + profiles + + 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords + +*blackdown-jre-1.3.1-r8 (21 Nov 2002) + + 21 Nov 2002; phoen][x <phoenix@gentoo.org> blackdown-jre-1.3.1-r8.ebuild, + files/digest-blackdown-jre-1.3.1-r8 : + Switched to the new nsplugins layout. + +*blackdown-jre-1.3.1-r7 (16 Jul 2002) + + 08 Sep 2002; Karl Trygve Kalleberg <karltk@gentoo.org> blackdown-jre-1.3.1-r7 : + Now properly installs the Mozilla plugin again. Still won't work if Mozilla + is compiled with gcc-3.2. + + 07 Sep 2002; Karl Trygve Kalleberg <karltk@gentoo.org> blackdown-jre-1.3.1-r7 : + Updated dep on java-config to fix CLASSPATH bug. Fixed nasty multi-platform + unpacking bug that prevented it from installing. + + 29 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> blackdown-jre-1.3.1-r7 : + All files were owned by 1000.100, this is now changed to root.root. + + 28 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> blackdown-jre-1.3.1-r7 : + Added sparc platform support, not entirely tested. + + 26 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> blackdown-jre-1.3.1-r7 : + Now provides the jre-1.3.1 virtual package. + + 01 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> blackdown-jre-1.3.1-r7 : + Added LICENSE and KEYWORDS. Removed older revisions. + + 16 Jul 2002; Karl Trygve Kalleberg <karltk@gentoo.org> files/blackdown-jre-1.3.1 : + Added MANPATH to the the environment file. + + 27 Apr 2002; pvdabeel <pvdabeel@gentoo.org> blackdown-jre-1.3.1-r7 : + PPC(/sparc) compatible ebuild + +*blackdown-jre-1.3.1-r6 (09 Apr 2002) + + 09 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> blackdown-jre-1.3.1-r6.ebuild files/digest-blackdown-jre-1.3.1-r6 files/blackdown-jre-1.3.1 : + Fixed JRE_HOME env var in the environment script (#1593), fixed erroneous + font specs in font.properties (#1533). + Old revisions removed. + +*blackdown-jre-1.3.1-r5 (18 Mar 2002) + + 18 Mar 2002; Karl Trygve Kalleberg <karltk@gentoo.org> blackdown-jre-1.3.1-r5.ebuild files/digest-blackdown-jre-1.3.1-r5 files/blackdown-jre-1.3.1 : + Added support for JVM switching. + Removed old revisions. *blackdown-jre-1.3.1-r4 (1 Feb 2002) 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. + Added initial ChangeLog. diff --git a/dev-java/blackdown-jre/Manifest b/dev-java/blackdown-jre/Manifest index 252332bf4bce..e311b73fefbb 100644 --- a/dev-java/blackdown-jre/Manifest +++ b/dev-java/blackdown-jre/Manifest @@ -1,11 +1,26 @@ -MD5 00e0e8ec9b63395ae93e08b5718a3523 blackdown-jre-1.3.1-r7.ebuild 2161 -MD5 091dcdbb6dd671f6f73f3e457fc5d8ff blackdown-jre-1.4.1.ebuild 2058 -MD5 e56eeb7bcd37c65101c610cefd3865bb blackdown-jre-1.3.1-r9.ebuild 2166 -MD5 adf3f974112a936747d64c6b130bdb1e blackdown-jre-1.3.1-r8.ebuild 1990 -MD5 3cb72b93170413f27c8cba6872d86288 ChangeLog 3153 -MD5 87689b5c7a0f97a6571a10ac42cb3bac files/digest-blackdown-jre-1.3.1-r7 240 -MD5 87689b5c7a0f97a6571a10ac42cb3bac files/digest-blackdown-jre-1.3.1-r8 240 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 f58bb74f11453d8cdcae2e2d54ab89c3 ChangeLog 11250 +MD5 f46f38d24a8e09a0248800bbe8e7345b blackdown-jre-1.3.1-r9.ebuild 2142 +MD5 7095ff1843f160ccb8c433a894cf131f blackdown-jre-1.4.1-r1.ebuild 3015 +MD5 8c1b240e5c7f57f80947f7d1c8dcb76c blackdown-jre-1.4.2.01-r1.ebuild 3812 +MD5 bcdb68fa4cd74925bffec10a676f3844 blackdown-jre-1.4.2.02-r1.ebuild 4055 +MD5 6497d0dafadf32c00c7dccfbb0c5f9e2 blackdown-jre-1.4.2.02.ebuild 3811 +MD5 3facc5cbb2965471e9b1986926221552 files/blackdown-jre-1.3.1 429 +MD5 271b1f89b9f0f70dd5154090978263b1 files/blackdown-jre-1.4.1 425 +MD5 57462605c4cce61fe2ac166306c5b491 files/blackdown-jre-1.4.2.01 428 +MD5 d807d4748f853aab768ead08cffd5454 files/blackdown-jre-1.4.2.02 428 MD5 44d855f52a687d922d2230b27bccad0f files/digest-blackdown-jre-1.3.1-r9 79 -MD5 9b4497b7cd7a0cab9fff5d958a18da8e files/digest-blackdown-jre-1.4.1 82 -MD5 60f9af5767a218c44dd128c4f4d4b0ab files/blackdown-jre-1.3.1 562 -MD5 62521a51904596cc001140b1067c3ce0 files/blackdown-jre-1.4.1 562 +MD5 773e3dae29edd26397f43c1e1ab99dae files/digest-blackdown-jre-1.4.1-r1 248 +MD5 7d186c2364cc118125d06076161306a8 files/digest-blackdown-jre-1.4.2.01-r1 151 +MD5 71bbb04601fe32e845c98fab7f732ae4 files/digest-blackdown-jre-1.4.2.02 151 +MD5 71bbb04601fe32e845c98fab7f732ae4 files/digest-blackdown-jre-1.4.2.02-r1 151 +MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.1 (GNU/Linux) + +iD8DBQFDVVk9JrHF4yAQTrARAuAKAJ9RLTtghOUy5pE+xNPq7ZA0aQZ1DwCfW64c +4635vIIkpqqxFYde3PhCP28= +=TNyg +-----END PGP SIGNATURE----- diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild index df8fbd30f9d9..1999d04dc541 100644 --- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild +++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild @@ -1,75 +1,74 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.1 2003/01/27 20:30:32 gerk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.1.1.1 2005/11/30 09:47:06 chriswhite Exp $ -IUSE="" - -. /usr/portage/eclass/inherit.eclass -inherit java nsplugins +inherit java toolchain-funcs S=${WORKDIR}/j2re1.3.1 DESCRIPTION="Blackdown Java Runtime Environment 1.3.1" -SRC_URI="ppc? http://distro.ibiblio.org/pub/Linux/distributions/yellowdog/software/openoffice/j2re-1.3.1-02c-FCS-linux-ppc.bin" - HOMEPAGE="http://www.blackdown.org" -DEPEND="virtual/glibc - >=dev-java/java-config-0.2.5" -RDEPEND="$DEPEND" -PROVIDE="virtual/jre-1.3.1 - virtual/java-scheme-2" +SRC_URI="ppc? ( http://distro.ibiblio.org/pub/Linux/distributions/yellowdog/software/openoffice/j2re-1.3.1-02c-FCS-linux-ppc.bin )" + +LICENSE="sun-bcla-java-vm" SLOT="0" -LICENSE="sun-bcla" +KEYWORDS="ppc -*" +IUSE="browserplugin nsplugin mozilla" -# other arches will need to chase this down when its released for them -KEYWORDS="ppc" +DEPEND="virtual/libc + >=dev-java/java-config-0.2.5 + >=sys-apps/sed-4 + >=sys-devel/gcc-3.2" +PROVIDE="virtual/jre" -src_unpack () { - if (use ppc) || (use sparc) || (use sparc64) ; then - # this is built on gcc 3.2 so only update if gcc 3.x is present - [ -z "${CC}" ] && CC=gcc - if [ "`${CC} -dumpversion | cut -d. -f1,2`" = "2.95" ] ; then - die "This is for gcc 3.x only" - fi +src_unpack() { + for a in ${A}; do + if [[ ${a} == *.bin ]]; then + echo ">>> Unpacking ${a}..." + tail -n +422 ${DISTDIR}/${a} | tar xjf - || die + else + # Handle files (none right now) that don't have a gcc + # version dependency + unpack ${a} + fi + done - tail +422 ${DISTDIR}/${A} | tar xjf - - else - unpack ${A} - fi - if (use sparc) || (use sparc64) ; then + # On sparc the files are owned by 1000:100 for some reason + if use sparc; then # The files are owned by 1000.100, for some reason. - chown -R root.root + chown -R root:root fi } -src_install () { +src_install() { + typeset platform + dodir /opt/${P} cp -dpR ${S}/{bin,lib,man,plugin} ${D}/opt/${P}/ - find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \; + find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \; dodoc COPYRIGHT LICENSE README INSTALL dohtml README.html - # Install mozilla plugin - if [ "${ARCH}" == "x86" ] ; then - PLATFORM="i386" - elif [ "${ARCH}" == "ppc" ] ; then - PLATFORM="ppc" - elif [ "${ARCH}" == "sparc" ] || [ "${ARCH}" == "sparc64" ] ; then - PLATFORM="sparc" + if use nsplugin || # global useflag for netscape-compat plugins + use browserplugin || # deprecated but honor for now + use mozilla; then # wrong but used to honor it + case ${ARCH} in + amd64|x86) platform="i386" ;; + ppc) platform="ppc" ;; + sparc*) platform="sparc" ;; + esac + install_mozilla_plugin /opt/${P}/plugin/${platform}/mozilla/javaplugin_oji.so fi - inst_plugin /opt/${P}/plugin/${PLATFORM}/mozilla/javaplugin_oji.so - mv ${D}/opt/${P}/lib/font.properties ${D}/opt/${P}/lib/font.properties.orig - sed "s/standard symbols l/symbol/g" \ - < ${D}/opt/${P}/lib/font.properties.orig \ - > ${D}/opt/${P}/lib/font.properties - rm ${D}/opt/${P}/lib/font.properties.orig + sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/lib/font.properties set_java_env ${FILESDIR}/${VMHANDLE} -} -pkg_postinst () { - java_pkg_postinst + if ! use nsplugin && ( use browserplugin || use mozilla ); then + echo + ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in" + ewarn "future jdk/jre ebuilds for plugin installation. Please" + ewarn "update your USE to include 'nsplugin'." + fi } - diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild index be384298f4f8..2d33bdd92183 100644 --- a/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild +++ b/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild,v 1.1 2004/11/29 19:11:47 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:47:06 chriswhite Exp $ -inherit java gcc +inherit java toolchain-funcs S=${WORKDIR}/j2re1.4.1 DESCRIPTION="Blackdown Java Runtime Environment 1.4.1" @@ -18,21 +18,19 @@ SRC_URI=" sparc? ( ftp://ftp.uk.linux.org/pub/linux/java/JDK-1.4.1/sparc/01/j2re-1.4.1-01-linux-sparc-gcc3.2.bin )" - HOMEPAGE="http://www.blackdown.org" DEPEND="virtual/libc - amd64? ( >=app-emulation/emul-linux-x86-baselibs-1 ) + emul-linux-x86? ( >=app-emulation/emul-linux-x86-baselibs-1 ) >=dev-java/java-config-0.2.5 >=sys-apps/sed-4" RDEPEND="${DEPEND} sparc? ( >=sys-devel/gcc-3.2 ) amd64? ( >=sys-devel/gcc-3.2 )" -PROVIDE="virtual/jre-1.4.1 - virtual/java-scheme-2" +PROVIDE="virtual/jre" SLOT="0" LICENSE="sun-bcla-java-vm" -KEYWORDS="x86 sparc amd64" -IUSE="mozilla" +KEYWORDS="x86 sparc amd64 -*" +IUSE="emul-linux-x86 browserplugin nsplugin mozilla" src_unpack () { typeset a want_gcc_ver @@ -57,7 +55,7 @@ src_unpack () { done } -src_install () { +src_install() { typeset platform dodir /opt/${P} @@ -71,7 +69,7 @@ src_install () { # Install mozilla plugin # do not install plugins, security vulnerability #72221 rm -rf ${D}/opt/${P}/plugin/ - #if use mozilla; then + #if use nsplugin || use mozilla; then # case ${ARCH} in # amd64|x86) platform="i386" ;; # ppc) platform="ppc" ;; @@ -85,17 +83,25 @@ src_install () { set_java_env ${FILESDIR}/${VMHANDLE} # Fix for bug #26629. - if [ "${PROFILE_ARCH}" = "sparc64" ] - then + if [[ "${PROFILE_ARCH}" == "sparc64" ]]; then sed -i -e 's/\/\//\/sparc\//g' \ ${D}/etc/env.d/java/20blackdown-jre-1.4.1 fi } pkg_postinst() { - if use mozilla; then + java_pkg_postinst + + if use nsplugin || use browserplugin || use mozilla; then echo einfo "mozilla plugin NOT installed" einfo "http://www.blackdown.org/java-linux/java2-status/security/Blackdown-SA-2004-01.txt" fi + + if ! use nsplugin && ( use browserplugin || use mozilla ); then + echo + ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in" + ewarn "future jdk/jre ebuilds for plugin installation. Please" + ewarn "update your USE to include 'nsplugin'." + fi } diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild index 14662caa2c43..56cdf3bde781 100644 --- a/dev-java/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild +++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild,v 1.1 2005/03/25 22:37:07 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild,v 1.1.1.1 2005/11/30 09:47:06 chriswhite Exp $ inherit java versionator @@ -20,13 +20,11 @@ HOMEPAGE="http://www.blackdown.org" SLOT="1.4.2" LICENSE="sun-bcla-java-vm" KEYWORDS="-* amd64 x86" -IUSE="mozilla" +IUSE="browserplugin nsplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-1.2.11 >=sys-apps/sed-4" - -PROVIDE="virtual/jre-1.4.2 - virtual/java-scheme-2" +PROVIDE="virtual/jre" S="${WORKDIR}/j2re${JV}" # Extract the 'skip' value (offset of tarball) we should pass to tail @@ -85,7 +83,7 @@ unpack_jars() { rm -f "$UNPACK_CMD" } -src_install () { +src_install() { typeset platform dodir /opt/${P} @@ -96,7 +94,9 @@ src_install () { dohtml README.html # Install mozilla plugin - if use mozilla; then + if use nsplugin || # global useflag for netscape-compat plugins + use browserplugin || # deprecated but honor for now + use mozilla; then # wrong but used to honor it case ${ARCH} in x86) platform="i386" ;; ppc) platform="ppc" ;; @@ -120,3 +120,13 @@ src_install () { unpack_jars } + +pkg_postinst() { + java_pkg_postinst + if ! use nsplugin && ( use browserplugin || use mozilla ); then + echo + ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in" + ewarn "future jdk/jre ebuilds for plugin installation. Please" + ewarn "update your USE to include 'nsplugin'." + fi +} diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2.02-r1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2.02-r1.ebuild index 57fd6c381a48..9dbc96aaa41f 100644 --- a/dev-java/blackdown-jre/blackdown-jre-1.4.2.02-r1.ebuild +++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2.02-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.02-r1.ebuild,v 1.1 2005/10/06 20:33:29 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.02-r1.ebuild,v 1.1.1.1 2005/11/30 09:47:06 chriswhite Exp $ inherit java versionator @@ -20,7 +20,7 @@ HOMEPAGE="http://www.blackdown.org" SLOT="1.4.2" LICENSE="sun-bcla-java-vm" KEYWORDS="-* ~amd64 ~x86" -IUSE="browserplugin mozilla" +IUSE="browserplugin nsplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-1.2.11 >=sys-apps/sed-4" @@ -101,7 +101,9 @@ src_install() { dohtml README.html # Install mozilla plugin - if use browserplugin || use mozilla; then + if use nsplugin || # global useflag for netscape-compat plugins + use browserplugin || # deprecated but honor for now + use mozilla; then # wrong but used to honor it case ${ARCH} in x86) platform="i386" ;; ppc) platform="ppc" ;; @@ -128,9 +130,10 @@ src_install() { pkg_postinst() { java_pkg_postinst - if ! use browserplugin && use mozilla; then - ewarn - ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" - ewarn "has been renamed to 'browserplugin' please update your USE" + if ! use nsplugin && ( use browserplugin || use mozilla ); then + echo + ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in" + ewarn "future jdk/jre ebuilds for plugin installation. Please" + ewarn "update your USE to include 'nsplugin'." fi } diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2.02.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2.02.ebuild index 37b833b7924f..94b1dcad7ca8 100644 --- a/dev-java/blackdown-jre/blackdown-jre-1.4.2.02.ebuild +++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2.02.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.02.ebuild,v 1.1 2005/06/16 09:29:10 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.02.ebuild,v 1.1.1.1 2005/11/30 09:47:07 chriswhite Exp $ inherit java versionator @@ -19,8 +19,8 @@ HOMEPAGE="http://www.blackdown.org" SLOT="1.4.2" LICENSE="sun-bcla-java-vm" -KEYWORDS="-* ~amd64 ~x86" -IUSE="mozilla" +KEYWORDS="-* amd64 x86" +IUSE="browserplugin nsplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-1.2.11 >=sys-apps/sed-4" @@ -83,18 +83,20 @@ unpack_jars() { rm -f "$UNPACK_CMD" } -src_install () { +src_install() { typeset platform dodir /opt/${P} - cp -a ${S}/{bin,lib,man,plugin} ${D}/opt/${P} || die "failed to copy" + cp -pPR ${S}/{bin,lib,man,plugin} ${D}/opt/${P} || die "failed to copy" dodoc COPYRIGHT LICENSE README INSTALL dohtml README.html # Install mozilla plugin - if use mozilla; then + if use nsplugin || # global useflag for netscape-compat plugins + use browserplugin || # deprecated but honor for now + use mozilla; then # wrong but used to honor it case ${ARCH} in x86) platform="i386" ;; ppc) platform="ppc" ;; @@ -118,3 +120,13 @@ src_install () { unpack_jars } + +pkg_postinst() { + java_pkg_postinst + if ! use nsplugin && ( use browserplugin || use mozilla ); then + echo + ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in" + ewarn "future jdk/jre ebuilds for plugin installation. Please" + ewarn "update your USE to include 'nsplugin'." + fi +} diff --git a/dev-java/blackdown-jre/files/blackdown-jre-1.3.1 b/dev-java/blackdown-jre/files/blackdown-jre-1.3.1 index a41aa1fdc117..50822b49dd57 100644 --- a/dev-java/blackdown-jre/files/blackdown-jre-1.3.1 +++ b/dev-java/blackdown-jre/files/blackdown-jre-1.3.1 @@ -1,14 +1,11 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author: Karl Trygve Kalleberg -# Maintainer: Tools Team <tools@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/files/blackdown-jre-1.3.1,v 1.1 2002/03/18 21:45:38 karltk Exp $ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/files/blackdown-jre-1.3.1,v 1.1.1.1 2005/11/30 09:47:07 chriswhite Exp $ VERSION="Blackdown JRE @PV@" JAVA_HOME=/opt/@P@ -CLASSPATH=/opt/@P@/lib/rt.jar -JDK_HOME=/opt/@P@ -ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" -ADDLDPATH=/opt/@P@/jre/lib/rt.jar - -ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH" +JRE_HOME=/opt/@P@ +ADDPATH="${JAVA_HOME}/bin" +ADDLDPATH="/opt/@P@/lib/" +MANPATH=/opt/@P@/man +ENV_VARS="JAVA_HOME JRE_HOME ADDPATH ADDLDPATH MANPATH" diff --git a/dev-java/blackdown-jre/files/blackdown-jre-1.4.1 b/dev-java/blackdown-jre/files/blackdown-jre-1.4.1 index 3a8c10e23214..c2a9cc9cef85 100644 --- a/dev-java/blackdown-jre/files/blackdown-jre-1.4.1 +++ b/dev-java/blackdown-jre/files/blackdown-jre-1.4.1 @@ -1,14 +1,11 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author: Karl Trygve Kalleberg -# Maintainer: Tools Team <tools@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/files/blackdown-jre-1.4.1,v 1.1 2003/02/18 19:28:15 cretin Exp $ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/files/blackdown-jre-1.4.1,v 1.1.1.1 2005/11/30 09:47:07 chriswhite Exp $ VERSION="Blackdown JRE @PV@" JAVA_HOME=/opt/@P@ -CLASSPATH=/opt/@P@/lib/rt.jar JRE_HOME=/opt/@P@ ADDPATH="${JAVA_HOME}/bin" ADDLDPATH="/opt/@P@/lib/" MANPATH=/opt/@P@/man -ENV_VARS="JAVA_HOME CLASSPATH JRE_HOME ADDPATH ADDLDPATH MANPATH" +ENV_VARS="JAVA_HOME JRE_HOME ADDPATH ADDLDPATH MANPATH" diff --git a/dev-java/blackdown-jre/files/blackdown-jre-1.4.2.01 b/dev-java/blackdown-jre/files/blackdown-jre-1.4.2.01 index d73959204f90..34e75ef55502 100644 --- a/dev-java/blackdown-jre/files/blackdown-jre-1.4.2.01 +++ b/dev-java/blackdown-jre/files/blackdown-jre-1.4.2.01 @@ -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-jre/files/blackdown-jre-1.4.2.01,v 1.1 2004/11/24 20:51:37 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/files/blackdown-jre-1.4.2.01,v 1.1.1.1 2005/11/30 09:47:07 chriswhite Exp $ VERSION="Blackdown JRE @PV@" JAVA_HOME=/opt/@P@ diff --git a/dev-java/blackdown-jre/files/blackdown-jre-1.4.2.02 b/dev-java/blackdown-jre/files/blackdown-jre-1.4.2.02 index 493179d135b2..999d9a0ac189 100644 --- a/dev-java/blackdown-jre/files/blackdown-jre-1.4.2.02 +++ b/dev-java/blackdown-jre/files/blackdown-jre-1.4.2.02 @@ -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-jre/files/blackdown-jre-1.4.2.02,v 1.1 2005/06/16 09:30:43 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/files/blackdown-jre-1.4.2.02,v 1.1.1.1 2005/11/30 09:47:07 chriswhite Exp $ VERSION="Blackdown JRE @PV@" JAVA_HOME=/opt/@P@ |