Drop java on ia64 and also drop old version.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9C6D7DE4)

3 files changed, 8 insertions, 114 deletions

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index 51dd65577545..363f7a756e8d 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/gcj-jdk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.19 2015/05/21 08:50:13 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.20 2015/07/11 09:19:56 chewi Exp $
+
+  11 Jul 2015; James Le Cuirot <chewi@gentoo.org> -gcj-jdk-4.7.3-r1.ebuild,
+  gcj-jdk-4.7.4.ebuild:
+  Drop java on ia64 and also drop old version.
 
   21 May 2015; James Le Cuirot <chewi@gentoo.org> -gcj-jdk-4.8.3.ebuild,
   gcj-jdk-4.8.4.ebuild:
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild
deleted file mode 100644
index ba7808501d62..000000000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild,v 1.1 2014/07/14 18:45:53 sera Exp $
-
-EAPI="5"
-
-inherit java-vm-2 multilib
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
-SLOT="0"
-IUSE="X"
-
-ECJ_GCJ_SLOT="3.6"
-API_DIFF_PV="4.8.2"
-
-# perl is needed for javac wrapper
-RDEPEND="
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}
-	dev-lang/perl
-	~sys-devel/gcc-${PV}[gcj]
-	X? ( ~sys-devel/gcc-${PV}[awt] )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gcc_version=${PV}
-	local gccbin=$(gcc-config -B ${gcc_version})
-	gccbin=${gccbin#"${EPREFIX}"}
-	local gcclib=$(gcc-config -L ${gcc_version} | cut -d':' -f1)
-	gcclib=${gcclib#"${EPREFIX}"}
-	local gcjhome="/usr/$(get_libdir)/${P}"
-	local gccchost="${CHOST}"
-	local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*)
-	gcjlibdir=${gcjlibdir#"${EPREFIX}"}
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gccbin}/gij ${gcjhome}/bin/java
-	dosym ${gccbin}/gij ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dodir ${gcjhome}/jre/lib/${libarch}/server
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	use X && dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}/include
-
-	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
-	exeinto ${gcjhome}/bin
-	sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
-		-e "s#@ECJ_JAR@#${ecj_jar}#" \
-		-e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
-		-e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
-		"${FILESDIR}"/javac.in \
-	| newexe - javac
-	assert
-
-	set_java_env
-}
-
-pkg_postinst() {
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 or 1.6 APIs."
-	ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${API_DIFF_PV}.html"
-	ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${API_DIFF_PV}.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-}
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild
index ce8672f760ec..410f89807b9e 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.7.4.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/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild,v 1.1 2014/07/14 18:45:53 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild,v 1.2 2015/07/11 09:19:56 chewi Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gentoo.org/"
 SRC_URI=""
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-linux"
 SLOT="0"
 IUSE="X"