aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2011-11-04 15:09:00 +0000
committerVlastimil Babka <caster@gentoo.org>2011-11-04 15:09:00 +0000
commit3a9be86ca17bc7d70951f4298f37e1dda859c8bc (patch)
tree94cd17497ee5a00186b755a143a04fa77a9cc6ad /virtual
parentAdd ~x86 keyword. (diff)
downloadjava-3a9be86ca17bc7d70951f4298f37e1dda859c8bc.tar.gz
java-3a9be86ca17bc7d70951f4298f37e1dda859c8bc.tar.bz2
java-3a9be86ca17bc7d70951f4298f37e1dda859c8bc.zip
Moved to main tree.
(Portage version: 2.2.0_alpha68/svn/Linux x86_64, RepoMan options: --force, unsigned Manifest commit) svn path=/java-overlay/; revision=8883
Diffstat (limited to 'virtual')
-rw-r--r--virtual/jdk/ChangeLog3
-rw-r--r--virtual/jdk/Manifest3
-rw-r--r--virtual/jdk/jdk-1.7.0.ebuild20
3 files changed, 4 insertions, 22 deletions
diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index 69280bc8..32c1c4e8 100644
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 04 Nov 2011; Vlastimil Babka <caster@gentoo.org> -jdk-1.7.0.ebuild:
+ Moved to main tree.
+
*jdk-1.7.0 (09 Sep 2011)
09 Sep 2011; Andrew John Hughes <andrew@gentoo.org> +jdk-1.7.0.ebuild:
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index 1ec368ad..061300a9 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.7.0.ebuild 454 RMD160 36697fb55a5c0bb158fd61ab7b57ed48cce9dfc9 SHA1 4b64a75f482aa237678483bcfa3888d12af885d4 SHA256 561d650793be2a79f013592562cfd07ae9cd67408d5366bab8c3c1a046af3a62
-MISC ChangeLog 3475 RMD160 328bd7cfcdd4a6b08228fa8f864e534072adefa1 SHA1 3a8531a92cd945b851c034d61f6e53e1f284c40f SHA256 25b2e1bb09321e9f632dce022b30a5271e775eb907081e7ebdb86305b8d33b05
+MISC ChangeLog 3568 RMD160 664e8a1d112f992bacb491a8f79d87254612810e SHA1 00d13c847b9bd285e8e60e6ab51c88917e6b830f SHA256 1e04d3b842b957a11d98978ff367512073ee961097aeb496d8e98ef649780a28
MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
diff --git a/virtual/jdk/jdk-1.7.0.ebuild b/virtual/jdk/jdk-1.7.0.ebuild
deleted file mode 100644
index 75326a24..00000000
--- a/virtual/jdk/jdk-1.7.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild,v 1.1 2011/09/08 07:33:39 caster Exp $
-
-DESCRIPTION="Virtual for JDK"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="1.7"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-EAPI="2"
-
-# Keeps this and java-virtuals/jaf in sync
-RDEPEND="|| (
- dev-java/icedtea:7
- =dev-java/oracle-jdk-bin-1.7.0*
- )"
-DEPEND=""