| 1 |
betelgeuse 08/09/09 14:00:31 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: sun-jdk-1.6.0.07-r1.ebuild |
| 5 |
Log: |
| 6 |
Sun finally made libstdc++ statically linked again for 1.6 so removing the dep on virtual/libstdc++. Reported in bug #237181. |
| 7 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.244 dev-java/sun-jdk/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.244&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.244&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?r1=1.243&r2=1.244 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v |
| 19 |
retrieving revision 1.243 |
| 20 |
retrieving revision 1.244 |
| 21 |
diff -u -r1.243 -r1.244 |
| 22 |
--- ChangeLog 16 Jul 2008 11:15:37 -0000 1.243 |
| 23 |
+++ ChangeLog 9 Sep 2008 14:00:30 -0000 1.244 |
| 24 |
@@ -1,6 +1,13 @@ |
| 25 |
# ChangeLog for dev-java/sun-jdk |
| 26 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.243 2008/07/16 11:15:37 opfer Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.244 2008/09/09 14:00:30 betelgeuse Exp $ |
| 29 |
+ |
| 30 |
+*sun-jdk-1.6.0.07-r1 (09 Sep 2008) |
| 31 |
+ |
| 32 |
+ 09 Sep 2008; Petteri Räty <betelgeuse@g.o> |
| 33 |
+ +sun-jdk-1.6.0.07-r1.ebuild: |
| 34 |
+ Sun finally made libstdc++ statically linked again for 1.6 so removing the |
| 35 |
+ dep on virtual/libstdc++. Reported in bug #237181. |
| 36 |
|
| 37 |
16 Jul 2008; Christian Faulhammer <opfer@g.o> |
| 38 |
sun-jdk-1.6.0.07.ebuild: |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 dev-java/sun-jdk/sun-jdk-1.6.0.07-r1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.07-r1.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.07-r1.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: sun-jdk-1.6.0.07-r1.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/sun-jdk/sun-jdk-1.6.0.07-r1.ebuild,v 1.1 2008/09/09 14:00:30 betelgeuse Exp $ |
| 52 |
|
| 53 |
inherit versionator java-vm-2 eutils pax-utils |
| 54 |
|
| 55 |
UPDATE="$(get_version_component_range 4)" |
| 56 |
UPDATE="${UPDATE#0}" |
| 57 |
MY_PV="$(get_version_component_range 2)u${UPDATE}" |
| 58 |
X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin" |
| 59 |
AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin" |
| 60 |
|
| 61 |
DESCRIPTION="Sun's J2SE Development Kit, version ${PV}" |
| 62 |
HOMEPAGE="http://java.sun.com/javase/6/" |
| 63 |
URL_BASE="http://download.java.net/dlj/binaries" |
| 64 |
SRC_URI="x86? ( ${URL_BASE}/${X86_AT} ) |
| 65 |
amd64? ( ${URL_BASE}/${AMD64_AT} )" |
| 66 |
SLOT="1.6" |
| 67 |
LICENSE="dlj-1.1" |
| 68 |
KEYWORDS="~amd64 ~x86" |
| 69 |
RESTRICT="strip" |
| 70 |
IUSE="X alsa doc examples jce nsplugin odbc" |
| 71 |
|
| 72 |
QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so |
| 73 |
opt/${P}/jre/lib/i386/libdeploy.so |
| 74 |
opt/${P}/jre/lib/i386/client/libjvm.so |
| 75 |
opt/${P}/jre/lib/i386/server/libjvm.so" |
| 76 |
|
| 77 |
DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )" |
| 78 |
RDEPEND="doc? ( =dev-java/java-sdk-docs-1.6.0* ) |
| 79 |
sys-libs/glibc |
| 80 |
alsa? ( media-libs/alsa-lib ) |
| 81 |
X? ( |
| 82 |
x11-libs/libXext |
| 83 |
x11-libs/libXi |
| 84 |
x11-libs/libXp |
| 85 |
x11-libs/libXtst |
| 86 |
amd64? ( x11-libs/libXt ) |
| 87 |
x11-libs/libX11 |
| 88 |
) |
| 89 |
odbc? ( dev-db/unixODBC )" |
| 90 |
|
| 91 |
JAVA_PROVIDE="jdbc-stdext jdbc-rowset" |
| 92 |
|
| 93 |
S="${WORKDIR}/jdk$(replace_version_separator 3 _)" |
| 94 |
|
| 95 |
src_unpack() { |
| 96 |
sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack" |
| 97 |
} |
| 98 |
|
| 99 |
src_compile() { |
| 100 |
# Set PaX markings on all JDK/JRE executables to allow code-generation on |
| 101 |
# the heap by the JIT compiler. This needs to be done before CDS - #215225 |
| 102 |
pax-mark m $(list-paxables "${S}"{,/jre}/bin/*) |
| 103 |
|
| 104 |
# see bug #207282 |
| 105 |
if use x86; then |
| 106 |
einfo "Creating the Class Data Sharing archives" |
| 107 |
"${S}"/bin/java -client -Xshare:dump || die |
| 108 |
"${S}"/bin/java -server -Xshare:dump || die |
| 109 |
fi |
| 110 |
} |
| 111 |
|
| 112 |
src_install() { |
| 113 |
local dirs="bin include jre lib man" |
| 114 |
|
| 115 |
dodir /opt/${P} |
| 116 |
|
| 117 |
cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy" |
| 118 |
dodoc COPYRIGHT || die |
| 119 |
dohtml README.html || die |
| 120 |
|
| 121 |
cp -pP src.zip "${D}/opt/${P}/" || die |
| 122 |
|
| 123 |
if use examples; then |
| 124 |
cp -pPR demo sample "${D}/opt/${P}/" || die |
| 125 |
fi |
| 126 |
|
| 127 |
if use jce; then |
| 128 |
cd "${D}/opt/${P}/jre/lib/security" |
| 129 |
dodir /opt/${P}/jre/lib/security/strong-jce |
| 130 |
mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \ |
| 131 |
"${D}"/opt/${P}/jre/lib/security/strong-jce || die |
| 132 |
mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \ |
| 133 |
"${D}"/opt/${P}/jre/lib/security/strong-jce || die |
| 134 |
dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/ |
| 135 |
dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ |
| 136 |
fi |
| 137 |
|
| 138 |
if use nsplugin; then |
| 139 |
local plugin_dir="ns7-gcc29" |
| 140 |
if has_version '>=sys-devel/gcc-3' ; then |
| 141 |
plugin_dir="ns7" |
| 142 |
fi |
| 143 |
|
| 144 |
if use x86 ; then |
| 145 |
install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so |
| 146 |
else |
| 147 |
eerror "No plugin available for amd64 arch" |
| 148 |
fi |
| 149 |
fi |
| 150 |
|
| 151 |
# create dir for system preferences |
| 152 |
dodir /opt/${P}/jre/.systemPrefs |
| 153 |
# Create files used as storage for system preferences. |
| 154 |
touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock |
| 155 |
chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock |
| 156 |
touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile |
| 157 |
chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile |
| 158 |
|
| 159 |
if [[ -f "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then |
| 160 |
# install control panel for Gnome/KDE |
| 161 |
# The jre also installs these so make sure that they do not have the same |
| 162 |
# Name |
| 163 |
sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \ |
| 164 |
-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \ |
| 165 |
-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \ |
| 166 |
"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \ |
| 167 |
"${T}"/sun_jdk-${SLOT}.desktop |
| 168 |
|
| 169 |
domenu "${T}"/sun_jdk-${SLOT}.desktop |
| 170 |
fi |
| 171 |
|
| 172 |
# bug #56444 |
| 173 |
insinto /opt/${P}/jre/lib/ |
| 174 |
newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties |
| 175 |
|
| 176 |
set_java_env |
| 177 |
java-vm_revdep-mask |
| 178 |
} |
| 179 |
|
| 180 |
pkg_postinst() { |
| 181 |
# Set as default VM if none exists |
| 182 |
java-vm-2_pkg_postinst |
| 183 |
|
| 184 |
elog "Please reinstall eclipse-sdk if you have it installed and want" |
| 185 |
elog "workaround for bug #215150." |
| 186 |
} |
Archives