diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2011-02-13 11:55:29 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2011-02-13 11:55:29 +0000 |
| commit | 0ed6c03af6432934306f9b203411c2fc0cab187e (patch) | |
| tree | a80617f6b85abf7268a02b262b852e1925bd1365 /virtual | |
| parent | Security update: http://blog.fuseyism.com/index.php/2011/02/09/security-icedt... (diff) | |
| download | java-0ed6c03af6432934306f9b203411c2fc0cab187e.tar.gz java-0ed6c03af6432934306f9b203411c2fc0cab187e.tar.bz2 java-0ed6c03af6432934306f9b203411c2fc0cab187e.zip | |
Remove the 1.6 ebuild, as it's outdated and the one in main tree supports everything needed.
(Portage version: 2.2.0_alpha23/svn/Linux x86_64, RepoMan options: --force)
svn path=/java-overlay/; revision=8313
Diffstat (limited to 'virtual')
| -rw-r--r-- | virtual/jdk/ChangeLog | 6 | ||||
| -rw-r--r-- | virtual/jdk/Manifest | 3 | ||||
| -rw-r--r-- | virtual/jdk/jdk-1.6.0-r2.ebuild | 28 |
3 files changed, 6 insertions, 31 deletions
diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog index 400930e5..f9521391 100644 --- a/virtual/jdk/ChangeLog +++ b/virtual/jdk/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for virtual/jdk -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 13 Feb 2011; Vlastimil Babka <caster@gentoo.org> -jdk-1.6.0-r2.ebuild: + Remove the 1.6 ebuild, as it's outdated and the one in main tree supports + everything needed. + 01 Apr 2010; Vlastimil Babka <caster@gentoo.org> -jdk-1.5.0-r1.ebuild, jdk-1.5.0-r2.ebuild, -jdk-1.6.0-r1.ebuild, jdk-1.6.0-r2.ebuild: Instead of gnu-classpath-jdk, list all its alternatives directly. The diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest index efbca9f5..74fe40c4 100644 --- a/virtual/jdk/Manifest +++ b/virtual/jdk/Manifest @@ -1,5 +1,4 @@ EBUILD jdk-1.4.2-r1.ebuild 573 RMD160 71f92afd309fb03877a41ed9ca32eff6b35a50d4 SHA1 29462a9026d011ad3e191e916664457635f8c3cb SHA256 0634a8b3715a15a8b2f1657d4c17a02464b7a23921f9de924009ccb135caed5b EBUILD jdk-1.5.0-r2.ebuild 660 RMD160 a6483d726edeabf748bf34da186a3e4f88c1eba2 SHA1 646fda9b45f91a87ec32149e50a06f65c3d740cc SHA256 42da855b634b99d48cda9936b99725146fe75dc2eac9c01e98e66a133020fc2f -EBUILD jdk-1.6.0-r2.ebuild 853 RMD160 a2248d607029ad5751b807cb06dfa795e7f82ae7 SHA1 e04f770028a20d1b3304ab52beb669bb47f079a6 SHA256 28f595c68f457e3fe9c23b57cf67cedac3d662cb77538cff538e1dcdf397fb0a -MISC ChangeLog 3143 RMD160 652d62bc4dfc1836f7d246f0942716398ada722a SHA1 0493814a2ec39df5aa5cb3d3d42ca77e530d1aa2 SHA256 175d381dfa3bb66e429b5bf7a67f31988be75a6ca96db28d6ea71d2d6efb782b +MISC ChangeLog 3314 RMD160 28d86f0907bc4449d521e0f85d80c151c315b106 SHA1 aa2ae74b057de1a8d563de839b8713f9b1b4caf6 SHA256 ee6087749b3448b0c8c6ae00c61bcfcdff1ea854554458066438681056e3b4d5 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb diff --git a/virtual/jdk/jdk-1.6.0-r2.ebuild b/virtual/jdk/jdk-1.6.0-r2.ebuild deleted file mode 100644 index c9ba4001..00000000 --- a/virtual/jdk/jdk-1.6.0-r2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.6 2008/01/18 01:41:42 ranger Exp $ - -EAPI="1" - -DESCRIPTION="Virtual for JDK" -HOMEPAGE="http://java.sun.com/" -SRC_URI="" - -LICENSE="as-is" -SLOT="1.6" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" - -# Keeps this and java-virtuals/jaf in sync -RDEPEND="|| ( - dev-java/icedtea6-bin - dev-java/icedtea:6 - =dev-java/sun-jdk-1.6.0* - =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* - )" -DEPEND="" |