public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/java:master commit in: dev-java/blackdown-jdk/, virtual/jre/, dev-java/ibm-jdk-bin/, ...
@ 2015-08-08 11:21 James Le Cuirot
  0 siblings, 0 replies; only message in thread
From: James Le Cuirot @ 2015-08-08 11:21 UTC (permalink / raw
  To: gentoo-commits

commit:     80a237f85c146706f4f435440430b8b55c8c2410
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Aug  7 18:46:42 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Aug  8 11:05:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=80a237f8

[dev-java] [virtual] Drop *jdk*-1.4, *jre*-1.4

Package-Manager: portage-2.2.20

 dev-java/blackdown-jdk/Manifest                    |   2 -
 .../blackdown-jdk-1.4.2.03-r17.ebuild              | 161 -------------------
 .../blackdown-jdk/files/blackdown-jdk-1.4.2.env    |  17 --
 dev-java/blackdown-jdk/metadata.xml                |   5 -
 dev-java/ibm-jdk-bin/Manifest                      |   8 -
 dev-java/ibm-jdk-bin/files/cpuinfo                 |   1 -
 dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.env     |  16 --
 .../ibm-jdk-bin/files/ibm-jdk-bin-jawt.h.patch     |  12 --
 .../ibm-jdk-bin/ibm-jdk-bin-1.4.2.13-r1.ebuild     | 176 ---------------------
 dev-java/ibm-jdk-bin/metadata.xml                  |   9 --
 dev-java/sun-jdk/Manifest                          |   2 -
 dev-java/sun-jdk/files/sun-jdk-1.4.env             |  17 --
 dev-java/sun-jdk/sun-jdk-1.4.2.19-r1.ebuild        | 169 --------------------
 virtual/jdk/jdk-1.4.2-r1.ebuild                    |  21 ---
 virtual/jre/jre-1.4.2.ebuild                       |  17 --
 virtual/jre/metadata.xml                           |   5 -
 16 files changed, 638 deletions(-)

diff --git a/dev-java/blackdown-jdk/Manifest b/dev-java/blackdown-jdk/Manifest
deleted file mode 100644
index f02c853..0000000
--- a/dev-java/blackdown-jdk/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST j2sdk-1.4.2-03-linux-amd64.bin 33997205 SHA256 1810ffc356d7a10d773de003d074050de3c7322ca480ec0344e2b8798498f1dd
-DIST j2sdk-1.4.2-03-linux-i586.bin 34375872 SHA256 728f661fdf9510de3c01a79259d492a98d9b636034d14e1c930118280dba9df9

diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r17.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r17.ebuild
deleted file mode 100644
index ad51a58..0000000
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r17.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_SUPPORTS_GENERATION_1="true"
-JAVA_VM_BUILD_ONLY="TRUE"
-inherit java-vm-2 versionator pax-utils
-
-JREV=$(get_version_component_range 4- )
-JV=$(get_version_component_range 1-3 )
-J_URI="mirror://blackdown.org/JDK-${JV}"
-
-DESCRIPTION="Blackdown Java Development Kit"
-SRC_URI="amd64? ( ${J_URI}/amd64/${JREV}/j2sdk-${JV}-${JREV}-linux-amd64.bin )
-	x86? ( ${J_URI}/i386/${JREV}/j2sdk-${JV}-${JREV}-linux-i586.bin )"
-
-HOMEPAGE="http://www.blackdown.org"
-
-SLOT="1.4.2"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="X alsa examples nsplugin odbc"
-
-DEPEND=""
-RDEPEND="odbc? ( dev-db/unixODBC )
-	alsa? ( media-libs/alsa-lib )
-	x86? ( net-libs/libnet )
-	sys-libs/glibc
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXp
-		x11-libs/libXtst
-		x11-libs/libXt
-		x11-libs/libX11
-	)"
-
-JAVA_PROVIDE="jdbc-stdext"
-
-S="${WORKDIR}/j2sdk${JV}"
-
-RESTRICT="strip"
-
-# Extract the 'skip' value (offset of tarball) we should pass to tail
-get_offset() {
-	[ ! -f "$1" ] && return
-
-	local offset=$(gawk '
-		/^[[:space:]]*skip[[:space:]]*=/ {
-			sub(/^[[:space:]]*skip[[:space:]]*=/, "")
-			SKIP = $0
-		}
-		END { print SKIP }' $1)
-
-	echo $offset
-}
-
-src_unpack() {
-	local offset=$(get_offset ${DISTDIR}/${A})
-
-	if [ -z "${offset}" ] ; then
-		die "Failed to get offset of tarball!"
-	fi
-
-	echo ">>> Unpacking ${A}..."
-	tail -n +${offset} "${DISTDIR}"/${A} | tar --no-same-owner -jxpf - || die
-}
-
-unpack_jars() {
-	# New to 1.4.2
-	local PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar"
-	local JAVAHOME="${D}/opt/${P}"
-	local UNPACK_CMD=""
-	if [ -f "$JAVAHOME/lib/unpack" ]; then
-		UNPACK_CMD="$JAVAHOME/lib/unpack"
-		chmod +x "$UNPACK_CMD"
-		packerror=""
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		for i in $PACKED_JARS; do
-			if [ -f "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack" ]; then
-				einfo "Creating ${JAVAHOME}/${i}\n"
-				"$UNPACK_CMD" "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack" "$JAVAHOME/$i"
-				if [ ! -f "$JAVAHOME/$i" ]; then
-					ewarn "Failed to unpack jar files ${i}. Please refer\n"
-					ewarn "to the Troubleshooting section of the Installation\n"
-					ewarn "Instructions on the download page for more information.n"
-					packerror="1"
-				fi
-				rm -f "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack"
-			fi
-		done
-	fi
-	rm -f "$UNPACK_CMD"
-}
-
-src_install() {
-	typeset platform
-
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
-
-	dodir /opt/${P}
-
-	cp -pPR "${S}"/{bin,jre,lib,man,include} "${D}"/opt/${P} || die "failed to copy"
-
-	dodir /opt/${P}/share/
-	if use examples; then
-		cp -pPR "${S}"/demo "${D}"/opt/${P}/share/ || die "failed to copy"
-	fi
-
-	cp -pPR "${S}"/src.zip "${D}/opt/${P}/" || die "failed to copy"
-	dosym "../src.zip" /opt/${P}/share || die "failed dosym"
-
-	dodoc README
-	dohtml README.html
-
-	if use nsplugin; then
-		case ${ARCH} in
-			amd64) platform="amd64" ;;
-			x86) platform="i386" ;;
-			ppc) platform="ppc" ;;
-			sparc*) platform="sparc" ;;
-		esac
-
-		install_mozilla_plugin /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so
-	else
-		rm -f "${D}"/opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so
-	fi
-
-	find "${D}"/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
-
-	sed -i "s/standard symbols l/symbol/g" "${D}"/opt/${P}/jre/lib/font.properties
-
-	# install env into /etc/env.d
-	set_java_env
-	java-vm_revdep-mask
-
-	# Fix for bug 26629
-	if [[ "${PROFILE_ARCH}" == "sparc64" ]]; then
-		dosym /opt/${P}/jre/lib/sparc /opt/${P}/jre/lib/sparc64
-	fi
-
-	unpack_jars
-}
-
-pkg_postinst() {
-	# Set as default system VM if none exists
-	java-vm-2_pkg_postinst
-
-	elog ""
-	elog "Starting with 1.4.0.03-r16 demos are installed only with USE=examples"
-	elog ""
-	elog "Starting with 1.4.0.03-r16 the src.jar is installed to the standard"
-	elog "location. It is still symlinked to the old location (/opt/${P}/share)"
-	elog "but it will be removed if there will ever be a version bump."
-	elog "See https://bugs.gentoo.org/show_bug.cgi?id=2241"
-	elog "for more details."
-}

