[patch] ecj-gcj.patch

ecj-gcj.patch (text/plain), 1.91 KB, created by Benda Xu on 2012-05-17 11:36:30 UTC

diff -Naurp ecj-gcj.old/ecj-gcj-3.6.ebuild ecj-gcj/ecj-gcj-3.6.ebuild
--- ecj-gcj.old/ecj-gcj-3.6.ebuild	2012-05-17 19:21:38.000000000 +0900
+++ ecj-gcj/ecj-gcj-3.6.ebuild	2012-05-17 20:27:47.000000000 +0900
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-3.6.ebuild,v 1.1 2012/05/06 17:41:31 sera Exp $
 
-EAPI=2
+EAPI=4
 
-inherit java-pkg-2 toolchain-funcs
+inherit java-pkg-2 toolchain-funcs prefix
 
 MY_PN="ecj"
 DMF="R-${PV}-201006080911"
@@ -88,14 +88,15 @@ src_compile() {
 src_install() {
 	java-pkg_dojar ${MY_PN}.jar
 	dobin "${FILESDIR}/${PN}-${SLOT}"
+	eprefixify "${ED}/usr/bin/${PN}-${SLOT}"
 	use native && dolib.so ${MY_PS}.so
 }
 
 pkg_postinst() {
 	if use native; then
 		$(gcc-config -B)/gcj-dbtool -a $(gcj-dbtool -p) \
-			/usr/share/${PN}-${SLOT}/lib/ecj.jar \
-			/usr/$(get_libdir)/${MY_PN}-${SLOT}.so
+			"${EPREFIX}"/usr/share/${PN}-${SLOT}/lib/ecj.jar \
+			"${EPREFIX}"/usr/$(get_libdir)/${MY_PN}-${SLOT}.so
 	fi
 
 	einfo "To select between slots of ECJ..."
--- ecj-gcj.old/files/ecj-gcj-3.6	2012-05-17 19:21:38.000000000 +0900
+++ ecj-gcj/files/ecj-gcj-3.6	2012-05-17 13:51:25.000000000 +0900
@@ -1,7 +1,7 @@
 #!/bin/bash
 # gcj-jdk installs /usr/bin/gcj-jdk symlink, depending on it would be circular
 # so we fallback to gcc-config discovery
-GIJ_BIN="/usr/bin/gij"
+GIJ_BIN="@GENTOO_PORTAGE_EPREFIX@/usr/bin/gij"
 if [[ ! -f ${GIJ_BIN} ]]; then
 	GIJ_BIN="$(gcc-config -B)/gij"
 fi
@@ -13,7 +13,7 @@ fi
 
 # we need to append user CLASSPATH otherwise it will be overriden by the -classpath parameter
 # this breaks e.g. bootstrap of ant-core
-ecj_cp="/usr/share/ecj-gcj-3.6/lib/ecj.jar"
+ecj_cp="@GENTOO_PORTAGE_EPREFIX@/usr/share/ecj-gcj-3.6/lib/ecj.jar"
 if [[ -n "${CLASSPATH}" ]]; then
 	ecj_cp="${ecj_cp}:${CLASSPATH}"
 fi
diff -Naurp ecj-gcj.old/Manifest ecj-gcj/Manifest