Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/diablo-jre-bin: ChangeLog diablo-jre-bin-1.6.0.07.02.ebuild
Date: Wed, 15 Oct 2008 13:34:10
Message-Id: E1Kq6Vp-0004gV-Hs@stork.gentoo.org
1 aballier 08/10/15 13:34:05
2
3 Modified: ChangeLog
4 Added: diablo-jre-bin-1.6.0.07.02.ebuild
5 Log:
6 Bump to JRE 1.6, bug #232310
7 (Portage version: 2.2_rc12/cvs/Linux 2.6.26.6 x86_64)
8
9 Revision Changes Path
10 1.5 dev-java/diablo-jre-bin/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/diablo-jre-bin/ChangeLog?rev=1.5&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/diablo-jre-bin/ChangeLog?rev=1.5&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/diablo-jre-bin/ChangeLog?r1=1.4&r2=1.5
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-java/diablo-jre-bin/ChangeLog,v
19 retrieving revision 1.4
20 retrieving revision 1.5
21 diff -u -r1.4 -r1.5
22 --- ChangeLog 22 Jul 2007 09:41:58 -0000 1.4
23 +++ ChangeLog 15 Oct 2008 13:34:05 -0000 1.5
24 @@ -1,6 +1,12 @@
25 # ChangeLog for dev-java/diablo-jre-bin
26 -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jre-bin/ChangeLog,v 1.4 2007/07/22 09:41:58 graaff Exp $
28 +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jre-bin/ChangeLog,v 1.5 2008/10/15 13:34:05 aballier Exp $
30 +
31 +*diablo-jre-bin-1.6.0.07.02 (15 Oct 2008)
32 +
33 + 15 Oct 2008; Alexis Ballier <aballier@g.o>
34 + +files/diablo-jre-bin-1.6.env, +diablo-jre-bin-1.6.0.07.02.ebuild:
35 + Bump to JRE 1.6, bug #232310
36
37 22 Jul 2007; Hans de Graaff <graaff@g.o>
38 diablo-jre-bin-1.5.0.07.01.ebuild:
39
40
41
42 1.1 dev-java/diablo-jre-bin/diablo-jre-bin-1.6.0.07.02.ebuild
43
44 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/diablo-jre-bin/diablo-jre-bin-1.6.0.07.02.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/diablo-jre-bin/diablo-jre-bin-1.6.0.07.02.ebuild?rev=1.1&content-type=text/plain
46
47 Index: diablo-jre-bin-1.6.0.07.02.ebuild
48 ===================================================================
49 # Copyright 1999-2008 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jre-bin/diablo-jre-bin-1.6.0.07.02.ebuild,v 1.1 2008/10/15 13:34:05 aballier Exp $
52
53 inherit java-vm-2 eutils versionator
54
55 DESCRIPTION="Java Runtime Environment"
56 HOMEPAGE="http://www.FreeBSDFoundation.org/downloads/java.shtml"
57 MY_PV=$(replace_version_separator 3 '_')
58 MY_PVA=$(replace_version_separator 4 '-b' ${MY_PV})
59
60 SRC_URI="diablo-latte-freebsd7-i386-${MY_PVA}.tar.bz2"
61
62 LICENSE="sun-bcla-java-vm"
63 SLOT="1.6"
64 KEYWORDS="-* ~x86-fbsd"
65 RESTRICT="fetch"
66 IUSE="X nsplugin"
67
68 QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/server/libjvm.so opt/${P}/jre/lib/i386/client/libjvm.so"
69
70 JAVA_VM_NO_GENERATION1=true
71
72 DEPEND=""
73 RDEPEND="X? (
74 x11-libs/libX11
75 x11-libs/libXext
76 x11-libs/libXi
77 x11-libs/libXp
78 x11-libs/libXt
79 x11-libs/libXtst
80 )
81 =sys-freebsd/freebsd-lib-7*"
82
83 S="${WORKDIR}/diablo-jre$(get_version_component_range 1-4 ${MY_PV})"
84
85 pkg_nofetch() {
86 einfo "Please download ${SRC_URI} from:"
87 einfo "${HOMEPAGE}"
88 einfo "and move it to ${DISTDIR}"
89 }
90
91 src_install() {
92 local dirs="bin lib man plugin javaws"
93
94 dodir /opt/${P}
95
96 for i in $dirs ; do
97 cp -pPR $i "${D}"/opt/${P}/ || die "failed to build"
98 done
99
100 dodoc COPYRIGHT README
101 dohtml Welcome.html
102
103 if use nsplugin; then
104 install_mozilla_plugin /opt/${P}/plugin/i386/ns7/libjavaplugin_oji.so
105 fi
106
107 # Change libz.so.4 to libz.so.1
108 scanelf -qR -N libz.so.4 -F "#N" "${D}"/opt/${P}/ | \
109 while read i; do
110 if [[ $(strings "$i" | fgrep -c libz.so.4) -ne 1 ]]; then
111 export SANITY_CHECK_LIBZ_FAILED=1
112 break
113 fi
114 sed -i -e 's/libz\.so\.4/libz.so.1/g' "$i"
115 done
116 [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.4 to libz.so.1"
117
118 # create dir for system preferences
119 dodir /opt/${P}/.systemPrefs
120
121 # install control panel for Gnome/KDE
122 sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
123 -e "s/\(Name=Java\)/\1 Control Panel/" \
124 "${D}"/opt/${P}/plugin/desktop/sun_java.desktop > \
125 "${T}"/sun_java-jre.desktop
126
127 domenu "${T}"/sun_java-jre.desktop
128
129 set_java_env
130 }
131
132 pkg_postinst() {
133 # Create files used as storage for system preferences.
134 PREFS_LOCATION=/opt/${P}/
135 mkdir -p "${PREFS_LOCATION}"/.systemPrefs
136 if [ ! -f "${PREFS_LOCATION}"/.systemPrefs/.system.lock ] ; then
137 touch "${PREFS_LOCATION}"/.systemPrefs/.system.lock
138 chmod 644 "${PREFS_LOCATION}"/.systemPrefs/.system.lock
139 fi
140 if [ ! -f "${PREFS_LOCATION}"/.systemPrefs/.systemRootModFile ] ; then
141 touch "${PREFS_LOCATION}"/.systemPrefs/.systemRootModFile
142 chmod 644 "${PREFS_LOCATION}"/.systemPrefs/.systemRootModFile
143 fi
144
145 # Set as default VM if none exists
146 java-vm-2_pkg_postinst
147
148 if ! use X; then
149 local xwarn="X11 libraries and/or"
150 fi
151
152 echo
153 ewarn "Some parts of Sun's JRE require ${xwarn} virtual/lpr to be installed."
154 ewarn "Be careful which Java libraries you attempt to use."
155 }