summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2015-04-14 21:34:29 +0000
committerJames Le Cuirot <chewi@gentoo.org>2015-04-14 21:34:29 +0000
commit950c8e66ae46cf2c7f05a77e8219e331a52a58fa (patch)
treebfe480f1d47e335b2cc2d3dfc21506548c769bed /virtual
parentRemove old. (diff)
downloadhistorical-950c8e66ae46cf2c7f05a77e8219e331a52a58fa.tar.gz
historical-950c8e66ae46cf2c7f05a77e8219e331a52a58fa.tar.bz2
historical-950c8e66ae46cf2c7f05a77e8219e331a52a58fa.zip
Remove dead icedtea-bin-1* and winjdk-bin options as well as
diablo-jdk, which is about to be last-rited. Also remove PREFIX_OPTS because it no longer makes sense. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x9C6D7DE4
Diffstat (limited to 'virtual')
-rw-r--r--virtual/jdk/ChangeLog7
-rw-r--r--virtual/jdk/Manifest26
-rw-r--r--virtual/jdk/jdk-1.6.0-r2.ebuild16
3 files changed, 33 insertions, 16 deletions
diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index a234a8d58c1b..efa4d9e9c253 100644
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for virtual/jdk
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.63 2015/02/11 08:49:39 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.64 2015/04/14 21:34:15 chewi Exp $
+
+ 14 Apr 2015; James Le Cuirot <chewi@gentoo.org> jdk-1.6.0-r2.ebuild:
+ Remove dead icedtea-bin-1* and winjdk-bin options as well as diablo-jdk, which
+ is about to be last-rited. Also remove PREFIX_OPTS because it no longer makes
+ sense.
11 Feb 2015; Miroslav Šulc <fordfrog@gentoo.org> -jdk-1.5.0-r1.ebuild:
removed slot 1.5 per bug #292001
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index edef6db8e1cb..e0aa1ffbdfa4 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,5 +1,27 @@
-EBUILD jdk-1.6.0-r2.ebuild 1496 SHA256 616fa14207e32875d08e0e911d02cec465519a1aafd6313c483f6dad93122ea4 SHA512 22c49cb2b7b17a9055931ad64b0a9f7ff77dbdff32459ca57d4f03cb969d6c04fc858e443480f19a536910489634b7627aff9e4c10ae875eb1807e3bd9d58850 WHIRLPOOL f63e48ee31e2f09eabca7832787d83069be8040b5ce1a38674d66147ac7680eb90fb5f661c8df347b808f3fb55570cc49489dcacf4c8563dd8bcecc97c6a0929
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD jdk-1.6.0-r2.ebuild 1201 SHA256 47beeefea0e033db0b5a05eb8ab10a408c0ab9d6b6d24a63da399925b999ef95 SHA512 f14bf731d4c714ad209b81670d4002f63de2aa1296263d9aaa647653cdefbe67781b412a6b3186f3afced95c8006cc66a76bd1196dc4fc09bcbcbcae2b37d6ae WHIRLPOOL 9a9e54eac46ccffcb338dd68940e0705df628b969ee55a54745e1e237f72a0a9e3e1ce0e2eab7741dbe51de5ca174677f051be1bd402966be7ec8ca672bd7882
EBUILD jdk-1.7.0.ebuild 570 SHA256 e6916abd40962591719a7243c24e9f3da2d79d98b0ad31c0d343fcbd8f85ede8 SHA512 4ec2120b0e1adb58d6d3d64a937faf91ebcc7bc9d626ba37d8773cee4f427059965ef394ea44701dec3b1d6bb83fa4a4386e0aa709d244205ea80b161351cf8a WHIRLPOOL b308585ea0a70d3dc9f6ae891d8c9abdfa46b93c6e8fd675adb136ae8fe8a7565753561ba71bae4b5ff54c3d6e675077433b45a74da5ae8c5a3744c0912200f6
EBUILD jdk-1.8.0.ebuild 582 SHA256 c7af7afecc013c667c55af59bf63ec14908c797a5da56b03dfc7bbb5e35eb7d9 SHA512 d95cb421c96eee85973707adf51b64beca0d8e71b3a3a624def7acc1b3f75bfab915ebb4ddaed72e8373b78fe6c69e6575c1d3d9e56154078e83175765759294 WHIRLPOOL 0302e856a0d2d04e297eac1012248a25e727bcea54a0504187d35d2721626e595415af43eab56e28e71b1ab2bb19f5b0d31211e0b84c32d64441fbb2729332b8
-MISC ChangeLog 8787 SHA256 9519ac0f7868db0e769732affe3725aa251e6609a01f96c88e63cfa913cb287f SHA512 8f70b7b5aa375cea158cde80096fe7edd2fcfaa3c25bfaf9a6b3a7d869b6736bdc65cb6a73c443a2e4f4ff71e91a78820b0bbee7c8ee05eaf782775ffe12975d WHIRLPOOL 3f5d2e2c339f94f7072e6d2f37b9d15295cff0ca6409ee8896430fab7a8749e38d2e352db74737370530648a64cae8a6b750c44ce0cadefe563dc24c9bcc1e04
+MISC ChangeLog 9026 SHA256 b06aa741c3c1a99268fcfb727ec0a1026d7da50f9048cd66aec90bc2d074fe4c SHA512 962d047f413cfd9c48e317200a7a9d27ccae809b4ce129960d8e6ccd21cab93adf809dfbaaed395cd56b8ae909c37a4bfc87e832d9cb75649262b3b6d605681a WHIRLPOOL 919829bca756ce59fca86fd6872d2280f155f495030719d66c11f257475ba3d7cd6eb84ad64c1af75a46368a2e567fac72bec2d6a761c8633a20054581c93af3
MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJVLYfgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kh9cP/0AC4rEaYs6ZebgGqhACe4zU
+cIZFxqoa2z/tBd8v471KlK+mXbgXiesmXyLQgcJHG01yF9Fcb+kJF9Qe780q0HF2
+uFYYPwrWwAfsT0ojvQYn5CbZZEjQ/PG1DcFEagHndXm6qsg+OsJogwMpnInogn1M
+hey2EHQn5QusLbD74qa4PgJs8idrqYTJR8KhjSa0XfEm6RKT6/LfeZHKsmczI9TF
+rYHbmdzc/JgmeM+Mn41CZdQ8cHTgXnQJ2pYlPL8IkpN0AUjENqLUbPkz14oxf8A/
+PuEU81NzAxosX/BYlDxJCoxKArZ4I1IEaNSYBRB4P5r0snXN3+tW0Y7tQR9yTcn+
+YPDwsv9YFLWAaXGDfBHNjhBRlUviojxSTEMEAtO9ymWEowJu5o6cE5/U2FtAfooy
+t6RReKH91yS5lC1Ji3nemhsLIXz3cmTyPHPdMfsL+WJRS7wUqbu7GKDv3bGkT4J2
+WLbFDLYMeO0u6dvQTanIGsquYB7MlkidTBdG2oLe+oms5+UU3/mpILwE2QWuWNFE
+n6kc7D+Y44GP/6mNhmmHKPqfEpKWMQQslWuNzRGjSa4HH4m0BqEiS3MRyRkhG5dT
+cj/DeiBl2s1CtwGi6ZBkCZiKghZQYFi6QpMuTZvi6Cg4kkhiW0F6H1yHlMAXlN3H
+d4nXl/zigFVMRqrEkdHf
+=vhs6
+-----END PGP SIGNATURE-----
diff --git a/virtual/jdk/jdk-1.6.0-r2.ebuild b/virtual/jdk/jdk-1.6.0-r2.ebuild
index 62fb01511b6d..1246dab8b330 100644
--- a/virtual/jdk/jdk-1.6.0-r2.ebuild
+++ b/virtual/jdk/jdk-1.6.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild,v 1.2 2014/05/30 11:20:17 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild,v 1.3 2015/04/14 21:34:15 chewi Exp $
EAPI="4"
@@ -19,22 +19,12 @@ PPC_OPTS="|| (
=dev-java/ibm-jdk-bin-1.6.0*
=dev-java/icedtea-6* )"
-# Prefix defaults - prefer sun-jdk over icedtea
-PREFIX_OPTS="|| (
- =dev-java/icedtea-bin-6*
- =dev-java/icedtea-bin-1* )"
-
-# icedtea-bin-1* is old versioning scheme of icedtea-bin-6*
RDEPEND="|| (
ppc? ( ${PPC_OPTS} )
ppc64? ( ${PPC_OPTS} )
- prefix? ( ${PREFIX_OPTS} )
=dev-java/icedtea-bin-6*
- =dev-java/icedtea-bin-1*
=dev-java/icedtea-6*
=dev-java/ibm-jdk-bin-1.6.0*
=dev-java/hp-jdk-bin-1.6.0*
- =dev-java/diablo-jdk-1.6.0*
=dev-java/soylatte-jdk-bin-1.0*
- =dev-java/apple-jdk-bin-1.6.0*
- =dev-java/winjdk-bin-1.6.0* )"
+ =dev-java/apple-jdk-bin-1.6.0* )"