dev-java/gcj-jdk: Update to latest version of GCC 5 and merge with broken system version, which lacks environment file.

Package-Manager: portage-2.3.5

4 files changed, 18 insertions, 120 deletions

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index 3261fcef..8beb1bcc 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for dev-java/gcj-jdk
-# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2018 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 $
 
+*gcj-jdk-5.4.0-r1 (03 Feb 2018)
+
+  03 Feb 2018; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  +files/gcj-jdk.env.sh, +gcj-jdk-5.4.0-r1.ebuild, -files/gcj-jdk.env,
+  -gcj-jdk-5.1.0-r2.ebuild, -gcj-jdk-5.3.0.ebuild:
+  dev-java/gcj-jdk: Update to latest version of GCC 5 and merge with broken
+  system version, which lacks environment file.
+
 *gcj-jdk-5.3.0 (25 Mar 2016)
 
   25 Mar 2016; Andrew John Hughes <gnu_andrew@member.fsf.org>
diff --git a/dev-java/gcj-jdk/files/gcj-jdk.env b/dev-java/gcj-jdk/files/gcj-jdk.env.sh
index beed450e..0fde8b32 100644
--- a/dev-java/gcj-jdk/files/gcj-jdk.env
+++ b/dev-java/gcj-jdk/files/gcj-jdk.env.sh
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-VERSION="GCJ @PV@"
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/lib/@P@"
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/lib/@P@"
+VERSION="GCJ ${PV}"
+JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${P}"
+JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${P}"
 JAVAC="${JAVA_HOME}/bin/javac"
 PATH="${JAVA_HOME}/bin"
 ROOTPATH="${JAVA_HOME}/bin"
diff --git a/dev-java/gcj-jdk/gcj-jdk-5.1.0-r2.ebuild b/dev-java/gcj-jdk/gcj-jdk-5.1.0-r2.ebuild
deleted file mode 100644
index 8790c660..00000000
--- a/dev-java/gcj-jdk/gcj-jdk-5.1.0-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit java-vm-2 multilib
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-#KEYWORDS="~amd64"
-SLOT="0"
-IUSE="awt javadoc"
-
-API_DIFF_PV="5.1.0"
-
-# perl is needed for javac wrapper
-RDEPEND="
-	dev-java/ecj-gcj:*
-	dev-lang/perl
-	~sys-devel/gcc-${PV}[awt?,gcj]
-	javadoc? ( dev-java/gnu-classpath:0[gjdoc] )"
-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 gcjprefix="${EPREFIX}${gcjhome}"
-	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}/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 awt && dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-	use javadoc && dosym /usr/bin/gjdoc ${gcjhome}/bin/javadoc
-
-	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
-
-	exeinto ${gcjhome}/bin
-	sed -e "s#@JAVA@#${gcjprefix}/bin/java#" \
-		-e "s#@ECJ_JAR@#${EPREFIX}/usr/share/eclipse-ecj/ecj.jar#" \
-		-e "s#@RT_JAR@#${gcjprefix}/jre/lib/rt.jar#" \
-		-e "s#@TOOLS_JAR@#${gcjprefix}/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-5.3.0.ebuild b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
index fb8452bd..021552bc 100644
--- a/dev-java/gcj-jdk/gcj-jdk-5.3.0.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit java-vm-2 multilib
 
 DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
+HOMEPAGE="https://www.gentoo.org/"
 SRC_URI=""
 
 LICENSE="GPL-2"
@@ -15,7 +14,7 @@ KEYWORDS="~amd64"
 SLOT="0"
 IUSE="awt javadoc"
 
-API_DIFF_PV="${PV}"
+API_DIFF_PV="5.1.0"
 
 # perl is needed for javac wrapper
 RDEPEND="
@@ -88,7 +87,7 @@ src_install() {
 	| newexe - javac
 	assert
 
-	set_java_env
+	java-vm_install-env
 }
 
 pkg_postinst() {