From 60323de7e21e60f6e7496f52de7175dce1a6ead5 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Tue, 3 Mar 2015 22:59:02 -0500
Subject: [PATCH] openjdk: remove old versions.

---
 .../openjdk/openjdk-1.7_2013_11_08.recipe     | 219 ------------------
 dev-lang/openjdk/openjdk-1.7_u80_b00.recipe   | 178 --------------
 2 files changed, 397 deletions(-)
 delete mode 100644 dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe
 delete mode 100644 dev-lang/openjdk/openjdk-1.7_u80_b00.recipe

diff --git a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe
deleted file mode 100644
index f9892e157..000000000
--- a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe
+++ /dev/null
@@ -1,219 +0,0 @@
-SUMMARY="Open-source implementation of the Java Platform, SE"
-DESCRIPTION="
-Open-source implementation of the Java Platform, Standard Edition.
-"
-HOMEPAGE="http://openjdk.java.net/"
-COPYRIGHT="2005, 2006, Oracle and/or its affiliates"
-LICENSE="GNU GPL v2"
-
-#SRC_URI="http://dl.dropbox.com/u/61946213/j2sdk-august.tar.xz"
-#CHECKSUM_MD5="65b348918f92eb357ed7b455dadcded8"
-# The August j2sdk image is apparently incomplete.
-SRC_URI="http://ports-space.haiku-files.org/source/openjdk/j2sdk-april-2013.tar"
-CHECKSUM_SHA256="fca2603875d5c0b77b95a6f01f3d0fd368d32754801d5180d262404f8e2a31c6"
-SOURCE_DIR="j2sdk-image"
-
-SRC_URI_2="http://archive.apache.org/dist/ant/source/apache-ant-1.8.4-src.tar.gz"
-CHECKSUM_SHA256_2="df6f0aaede2549dc4347b972efc8036c01a737caac545b8ba43a21687bc521e7"
-SOURCE_DIR_2="apache-ant-1.8.4"
-
-SRC_URI_3="hg+http://hg.openjdk.java.net/haiku/haiku#ee67ee3bd597"
-
-SRC_URI_4="hg+http://hg.openjdk.java.net/haiku/haiku/corba#84b78407a004"
-PATCHES_4="openjdk-1.7_2013_11_08-source4.patchset"
-
-SRC_URI_5="hg+http://hg.openjdk.java.net/haiku/haiku/hotspot#03a6a75222a8"
-PATCHES_5="openjdk-1.7_2013_11_08-source5.patchset"
-
-SRC_URI_6="hg+http://hg.openjdk.java.net/haiku/haiku/jaxp#6c9ac74190a0"
-SRC_URI_7="hg+http://hg.openjdk.java.net/haiku/haiku/jaxws#84f654f41f6b"
-
-SRC_URI_8="hg+http://hg.openjdk.java.net/haiku/haiku/jdk#df0cce7b0238"
-PATCHES_8="openjdk-1.7_2013_11_08-source8.patchset"
-
-SRC_URI_9="hg+http://hg.openjdk.java.net/haiku/haiku/langtools#0dabb2f5fad0"
-
-SRC_URI_10="http://ports-space.haiku-files.org/source/openjdk/jaxp145_01.zip#noarchive"
-CHECKSUM_SHA256_10="c5924c6188988e2e8397ee5143bd8eaa062569d052567afd2ac9326a54a848cb"
-
-SRC_URI_11="http://ports-space.haiku-files.org/source/openjdk/jdk7-jaf-2010_08_19.zip#noarchive"
-CHECKSUM_SHA256_11="e6aefedfdbb4673e8019583d1344fb162b94e1b10382c362364dbbfd5889c09e"
-
-SRC_URI_12="http://ports-space.haiku-files.org/source/openjdk/jdk7-jaxws2_2_4-b03-2011_05_27.zip#noarchive"
-CHECKSUM_SHA256_12="05ae7259b75d0f2307276d61ece1887fcd437cb4ecda42fab8c22d4b537effd6"
-
-REVISION="2"
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
-SECONDARY_ARCHITECTURES="x86"
-
-DISABLE_SOURCE_PACKAGE=yes
-	# at least as long as Ant and a complete SDK image are part of the sources
-
-PROVIDES="
-	openjdk = $portVersion compat >= 1
-	cmd:apt = $portVersion compat >= 1
-	cmd:extcheck = $portVersion compat >= 1
-	cmd:idlj = $portVersion compat >= 1
-	cmd:jar = $portVersion compat >= 1
-	cmd:jarsigner = $portVersion compat >= 1
-	cmd:java = $portVersion compat >= 1
-	cmd:java_config = $portVersion compat >= 1
-	cmd:javac = $portVersion compat >= 1
-	cmd:javadoc = $portVersion compat >= 1
-	cmd:javah = $portVersion compat >= 1
-	cmd:javap = $portVersion compat >= 1
-	cmd:jconsole = $portVersion compat >= 1
-	cmd:jdb = $portVersion compat >= 1
-	cmd:jhat = $portVersion compat >= 1
-	cmd:jinfo = $portVersion compat >= 1
-	cmd:jmap = $portVersion compat >= 1
-	cmd:jps = $portVersion compat >= 1
-	cmd:jrunscript = $portVersion compat >= 1
-	cmd:jsadebugd = $portVersion compat >= 1
-	cmd:jstack = $portVersion compat >= 1
-	cmd:jstat = $portVersion compat >= 1
-	cmd:jstatd = $portVersion compat >= 1
-	cmd:keytool = $portVersion compat >= 1
-	cmd:native2ascii = $portVersion compat >= 1
-	cmd:orbd = $portVersion compat >= 1
-	cmd:pack200 = $portVersion compat >= 1
-	cmd:rmic = $portVersion compat >= 1
-	cmd:rmid = $portVersion compat >= 1
-	cmd:rmiregistry = $portVersion compat >= 1
-	cmd:schemagen = $portVersion compat >= 1
-	cmd:serialver = $portVersion compat >= 1
-	cmd:servertool = $portVersion compat >= 1
-	cmd:tnameserv = $portVersion compat >= 1
-	cmd:unpack200 = $portVersion compat >= 1
-	cmd:wsgen = $portVersion compat >= 1
-	cmd:wsimport = $portVersion compat >= 1
-	cmd:xjc = $portVersion compat >= 1
-	"
-
-REQUIRES="
-	haiku$secondaryArchSuffx
-	lib:libfreetype$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libfreetype$secondaryArchSuffix
-	devel:libiconv$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-
-BUILD_PREREQUIRES="
-	cmd:cpio >= 2.10
-	cmd:make
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:sed
-	cmd:tar
-	cmd:zip
-	"
-
-PATCH()
-{
-	# patch Ant
-	cd $sourceDir2
-	sed -i 's/depends=\"jars,test-jar\"/depends=\"jars\"/' build.xml
-
-	# small patch allowing to finish build without errors
-	# this modification already exists in another dev branch
-	# if someone fix it in current branch, using sed rather than patch should
-	# not brake the whole build
-	cd $sourceDir3
-	sed -i s/'$(PRINTF) "--'/'$(PRINTF) -- "--'/ make/Defs-internal.gmk
-}
-
-BUILD()
-{
-	OPENJDK_DIR=$(dirname $sourceDir)
-
-	# build Apache Ant
-	export LIBRARY_PATH=${OPENJDK_DIR}/j2sdk-image/jre/lib/i386/:$LIBRARY_PATH
-	export JAVA_HOME=${OPENJDK_DIR}/j2sdk-image
-	export ANT_HOME=${OPENJDK_DIR}/ant
-	cd $sourceDir2
-	sh build.sh install-lite
-	unset JAVA_HOME
-
-	# prepare the directory structure
-	cd $OPENJDK_DIR
-	ln -sfn $sourceDir3 jdk
-	ln -sfn $sourceDir4 jdk/corba
-	ln -sfn $sourceDir5 jdk/hotspot
-	ln -sfn $sourceDir6 jdk/jaxp
-	ln -sfn $sourceDir7 jdk/jaxws
-	ln -sfn $sourceDir8 jdk/jdk
-	ln -sfn $sourceDir9 jdk/langtools
-
-	export ALT_DROPS_DIR=${OPENJDK_DIR}/drop
-	mkdir -p ${ALT_DROPS_DIR}
-
-	cp $sourceDir10/jaxp145_01.zip $ALT_DROPS_DIR
-	cp $sourceDir11/jdk7-jaf-2010_08_19.zip $ALT_DROPS_DIR
-	cp $sourceDir12/jdk7-jaxws2_2_4-b03-2011_05_27.zip $ALT_DROPS_DIR
-
-	# set up environment
-	export ALT_BOOTDIR=${OPENJDK_DIR}/j2sdk-image
-	export ALT_JDK_IMPORT_PATH=$ALT_BOOTDIR
-	export ANT=${OPENJDK_DIR}/ant
-	export ALT_OUTPUTDIR=${OPENJDK_DIR}/output
-	export LANG=C
-	export PATH=$PATH:$ANT_HOME/bin
-
-	# use PATH to search commands rather than explicitly set path for each
-	# commands so that grep, egrep & readelf are automatically found
-	# see Defs-haiku.gmk
-	export ALT_UNIXCOMMAND_PATH=
-
-	mkdir -p ${ALT_OUTPUTDIR}
-
-	export ALLOW_DOWNLOADS=false
-
-	export USE_EXTERNAL_ZLIB=true
-
-	# Build.
-	cd jdk
-	make
-
-	# The build system is broken in that it doesn't pick up all auto-generated
-	# java sources (it uses "find ... -name '*.java'" too early). Unfortunately
-	# that isn't easy to fix, so we just run a second make, which will pick up
-	# the then already existing files.
-	make
-}
-
-INSTALL()
-{
-	# install the generated SDK image dir
-	cd ..
-	jdkDir=$libDir/openjdk
-	mkdir -p $(dirname $jdkDir)
-	cp -a output/j2sdk-image $jdkDir
-
-	# symlink the executables to binDir
-	mkdir -p $binDir
-	symlinkRelative -s $jdkDir/bin/* $binDir
-		# TODO: We should probably link only a subset.
-
-	# create a java-config script in binDir
-	javaConfig=$binDir/java-config
-	sed -e "s,%JAVA_HOME%,$jdkDir," $portDir/sources/java-config.in \
-		> $javaConfig
-	chmod a+x $javaConfig
-
-	# create a profile.d file that sets up JAVA_HOME
-	jdkProfile=$dataDir/profile.d/openjdk.sh
-	mkdir -p $(dirname $jdkProfile)
-	echo 'JAVA_HOME=`java-config -H`' > $jdkProfile
-	echo "export JAVA_HOME" >> $jdkProfile
-}
diff --git a/dev-lang/openjdk/openjdk-1.7_u80_b00.recipe b/dev-lang/openjdk/openjdk-1.7_u80_b00.recipe
deleted file mode 100644
index 9af7e6b87..000000000
--- a/dev-lang/openjdk/openjdk-1.7_u80_b00.recipe
+++ /dev/null
@@ -1,178 +0,0 @@
-SUMMARY="Open-source implementation of the Java Platform, SE."
-DESCRIPTION="OpenJDK (Open Java Development Kit) is a free and open source \
-implementation of the Java Platform, Standard Edition (Java SE). It is the \
-result of an effort Sun Microsystems began in 2006. The implementation is \
-licensed under the GNU General Public License (GNU GPL) with a linking \
-exception. Were it not for the GPL linking exception, components that linked \
-to the Java class library would be subject to the terms of the GPL license. \
-OpenJDK is the official Java SE 7 reference implementation."
-HOMEPAGE="http://openjdk.java.net/"
-COPYRIGHT="2012 Oracle and/or its affiliates."
-LICENSE="GNU GPL v2"
-
-SRC_URI="https://dl.dropboxusercontent.com/u/61946213/j2sdk-image-140528.tar.xz"
-CHECKSUM_SHA256="fe9ad5156baf62a14213667f18bf88035daf5f24d6370afc9af30d079d8609a3"
-SOURCE_DIR="j2sdk-image"
-
-SRC_URI_2="http://www.eu.apache.org/dist/ant/binaries/apache-ant-1.9.4-bin.zip"
-CHECKSUM_SHA256_2="973d97d656e65561e2753823de6cf6db35570aaf93eeec6e7cb3d68e1ec4d0e8"
-SOURCE_DIR_2="apache-ant-1.9.4"
-
-SRC_URI_3="hg+http://hg.openjdk.java.net/jdk7u/jdk7u#jdk7u80-b00"
-SRC_URI_4="hg+http://hg.openjdk.java.net/jdk7u/jdk7u/langtools#jdk7u80-b00"
-SRC_URI_5="hg+http://bitbucket.org/hamishm/haiku-jdk7u-corba"
-SRC_URI_6="hg+http://hg.openjdk.java.net/jdk7u/jdk7u/jaxp#jdk7u80-b00"
-SRC_URI_7="hg+http://hg.openjdk.java.net/jdk7u/jdk7u/jaxws#jdk7u80-b00"
-SRC_URI_8="hg+http://bitbucket.org/hamishm/haiku-jdk7u-hotspot"
-SRC_URI_9="hg+http://bitbucket.org/hamishm/haiku-jdk7u-jdk"
-
-REVISION="3"
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
-SECONDARY_ARCHITECTURES="x86"
-
-DISABLE_SOURCE_PACKAGE=yes
-	# at least as long as Ant and a complete SDK image are part of the sources
-
-PROVIDES="
-	openjdk$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:apt$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:extcheck$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:idlj$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:jar$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:jarsigner$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:java$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:java_config$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:javac$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:javadoc$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:javah$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:javap$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:jcmd$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:jconsole$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:jdb$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:jhat$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:jinfo$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:jmap$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:jps$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:jrunscript$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:jsadebugd$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:jstack$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:jstat$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:jstatd$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:keytool$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:native2ascii$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:orbd$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:pack200$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:rmic$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:rmid$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:rmiregistry$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:schemagen$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:serialver$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:servertool$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:tnameserv$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:unpack200$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:wsgen$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:wsimport$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:xjc$secondaryArchSuffix = $portVersion compat >= 1
-	"
-
-REQUIRES="
-	haiku$secondaryArchSuffx
-	lib:libfreetype$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libfreetype$secondaryArchSuffix
-	devel:libiconv$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-
-BUILD_PREREQUIRES="
-	cmd:cpio >= 2.10
-	cmd:make
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:sed
-	cmd:tar
-	cmd:zip
-	cmd:awk
-	cmd:hostname
-	cmd:find
-	cmd:unzip
-	cmd:unzipsfx
-	cmd:head
-	"
-
-BUILD()
-{
-	OPENJDK_DIR=$(dirname $sourceDir)
-
-	# prepare the directory structure
-	cd $OPENJDK_DIR
-	ln -sfn $sourceDir3 jdk
-	ln -sfn $sourceDir4 jdk/langtools
-	ln -sfn $sourceDir5 jdk/corba
-	ln -sfn $sourceDir6 jdk/jaxp
-	ln -sfn $sourceDir7 jdk/jaxws
-	ln -sfn $sourceDir8 jdk/hotspot
-	ln -sfn $sourceDir9 jdk/jdk
-
-	chmod u+x ${sourceDir2}/bin/ant
-
-	# set up environment
-	export ALT_BOOTDIR=${OPENJDK_DIR}/j2sdk-image
-	export ALT_JDK_IMPORT_PATH=$ALT_BOOTDIR
-	export ANT_HOME=${sourceDir2}
-	export ALT_OUTPUTDIR=${OPENJDK_DIR}/output
-	export ALT_UNIXCOMMAND_PATH=
-
-	export LC_ALL=C
-
-	# If ASLR is enabled, the JVM can fail to find a large enough area for
-	# the heap.
-	export DISABLE_ASLR=1
-
-	if [ -n "$secondaryArchSuffix" ]; then
-		export ALT_COMPILER_PATH=`finddir B_SYSTEM_BIN_DIRECTORY`$secondaryArchSubDir
-		export ALT_FREETYPE_HEADERS_PATH=`finddir B_SYSTEM_HEADERS_DIRECTORY`$secondaryArchSubDir
-	fi
-
-	export USE_EXTERNAL_ZLIB=true
-
-	# Build.
-	cd jdk
-	make
-}
-
-INSTALL()
-{
-	# install the generated SDK image dir
-	cd ..
-	jdkDir=$libDir/openjdk
-	mkdir -p $(dirname $jdkDir)
-	cp -a output/j2sdk-image $jdkDir
-
-	# symlink the executables to binDir
-	mkdir -p $binDir
-	symlinkRelative -s $jdkDir/bin/* $binDir
-		# TODO: We should probably link only a subset.
-
-	# create a java-config script in binDir
-	javaConfig=$binDir/java-config
-	sed -e "s,%JAVA_HOME%,$jdkDir," $portDir/sources/java-config.in \
-		> $javaConfig
-	chmod a+x $javaConfig
-
-	# create a profile.d file that sets up JAVA_HOME
-	jdkProfile=$dataDir/profile.d/openjdk.sh
-	mkdir -p $(dirname $jdkProfile)
-	echo 'JAVA_HOME=`java-config -H`' > $jdkProfile
-	echo "export JAVA_HOME" >> $jdkProfile
-}