4 files changed, 7 insertions, 107 deletions
diff --git a/dev-java/apple-jdk-bin/ChangeLog b/dev-java/apple-jdk-bin/ChangeLog
index c69ebf7dbc8b..9bb0da196e88 100644
--- a/dev-java/apple-jdk-bin/ChangeLog
+++ b/dev-java/apple-jdk-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/apple-jdk-bin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/apple-jdk-bin/ChangeLog,v 1.4 2012/11/27 07:54:39 grobian Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/apple-jdk-bin/ChangeLog,v 1.5 2015/02/11 08:56:52 fordfrog Exp $
+
+  11 Feb 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  -apple-jdk-bin-1.4.2.ebuild, -apple-jdk-bin-1.5.0.ebuild:
+  removed obsolete ebuilds
 
   27 Nov 2012; Fabian Groffen <grobian@gentoo.org> apple-jdk-bin-1.4.2.ebuild,
   apple-jdk-bin-1.5.0.ebuild, apple-jdk-bin-1.6.0.ebuild:
diff --git a/dev-java/apple-jdk-bin/Manifest b/dev-java/apple-jdk-bin/Manifest
index a0969e239a15..dfde9ee796fe 100644
--- a/dev-java/apple-jdk-bin/Manifest
+++ b/dev-java/apple-jdk-bin/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX apple-jdk-bin-1.4.env 1073 SHA256 6768e274bf7d64b1ab7547c2872941755eff1dada70e96c848e2e1e8d12437b8 SHA512 c0199d1ae4f39d2c6d3db39ba6987eb80135c7c9d23fe14da5531a30948ff3600657d07ee31823a7bf4178c7263592c449cbf7db06b5f60a8ff739cf6256e109 WHIRLPOOL 6bc9f6501aec8ee1667fbae062d325531fa96a90660de7251cfddd8f8d0c4003e03661bc8e64a5244d9ae8e21dbe6586dcedba439db3f614a96c7b6623149be7
 AUX apple-jdk-bin-1.5.env 1022 SHA256 a4f07ffb5e3fff6c5e800a406e6e10498626aeed52c9dd662e92f0a5cac04626 SHA512 dddbf2b528d7c10a6b2b1ea491693d98ce51aec6bfd60a80bbfe9ff201ce89e068f74b345b2584bb198f8f84e76fde2e0bd971f8e01a91073acfd7551e478ea2 WHIRLPOOL 35ab1d5a4cb6bac5e06f695aac9f25771bb4ecefe4d68cde107b3f85d31a65727039532574bce7603458efe849467073f539c5f292a746aa70dbf26cbdf7c11f
 AUX apple-jdk-bin-1.6.env 1022 SHA256 5dc55cdb0f2cf366e6cb83a70bb324978fd250142451108644f09c71f1558f52 SHA512 a3f159575026146ead28e45e2b05b305a8e92e0124e868b86ec2fe7406fc9756cf20246e4ad00be293f6d2a57c6d2426abe02f5e0b376fc3b207cbfefc2e3170 WHIRLPOOL 4bae248f3d29f894c5c402d71b10b501e42784ba5abb715bacfe8a2c763c582d1bd05679b3dc463a3cb248d5b48cc913fb9a3b01084cd0cecdb0f675cca139ee
-EBUILD apple-jdk-bin-1.4.2.ebuild 1420 SHA256 bc803f8213ccf89ac3459e39cfc38a46cc9853903c21639da48048ef83736a07 SHA512 03a09a7d79ab5c168a750a7bd227c019bdcd74be1f80a17c1ede2c1d9bd8841f79b62643fb9924e57e88e0c6db2e35e0193edc73d23be2e93e9fe7e194ab8566 WHIRLPOOL 33b7642172701a10a45da79834174c23dfd0454096e6941c3ff98733f0b8f85cd4d1a6d762de53a01c6d5fdf527ed075042a190e00aad691bdcdf97c28bf5306
-EBUILD apple-jdk-bin-1.5.0.ebuild 1431 SHA256 ae9d7eac2522843c02f601dd9192bca4a9518ec97cd887a2d6450b1ef889d977 SHA512 a466e398ea1a8ac5f5dec8c4beb98848cf1a99f938299dc223d8b17bb5d2927b29a7be7923c4e32d3fda418f4b73cc5dbbf85b0489e915c6e3f1cf72ec6a461f WHIRLPOOL 7d939243b80e60bde69f4240689c5377a736e520e20b13241ad1be7832ef2df26d55a84c2cceea5664e325fb0fdd4de34f7cfaea12ebd7ac8964ab4eba5a37c5
 EBUILD apple-jdk-bin-1.6.0.ebuild 1500 SHA256 e32f44c4b3b09f3a29709e3c5c26a41c6375bdfa85c698c4f786bbb5c7074308 SHA512 c4c71be0200a967d825c1e7dc7973dd99c500e2afc4ba2114871c5d4574d461e11aafff3c71e1d9db5eae07035b17b783553987b803b60a77fb44e6e659bd0be WHIRLPOOL 52def78a04a9a4bd50b976debdf99e518447e2c5fc5b5eaac497bd071359fa8a5cad3377433cf891893c45ea8f54032bba2aaa7641c5d679a392ccc60756f190
