Version bump. Import from java-overlay.

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

3 files changed, 126 insertions, 16 deletions

diff --git a/dev-java/ecj-gcj/ChangeLog b/dev-java/ecj-gcj/ChangeLog
index 994f73c5cf7b..0d398ee0f75b 100644
--- a/dev-java/ecj-gcj/ChangeLog
+++ b/dev-java/ecj-gcj/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ecj-gcj
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ChangeLog,v 1.2 2012/04/15 17:50:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ChangeLog,v 1.3 2012/05/06 17:41:31 sera Exp $
+
+*ecj-gcj-3.6 (06 May 2012)
+
+  06 May 2012; Ralph Sennhauser <sera@gentoo.org> +ecj-gcj-3.6.ebuild:
+  Version bump. Import from java-overlay.
 
   15 Apr 2012; Mike Frysinger <vapier@gentoo.org> ecj-gcj-3.5.2-r2.ebuild:
   Add back ia64 love #349020 by Dennis Schridde.
diff --git a/dev-java/ecj-gcj/Manifest b/dev-java/ecj-gcj/Manifest
index c79573761013..339ee9894b06 100644
--- a/dev-java/ecj-gcj/Manifest
+++ b/dev-java/ecj-gcj/Manifest
@@ -3,23 +3,19 @@ Hash: SHA1
 
 AUX ecj-gcj-3.5 723 RMD160 fb62d5bf35ef27f96c574b774410a0a1931d0e2d SHA1 713b2a237296af6d6745d31bf21447a0f4faeeb6 SHA256 6272829cdc298abd20683a78d3d159bcd4c29f96478e20428d4214c743cce21b
 DIST ecjsrc-3.5.2.zip 1298691 RMD160 f6dc987418682dd9d776a692383a37497656fc04 SHA1 7d79ac9602ffa825f6f3ea8ab5a3387b687f5215 SHA256 4ae91449962b1e2781b70713e299f9fa16fb1ce25a4d2bb335c13b55c08d6d74
+DIST ecjsrc-3.6.zip 1310484 RMD160 82d9980aa4e6be1014d1bac396cceb2ab304cee3 SHA1 9bfda69c7c8528ecfe1b6cbcbe976b642069ca9c SHA256 bc2d624c5ca135d593c71a677674509f5801998ffe98c386749d15a46ee69242
 EBUILD ecj-gcj-3.5.2-r2.ebuild 2790 RMD160 5813b257d32760fc443625aae12a563933ec7ca7 SHA1 2a4a38b0999d628c53d469f37e1c62bb14c36e50 SHA256 4a93bf9d49d9ef0bb8c5272661601812b98884a33db39b7f51646ed459a759ca
