From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4E2561397EC for ; Wed, 19 Aug 2015 22:14:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A9CDE07A0; Wed, 19 Aug 2015 22:14:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9A62514145 for ; Wed, 19 Aug 2015 22:14:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E161340928 for ; Wed, 19 Aug 2015 22:14:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E3E2714E for ; Wed, 19 Aug 2015 22:14:37 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1440022418.e4fccac5b851feca81411b93aa5514448ec80c00.chewi@gentoo> Subject: [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/ X-VCS-Repository: proj/java X-VCS-Files: dev-java/gcj-jdk/gcj-jdk-5.1.0-r1.ebuild dev-java/gcj-jdk/gcj-jdk-5.1.0-r2.ebuild dev-java/gcj-jdk/metadata.xml X-VCS-Directories: dev-java/gcj-jdk/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: e4fccac5b851feca81411b93aa5514448ec80c00 X-VCS-Branch: master Date: Wed, 19 Aug 2015 22:14:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 295257d4-ba0c-401e-8ab4-b139d718a459 X-Archives-Hash: 1e5913e517a2dede60fdd9c5ff46939a commit: e4fccac5b851feca81411b93aa5514448ec80c00 Author: James Le Cuirot gentoo org> AuthorDate: Wed Aug 19 22:13:38 2015 +0000 Commit: James Le Cuirot gentoo 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 @@ -java -proxy-maintainers - - gnu_andrew@member.fsf.org - Andrew John Hughes - -This provides a JDK wrapper for GCJ, in the style of gcj-java-compat in other distributions. - - Provide javadoc using gjdoc from GNU Classpath. - + java + proxy-maintainers + + gnu_andrew@member.fsf.org + Andrew John Hughes + + This provides a JDK wrapper for GCJ, in the style of gcj-java-compat in other distributions. + + Install AWT libraries, needed by some GUIs (not needed to build icedtea) + Provide javadoc using gjdoc from GNU Classpath. +