* [gentoo-commits] gentoo-x86 commit in dev-java/ibm-jre-bin: ibm-jre-bin-1.4.2.9.ebuild ChangeLog ibm-jre-bin-1.5.0.6-r1.ebuild ibm-jre-bin-1.5.0.6.ebuild
@ 2007-12-16 20:13 Vlastimil Babka (caster)
0 siblings, 0 replies; only message in thread
From: Vlastimil Babka (caster) @ 2007-12-16 20:13 UTC (permalink / raw
To: gentoo-commits
caster 07/12/16 20:13:03
Modified: ibm-jre-bin-1.4.2.9.ebuild ChangeLog
ibm-jre-bin-1.5.0.6-r1.ebuild
Removed: ibm-jre-bin-1.5.0.6.ebuild
Log:
Add odbc USE flag and revdep-rebuild control file for bug #177925, tweak the deps.
(Portage version: 2.1.4_rc9)
Revision Changes Path
1.6 dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.9.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.9.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.9.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.9.ebuild?r1=1.5&r2=1.6
Index: ibm-jre-bin-1.4.2.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.9.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ibm-jre-bin-1.4.2.9.ebuild 12 Aug 2007 14:35:33 -0000 1.5
+++ ibm-jre-bin-1.4.2.9.ebuild 16 Dec 2007 20:13:03 -0000 1.6
@@ -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/ibm-jre-bin/ibm-jre-bin-1.4.2.9.ebuild,v 1.5 2007/08/12 14:35:33 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.9.ebuild,v 1.6 2007/12/16 20:13:03 caster Exp $
inherit java-vm-2 eutils versionator
@@ -51,19 +51,18 @@
KEYWORDS="-* amd64 ppc ppc64 x86"
IUSE="X alsa nsplugin"
-RDEPEND="
+RDEPEND="x86? ( net-libs/libnet )
=virtual/libstdc++-3.3
alsa? ( media-libs/alsa-lib )
X? (
- x11-libs/libXt
- x11-libs/libX11
- x11-libs/libXtst
- x11-libs/libXp
x11-libs/libXext
x11-libs/libXi
x11-libs/libXmu
- )
- x86? ( nsplugin? ( =x11-libs/gtk+-1* =dev-libs/glib-1* ) )"
+ x11-libs/libXp
+ x11-libs/libXtst
+ x11-libs/libXt
+ x11-libs/libX11
+ )"
DEPEND=""
RESTRICT="fetch"
@@ -101,7 +100,7 @@
# javaws is on x86 only
if use x86; then
# The javaws execution script is 777 why?
- chmod 0755 ${S}/jre/javaws/javaws
+ chmod 0755 "${S}"/jre/javaws/javaws
# bug #147259
dosym ../javaws/javaws /opt/${P}/bin/javaws
@@ -109,7 +108,7 @@
# Copy all the files to the designated directory
dodir /opt/${P}
- cp -pR ${S}/jre/* ${D}opt/${P}/
+ cp -pR "${S}"/jre/* "${D}"/opt/${P}/
if use x86 && use nsplugin; then
local plugin="libjavaplugin_oji.so"
@@ -119,31 +118,11 @@
fi
install_mozilla_plugin /opt/${P}/bin/${plugin}
- elif use x86; then
- rm ${D}/opt/${P}/bin/libjavaplugin*.so
- fi
-
- if ! use alsa; then
- rm ${D}/opt/${P}/bin/libjsoundalsa.so \
- || eerror "${D}/opt/${P}/bin/libjsoundalsa.so not found"
fi
dohtml -a html,htm,HTML -r docs
- dodoc ${S}/docs/COPYRIGHT
+ dodoc "${S}"/docs/COPYRIGHT
set_java_env
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
-
- if ! use X; then
- ewarn
- ewarn "You have not enabled the X useflag. It is possible that"
- ewarn "you do not have an X server installed. Please note that"
- ewarn "some parts of the IBM JRE require an X server to properly"
- ewarn "function. Be careful which Java libraries you attempt to"
- ewarn "use with your installation."
- ewarn
- fi
+ java-vm_revdep-mask
}
1.82 dev-java/ibm-jre-bin/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog?rev=1.82&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog?rev=1.82&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog?r1=1.81&r2=1.82
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- ChangeLog 16 Dec 2007 17:16:32 -0000 1.81
+++ ChangeLog 16 Dec 2007 20:13:03 -0000 1.82
@@ -1,6 +1,12 @@
# ChangeLog for dev-java/ibm-jre-bin
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.81 2007/12/16 17:16:32 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.82 2007/12/16 20:13:03 caster Exp $
+
+ 16 Dec 2007; Vlastimil Babka <caster@gentoo.org>
+ ibm-jre-bin-1.4.2.9.ebuild, -ibm-jre-bin-1.5.0.6.ebuild,
+ ibm-jre-bin-1.5.0.6-r1.ebuild:
+ Add odbc USE flag and revdep-rebuild control file for bug #177925, tweak the
+ deps.
16 Dec 2007; Vlastimil Babka <caster@gentoo.org>
ibm-jre-bin-1.6.0.0.ebuild:
1.2 dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild?r1=1.1&r2=1.2
Index: ibm-jre-bin-1.5.0.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ibm-jre-bin-1.5.0.6-r1.ebuild 12 Dec 2007 15:14:09 -0000 1.1
+++ ibm-jre-bin-1.5.0.6-r1.ebuild 16 Dec 2007 20:13:03 -0000 1.2
@@ -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/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild,v 1.1 2007/12/12 15:14:09 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild,v 1.2 2007/12/16 20:13:03 caster Exp $
inherit java-vm-2 versionator eutils
@@ -50,24 +50,26 @@
LICENSE="IBM-J1.5"
KEYWORDS="-* amd64 ppc ppc64 x86"
RESTRICT="fetch"
-IUSE="X alsa nsplugin"
+IUSE="X alsa nsplugin odbc"
-RDEPEND="
+RDEPEND="x86? ( net-libs/libnet )
=virtual/libstdc++-3.3
- X? ( x11-libs/libXt
- x11-libs/libX11
- x11-libs/libXtst
- x11-libs/libXp
+ X? (
x11-libs/libXext
+ x11-libs/libXft
x11-libs/libXi
x11-libs/libXmu
- x11-libs/libXft
- )
+ x11-libs/libXp
+ x11-libs/libXtst
+ x11-libs/libXt
+ x11-libs/libX11
+ )
alsa? ( media-libs/alsa-lib )
nsplugin? (
x86? ( =x11-libs/gtk+-2* =x11-libs/gtk+-1* )
ppc? ( =x11-libs/gtk+-1* )
- )"
+ )
+ odbc? ( dev-db/unixODBC )"
DEPEND=""
QA_EXECSTACK_amd64="opt/${P}/bin/libjclscar_23.so
@@ -188,14 +190,6 @@
dodir /opt/${P}
cp -pR "${S}"/jre/* "${D}/opt/${P}/"
- # setting the ppc stuff
- #if use ppc; then
- # dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc.so
- # dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc_g.so
- # insinto /etc
- # doins ${FILESDIR}/cpuinfo
- #fi
-
local x86plugin=libjavaplugin_ojigtk2.so
local ppcplugin=libjavaplugin_oji.so
local jrebindest="${D}/opt/${P}/bin/"
@@ -205,8 +199,6 @@
plugin=${x86plugin}
elif use ppc; then
plugin=${ppcplugin}
- # rm "${jrebindest}/${x86plugin}" "${jrebindest}/libjavaplugin_nscpgtk2.so" || \
- # eerror "Failed to delete gtk2 javaplugin."
fi
plugin=/opt/${P}/bin/${plugin}
@@ -214,27 +206,12 @@
if use x86 || use ppc; then
if use nsplugin; then
install_mozilla_plugin ${plugin}
- else
- rm "${jrebindest}/*javaplugin*.so" || \
- eerror "Failed to delete javaplugin shared libraries"
fi
fi
- use !alsa && rm "${jrebindest}/libjsoundalsa.so"
-
dohtml -a html,htm,HTML -r docs || die
dodoc "${S}/COPYRIGHT" || die
set_java_env
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
- if ! use X; then
- echo
- ewarn "You're not using X so its possible that you dont have"
- ewarn "a X server installed, please read the following warning: "
- ewarn "Some parts of IBM JDK require XFree86 to be installed."
- ewarn "Be careful which Java libraries you attempt to use."
- fi
+ java-vm_revdep-mask
}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-12-16 20:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-16 20:13 [gentoo-commits] gentoo-x86 commit in dev-java/ibm-jre-bin: ibm-jre-bin-1.4.2.9.ebuild ChangeLog ibm-jre-bin-1.5.0.6-r1.ebuild ibm-jre-bin-1.5.0.6.ebuild Vlastimil Babka (caster)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox