Mercurial > hg > portage

changeset 302:0567492f4a01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix version format
author holger
date Sat, 22 Oct 2011 20:44:53 +0200
parents 557cd567f9e3
children e93f329bcdf7
files dev-java/oracle-jdk-bin/Manifest dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.02.ebuild dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.2.ebuild
diffstat 3 files changed, 167 insertions(+), 166 deletions(-) [+]
line wrap: on
line diff
--- a/dev-java/oracle-jdk-bin/Manifest	Fri Sep 30 18:02:49 2011 +0200
+++ b/dev-java/oracle-jdk-bin/Manifest	Sat Oct 22 20:44:53 2011 +0200
@@ -3,5 +3,5 @@
 DIST UnlimitedJCEPolicyJDK7.zip 7426 RMD160 a4a6a284579f43d2df3532d279e143d2f03c2c3f SHA1 7d3c9ee89536b82cd21c680088b1bced16017253 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d
 DIST jdk-7u2-ea-bin-b08-linux-i586-21_sep_2011.tar.gz 82258159 RMD160 94907550dc066861b5711b2153983b5133ffc6e9 SHA1 f94d15ec680a41ce391a4a2dbaa932e7d419c981 SHA256 d7c29641514c0b4f0f6d88298d2519f0cb711675a49a90e7d49ee2eca75aba46
 DIST jdk-7u2-ea-bin-b08-linux-x64-21_sep_2011.tar.gz 80838492 RMD160 cd71b7346059d361d3945c2fae417c8c6f5298d6 SHA1 3baa90310129cc6630ed7fbb52e8991a50829f93 SHA256 5ace3cce57aa9171b443abdf0e84cfdc67b17433381a338190174d88fe97e800