diff --git a/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.env b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.env
deleted file mode 100644
index b57f497..0000000
--- a/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.env
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.env,v 1.1 2006/06/25 16:47:40 nichoj Exp $
-
-VERSION="Blackdown JDK @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/classic/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
-MANPATH=/opt/@P@/man
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.4"
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
-GENERATION="2"

diff --git a/dev-java/blackdown-jdk/metadata.xml b/dev-java/blackdown-jdk/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/blackdown-jdk/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
deleted file mode 100644
index 07c43ea..0000000
--- a/dev-java/ibm-jdk-bin/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST IBMJava2-JAVACOMM-1.4.2-13.0.ppc.tgz 124759 SHA256 a8f990039305f6557058c2326155d8efcc2cc1d07d15a7a9b9e225ef63d9e028
-DIST IBMJava2-JAVACOMM-1.4.2-13.0.ppc64.tgz 126768 SHA256 f4e88001884bb76696be3e09dd3ff33230667776602bf4624285e01a6bae80af
-DIST IBMJava2-JAVACOMM-1.4.2-13.0.tgz 118484 SHA256 a8ff3aae2e9e5d22f3c8889e2df577f746a544c16c3c071641543bc08c452f0b
-DIST IBMJava2-JAVACOMM-AMD64-1.4.2-13.0.x86_64.tgz 120805 SHA256 4151ec541cb4b6d3a74525a3af49b2c7f33621a50244513fff4f2d60c94125f7
-DIST IBMJava2-SDK-1.4.2-13.0.ppc.tgz 67149283 SHA256 796c8b9e4dac96ba23dce2bd7c371acd25195cafabe82feb3b9256414aebe930
-DIST IBMJava2-SDK-1.4.2-13.0.ppc64.tgz 65363596 SHA256 2f68c37f6d9717396e7f9fbfa92af4cdd16769c4f6e1fe19b994f90916037fe5
-DIST IBMJava2-SDK-1.4.2-13.0.tgz 59094335 SHA256 f631218b86ac7bba487e0beca091ce832d9c8ba137c05ac6785385ebc1535667
-DIST IBMJava2-SDK-AMD64-1.4.2-13.0.x86_64.tgz 57358200 SHA256 67559e72b8a5df7d1e8d5a790cda98395629da9be3d9f371ccebafa4a9cf7844

