diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2005-12-09 20:22:50 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2005-12-09 20:22:50 +0000 |
| commit | eb2fcd3b555cdadc1a8c8d19771f03cbd8acce5f (patch) | |
| tree | fdbf2c4ce84dc299bbc07d1d2017cc06587fe1d1 /dev-java/sun-jdk | |
| parent | Version bumped for gcc 4.0 compatibility and closing bug #114920. (diff) | |
| download | gentoo-2-eb2fcd3b555cdadc1a8c8d19771f03cbd8acce5f.tar.gz gentoo-2-eb2fcd3b555cdadc1a8c8d19771f03cbd8acce5f.tar.bz2 gentoo-2-eb2fcd3b555cdadc1a8c8d19771f03cbd8acce5f.zip | |
Removed lib-compat from dependencies because it is not needed by 1.4.2 or 1.5, fixes bug #115011. Also added proper dependencies to sun-jdk-1.4.2.10.ebuild.
(Portage version: 2.0.53)
Diffstat (limited to 'dev-java/sun-jdk')
| -rw-r--r-- | dev-java/sun-jdk/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/sun-jdk/sun-jdk-1.4.2.10.ebuild | 31 | ||||
| -rw-r--r-- | dev-java/sun-jdk/sun-jdk-1.5.0.06.ebuild | 4 |
3 files changed, 32 insertions, 11 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index 290e97a2d123..c2a222fff2a5 100644 --- a/dev-java/sun-jdk/ChangeLog +++ b/dev-java/sun-jdk/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/sun-jdk # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.130 2005/12/07 23:06:48 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.131 2005/12/09 20:22:50 betelgeuse Exp $ + + 09 Dec 2005; Petteri Räty <betelgeuse@gentoo.org> + sun-jdk-1.4.2.10.ebuild, sun-jdk-1.5.0.06.ebuild: + Removed lib-compat from dependencies because it is not needed by 1.4.2 or + 1.5, fixes bug #115011. Also added proper dependencies to + sun-jdk-1.4.2.10.ebuild. *sun-jdk-1.5.0.06 (07 Dec 2005) diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.10.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.10.ebuild index e39ac189cc5f..93f09d4cb9ec 100644 --- a/dev-java/sun-jdk/sun-jdk-1.4.2.10.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.4.2.10.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-jdk/sun-jdk-1.4.2.10.ebuild,v 1.2 2005/11/29 09:40:13 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.10.ebuild,v 1.3 2005/12/09 20:22:50 betelgeuse Exp $ inherit java eutils @@ -26,10 +26,25 @@ IUSE="doc browserplugin nsplugin jce mozilla examples" DEPEND=">=dev-java/java-config-1.1.5 >=sys-libs/glibc-2.3.5 sys-apps/sed - app-arch/unzip - doc? ( =dev-java/java-sdk-docs-1.4.2* )" - -RDEPEND="sys-libs/lib-compat" + app-arch/unzip" + +RDEPEND=">=sys-libs/glibc-2.3.5 + alsa? ( media-libs/alsa-lib ) + doc? ( =dev-java/java-sdk-docs-1.4.2* ) + X? ( || ( ( x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXi + x11-libs/libXp + x11-libs/libXt + x11-libs/libXtst + ) + virtual/x11 + ) + )" PROVIDE="virtual/jre virtual/jdk" @@ -125,9 +140,9 @@ src_install() { dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ fi - if use nsplugin || # global useflag for netscape-compat plugins + 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 + use mozilla; then # wrong but used to honor it local plugin_dir="ns610" if has_version '>=sys-devel/gcc-3.2' ; then plugin_dir="ns610-gcc32" @@ -199,7 +214,7 @@ 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 "future jdk/jre ebuilds for plugin installation. Please" ewarn "update your USE to include 'nsplugin'." fi } diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.06.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.06.ebuild index c31399521a0e..cb1065ea7bbc 100644 --- a/dev-java/sun-jdk/sun-jdk-1.5.0.06.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.5.0.06.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-jdk/sun-jdk-1.5.0.06.ebuild,v 1.1 2005/12/07 22:59:33 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.06.ebuild,v 1.2 2005/12/09 20:22:50 betelgeuse Exp $ inherit java eutils @@ -35,7 +35,7 @@ DEPEND=">=dev-java/java-config-1.2 jce? ( app-arch/unzip ) doc? ( =dev-java/java-sdk-docs-1.5.0* )" -RDEPEND="x86? ( sys-libs/lib-compat ) +RDEPEND=" alsa? ( media-libs/alsa-lib ) doc? ( =dev-java/java-sdk-docs-1.5.0* ) X? ( || ( ( x11-libs/libICE |