-MISC ChangeLog 1419 SHA256 bc86cb3a43f44ba3aae9a97f982ea3e4a3592c3688878d6da3ceed829882bf95 SHA512 f24ff8e73fee198ce49822fb1522a4ca4147cd6f82689460c2fe6ffb71bc06e4c14a6b99143582958a7da86db8937c9508d50011acb4b3a0b8c716216f5e891a WHIRLPOOL 936a1fcb0b18b9c3551df7fac02ec5392095dc5331a0235769fcb1194558e18d8322af29780443a7c3a1cc728a1090840ddd7d4386023342e05d50ec44f7f5da
+MISC ChangeLog 1560 SHA256 86ce4d1597a55d5b1601b118ff91ca84f5665daee478e47ece6d3f2ac229ef1d SHA512 0468eda7b002c7aa82e5b827df5a5838664714242e0b2b542088ec7ec3a66e2c5f84414541490898d8f9c61508f51a8c3891c249d1f9197be53d0f1907e890ee WHIRLPOOL 4eb4c17084a8146859d33ede41af9af52aff4283407058c40895fac8cf1090874102112cfb8b8f6d1530e8f17ded5a1fa0e1cd91364056bfd3905b079b1ccf57
 MISC metadata.xml 160 SHA256 27667dd7db1d188c12342624ec5ff2155717821d646e442aef9a691c65539ac4 SHA512 23ce0baa192a52aed9c84e2f1244b34513a7909c00538dce260a3f06e933aae9377ae0906d0d224d24a708537df1bfbdecf74dd26165aa6ffff1afc9f5aa0359 WHIRLPOOL 4417cf46c7ae7268980d6c3195e3d197227f447b90c2d22158a3882be393cc416a390421241021f2c556adae381911625585025add367f012c1567dd0c3b1a1c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (Darwin)
-
-iEYEAREIAAYFAlC0ccIACgkQX3X2B8XHTom/LQCfcUxl/auPiQ5xK481miw2E+te
-upcAn3PoZRB+zdRa4C1Jt1oRQOZsmgDv
-=jowI
------END PGP SIGNATURE-----
diff --git a/dev-java/apple-jdk-bin/apple-jdk-bin-1.4.2.ebuild b/dev-java/apple-jdk-bin/apple-jdk-bin-1.4.2.ebuild
deleted file mode 100644
index e80d14ae6678..000000000000
--- a/dev-java/apple-jdk-bin/apple-jdk-bin-1.4.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/apple-jdk-bin/apple-jdk-bin-1.4.2.ebuild,v 1.4 2012/11/27 07:54:39 grobian Exp $
-
-JAVA_SUPPORTS_GENERATION_1="true"
-inherit java-vm-2 eutils
-
-DESCRIPTION="Links to Apple's version of Sun's J2SE Development Kit"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
-SLOT="1.4"
-LICENSE="public-domain"
-KEYWORDS="-* ~ppc-macos ~x86-macos"
-IUSE=""
-
-JAVA_PROVIDE="jdbc-stdext"
-
-APPLE_JAVA_DIR="/System/Library/Frameworks/JavaVM.framework/Versions/${PV}/Home"
-
-src_install() {
-	local dirs="bin include lib man"
-	dodir /opt/${P}
-
-	for d in ${dirs}; do
-		ln -s "${APPLE_JAVA_DIR}"/${d} "${ED}"/opt/${P}/${d}
-	done
-	# Apple just puts al JRE stuff in the Home dir next to the JDK stuff,
-	# "emulate" it to make the wrappers happy
-	ln -s "${APPLE_JAVA_DIR}" "${ED}"/opt/${P}/jre
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-	# Create files used as storage for system preferences.
-	touch "${ED}/opt/${P}/.systemPrefs/.system.lock"
-	chmod 644 "${ED}/opt/${P}/.systemPrefs/.system.lock"
-	touch "${ED}/opt/${P}/.systemPrefs/.systemRootModFile"
-	chmod 644 "${ED}/opt/${P}/.systemPrefs/.systemRootModFile"
-
-	set_java_env
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	elog "Note: you're using your OSX (pre-)installed Java installation"
-}
diff --git a/dev-java/apple-jdk-bin/apple-jdk-bin-1.5.0.ebuild b/dev-java/apple-jdk-bin/apple-jdk-bin-1.5.0.ebuild
deleted file mode 100644
index 6f111c2303a8..000000000000
--- a/dev-java/apple-jdk-bin/apple-jdk-bin-1.5.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/apple-jdk-bin/apple-jdk-bin-1.5.0.ebuild,v 1.3 2012/11/27 07:54:39 grobian Exp $
-
-JAVA_SUPPORTS_GENERATION_1="true"
-inherit java-vm-2 eutils
-
-DESCRIPTION="Links to Apple's version of Sun's J2SE Development Kit"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SLOT="1.5"
-LICENSE="public-domain"
-KEYWORDS="-* ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-JAVA_PROVIDE="jdbc-stdext"
-
-APPLE_JAVA_DIR="/System/Library/Frameworks/JavaVM.framework/Versions/${PV}/Home"
-
-src_install() {
-	local dirs="bin include lib man"
-	dodir /opt/${P}
-
-	for d in ${dirs}; do
-		ln -s "${APPLE_JAVA_DIR}"/${d} "${ED}"/opt/${P}/${d}
-	done
-	# Apple just puts al JRE stuff in the Home dir next to the JDK stuff,
-	# "emulate" it to make the wrappers happy
-	ln -s "${APPLE_JAVA_DIR}" "${ED}"/opt/${P}/jre
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-	# Create files used as storage for system preferences.
-	touch "${ED}/opt/${P}/.systemPrefs/.system.lock"
-	chmod 644 "${ED}/opt/${P}/.systemPrefs/.system.lock"
-	touch "${ED}/opt/${P}/.systemPrefs/.systemRootModFile"
-	chmod 644 "${ED}/opt/${P}/.systemPrefs/.systemRootModFile"
-
-	set_java_env
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	elog "Note: you're using your OSX (pre-)installed Java installation"
-}