diff --git a/dev-java/ibm-jdk-bin/files/cpuinfo b/dev-java/ibm-jdk-bin/files/cpuinfo
deleted file mode 100644
index f83be96..0000000
--- a/dev-java/ibm-jdk-bin/files/cpuinfo
+++ /dev/null
@@ -1 +0,0 @@
-cpu		: 604e

diff --git a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.env b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.env
deleted file mode 100644
index edf7490..0000000
--- a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.env
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.env,v 1.1 2006/06/25 18:07:17 nichoj Exp $
-
-VERSION="IBM JDK @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-LDPATH="/opt/@P@/jre/bin/:/opt/@P@/jre/bin/classic"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.4"
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/core.jar:${JAVA_HOME}/jre/lib/graphics.jar:${JAVA_HOME}/jre/lib/security.jar:${JAVA_HOME}/jre/lib/server.jar:${JAVA_HOME}/jre/lib/xml.jar:${JAVA_HOME}/jre/lib/charsets.jar:${JAVA_HOME}/jre/lib/ibmjgssprovider.jar:${JAVA_HOME}/jre/lib/ibmjaaslm.jar:${JAVA_HOME}/jre/lib/ibmorbapi.jar:${JAVA_HOME}/jre/lib/ibmorb.jar:${JAVA_HOME}/jre/lib/ibmjcefw.jar:${JAVA_HOME}/jre/lib/ibmjssefips.jar:${JAVA_HOME}/jre/lib/ibmjsseprovider.jar:${JAVA_HOME}/jre/lib/ibmpkcs.jar:${JAVA_HOME}/jre/lib/ibmcertpathprovider.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH"

