summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2005-06-28 13:06:55 +0000
committerThomas Matthijs <axxo@gentoo.org>2005-06-28 13:06:55 +0000
commitf73570ab956a45ef10c3aff259936932a4a3e9b5 (patch)
tree0664cb5d143f85c660ff77503a2cd3d506c70772 /dev-java
parentUpdate version. (diff)
downloadhistorical-f73570ab956a45ef10c3aff259936932a4a3e9b5.tar.gz
historical-f73570ab956a45ef10c3aff259936932a4a3e9b5.tar.bz2
historical-f73570ab956a45ef10c3aff259936932a4a3e9b5.zip
remove virtual/lpr dep
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/sun-jre-bin/ChangeLog8
-rw-r--r--dev-java/sun-jre-bin/Manifest16
-rw-r--r--dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.022
-rw-r--r--dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.032
-rw-r--r--dev-java/sun-jre-bin/files/sun-jre-bin-1.5.0.0211
-rw-r--r--dev-java/sun-jre-bin/files/sun-jre-bin-1.5.0.0311
-rw-r--r--dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild180
-rw-r--r--dev-java/sun-jre-bin/sun-jre-bin-1.5.0.03.ebuild180
-rw-r--r--dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild10
9 files changed, 16 insertions, 404 deletions
diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index ad521df03cbb..808e0eab6a50 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-java/sun-jre-bin
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.26 2005/06/28 11:31:59 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.27 2005/06/28 13:06:55 axxo Exp $
+
+ 28 Jun 2005; Thomas Matthijs <axxo@gentoo.org>
+ -files/sun-jre-bin-1.5.0.02, -files/sun-jre-bin-1.5.0.03,
+ -sun-jre-bin-1.5.0.02.ebuild, -sun-jre-bin-1.5.0.03.ebuild,
+ sun-jre-bin-1.5.0.04.ebuild:
+ remove virtual/lpr dep
*sun-jre-bin-1.5.0.04 (28 Jun 2005)
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index 7ce484db1fb3..7e9b399b3365 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -2,23 +2,17 @@
Hash: SHA1
MD5 f616a1f2c6d082217298811f4b31227d sun-jre-bin-1.4.2.08.ebuild 4610
-MD5 b2f33463d4557c5aa2da343407ea3c54 sun-jre-bin-1.5.0.02.ebuild 4984
-MD5 f592961e0f9eeac2cd9a87172f835f69 sun-jre-bin-1.5.0.04.ebuild 4984
-MD5 875827a92677e8e3c840b284f662853a ChangeLog 5177
+MD5 f315428e927a7b623c56519222470d78 sun-jre-bin-1.5.0.04.ebuild 4974
+MD5 c3c6b18d50bc518c15fbfbb94174b007 ChangeLog 5405
MD5 ca35f917561afc166491d77810b71095 metadata.xml 242
-MD5 d7bd4038d75c1402af1a498eb9870235 sun-jre-bin-1.5.0.03.ebuild 4984
MD5 8f5aa278070a1b37d88a9abe3f238c31 files/digest-sun-jre-bin-1.4.2.08 75
-MD5 7e91bb778615defd4a486c0142ac3c7e files/digest-sun-jre-bin-1.5.0.02 149
-MD5 d1d10f1dd83a8ffedd5ac03508440c53 files/digest-sun-jre-bin-1.5.0.03 149
MD5 375f1fcc6d5fbf77a2202df4851b0033 files/digest-sun-jre-bin-1.5.0.04 149
MD5 5a80336551071fdccb6dda6f2e08a79d files/sun-jre-bin-1.4.2.08 439
-MD5 9ec5971648d181d0afed8ba13b208b71 files/sun-jre-bin-1.5.0.02 444
-MD5 a7b20706045224edddac4a16f68a965d files/sun-jre-bin-1.5.0.03 444
MD5 25c2e617fdcc9fa2215a8682748b64f3 files/sun-jre-bin-1.5.0.04 439
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFCwTVM/rLF9B432nYRAk0cAKCDBBILxAdMyl5oLni4IGFs72AXcgCgw0r1
-qSj7gghXrRUE86/skW5BsmA=
-=TPJw
+iD8DBQFCwUuV/rLF9B432nYRAtrQAJ0Ui+N4ajiamxI7BCL/gQ2MXJDE1wCgnJsp
+kHpTIMro+Pgkj6B4B58sW9A=
+=B/gF
-----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.02 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.02
deleted file mode 100644
index 31582391859c..000000000000
--- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.02
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1c9b3bb9670df5ebb5587d2bcba73b3c jre-1_5_0_02-linux-i586.bin 16542512
-MD5 49045ab3a0ab3d2fb077326a46314a16 jre-1_5_0_02-linux-amd64.bin 16160568
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.03 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.03
deleted file mode 100644
index 86cae996fff1..000000000000
--- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.03
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 44b7c934d0a2c5286ef3e2959d490936 jre-1_5_0_03-linux-i586.bin 16565948
-MD5 f08b6cc3c77feaf33800ae573030fdd2 jre-1_5_0_03-linux-amd64.bin 16245788
diff --git a/dev-java/sun-jre-bin/files/sun-jre-bin-1.5.0.02 b/dev-java/sun-jre-bin/files/sun-jre-bin-1.5.0.02
deleted file mode 100644
index acd040de4b94..000000000000
--- a/dev-java/sun-jre-bin/files/sun-jre-bin-1.5.0.02
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/files/sun-jre-bin-1.5.0.02,v 1.1 2005/03/28 01:14:30 luckyduck Exp $
-
-VERSION="Sun JRE @PV@"
-JAVA_HOME=/opt/@P@
-JRE_HOME=/opt/@P@
-ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/javaws"
-ADDLDPATH="/opt/@P@/lib"
-MANPATH="/opt/@P@/man"
-ENV_VARS="JAVA_HOME JRE_HOME ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/sun-jre-bin/files/sun-jre-bin-1.5.0.03 b/dev-java/sun-jre-bin/files/sun-jre-bin-1.5.0.03
deleted file mode 100644
index c6911dbddd38..000000000000
--- a/dev-java/sun-jre-bin/files/sun-jre-bin-1.5.0.03
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/files/sun-jre-bin-1.5.0.03,v 1.1 2005/05/05 18:13:06 luckyduck Exp $
-
-VERSION="Sun JRE @PV@"
-JAVA_HOME=/opt/@P@
-JRE_HOME=/opt/@P@
-ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/javaws"
-ADDLDPATH="/opt/@P@/lib"
-MANPATH="/opt/@P@/man"
-ENV_VARS="JAVA_HOME JRE_HOME ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild
deleted file mode 100644
index c3f4ff6d4cb4..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild,v 1.4 2005/05/18 15:48:38 axxo Exp $
-
-inherit java eutils
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-
-amd64file="jre-${MY_PVA}-linux-amd64.bin"
-x86file="jre-${MY_PVA}-linux-i586.bin"
-
-if use x86; then
- At=${x86file}
-elif use amd64; then
- At=${amd64file}
-fi
-
-S="${WORKDIR}/jre${MY_PVL}"
-DESCRIPTION="Sun's J2SE Platform"
-HOMEPAGE="http://java.sun.com/j2se/"
-SRC_URI="x86? ( $x86file ) amd64? ( $amd64file )"
-SLOT="1.5"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="~x86 ~amd64"
-RESTRICT="fetch"
-IUSE="mozilla"
-
-DEPEND=">=dev-java/java-config-1.2
- sys-apps/sed
- virtual/lpr"
-
-RDEPEND="x86? ( sys-libs/lib-compat )
- virtual/lpr"
-
-PROVIDE="virtual/jre"
-
-PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-FETCH_SDK="http://javashoplm.sun.com:80/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jre-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-
-pkg_nofetch() {
- einfo "Please download ${At} from:"
- einfo ${FETCH_SDK}
- einfo "(Select the Linux or Linux AMD64 Self-extracting (.bin), depending on your arch)"
- einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
- if [ ! -r ${DISTDIR}/${At} ]; then
- die "cannot read ${At}. Please check the permission and try again."
- fi
-
- #Search for the ELF Header
- testExp=`echo -e "\105\114\106"`
- startAt=`grep -aonm 1 ${testExp} ${DISTDIR}/${At} | cut -d: -f1`
- tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
- chmod +x install.sfx
- ./install.sfx || die
- rm install.sfx
-
- if [ -f ${S}/bin/unpack200 ]; then
- UNPACK_CMD=${S}/bin/unpack200
- chmod +x $UNPACK_CMD
- sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
- for i in $PACKED_JARS; do
- PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
- if [ -f ${PACK_FILE} ]; then
- echo " unpacking: $i"
- $UNPACK_CMD ${PACK_FILE} ${S}/$i
- rm -f ${PACK_FILE}
- fi
- done
- rm -f ${UNPACK_CMD}
- else
- die "unpack not found"
- fi
-}
-
-src_install() {
-
- if use amd64; then
- local dirs="bin lib man"
- else
- local dirs="bin lib man plugin javaws"
- fi
-
-
- dodir /opt/${P}
-
- for i in $dirs ; do
- cp -a $i ${D}/opt/${P}/ || die "failed to build"
- done
-
- dodoc COPYRIGHT LICENSE README
- dohtml Welcome.html
-
- if use mozilla; then
- local plugin_dir="ns7-gcc29"
- if has_version '>=gcc-3*' ; then
- plugin_dir="ns7"
- fi
-
- if use x86 ; then
- install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
- else
- eerror "No plugin available for amd64 arch"
- fi
- fi
-
- # create dir for system preferences
- dodir /opt/${P}/.systemPrefs
-
- # install control panel for Gnome/KDE
- sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
- -e "s/\(Name=Java\)/\1 Control Panel/" \
- ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
- ${T}/sun_java-jre.desktop
-
- domenu ${T}/sun_java-jre.desktop
-
- set_java_env ${FILESDIR}/${VMHANDLE}
-}
-
-pkg_postinst() {
- # Create files used as storage for system preferences.
- PREFS_LOCATION=/opt/${P}/
- mkdir -p ${PREFS_LOCATION}/.systemPrefs
- if [ ! -f ${PREFS_LOCATION}/.systemPrefs/.system.lock ] ; then
- touch $PREFS_LOCATION/.systemPrefs/.system.lock
- chmod 644 $PREFS_LOCATION/.systemPrefs/.system.lock
- fi
- if [ ! -f $PREFS_LOCATION/.systemPrefs/.systemRootModFile ] ; then
- touch $PREFS_LOCATION/.systemPrefs/.systemRootModFile
- chmod 644 $PREFS_LOCATION/.systemPrefs/.systemRootModFile
- fi
-
- # Set as default VM if none exists
- java_pkg_postinst
-
- #Show info about netscape
- if has_version '>=netscape-navigator-4.79-r1' || has_version '>=netscape-communicator-4.79-r1' ; then
- echo
- einfo "If you want to install the plugin for Netscape 4.x, type"
- einfo
- einfo " cd /usr/lib/nsbrowser/plugins/"
- einfo " ln -sf /opt/${P}/plugin/i386/ns4/libjavaplugin.so"
- fi
-
- # if chpax is on the target system, set the appropriate PaX flags
- # this will not hurt the binary, it modifies only unused ELF bits
- # but may confuse things like AV scanners and automatic tripwire
- if has_version "sys-apps/chpax"
- then
- echo
- einfo "setting up conservative PaX flags for jar, javac and java"
-
- for paxkills in "java"
- do
- chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
- done
-
- # /opt/$VM/bin/java_vm
- chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/java_vm
-
- einfo "you should have seen lots of chpax output above now"
- ewarn "make sure the grsec ACL contains those entries also"
- ewarn "because enabling it will override the chpax setting"
- ewarn "on the physical files - help for PaX and grsecurity"
- ewarn "can be given by #gentoo-hardened + pappy@gentoo.org"
- fi
-
- echo
- eerror "Some parts of Sun's JRE require virtual/x11 to be installed."
- eerror "Be careful which Java libraries you attempt to use."
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.03.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.03.ebuild
deleted file mode 100644
index a0563669cb21..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.03.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.03.ebuild,v 1.2 2005/05/18 15:48:38 axxo Exp $
-
-inherit java eutils
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-
-amd64file="jre-${MY_PVA}-linux-amd64.bin"
-x86file="jre-${MY_PVA}-linux-i586.bin"
-
-if use x86; then
- At=${x86file}
-elif use amd64; then
- At=${amd64file}
-fi
-
-S="${WORKDIR}/jre${MY_PVL}"
-DESCRIPTION="Sun's J2SE Platform"
-HOMEPAGE="http://java.sun.com/j2se/"
-SRC_URI="x86? ( $x86file ) amd64? ( $amd64file )"
-SLOT="1.5"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="~x86 ~amd64"
-RESTRICT="fetch"
-IUSE="mozilla"
-
-DEPEND=">=dev-java/java-config-1.2
- sys-apps/sed
- virtual/lpr"
-
-RDEPEND="x86? ( sys-libs/lib-compat )
- virtual/lpr"
-
-PROVIDE="virtual/jre"
-
-PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-FETCH_SDK="http://javashoplm.sun.com:80/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jre-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-
-pkg_nofetch() {
- einfo "Please download ${At} from:"
- einfo ${FETCH_SDK}
- einfo "(Select the Linux or Linux AMD64 Self-extracting (.bin), depending on your arch)"
- einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
- if [ ! -r ${DISTDIR}/${At} ]; then
- die "cannot read ${At}. Please check the permission and try again."
- fi
-
- #Search for the ELF Header
- testExp=`echo -e "\105\114\106"`
- startAt=`grep -aonm 1 ${testExp} ${DISTDIR}/${At} | cut -d: -f1`
- tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
- chmod +x install.sfx
- ./install.sfx || die
- rm install.sfx
-
- if [ -f ${S}/bin/unpack200 ]; then
- UNPACK_CMD=${S}/bin/unpack200
- chmod +x $UNPACK_CMD
- sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
- for i in $PACKED_JARS; do
- PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
- if [ -f ${PACK_FILE} ]; then
- echo " unpacking: $i"
- $UNPACK_CMD ${PACK_FILE} ${S}/$i
- rm -f ${PACK_FILE}
- fi
- done
- rm -f ${UNPACK_CMD}
- else
- die "unpack not found"
- fi
-}
-
-src_install() {
-
- if use amd64; then
- local dirs="bin lib man"
- else
- local dirs="bin lib man plugin javaws"
- fi
-
-
- dodir /opt/${P}
-
- for i in $dirs ; do
- cp -a $i ${D}/opt/${P}/ || die "failed to build"
- done
-
- dodoc COPYRIGHT LICENSE README
- dohtml Welcome.html
-
- if use mozilla; then
- local plugin_dir="ns7-gcc29"
- if has_version '>=gcc-3*' ; then
- plugin_dir="ns7"
- fi
-
- if use x86 ; then
- install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
- else
- eerror "No plugin available for amd64 arch"
- fi
- fi
-
- # create dir for system preferences
- dodir /opt/${P}/.systemPrefs
-
- # install control panel for Gnome/KDE
- sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
- -e "s/\(Name=Java\)/\1 Control Panel/" \
- ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
- ${T}/sun_java-jre.desktop
-
- domenu ${T}/sun_java-jre.desktop
-
- set_java_env ${FILESDIR}/${VMHANDLE}
-}
-
-pkg_postinst() {
- # Create files used as storage for system preferences.
- PREFS_LOCATION=/opt/${P}/
- mkdir -p ${PREFS_LOCATION}/.systemPrefs
- if [ ! -f ${PREFS_LOCATION}/.systemPrefs/.system.lock ] ; then
- touch $PREFS_LOCATION/.systemPrefs/.system.lock
- chmod 644 $PREFS_LOCATION/.systemPrefs/.system.lock
- fi
- if [ ! -f $PREFS_LOCATION/.systemPrefs/.systemRootModFile ] ; then
- touch $PREFS_LOCATION/.systemPrefs/.systemRootModFile
- chmod 644 $PREFS_LOCATION/.systemPrefs/.systemRootModFile
- fi
-
- # Set as default VM if none exists
- java_pkg_postinst
-
- #Show info about netscape
- if has_version '>=netscape-navigator-4.79-r1' || has_version '>=netscape-communicator-4.79-r1' ; then
- echo
- einfo "If you want to install the plugin for Netscape 4.x, type"
- einfo
- einfo " cd /usr/lib/nsbrowser/plugins/"
- einfo " ln -sf /opt/${P}/plugin/i386/ns4/libjavaplugin.so"
- fi
-
- # if chpax is on the target system, set the appropriate PaX flags
- # this will not hurt the binary, it modifies only unused ELF bits
- # but may confuse things like AV scanners and automatic tripwire
- if has_version "sys-apps/chpax"
- then
- echo
- einfo "setting up conservative PaX flags for jar, javac and java"
-
- for paxkills in "java"
- do
- chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
- done
-
- # /opt/$VM/bin/java_vm
- chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/java_vm
-
- einfo "you should have seen lots of chpax output above now"
- ewarn "make sure the grsec ACL contains those entries also"
- ewarn "because enabling it will override the chpax setting"
- ewarn "on the physical files - help for PaX and grsecurity"
- ewarn "can be given by #gentoo-hardened + pappy@gentoo.org"
- fi
-
- echo
- eerror "Some parts of Sun's JRE require virtual/x11 to be installed."
- eerror "Be careful which Java libraries you attempt to use."
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild
index 18060cdf259d..30a3b2ab8926 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.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/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild,v 1.1 2005/06/28 11:31:59 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild,v 1.2 2005/06/28 13:06:55 axxo Exp $
inherit java eutils
@@ -27,11 +27,9 @@ RESTRICT="fetch"
IUSE="mozilla"
DEPEND=">=dev-java/java-config-1.2
- sys-apps/sed
- virtual/lpr"
+ sys-apps/sed"
-RDEPEND="x86? ( sys-libs/lib-compat )
- virtual/lpr"
+RDEPEND="x86? ( sys-libs/lib-compat )"
PROVIDE="virtual/jre"
@@ -175,6 +173,6 @@ pkg_postinst() {
fi
echo
- eerror "Some parts of Sun's JRE require virtual/x11 to be installed."
+ eerror "Some parts of Sun's JRE require virtual/x11 and virtual/lpr to be installed."
eerror "Be careful which Java libraries you attempt to use."
}