Remove old/vulnarable

Package-Manager: portage-2.1.10.33/cvs/Linux x86_64

4 files changed, 6 insertions, 334 deletions

diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index cb809ace8d84..012ce86c0639 100644
--- a/dev-java/oracle-jdk-bin/ChangeLog
+++ b/dev-java/oracle-jdk-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/oracle-jdk-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.4 2011/11/12 13:18:42 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.5 2011/11/12 14:09:22 sera Exp $
+
+  12 Nov 2011; Ralph Sennhauser <sera@gentoo.org> -oracle-jdk-bin-1.7.0.ebuild,
+  -oracle-jdk-bin-1.7.0.1.ebuild:
+  Remove old/vulnarable
 
   12 Nov 2011; Ralph Sennhauser <sera@gentoo.org>
   oracle-jdk-bin-1.7.0.1-r1.ebuild:
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index c1edd04c5085..91bdd491165f 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,12 +1,8 @@
 AUX fontconfig.Gentoo.properties 11196 RMD160 e11989b6be27297af68bdd7040439f4d3bd09916 SHA1 58a53f90a8d0409769d371f2e07b5bec27b02469 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c
 AUX oracle-jdk-bin-1.7.env 1075 RMD160 41d907b09f7607d7bb41090aeba3709288392951 SHA1 7d32eec42464d0a869a63432b6c7d5cb6bb09064 SHA256 216a629d271095f87501a0872288b5da994796717097e3d9e6a6ecc2c00621eb
 DIST UnlimitedJCEPolicyJDK7.zip 7426 RMD160 a4a6a284579f43d2df3532d279e143d2f03c2c3f SHA1 7d3c9ee89536b82cd21c680088b1bced16017253 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d
-DIST jdk-7-linux-i586.tar.gz 96645974 RMD160 1570527cf84636f9a7542ab5b30476fd5c8ade8e SHA1 7b1a8c01885e0662018ee7829769f97499534b87 SHA256 2face2437fb6f91505e73fe41863dcc4ba5d23d761ba26d8712357b92c7eb201
-DIST jdk-7-linux-x64.tar.gz 94971634 RMD160 faf4b66e2f2f2619a69048defb2a82033580ce20 SHA1 d58395c605a4050e482f7bf94eaab72b7325c3be SHA256 cd71b7ca40d8dba47df960a9509bbc41e44f399d46ef8905a329258641e11829
 DIST jdk-7u1-linux-i586.tar.gz 96648208 RMD160 7a48b5ed92c34f3253e8a87e5ee53580a8e83736 SHA1 e581d977bdb8f2f7608d48b307ab3174a55f8f48 SHA256 acbfb8912a287facbee02ff138d94457aabab409b2f1d15855714ec9608a6cd4
 DIST jdk-7u1-linux-x64.tar.gz 94972183 RMD160 fc2efecd251ec552530ad57888cbdce163e009e6 SHA1 21ef2964df4575f1e5e935205700d06ee70f33b3 SHA256 f88070cfe7fe5ed60dfda7729cf9dd110b77840e2ca8cd14a86d5d2274b09c9c
 EBUILD oracle-jdk-bin-1.7.0.1-r1.ebuild 4838 RMD160 449dfe71f63badf64fc53540f39a871e921d1de2 SHA1 216fd012e9fc3a5f68afb8500a12a2ab6a0c55ad SHA256 7b59fd91d1170fab63ac69faf2fc380e29c1531c4c7a23372567f82c8b5770bc
-EBUILD oracle-jdk-bin-1.7.0.1.ebuild 4773 RMD160 2f38fe0e27421f3d4c92dc8a0d03fc5c505a15a7 SHA1 6f168ec0b32dab2e5ded5f212347d8f7b413f63d SHA256 92efa939577c039fd9fea6eb12e1a2459e76564d01bc1d62705ed1eb1b712c06
-EBUILD oracle-jdk-bin-1.7.0.ebuild 4723 RMD160 623a94fb84575f89dba8a5298a90b03f171c7c25 SHA1 14883e30f7f108430f12f8ba88ee7c480842a835 SHA256 327a429966c6561945994ed5371c7e3382c60b2c37a65e8c86a85a72ee52636e
-MISC ChangeLog 1061 RMD160 f82734991aa48783746d48986ded48ee75288555 SHA1 64f8ff4e52b5824c5ebe2d44fa6e1e19558c8c98 SHA256 e2ad16e5152d4a36c8b9c619dedd446b1a88b57fb344e0eb0f3698ffdedae44e
+MISC ChangeLog 1200 RMD160 2aa82f841a5fdc5fe3dc2c50ed2f01ae82fa487f SHA1 f3a450de2b1d73571bce6a08ddf9bf8c73c536d0 SHA256 a089e6d28e06d2e75e66b3e41bcddc1a6518121f1a48611e3ab8a6a81995b8c5
 MISC metadata.xml 447 RMD160 7d545e68fa24d3775c670d42dc2fae9a125f64a0 SHA1 be889d874ad2ab4f6a4be68ed2a33909c03ed1a2 SHA256 7f8266bbb1afdd6dcd6361bca86fc8178ce623c042a3eac3835bcbf03b6b9232
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1.ebuild
deleted file mode 100644
index c1b707547d23..000000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1.ebuild
+++ /dev/null
@@ -1,164 +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.1.ebuild,v 1.1 2011/10/21 23:00:04 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}"
-S_PV="$(get_version_component_range 1-3)_0${UPDATE}"
-
-X86_AT="jdk-${MY_PV}-linux-i586.tar.gz"
-AMD64_AT="jdk-${MY_PV}-linux-x64.tar.gz"
-
-# check the URIs when bumping, no idea about their stability yet
-JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk-7u1-download-513651.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
-}
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.ebuild
deleted file mode 100644
index d4b94ed90f56..000000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.ebuild
+++ /dev/null
@@ -1,164 +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
-
-#UPDATE="$(get_version_component_range 4)"
-#UPDATE="${UPDATE#0}"
-#MY_PV="$(get_version_component_range 2)u${UPDATE}"
-MY_PV="7"
-
-X86_AT="jdk-${MY_PV}-linux-i586.tar.gz"
-AMD64_AT="jdk-${MY_PV}-linux-x64.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${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
-}