| 1 |
betelgeuse 07/09/27 16:57:22 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: sun-jdk-1.5.0.13.ebuild sun-jdk-1.6.0.03.ebuild |
| 5 |
Log: |
| 6 |
Version bumps. |
| 7 |
(Portage version: 2.1.3.9) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.213 dev-java/sun-jdk/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.213&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.213&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?r1=1.212&r2=1.213 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v |
| 19 |
retrieving revision 1.212 |
| 20 |
retrieving revision 1.213 |
| 21 |
diff -u -r1.212 -r1.213 |
| 22 |
--- ChangeLog 21 Aug 2007 08:41:05 -0000 1.212 |
| 23 |
+++ ChangeLog 27 Sep 2007 16:57:21 -0000 1.213 |
| 24 |
@@ -1,6 +1,13 @@ |
| 25 |
# ChangeLog for dev-java/sun-jdk |
| 26 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.212 2007/08/21 08:41:05 opfer Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.213 2007/09/27 16:57:21 betelgeuse Exp $ |
| 29 |
+ |
| 30 |
+*sun-jdk-1.6.0.03 (27 Sep 2007) |
| 31 |
+*sun-jdk-1.5.0.13 (27 Sep 2007) |
| 32 |
+ |
| 33 |
+ 27 Sep 2007; Petteri Räty <betelgeuse@g.o> |
| 34 |
+ +sun-jdk-1.5.0.13.ebuild, +sun-jdk-1.6.0.03.ebuild: |
| 35 |
+ Version bumps. |
| 36 |
|
| 37 |
21 Aug 2007; Christian Faulhammer <opfer@g.o> |
| 38 |
sun-jdk-1.6.0.02.ebuild: |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 dev-java/sun-jdk/sun-jdk-1.5.0.13.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.13.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.13.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: sun-jdk-1.5.0.13.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2007 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.13.ebuild,v 1.1 2007/09/27 16:57:21 betelgeuse Exp $ |
| 52 |
|
| 53 |
inherit versionator java-vm-2 eutils pax-utils |
| 54 |
|
| 55 |
MY_PV=${PV//./_} |
| 56 |
|
| 57 |
X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin" |
| 58 |
AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin" |
| 59 |
|
| 60 |
DESCRIPTION="Sun's J2SE Development Kit, version 1.5" |
| 61 |
HOMEPAGE="http://java.sun.com/j2se/1.5.0/" |
| 62 |
SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} ) |
| 63 |
amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )" |
| 64 |
SLOT="1.5" |
| 65 |
LICENSE="dlj-1.1" |
| 66 |
KEYWORDS="~amd64 ~x86" |
| 67 |
RESTRICT="strip" |
| 68 |
IUSE="X alsa doc examples jce nsplugin" |
| 69 |
|
| 70 |
QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/libdeploy.so" |
| 71 |
|
| 72 |
DEPEND=" |
| 73 |
doc? ( =dev-java/java-sdk-docs-1.5.0* ) |
| 74 |
jce? ( =dev-java/sun-jce-bin-1.5.0* )" |
| 75 |
|
| 76 |
RDEPEND=" |
| 77 |
sys-libs/glibc |
| 78 |
alsa? ( media-libs/alsa-lib ) |
| 79 |
doc? ( =dev-java/java-sdk-docs-1.5.0* ) |
| 80 |
X? ( |
| 81 |
x11-libs/libX11 |
| 82 |
x11-libs/libXext |
| 83 |
x11-libs/libXi |
| 84 |
x11-libs/libXp |
| 85 |
x11-libs/libXt |
| 86 |
x11-libs/libXtst |
| 87 |
)" |
| 88 |
|
| 89 |
S="${WORKDIR}/jdk$(replace_version_separator 3 _)" |
| 90 |
|
| 91 |
JAVA_PROVIDE="jdbc-stdext jdbc-rowset" |
| 92 |
|
| 93 |
src_unpack() { |
| 94 |
if [ ! -r "${DISTDIR}/${A}" ]; then |
| 95 |
die "cannot read ${A}. Please check the permission and try again." |
| 96 |
fi |
| 97 |
|
| 98 |
sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack" |
| 99 |
} |
| 100 |
|
| 101 |
src_install() { |
| 102 |
local dirs="bin include jre lib man" |
| 103 |
|
| 104 |
# Set PaX markings on all JDK/JRE executables to allow code-generation on |
| 105 |
# the heap by the JIT compiler. |
| 106 |
pax-mark m $(list-paxables ${S}{,/jre}/bin/*) |
| 107 |
|
| 108 |
dodir /opt/${P} |
| 109 |
|
| 110 |
cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy" |
| 111 |
dodoc COPYRIGHT README.html || die |
| 112 |
dohtml README.html || die |
| 113 |
|
| 114 |
cp -pP src.zip "${D}/opt/${P}/" || die |
| 115 |
|
| 116 |
if use examples; then |
| 117 |
cp -pPR demo "${D}/opt/${P}/" || die |
| 118 |
cp -pPR sample "${D}/opt/${P}/" || die |
| 119 |
fi |
| 120 |
|
| 121 |
if use jce; then |
| 122 |
cd "${D}"/opt/${P}/jre/lib/security || die |
| 123 |
dodir /opt/${P}/jre/lib/security/strong-jce |
| 124 |
mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \ |
| 125 |
"${D}"/opt/${P}/jre/lib/security/strong-jce || die |
| 126 |
mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \ |
| 127 |
"${D}"/opt/${P}/jre/lib/security/strong-jce || die |
| 128 |
local jcedir="/opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/" |
| 129 |
dosym ${jcedir}/US_export_policy.jar \ |
| 130 |
/opt/${P}/jre/lib/security/ || die |
| 131 |
dosym ${jcedir}/local_policy.jar \ |
| 132 |
/opt/${P}/jre/lib/security/ || die |
| 133 |
fi |
| 134 |
|
| 135 |
if use nsplugin; then |
| 136 |
local plugin_dir="ns7-gcc29" |
| 137 |
if has_version '>=sys-devel/gcc-3' ; then |
| 138 |
plugin_dir="ns7" |
| 139 |
fi |
| 140 |
|
| 141 |
if use x86 ; then |
| 142 |
install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so |
| 143 |
else |
| 144 |
eerror "No plugin available for amd64 arch" |
| 145 |
fi |
| 146 |
fi |
| 147 |
|
| 148 |
# create dir for system preferences |
| 149 |
dodir /opt/${P}/jre/.systemPrefs |
| 150 |
# Create files used as storage for system preferences. |
| 151 |
touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock |
| 152 |
chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock |
| 153 |
touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile |
| 154 |
chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile |
| 155 |
|
| 156 |
# install control panel for Gnome/KDE |
| 157 |
if [[ -f ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then |
| 158 |
sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \ |
| 159 |
-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \ |
| 160 |
${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \ |
| 161 |
${T}/sun_java-${SLOT}.desktop \ |
| 162 |
|| die "Failed to sed .desktop file" |
| 163 |
|
| 164 |
domenu ${T}/sun_java-${SLOT}.desktop |
| 165 |
fi |
| 166 |
|
| 167 |
# bug #56444 |
| 168 |
insinto /opt/${P}/jre/lib/ |
| 169 |
newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties |
| 170 |
|
| 171 |
set_java_env |
| 172 |
} |
| 173 |
|
| 174 |
pkg_postinst() { |
| 175 |
# Set as default VM if none exists |
| 176 |
java-vm-2_pkg_postinst |
| 177 |
|
| 178 |
if ! use X; then |
| 179 |
local xwarn="X11 libraries and/or" |
| 180 |
fi |
| 181 |
|
| 182 |
echo |
| 183 |
ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed." |
| 184 |
ewarn "Be careful which Java libraries you attempt to use." |
| 185 |
|
| 186 |
echo |
| 187 |
elog " Be careful: ${P}'s Java compiler uses" |
| 188 |
elog " '-source 1.5' as default. Some keywords such as 'enum'" |
| 189 |
elog " are not valid identifiers any more in that mode," |
| 190 |
elog " which can cause incompatibility with certain sources." |
| 191 |
|
| 192 |
echo |
| 193 |
elog "Beginning with 1.5.0.10 the hotspot vm can use epoll" |
| 194 |
elog "The epoll-based implementation of SelectorProvider is not selected by" |
| 195 |
elog "default." |
| 196 |
elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider" |
| 197 |
elog "" |
| 198 |
elog "Starting with 1.5.0.12 the src.zip and demos are installed to the standard" |
| 199 |
elog "locations." |
| 200 |
elog "See https://bugs.gentoo.org/show_bug.cgi?id=2241 and" |
| 201 |
elog "http://java.sun.com/j2se/1.5.0/docs/tooldocs/linux/jdkfiles.html" |
| 202 |
elog "for more details." |
| 203 |
} |
| 204 |
|
| 205 |
|
| 206 |
|
| 207 |
1.1 dev-java/sun-jdk/sun-jdk-1.6.0.03.ebuild |
| 208 |
|
| 209 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.03.ebuild?rev=1.1&view=markup |
| 210 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.03.ebuild?rev=1.1&content-type=text/plain |
| 211 |
|
| 212 |
Index: sun-jdk-1.6.0.03.ebuild |
| 213 |
=================================================================== |
| 214 |
# Copyright 1999-2007 Gentoo Foundation |
| 215 |
# Distributed under the terms of the GNU General Public License v2 |
| 216 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.03.ebuild,v 1.1 2007/09/27 16:57:21 betelgeuse Exp $ |
| 217 |
|
| 218 |
inherit versionator java-vm-2 eutils pax-utils |
| 219 |
|
| 220 |
UPDATE="$(get_version_component_range 4)" |
| 221 |
UPDATE="${UPDATE#0}" |
| 222 |
MY_PV="$(get_version_component_range 2)u${UPDATE}" |
| 223 |
X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin" |
| 224 |
AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin" |
| 225 |
|
| 226 |
DESCRIPTION="Sun's J2SE Development Kit, version ${PV}" |
| 227 |
HOMEPAGE="http://java.sun.com/javase/6/" |
| 228 |
# This release is probably under a different url because tmarble is on holiday |
| 229 |
#SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} ) |
| 230 |
# amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )" |
| 231 |
URL_BASE="http://dlc.sun.com/dlj/binaries" |
| 232 |
SRC_URI="x86? ( ${URL_BASE}/${X86_AT} ) |
| 233 |
amd64? ( ${URL_BASE}/${AMD64_AT} )" |
| 234 |
SLOT="1.6" |
| 235 |
LICENSE="dlj-1.1" |
| 236 |
KEYWORDS="~amd64 ~x86" |
| 237 |
RESTRICT="strip" |
| 238 |
IUSE="X alsa doc examples jce nsplugin" |
| 239 |
|
| 240 |
QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so |
| 241 |
opt/${P}/jre/lib/i386/libdeploy.so |
| 242 |
opt/${P}/jre/lib/i386/client/libjvm.so |
| 243 |
opt/${P}/jre/lib/i386/server/libjvm.so" |
| 244 |
|
| 245 |
DEPEND=" |
| 246 |
doc? ( =dev-java/java-sdk-docs-1.6.0* ) |
| 247 |
jce? ( =dev-java/sun-jce-bin-1.6.0* )" |
| 248 |
|
| 249 |
RDEPEND=" |
| 250 |
${DEPEND} |
| 251 |
x86? ( =virtual/libstdc++-3.3 ) |
| 252 |
sys-libs/glibc |
| 253 |
alsa? ( media-libs/alsa-lib ) |
| 254 |
X? ( |
| 255 |
x11-libs/libX11 |
| 256 |
x11-libs/libXext |
| 257 |
x11-libs/libXi |
| 258 |
x11-libs/libXp |
| 259 |
x11-libs/libXtst |
| 260 |
)" |
| 261 |
|
| 262 |
JAVA_PROVIDE="jdbc-stdext jdbc-rowset" |
| 263 |
|
| 264 |
S="${WORKDIR}/jdk$(replace_version_separator 3 _)" |
| 265 |
|
| 266 |
src_unpack() { |
| 267 |
if [ ! -r ${DISTDIR}/${A} ]; then |
| 268 |
die "cannot read ${A}. Please check the permission and try again." |
| 269 |
fi |
| 270 |
|
| 271 |
sh ${DISTDIR}/${A} --accept-license --unpack || die "Failed to unpack" |
| 272 |
} |
| 273 |
|
| 274 |
src_install() { |
| 275 |
local dirs="bin include jre lib man" |
| 276 |
|
| 277 |
# Set PaX markings on all JDK/JRE executables to allow code-generation on |
| 278 |
# the heap by the JIT compiler. |
| 279 |
pax-mark m $(list-paxables ${S}{,/jre}/bin/*) |
| 280 |
|
| 281 |
dodir /opt/${P} |
| 282 |
|
| 283 |
cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy" |
| 284 |
dodoc COPYRIGHT || die |
| 285 |
dohtml README.html || die |
| 286 |
|
| 287 |
cp -pP src.zip "${D}/opt/${P}/" || die |
| 288 |
|
| 289 |
if use examples; then |
| 290 |
cp -pPR demo sample "${D}/opt/${P}/" || die |
| 291 |
fi |
| 292 |
|
| 293 |
if use jce; then |
| 294 |
cd "${D}/opt/${P}/jre/lib/security" |
| 295 |
dodir /opt/${P}/jre/lib/security/strong-jce |
| 296 |
mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \ |
| 297 |
"${D}"/opt/${P}/jre/lib/security/strong-jce || die |
| 298 |
mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \ |
| 299 |
"${D}"/opt/${P}/jre/lib/security/strong-jce || die |
| 300 |
dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/ |
| 301 |
dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ |
| 302 |
fi |
| 303 |
|
| 304 |
if use nsplugin; then |
| 305 |
local plugin_dir="ns7-gcc29" |
| 306 |
if has_version '>=sys-devel/gcc-3' ; then |
| 307 |
plugin_dir="ns7" |
| 308 |
fi |
| 309 |
|
| 310 |
if use x86 ; then |
| 311 |
install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so |
| 312 |
else |
| 313 |
eerror "No plugin available for amd64 arch" |
| 314 |
fi |
| 315 |
fi |
| 316 |
|
| 317 |
# create dir for system preferences |
| 318 |
dodir /opt/${P}/jre/.systemPrefs |
| 319 |
# Create files used as storage for system preferences. |
| 320 |
touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock |
| 321 |
chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock |
| 322 |
touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile |
| 323 |
chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile |
| 324 |
|
| 325 |
if [[ -f "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then |
| 326 |
# install control panel for Gnome/KDE |
| 327 |
# The jre also installs these so make sure that they do not have the same |
| 328 |
# Name |
| 329 |
sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \ |
| 330 |
-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \ |
| 331 |
-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \ |
| 332 |
${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \ |
| 333 |
${T}/sun_jdk-${SLOT}.desktop |
| 334 |
|
| 335 |
domenu ${T}/sun_jdk-${SLOT}.desktop |
| 336 |
fi |
| 337 |
|
| 338 |
# bug #56444 |
| 339 |
insinto /opt/${P}/jre/lib/ |
| 340 |
newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties |
| 341 |
|
| 342 |
set_java_env |
| 343 |
} |
| 344 |
|
| 345 |
pkg_postinst() { |
| 346 |
# Set as default VM if none exists |
| 347 |
java-vm-2_pkg_postinst |
| 348 |
|
| 349 |
if ! use X; then |
| 350 |
local xwarn="X11 libraries and/or" |
| 351 |
fi |
| 352 |
|
| 353 |
echo |
| 354 |
ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed." |
| 355 |
ewarn "Be careful which Java libraries you attempt to use." |
| 356 |
|
| 357 |
echo |
| 358 |
elog " Be careful: ${P}'s Java compiler uses" |
| 359 |
elog " '-source 1.6' as default. Some keywords such as 'enum'" |
| 360 |
elog " are not valid identifiers any more in that mode," |
| 361 |
elog " which can cause incompatibility with certain sources." |
| 362 |
|
| 363 |
echo |
| 364 |
elog "Beginning with 1.5.0.10 the hotspot vm can use epoll" |
| 365 |
elog "The epoll-based implementation of SelectorProvider is not selected by" |
| 366 |
elog "default." |
| 367 |
elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider" |
| 368 |
elog "" |
| 369 |
elog "Starting with 1.6.0-r2 the src.zip is installed to the standard" |
| 370 |
elog "location. See https://bugs.gentoo.org/show_bug.cgi?id=2241 and" |
| 371 |
elog "http://java.sun.com/javase/6/docs/technotes/tools/linux/jdkfiles.html" |
| 372 |
elog "for more details." |
| 373 |
elog "" |
| 374 |
elog "Starting with 1.6.0.01 demo and sample directories have been moved" |
| 375 |
elog "to top level from the share sub directory." |
| 376 |
} |
| 377 |
|
| 378 |
|
| 379 |
|
| 380 |
-- |
| 381 |
gentoo-commits@g.o mailing list |
Archives