-EBUILD oracle-jdk-bin-1.7.0.02.ebuild 4828 RMD160 894321c9267da6b1596b0a43a68121bce8fa131e SHA1 dc492069bec9e7100dd3051a2660b4238df5856f SHA256 99f385cf78d5aee0dda2cfcb12060601fd8b52d8acfe223423bb519f1a678153
+EBUILD oracle-jdk-bin-1.7.0.2.ebuild 4854 RMD160 bd421a035f43498e285113d51d32f9bd5c306e9a SHA1 e4126a736e99a0e987e9384021ee3cf81eb78483 SHA256 47c5bc2019600cc8a52e8a44a427547ede862f8f434f6845cf15af799ee0dea8
 MISC metadata.xml 447 RMD160 7d545e68fa24d3775c670d42dc2fae9a125f64a0 SHA1 be889d874ad2ab4f6a4be68ed2a33909c03ed1a2 SHA256 7f8266bbb1afdd6dcd6361bca86fc8178ce623c042a3eac3835bcbf03b6b9232
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.02.ebuild	Fri Sep 30 18:02:49 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.ebuild,v 1.1 2011/09/08 07:28:32 caster Exp $
-
-EAPI="4"
-
-inherit java-vm-2 eutils pax-utils prefix versionator
-
-#UPDATE="$(get_version_component_range 4)"
-#UPDATE="${UPDATE#0}"
-#MY_PV="$(get_version_component_range 2)u${UPDATE}"
-MY_PV="7u2-ea-bin-b08"
-MY_PV_DATE="21_sep_2011"
-
-X86_AT="jdk-${MY_PV}-linux-i586-${MY_PV_DATE}.tar.gz"
-AMD64_AT="jdk-${MY_PV}-linux-x64-${MY_PV_DATE}.tar.gz"
-
-# check the URIs when bumping, no idea about their stability yet
-JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/java-se-jdk-7-download-432154.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
-
-JCE_DIR="UnlimitedJCEPolicy"
-JCE_FILE="${JCE_DIR}JDK7.zip"
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="x86? ( ${X86_AT} )
-	amd64? ( ${AMD64_AT} )
-	jce? ( ${JCE_FILE} )"
-SLOT="1.7"
-LICENSE="Oracle-BCLA-JavaSE"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="fetch strip"
-IUSE="X alsa derby doc examples jce nsplugin"
-
-QA_TEXTRELS_x86="
-	opt/${P}/jre/lib/i386/client/libjvm.so
-	opt/${P}/jre/lib/i386/server/libjvm.so"
-
-DEPEND="jce? ( app-arch/unzip )"
-RDEPEND="${DEPEND}
-	doc? ( dev-java/java-sdk-docs:1.7 )
-	!prefix? ( sys-libs/glibc )
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libX11
-	)"
-
-S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
-
-pkg_nofetch() {
-	if use x86; then
-		AT=${X86_AT}
-	elif use amd64; then
-		AT=${AMD64_AT}
-	fi
-
-	einfo "Please download ${AT} from:"
-	einfo "${JDK_URI}"
-	einfo "and move it to ${DISTDIR}"
-
-	if use jce; then
-		einfo "Also download ${JCE_FILE} from:"
-		einfo ${JCE_URI}
-		einfo "and move it to ${DISTDIR}"
-	fi
-}
-
-src_prepare() {
-	if use jce; then
-		mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
-	fi
-}
-
-src_compile() {
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler. This needs to be done before CDS - #215225
-	pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	if use x86; then
-		"${S}"/bin/java -client -Xshare:dump || die
-	fi
-	"${S}"/bin/java -server -Xshare:dump || die
-
-	# Create files used as storage for system preferences.
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-}
-
-src_install() {
-	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
-	# writable executable segments
-	if use x86; then
-		rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
-			{,jre/}lib/i386/libjavaplugin_nscp*.so
-		rm -vrf jre/plugin/i386
-	fi
-	# Without nsplugin flag, also remove the new plugin
-	local arch=${ARCH};
-	use x86 && arch=i386;
-	if ! use nsplugin; then
-		rm -vf {,jre/}lib/${arch}/libnpjp2.so \
-			{,jre/}lib/${arch}/libjavaplugin_jni.so
-	fi
-
-	dodir /opt/${P}
-	cp -pPR bin include jre lib man src.zip "${ED}"/opt/${P} || die
-
-	if use derby; then
-		cp -pPR db "${ED}"/opt/${P} || die
-	fi
-
-	if use examples; then
-		cp -pPR demo sample "${ED}"/opt/${P} || die
-	fi
-
-	# Remove empty dirs we might have copied
-	rmdir -v $(find "${D}" -type d -empty) || die
-
-	dodoc COPYRIGHT
-	dohtml README.html
-
-	if use jce; then
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv "${ED}"/opt/${P}/jre/lib/security/US_export_policy.jar \
-			"${ED}"/opt/${P}/jre/lib/security/strong-jce || die
-		mv "${ED}"/opt/${P}/jre/lib/security/local_policy.jar \
-			"${ED}"/opt/${P}/jre/lib/security/strong-jce || die
-		dosym /opt/${P}/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
-			/opt/${P}/jre/lib/security/
-		dosym /opt/${P}/jre/lib/security/${JCE_DIR}/local_policy.jar \
-			/opt/${P}/jre/lib/security/
-	fi
-
-	if use nsplugin; then
-		install_mozilla_plugin /opt/${P}/jre/lib/${arch}/libnpjp2.so
-	fi
-
-	# Install desktop file for the Java Control Panel. Using VMHANDLE as file
-	# name to prevent file collision with jre and or other slots.
-	[[ -f "${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop ]] || die
-	sed -e "s/\(Name=\)Java/\1 Java Control Panel for Oracle JDK ${SLOT}/" \
-		-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=/opt/${P}/jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png#" \
-		"${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop > \
-		"${T}"/${VMHANDLE}.desktop
-
-	domenu "${T}"/${VMHANDLE}.desktop
-
-	# bug #56444
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-	eprefixify "${T}"/fontconfig.properties
-	insinto /opt/${P}/jre/lib/
-	doins "${T}"/fontconfig.properties
-
-	set_java_env
-	java-vm_revdep-mask
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.2.ebuild	Sat Oct 22 20:44:53 2011 +0200
@@ -0,0 +1,166 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.ebuild,v 1.1 2011/09/08 07:28:32 caster Exp $
+
+EAPI="4"
+
+inherit java-vm-2 eutils pax-utils prefix versionator
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+#MY_PV="$(get_version_component_range 2)u${UPDATE}"
+MY_PV="7u2-ea-bin-b08"
+MY_PV_DATE="21_sep_2011"
+S_PV="$(get_version_component_range 1-3)_0${UPDATE}"
+
+X86_AT="jdk-${MY_PV}-linux-i586-${MY_PV_DATE}.tar.gz"
+AMD64_AT="jdk-${MY_PV}-linux-x64-${MY_PV_DATE}.tar.gz"
+
+# check the URIs when bumping, no idea about their stability yet
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/java-se-jdk-7-download-432154.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
+
+JCE_DIR="UnlimitedJCEPolicy"
+JCE_FILE="${JCE_DIR}JDK7.zip"
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="x86? ( ${X86_AT} )
+	amd64? ( ${AMD64_AT} )
+	jce? ( ${JCE_FILE} )"
+SLOT="1.7"
+LICENSE="Oracle-BCLA-JavaSE"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="fetch strip"
+IUSE="X alsa derby doc examples jce nsplugin"
+
+QA_TEXTRELS_x86="
+	opt/${P}/jre/lib/i386/client/libjvm.so
+	opt/${P}/jre/lib/i386/server/libjvm.so"
+
+DEPEND="jce? ( app-arch/unzip )"
+RDEPEND="${DEPEND}
+	doc? ( dev-java/java-sdk-docs:1.7 )
+	!prefix? ( sys-libs/glibc )
+	alsa? ( media-libs/alsa-lib )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libX11
+	)"
+
+S="${WORKDIR}/jdk${S_PV}"
+
+pkg_nofetch() {
+	if use x86; then
+		AT=${X86_AT}
+	elif use amd64; then
+		AT=${AMD64_AT}
+	fi
+
+	einfo "Please download ${AT} from:"
+	einfo "${JDK_URI}"
+	einfo "and move it to ${DISTDIR}"
+
+	if use jce; then
+		einfo "Also download ${JCE_FILE} from:"
+		einfo ${JCE_URI}
+		einfo "and move it to ${DISTDIR}"
+	fi
+}
+
+src_prepare() {
+	if use jce; then
+		mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
+	fi
+}
+
+src_compile() {
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler. This needs to be done before CDS - #215225
+	pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	if use x86; then
+		"${S}"/bin/java -client -Xshare:dump || die
+	fi
+	"${S}"/bin/java -server -Xshare:dump || die
+
+	# Create files used as storage for system preferences.
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+}
+
+src_install() {
+	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
+	# writable executable segments
+	if use x86; then
+		rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
+			{,jre/}lib/i386/libjavaplugin_nscp*.so
+		rm -vrf jre/plugin/i386
+	fi
+	# Without nsplugin flag, also remove the new plugin
+	local arch=${ARCH};
+	use x86 && arch=i386;
+	if ! use nsplugin; then
+		rm -vf {,jre/}lib/${arch}/libnpjp2.so \
+			{,jre/}lib/${arch}/libjavaplugin_jni.so
+	fi
+
+	dodir /opt/${P}
+	cp -pPR bin include jre lib man src.zip "${ED}"/opt/${P} || die
+
+	if use derby; then
+		cp -pPR db "${ED}"/opt/${P} || die
+	fi
+
+	if use examples; then
+		cp -pPR demo sample "${ED}"/opt/${P} || die
+	fi
+
+	# Remove empty dirs we might have copied
+	rmdir -v $(find "${D}" -type d -empty) || die
+
+	dodoc COPYRIGHT
+	dohtml README.html
+
+	if use jce; then
+		dodir /opt/${P}/jre/lib/security/strong-jce
+		mv "${ED}"/opt/${P}/jre/lib/security/US_export_policy.jar \
+			"${ED}"/opt/${P}/jre/lib/security/strong-jce || die
+		mv "${ED}"/opt/${P}/jre/lib/security/local_policy.jar \
+			"${ED}"/opt/${P}/jre/lib/security/strong-jce || die
+		dosym /opt/${P}/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
+			/opt/${P}/jre/lib/security/
+		dosym /opt/${P}/jre/lib/security/${JCE_DIR}/local_policy.jar \
+			/opt/${P}/jre/lib/security/
+	fi
+
+	if use nsplugin; then
+		install_mozilla_plugin /opt/${P}/jre/lib/${arch}/libnpjp2.so
+	fi
+
+	# Install desktop file for the Java Control Panel. Using VMHANDLE as file
+	# name to prevent file collision with jre and or other slots.
+	[[ -f "${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop ]] || die
+	sed -e "s/\(Name=\)Java/\1 Java Control Panel for Oracle JDK ${SLOT}/" \
+		-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=/opt/${P}/jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png#" \
+		"${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop > \
+		"${T}"/${VMHANDLE}.desktop
+
+	domenu "${T}"/${VMHANDLE}.desktop
+
+	# bug #56444
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+	eprefixify "${T}"/fontconfig.properties
+	insinto /opt/${P}/jre/lib/
+	doins "${T}"/fontconfig.properties
+
+	set_java_env
+	java-vm_revdep-mask
+}