Add odbc USE flag and revdep-rebuild control file for bug #177925, tweak the deps.

(Portage version: 2.1.4_rc9)

4 files changed, 36 insertions, 48 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 687d53338009..bf39b860a977 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.115 2007/11/25 13:52:13 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.116 2007/12/16 21:08:51 caster Exp $
+
+  16 Dec 2007; Vlastimil Babka <caster@gentoo.org>
+  sun-jre-bin-1.4.2.16.ebuild, sun-jre-bin-1.5.0.13.ebuild,
+  sun-jre-bin-1.6.0.03.ebuild:
+  Add odbc USE flag and revdep-rebuild control file for bug #177925, tweak the
+  deps.
 
   25 Nov 2007; Vlastimil Babka <caster@gentoo.org>
   sun-jre-bin-1.5.0.13.ebuild, sun-jre-bin-1.6.0.03.ebuild:
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild
index f371885c6f39..15210eaf6a06 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.4.2.16.ebuild,v 1.4 2007/10/12 00:14:43 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild,v 1.5 2007/12/16 21:08:51 caster Exp $
 
 inherit eutils pax-utils java-vm-2
 
@@ -16,19 +16,21 @@ LICENSE="sun-bcla-java-vm-1.4.2"
 KEYWORDS="-* x86"
 # pre stripped
 RESTRICT="fetch strip"
-IUSE="X alsa nsplugin"
+IUSE="X alsa nsplugin odbc"
 
 DEPEND=""
 
-RDEPEND="alsa? ( media-libs/alsa-lib )
+RDEPEND="net-libs/libnet
+	alsa? ( media-libs/alsa-lib )
 	X? (
-		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/libXi
 		x11-libs/libXp
-		x11-libs/libXt
 		x11-libs/libXtst
-	)"
+		x11-libs/libXt
+		x11-libs/libX11
+	)
+	odbc? ( dev-db/unixODBC )"
 
 DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2re-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
 
@@ -82,7 +84,7 @@ src_install() {
 
 	pax-mark srpm $(list-paxables "${D}"/opt/${P}/bin/*)
 
-	dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt || die
+	dodoc CHANGES COPYRIGHT README THIRDPARTYLICENSEREADME.txt || die
 	dohtml Welcome.html ControlPanel.html || die
 
 	if use nsplugin; then
@@ -115,15 +117,5 @@ src_install() {
 	domenu "${T}/sun_java-jre.desktop"
 
 	set_java_env
-}
-
-pkg_postinst () {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if ! use X; then
-		echo
-		ewarn "Some parts of Sun's JDK require X11 libraries to be installed."
-		ewarn "Be careful which Java libraries you attempt to use."
-	fi
+	java-vm_revdep-mask
 }
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild
index bc0d8a5d3ba9..436975b10ce8 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.13.ebuild,v 1.5 2007/11/25 13:52:13 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild,v 1.6 2007/12/16 21:08:51 caster Exp $
 
 inherit pax-utils eutils java-vm-2
 
@@ -19,19 +19,20 @@ SLOT="1.5"
 LICENSE="dlj-1.1"
 KEYWORDS="-* amd64 x86"
 RESTRICT="strip"
-IUSE="X alsa nsplugin"
+IUSE="X alsa nsplugin odbc"
 
-RDEPEND="
+RDEPEND="x86? ( net-libs/libnet )
 	sys-libs/glibc
 	alsa? ( media-libs/alsa-lib )
 	X? (
-		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/libXi
 		x11-libs/libXp
-		x11-libs/libXt
 		x11-libs/libXtst
-	)"
+		x11-libs/libXt
+		x11-libs/libX11
+	)
+	odbc? ( dev-db/unixODBC )"
 
 DEPEND=""
 
@@ -94,21 +95,13 @@ src_install() {
 		fontconfig.properties || die
 
 	set_java_env
+	java-vm_revdep-mask
 }
 
 pkg_postinst() {
 	# Set as default VM if none exists
 	java-vm-2_pkg_postinst
 
-	if ! use X; then
-		local xwarn="X11 libraries and/or"
-	fi
-
-	echo
-	ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
-	ewarn "Be careful which Java libraries you attempt to use."
-
-	echo
 	elog "Beginning with 1.5.0.10 the hotspot vm can use epoll"
 	elog "The epoll-based implementation of SelectorProvider is not selected by"
 	elog "default."
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild
index ced12d4139f2..ff5823b8d9f5 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.6.0.03.ebuild,v 1.5 2007/11/25 13:52:13 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild,v 1.6 2007/12/16 21:08:51 caster Exp $
 
 inherit versionator pax-utils eutils java-vm-2
 
@@ -24,19 +24,24 @@ SLOT="1.6"
 LICENSE="dlj-1.1"
 KEYWORDS="-* amd64 x86"
 RESTRICT="strip"
-IUSE="X alsa nsplugin"
+IUSE="X alsa nsplugin odbc"
 
 RDEPEND="
 	sys-libs/glibc
-	x86? ( =virtual/libstdc++-3.3 )
+	x86? (
+		=virtual/libstdc++-3.3
+		net-libs/libnet
+	)
 	alsa? ( media-libs/alsa-lib )
 	X? (
-		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/libXi
 		x11-libs/libXp
 		x11-libs/libXtst
-	)"
+		amd64? ( x11-libs/libXt )
+		x11-libs/libX11
+	)
+	odbc? ( dev-db/unixODBC )"
 
 DEPEND=""
 
@@ -101,21 +106,13 @@ src_install() {
 	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
 
 	set_java_env
+	java-vm_revdep-mask
 }
 
 pkg_postinst() {
 	# Set as default VM if none exists
 	java-vm-2_pkg_postinst
 
-	if ! use X; then
-		local xwarn="X11 libraries and/or"
-	fi
-
-	echo
-	ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
-	ewarn "Be careful which Java libraries you attempt to use."
-
-	echo
 	elog "Beginning with 1.5.0.10 the hotspot vm can use epoll"
 	elog "The epoll-based implementation of SelectorProvider is not selected by"
 	elog "default."