[gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     e4fccac5b851feca81411b93aa5514448ec80c00
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 22:13:38 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 22:13:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=e4fccac5

dev-java/gcj-jdk: Respect eselect-ecj, fix path prefixes, X -> awt

 * The ecj-gcj SLOT was previously hardcoded but it still used the
   version eselected at build time. Now it will resolve at runtime.
 * Paths have been fixed for prefixed systems.
 * X flag has changed to awt to better reflect what it does.

These changes have been mirrored from the main tree.

Package-Manager: portage-2.2.20.1

 ...jdk-5.1.0-r1.ebuild => gcj-jdk-5.1.0-r2.ebuild} | 24 +++++++++++-----------
 dev-java/gcj-jdk/metadata.xml                      | 21 ++++++++++---------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/dev-java/gcj-jdk/gcj-jdk-5.1.0-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-5.1.0-r2.ebuild
similarity index 84%
rename from dev-java/gcj-jdk/gcj-jdk-5.1.0-r1.ebuild
rename to dev-java/gcj-jdk/gcj-jdk-5.1.0-r2.ebuild
index 9564287..8790c66 100644
--- a/dev-java/gcj-jdk/gcj-jdk-5.1.0-r1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-5.1.0-r2.ebuild
@@ -13,15 +13,15 @@ SRC_URI=""
 LICENSE="GPL-2"
 #KEYWORDS="~amd64"
 SLOT="0"
-IUSE="javadoc X"
+IUSE="awt javadoc"
 
-ECJ_GCJ_SLOT="3.6"
+API_DIFF_PV="5.1.0"
 
 # perl is needed for javac wrapper
 RDEPEND="
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}
+	dev-java/ecj-gcj:*
 	dev-lang/perl
-	~sys-devel/gcc-${PV}[gcj]
+	~sys-devel/gcc-${PV}[awt?,gcj]
 	javadoc? ( dev-java/gnu-classpath:0[gjdoc] )"
 DEPEND="${RDEPEND}"
 
@@ -36,6 +36,7 @@ src_install() {
 	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}"}
@@ -68,7 +69,7 @@ src_install() {
 	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
+	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 \
@@ -78,12 +79,11 @@ src_install() {
 		${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#" \
+	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
@@ -96,8 +96,8 @@ pkg_postinst() {
 	# 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-${PV}.html"
-	ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${PV}.html"
+	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

diff --git a/dev-java/gcj-jdk/metadata.xml b/dev-java/gcj-jdk/metadata.xml
index 33d5fc2..872ab53 100644
--- a/dev-java/gcj-jdk/metadata.xml
+++ b/dev-java/gcj-jdk/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<herd>proxy-maintainers</herd>
-<maintainer>
-  <email>gnu_andrew@member.fsf.org</email>
-  <name>Andrew John Hughes</name>
-</maintainer>
-<longdescription>This provides a JDK wrapper for GCJ, in the style of gcj-java-compat in other distributions.</longdescription>
-<use>
-  <flag name="javadoc">Provide javadoc using gjdoc from GNU Classpath.</flag>
-</use>
+	<herd>java</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>gnu_andrew@member.fsf.org</email>
+		<name>Andrew John Hughes</name>
+	</maintainer>
+	<longdescription>This provides a JDK wrapper for GCJ, in the style of gcj-java-compat in other distributions.</longdescription>
+	<use>
+		<flag name="awt">Install AWT libraries, needed by some GUIs (not needed to build icedtea)</flag>
+		<flag name="javadoc">Provide javadoc using gjdoc from GNU Classpath.</flag>
+	</use>
 </pkgmetadata>