diff --git a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-jawt.h.patch b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-jawt.h.patch
deleted file mode 100644
index c3fa40c..0000000
--- a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-jawt.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/jawt.h	2006/07/20 23:02:04	1.1
-+++ include/jawt.h	2006/07/20 23:03:13
-@@ -298,7 +298,9 @@ typedef struct jawt {
-  * Get the AWT native structure.  This function returns JNI_FALSE if
-  * an error occurs.
-  */
-+#ifdef _JNI_IMPORT_OR_EXPORT_
- _JNI_IMPORT_OR_EXPORT_
-+#endif
- jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt);
- 
- #define JAWT_VERSION_1_3 0x00010003

diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.13-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.13-r1.ebuild
deleted file mode 100644
index 056f150..0000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.13-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_SUPPORTS_GENERATION_1="true"
-JAVA_VM_BUILD_ONLY="TRUE"
-inherit java-vm-2 eutils versionator
-
-JDK_RELEASE=$(get_version_component_range 1-3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-
-JDK_DIST_PREFIX="IBMJava2-SDK-${RPM_PV}"
-JAVACOMM_DIST_PREFIX="IBMJava2-JAVACOMM-${RPM_PV}"
-
-X86_JDK_DIST="${JDK_DIST_PREFIX}.tgz"
-X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}.tgz"
-
-# wonder why amd64 has this extra special AMD64 in its filename...
-AMD64_JDK_DIST="IBMJava2-SDK-AMD64-${RPM_PV}.x86_64.tgz"
-AMD64_JAVACOMM_DIST="IBMJava2-JAVACOMM-AMD64-${RPM_PV}.x86_64.tgz"
-
-PPC_JDK_DIST="${JDK_DIST_PREFIX}.ppc.tgz"
-PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}.ppc.tgz"
-
-PPC64_JDK_DIST="${JDK_DIST_PREFIX}.ppc64.tgz"
-PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}.ppc64.tgz"
-
-if use x86; then
-	JDK_DIST=${X86_JDK_DIST}
-	JAVACOMM_DIST=${X86_JAVACOMM_DIST}
-	S="${WORKDIR}/IBMJava2-142"
-	LINK_ARCH="ia32"
-elif use amd64; then
-	JDK_DIST=${AMD64_JDK_DIST}
-	JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
-	S="${WORKDIR}/IBMJava2-amd64-142"
-	LINK_ARCH="amd64"
-elif use ppc; then
-	JDK_DIST=${PPC_JDK_DIST}
-	JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
-	S="${WORKDIR}/IBMJava2-ppc-142"
-	LINK_ARCH="ip32"
-elif use ppc64; then
-	JDK_DIST=${PPC64_JDK_DIST}
-	JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
-	S="${WORKDIR}/IBMJava2-ppc64-142"
-	LINK_ARCH="ip64"
-fi
-
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=lxdk&S_PKG=${LINK_ARCH}142sr${SERVICE_RELEASE}&cp=UTF-8&S_TACT=105AGX05&S_CMP=JDK"
-
-DESCRIPTION="IBM Java SE Development Kit"
-HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
-DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
-# bug #125178
-ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
-
-SRC_URI="x86? ( ${X86_JDK_DIST} )
-	amd64? ( ${AMD64_JDK_DIST} )
-	ppc? ( ${PPC_JDK_DIST} )
-	ppc64? ( ${PPC64_JDK_DIST} )
-	javacomm? (
-		x86? ( ${X86_JAVACOMM_DIST} )
-		amd64? ( ${AMD64_JAVACOMM_DIST} )
-		ppc? ( ${PPC_JAVACOMM_DIST} )
-		ppc64? ( ${PPC64_JAVACOMM_DIST} )
-	)"
-
-LICENSE="IBM-J1.4"
-SLOT="1.4"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="X alsa examples javacomm nsplugin"
-
-RDEPEND="=virtual/libstdc++-3.3
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXp
-		x11-libs/libXtst
-		x11-libs/libXt
-		x11-libs/libX11
-	)"
-
-RESTRICT="fetch"
-
-QA_TEXTRELS_amd64="opt/${P}/jre/bin/libj9jit23.so
-	opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/j9vm/libjclscar_23.so
-	opt/${P}/jre/bin/j9vm/libj9jit23.so
-	opt/${P}/jre/bin/libjclscar_22.so
-	opt/${P}/jre/bin/libj9jit22.so"
-QA_TEXTRELS_ppc64="opt/${P}/jre/bin/classic/libjvm.so"
-QA_TEXTRELS_ppc="opt/${P}/jre/bin/libjitc.so
-	opt/${P}/jre/bin/libjaas.so"
-QA_TEXTRELS_x86="opt/${P}/jre/bin/lib*.so
-	opt/${P}/jre/bin/javaplugin.so
-	opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/bin/classic/libcore.so"
-
-pkg_nofetch() {
-	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
-	einfo "Please visit: ${DOWNLOADPAGE}"
-
-	einfo "Under Java 1.4.2, download SR${SERVICE_RELEASE} for your arch:"
-	einfo "${JDK_DIST}"
-	if use javacomm ; then
-		einfo "${JAVACOMM_DIST}"
-	fi
-	einfo "You can also use direct link to your arch download page:"
-	einfo "${DIRECT_DOWNLOAD}"
-	einfo "Place the file(s) in: ${DISTDIR}"
-	einfo "Then restart emerge: 'emerge --resume'"
-
-	einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}"
-	einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
-	einfo "isn't updated, but the files should still available through the"
-	einfo "direct link to arch download page. If it doesn't work, file a bug."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# bug #126105
-	epatch "${FILESDIR}/${PN}-jawt.h.patch"
-}
-
-src_compile() { true; }
-
-src_install() {
-	# javaws is on x86 only
-	if use x86; then
-		# The javaws execution script is 777 why?
-		chmod 0755 "${S}"/jre/javaws/javaws
-
-		# bug #147259
-		dosym ../jre/javaws/javaws /opt/${P}/bin/javaws
-		dosym ../javaws/javaws /opt/${P}/jre/bin/javaws
-	fi
-
-	# Copy all the files to the designated directory
-	dodir /opt/${P}
-	cp -pR "${S}"/{bin,jre,lib,include,src.jar} "${D}"/opt/${P}/
-
-	dodir /opt/${P}/share
-	if use examples; then
-		cp -pPR "${S}"/demo "${D}"/opt/${P}/share/
-	fi
-
-	# setting the ppc stuff
-	if use ppc; then
-		dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc.so
-		dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc_g.so
-		insinto /etc
-		doins "${FILESDIR}/cpuinfo"
-	fi
-
-	if use x86 && use nsplugin; then
-		local plugin="libjavaplugin_oji.so"
-
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin="libjavaplugin_ojigcc3.so"
-		fi
-
-		install_mozilla_plugin /opt/${P}/jre/bin/${plugin}
-	fi
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc "${S}"/docs/COPYRIGHT
-
-	set_java_env
-	java-vm_revdep-mask
-}