-MISC ChangeLog 1541 RMD160 5da56d97d520eede5ad89b791bb8df3b7105e3f3 SHA1 e13ffce81525aef0d60427568d55e19f902b9978 SHA256 8c23d2382bcd1d3d3b199847a62b611fb94bad75c2755ceeecf2d5eb3ba2cfd5
+EBUILD ecj-gcj-3.6.ebuild 2805 RMD160 93292100cd2d32e3dd2b4a37ce895369eb611210 SHA1 04e394eda11ca7bfee64f54d52de845a883c201a SHA256 4881e6daaffd4f0bdcdc91b91bdcf60b4239d8aff70489d5a977b35d0e6e4a3a
+MISC ChangeLog 1681 RMD160 115a4e819bf15667bab295c5e69f36ef6d5d26ae SHA1 768bb024d8521da724b13f6eccc8dacfe05e46b4 SHA256 1d0464b11d474478b41e89d2b5be446a768ddd4fd9df35fa35b84fd5505243fc
 MISC metadata.xml 328 RMD160 d09d8ec2e29ba96d03ede0ce6ddfc93c07c3436f SHA1 3a1c230643120b795fa9e2d835bb817b44dd560e SHA256 11219fb9b559b3e9737938e679434957b00c212473c71995cc4deeb734e60399
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPiwqXAAoJELEHsLL7fEFWhlEP/RZ0TnrKQzz7P5biD4VGjvaj
-hSGeV2LlUqNeEx3c9z8iCK0paWLm6ATEY6njw0kNN5q6VBSWwme96EoA36xUYiDM
-6kJAy6MRDUTbahOWSMgA8wncxgf23fWOMTrBi+1NGOBeE8fNWJ4vzCefMdOFQ7rG
-9GkgpHVHRbcdhxrW8lJgJgtMHyhrsYXTq8ViqTdH7o5C/x/33TbJ8VYGG4jz4jA1
-b6n2HklXDxIQgJdcCshB/2hI/RMyXlNhIkz6eLTBeurvShRvAXJloYTch9wLFcow
-6F1XCzuxI8zmx/1wjpdE/P2tZFTCjkjW2njMUk2EcJ5QfIy1276gl+MNyZnS5grL
-cZLgUwxY2SQA9cXAmZxlt7jA5vzyTeD0wYZehtkDdCCz6THZT/Pj5jyNDpe7LQDf
-SZMwbMVKHpIIb0uKtHfNEEqWT/1EinETJN4tSfqMw8rDqQ//Jf4fvo3k1pwC7qBh
-sWy+icgJGb5kdZCODLLO0QBLErNk+UM2hy4CTQwesAPj2+13toDiG38L9hRoQF65
-P8PD7greE/RP+V4m+jg88PNFtuAd65MgnjrKqSEcm4IyrbOgqI5B+M+CHL6SvX+T
-qWHHQEZYhJF+5o+aqc+n3kg2RXGU1ZZ/OnJatn96WyaI3fHdhMhiFO3a0ncYG0rN
-MJTJT8tzyw/Rs38exkJt
-=2Wfe
+iQEcBAEBAgAGBQJPprfaAAoJEIUJ+svaV163SMYIAI1ovl3+EsQD8MlaMWY8g08X
+RhyWJ4lwkogzhWrDETANso3rfiQBz1Urwa89mMoj/pUo67N3HsDH1hW7hkXNlXiO
+Z+oIg3t1QLrCgAWIqtD1RX4trmfd2fRIz44paWM0HmeC/vN59tZCKVsAIq4sSMlB
+l/w2xfyivb/V+q92lkmoHTCSy1SOO+PPpMm2o6G/V3AqILLVF3NiQcHSOl4SWxcb
+F+qsHPPAQG+ilIeAqjTs0nk8MTtDiVWBMfdpFqShdK3iYlHMW4iSnp0JwBn/N8Fz
+s1RLsr4Byc6HHO97/lxOV1kyV9tzEG8BV2bFLkXxhJVrN6DC702hetHvUGQpiiA=
+=CjMT
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ecj-gcj/ecj-gcj-3.6.ebuild b/dev-java/ecj-gcj/ecj-gcj-3.6.ebuild
new file mode 100644
index 000000000000..8b24bc77fd59
--- /dev/null
+++ b/dev-java/ecj-gcj/ecj-gcj-3.6.ebuild
@@ -0,0 +1,109 @@
+# 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=4
+
+inherit java-pkg-2 toolchain-funcs
+
+MY_PN="ecj"
+DMF="R-${PV}-201006080911"
+S="${WORKDIR}"
+
+DESCRIPTION="A subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip"
+
+IUSE="+native userland_GNU"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+SLOT="3.6"
+
+MY_PS="${MY_PN}-${SLOT}"
+
+# for compatibility with java eclass functions
+JAVA_PKG_WANT_SOURCE=1.4
+JAVA_PKG_WANT_TARGET=1.4
+
+CDEPEND="sys-devel/gcc[gcj]
+	>=app-admin/eselect-ecj-0.6"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	userland_GNU? ( sys-apps/findutils )
+	!dev-java/eclipse-ecj:3.5[gcj]"
+RDEPEND="${CDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# We don't need the ant adapter here
+	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -fr org/eclipse/jdt/internal/antadapter || die
+
+	# upstream build.xml excludes this
+	rm -f META-INF/eclipse.inf || die
+
+	# these java6 specific classes cannot compile with ecj
+	rm -fr org/eclipse/jdt/internal/compiler/{apt,tool}/ || die
+}
+
+src_compile() {
+	local javac_opts javac java jar
+
+	local gccbin=$(gcc-config -B)
+	local gccver=$(gcc-fullversion)
+
+	local gcj="${gccbin}/gcj"
+	javac="${gcj} -C --encoding=ISO-8859-1"
+	jar="${gccbin}/gjar"
+	java="${gccbin}/gij"
+
+	mkdir -p bootstrap || die
+	cp -pPR org bootstrap || die
+	cd "${S}/bootstrap" || die
+
+	einfo "bootstrapping ${MY_PN} with ${javac} ..."
+	${javac} ${javac_opts} $(find org/ -name '*.java') || die
+	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' |\
+		xargs ${jar} cf ${MY_PN}.jar
+
+	cd "${S}" || die
+
+	einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
+	${java} -classpath bootstrap/${MY_PN}.jar \
+		org.eclipse.jdt.internal.compiler.batch.Main \
+		${javac_opts} -nowarn org || die
+	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' |\
+		xargs ${jar} cf ${MY_PN}.jar
+
+	if use native; then
+		einfo "Building native ${MY_PS} library, patience needed ..."
+		${gcj} ${CFLAGS} -findirect-dispatch -shared -fPIC -Wl,-Bsymbolic \
+			-o ${MY_PS}.so ${MY_PN}.jar || die
+	fi
+}
+
+src_install() {
+	java-pkg_dojar ${MY_PN}.jar
+	dobin "${FILESDIR}/${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
+	fi
+
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ${PN}-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}