Version bump, bug #425612.

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

2 files changed, 104 insertions, 1 deletions

diff --git a/dev-java/eclipse-ecj/ChangeLog b/dev-java/eclipse-ecj/ChangeLog
index 23a6e6d80986..277abf7db39f 100644
--- a/dev-java/eclipse-ecj/ChangeLog
+++ b/dev-java/eclipse-ecj/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/eclipse-ecj
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.82 2012/07/10 14:55:24 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.83 2012/07/11 21:03:27 caster Exp $
+
+*eclipse-ecj-4.2 (11 Jul 2012)
+
+  11 Jul 2012; Vlastimil Babka <caster@gentoo.org> +eclipse-ecj-4.2.ebuild:
+  Version bump, bug #425612.
 
 *eclipse-ecj-3.7.2-r1 (10 Jul 2012)
 *eclipse-ecj-3.6-r1 (10 Jul 2012)
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.2.ebuild
new file mode 100644
index 000000000000..53249926e16b
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-4.2.ebuild,v 1.1 2012/07/11 21:03:27 caster Exp $
+
+EAPI="4"
+
+inherit java-pkg-2
+
+MY_PN="ecj"
+DMF="R-${PV}-201206081400"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.2"
+IUSE="+ant userland_GNU"
+
+COMMON_DEP="
+	|| ( app-admin/eselect-java app-admin/eselect-ecj )"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.6
+	app-arch/unzip
+	userland_GNU? ( sys-apps/findutils )"
+PDEPEND="
+	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+
+S="${WORKDIR}"
+
+JAVA_PKG_WANT_SOURCE=1.4
+JAVA_PKG_WANT_TARGET=1.4
+
+java_prepare() {
+	# These have their own package.
+	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -fr org/eclipse/jdt/internal/antadapter || die
+}
+
+src_compile() {
+	local javac_opts javac java jar
+
+	javac_opts="$(java-pkg_javac-args) -encoding ISO-8859-1"
+	javac="$(java-config -c)"
+	java="$(java-config -J)"
+	jar="$(java-config -j)"
+
+	find org/ -path org/eclipse/jdt/internal/compiler/apt -prune -o \
+		-path org/eclipse/jdt/internal/compiler/tool -prune -o -name '*.java' \
+		-print > sources-1.4
+	find org/eclipse/jdt/internal/compiler/{apt,tool} -name '*.java' > sources-1.6
+
+	mkdir -p bootstrap || die
+	cp -pPR org META-INF bootstrap || die
+	cd "${S}/bootstrap" || die
+
+	einfo "bootstrapping ${MY_PN} with ${javac} ..."
+	${javac} ${javac_opts} @../sources-1.4 || die
+	${javac} -encoding ISO-8859-1 -source 1.6 -target 1.6 @../sources-1.6 || die
+
+	find org/ META-INF/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' -o -name '*.inf' -o -name '*.props' \) \
+		-exec ${jar} cf ${MY_PN}.jar {} + || die
+
+	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 @sources-1.4 || die
+	${java} -classpath bootstrap/${MY_PN}.jar \
+		org.eclipse.jdt.internal.compiler.batch.Main \
+		-encoding ISO-8859-1 -source 1.6 -target 1.6 -nowarn @sources-1.6 || die
+
+	find org/ META-INF/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' -o -name '*.inf' -o -name '*.props' \) \
+		-exec ${jar} cf ${MY_PN}.jar {} + || die
+}
+
+src_install() {
+	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
+		org.eclipse.jdt.internal.compiler.batch.Main
+
+	# disable the class version verify, this has intentionally
+	# some classes with 1.6, but most is 1.4
+	JAVA_PKG_STRICT="" java-pkg_dojar ${MY_PN}.jar
+}
+
+pkg_postinst() {
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}