diff --git a/dev-java/ibm-jdk-bin/metadata.xml b/dev-java/ibm-jdk-bin/metadata.xml
deleted file mode 100644
index 6844eea..0000000
--- a/dev-java/ibm-jdk-bin/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>java</herd>
-  <longdescription>IBM SDK Development kit.</longdescription>
-  <use>
-    <flag name="javacomm">Enable Java Communications API support</flag>
-  </use>
-</pkgmetadata>

diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 18a52a4..07c1406 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,4 +1,2 @@
-DIST j2sdk-1_4_2_19-linux-i586.bin 36387084 SHA256 ce2a2be4ce97313626dd3dc093a7c594fa0f1ffb51e2e12dd341a8091b2c3369
-DIST jce_policy-1_4_2.zip 12195 SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097
 DIST jdk-5.0u22-dlj-linux-amd64.bin 44213188 SHA256 1182d9c8d06fad7e8fbbb994c06f75b32a096fa50e448a7cbf455825ff4b0b21
 DIST jdk-5.0u22-dlj-linux-i586.bin 49782555 SHA256 1c2e853b60e408176ec924e717fb7ec7953a9dddbfc397de91536e9084cf9e46

diff --git a/dev-java/sun-jdk/files/sun-jdk-1.4.env b/dev-java/sun-jdk/files/sun-jdk-1.4.env
deleted file mode 100644
index a5685d2..0000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.4.env
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.4.env,v 1.1 2006/06/25 20:06:24 nichoj Exp $
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin:${JAVA_HOME}/jre/javaws"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin:${JAVA_HOME}/jre/javaws"
-LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/classic/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
-MANPATH="/opt/@P@/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.4"
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"

diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.19-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.19-r1.ebuild
deleted file mode 100644
index 393cc1e..0000000
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.19-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_SUPPORTS_GENERATION_1="true"
-JAVA_VM_BUILD_ONLY="TRUE"
-inherit pax-utils java-vm-2 eutils
-
-MY_PV=${PV%.*}_${PV##*.}
-MY_PN=j2sdk
-MY_P=${MY_PN}${MY_PV}
-MY_PVB=${PV%.*}
-
-At="j2sdk-${PV//./_}-linux-i586.bin"
-jce_policy="jce_policy-${MY_PVB//./_}.zip"
-
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Sun's Java SE Development Kit"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
-SRC_URI="x86? ( ${At} )
-		jce? ( ${jce_policy} )"
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="~x86"
-# files are prestripped
-RESTRICT="fetch strip"
-IUSE="X alsa examples jce nsplugin odbc"
-
-DEPEND="sys-apps/sed
-	app-arch/unzip"
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXp
-		x11-libs/libXtst
-		x11-libs/libXt
-		x11-libs/libX11
-	)
-	odbc? ( dev-db/unixODBC )"
-
-JAVA_PROVIDE="jdbc-stdext"
-
-DL_PREFIX="https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef="
-DOWNLOAD_URL="${DL_PREFIX}${MY_PN}-${MY_PV}-oth-JPR@CDS-CDS_Developer"
-DOWNLOAD_URL_JCE="${DL_PREFIX}7503-jce-1.4.2-oth-JPR@CDS-CDS_Developer"
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libawt.so
-	opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so
-	opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so
-	opt/${P}/jre/plugin/i386/ns610-gcc32/libjavaplugin_oji.so"
-QA_DT_HASH="opt/${P}/.*"
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${DOWNLOAD_URL}
-	einfo "and move it to ${DISTDIR}"
-	if use jce; then
-		echo
-		einfo "Also download ${jce_policy} from:"
-		einfo ${DOWNLOAD_URL_JCE}
-		einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files"
-		einfo "and move it to ${DISTDIR}"
-	fi
-}
-
-src_unpack() {
-	if [ ! -r "${DISTDIR}/${At}" ]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-	if use jce; then
-		if [ ! -r "${DISTDIR}/${jce_policy}" ]; then
-			die "cannot read ${jce_policy}. Please check the permission and try again."
-		fi
-	fi
-	#Search for the ELF Header
-	testExp=$(echo -e '\0177\0105\0114\0106\0001\0001\0001')
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
-	tail -n +${startAt} "${DISTDIR}/${At}" > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-
-	if [[ -f ${S}/lib/unpack ]]; then
-		UNPACK_CMD=${S}/lib/unpack
-		chmod +x $UNPACK_CMD
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		local PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar \
-			jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar \
-			jre/javaws/javaws.jar"
-		for i in $PACKED_JARS; do
-			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
-			if [ -f ${PACK_FILE} ]; then
-				echo "	unpacking: $i"
-				$UNPACK_CMD ${PACK_FILE} "${S}"/$i
-				rm -f ${PACK_FILE}
-			fi
-		done
-	fi
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-	dodir /opt/${P}
-
-	cp -dPR ${dirs} "${D}/opt/${P}/"
-
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark srpm $(list-paxables "${D}"/opt/${P}/{,/jre}/bin/*)
-
-	dodoc COPYRIGHT README THIRDPARTYLICENSEREADME.txt || die
-	dohtml README.html || die
-	if use examples; then
-		cp -pPR demo "${D}/opt/${P}/" || die
-	fi
-
-	cp -pPR src.zip "${D}/opt/${P}/" || die
-
-	if use jce ; then
-		# Using unlimited jce while still retaining the strong jce
-		# May have repercussions when you find you cannot symlink libraries
-		# in classpaths.
-		cd "${D}/opt/${P}/jre/lib/security"
-		unzip "${DISTDIR}/${jce_policy}"
-		mv jce unlimited-jce
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv "${D}/opt/${P}/jre/lib/security/US_export_policy.jar" \
-			"${D}/opt/${P}/jre/lib/security/strong-jce" || die
-		mv "${D}/opt/${P}/jre/lib/security/local_policy.jar" \
-			"${D}/opt/${P}/jre/lib/security/strong-jce" || die
-		dosym /opt/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
-		dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
-	fi
-
-	if use nsplugin; then
-		local plugin_dir="ns610"
-		if has_version '>=sys-devel/gcc-3.2' ; then
-			plugin_dir="ns610-gcc32"
-		fi
-
-		install_mozilla_plugin /opt/${P}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so
-	fi
-
-	# bug #147259
-	dosym ../jre/javaws/javaws /opt/${P}/bin/javaws
-	dosym ../javaws/javaws /opt/${P}/jre/bin/javaws
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-	# Create files used as storage for system preferences.
-	touch "${D}/opt/${P}/.systemPrefs/.system.lock"
-	chmod 644 "${D}/opt/${P}/.systemPrefs/.system.lock"
-	touch "${D}/opt/${P}/.systemPrefs/.systemRootModFile"
-	chmod 644 "${D}/opt/${P}/.systemPrefs/.systemRootModFile"
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
-		-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
-		"${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop" > \
-		"${T}/sun_java-${SLOT}.desktop"
-
-	domenu "${T}/sun_java-${SLOT}.desktop"
-
-	set_java_env
-	java-vm_revdep-mask
-}

diff --git a/virtual/jdk/jdk-1.4.2-r1.ebuild b/virtual/jdk/jdk-1.4.2-r1.ebuild
deleted file mode 100644
index 39cd7ce..0000000
--- a/virtual/jdk/jdk-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="Virtual for JDK"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="1.4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="|| (
-		=dev-java/blackdown-jdk-1.4.2*
-		=dev-java/sun-jdk-1.4.2*
-		=dev-java/ibm-jdk-bin-1.4.2*
-	)"
-RDEPEND="${DEPEND}"

diff --git a/virtual/jre/jre-1.4.2.ebuild b/virtual/jre/jre-1.4.2.ebuild
deleted file mode 100644
index cc1bc46..0000000
--- a/virtual/jre/jre-1.4.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.4.2.ebuild,v 1.6 2010/01/11 11:03:47 ulm Exp $
-
-DESCRIPTION="Virtual for JRE"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="1.4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="|| (
-		=virtual/jdk-1.4.2*
-	)"
-DEPEND=""

diff --git a/virtual/jre/metadata.xml b/virtual/jre/metadata.xml
deleted file mode 100644
index 7303cef..0000000
--- a/virtual/jre/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2015-08-08 11:21 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-08 11:21 [gentoo-commits] proj/java:master commit in: dev-java/blackdown-jdk/, virtual/jre/, dev-java/ibm-jdk-bin/, James Le Cuirot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox