commit: b494054bd934de55610b1848ed89e222a4b52c61
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Sat May 21 15:23:16 2016 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Sat May 21 15:23:16 2016 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=b494054b
dev-java/icedtea: Drop icedtea-bin:6 support as now removed from main tree.
Package-Manager: portage-2.2.27
dev-java/icedtea/ChangeLog | 5 +++++
dev-java/icedtea/icedtea-6.1.13.11.ebuild | 4 +---
dev-java/icedtea/icedtea-6.9999.ebuild | 4 +---
dev-java/icedtea/icedtea-7.2.6.6.ebuild | 4 +---
dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild | 4 +---
5 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 17c9541..c25a9b3 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 21 May 2016; Andrew John Hughes <gnu_and...@member.fsf.org>
+ icedtea-6.1.13.11.ebuild, icedtea-6.9999.ebuild, icedtea-7.2.6.6.ebuild,
+ icedtea-7.2.7.0_pre05.ebuild:
+ dev-java/icedtea: Drop icedtea-bin:6 support as now removed from main tree.
+
*icedtea-3.1.0_pre02 (21 May 2016)
21 May 2016; Andrew John Hughes <gnu_and...@member.fsf.org>
diff --git a/dev-java/icedtea/icedtea-6.1.13.11.ebuild
b/dev-java/icedtea/icedtea-6.1.13.11.ebuild
index e62bda6..b4cfba7 100644
--- a/dev-java/icedtea/icedtea-6.1.13.11.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.11.ebuild
@@ -103,7 +103,6 @@ RDEPEND="${COMMON_DEP}
DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
${X_DEPEND}
|| (
>=dev-java/gcj-jdk-4.3
- dev-java/icedtea-bin:6
dev-java/icedtea:6
)
app-arch/cpio
@@ -145,8 +144,7 @@ pkg_setup() {
icedtea_check_requirements
JAVA_PKG_WANT_BUILD_VM="
- icedtea-6 icedtea-bin-6
- gcj-jdk"
+ icedtea-6 gcj-jdk"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"
diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild
b/dev-java/icedtea/icedtea-6.9999.ebuild
index eabe7de..83ee5e2 100644
--- a/dev-java/icedtea/icedtea-6.9999.ebuild
+++ b/dev-java/icedtea/icedtea-6.9999.ebuild
@@ -101,7 +101,6 @@ RDEPEND="${COMMON_DEP}
DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
${X_DEPEND}
|| (
>=dev-java/gcj-jdk-4.3
- dev-java/icedtea-bin:6
dev-java/icedtea:6
)
app-arch/cpio
@@ -143,8 +142,7 @@ pkg_setup() {
icedtea_check_requirements
JAVA_PKG_WANT_BUILD_VM="
- icedtea-6 icedtea-bin-6
- gcj-jdk"
+ icedtea-6 gcj-jdk"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"
diff --git a/dev-java/icedtea/icedtea-7.2.6.6.ebuild
b/dev-java/icedtea/icedtea-7.2.6.6.ebuild
index fc7f682..f10ade0 100644
--- a/dev-java/icedtea/icedtea-7.2.6.6.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.6.ebuild
@@ -136,7 +136,6 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP}
${X_COMMON_DEP} ${X_
|| (
>=dev-java/gcj-jdk-4.3
dev-java/icedtea-bin:7
- dev-java/icedtea-bin:6
dev-java/icedtea:7
dev-java/icedtea:6
)
@@ -181,8 +180,7 @@ pkg_setup() {
JAVA_PKG_WANT_BUILD_VM="
icedtea-7 icedtea-bin-7
- icedtea-6 icedtea-bin-6
- gcj-jdk"
+ icedtea-6 gcj-jdk"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"
diff --git a/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild
b/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild
index 714e065..c4c2275 100644
--- a/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild
@@ -136,7 +136,6 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP}
${X_COMMON_DEP} ${X_
|| (
>=dev-java/gcj-jdk-4.3
dev-java/icedtea-bin:7
- dev-java/icedtea-bin:6
dev-java/icedtea:7
dev-java/icedtea:6
)
@@ -181,8 +180,7 @@ pkg_setup() {
JAVA_PKG_WANT_BUILD_VM="
icedtea-7 icedtea-bin-7
- icedtea-6 icedtea-bin-6
- gcj-jdk"
+ icedtea-6 gcj-jdk"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"
