Add eselect-java as possible provider of eselect ecj.

Don't use xargs and other cleanup.

(Portage version: 2.1.11.5/cvs/Linux x86_64)

6 files changed, 494 insertions, 1 deletions

diff --git a/dev-java/eclipse-ecj/ChangeLog b/dev-java/eclipse-ecj/ChangeLog
index 46c94dd4292b..23a6e6d80986 100644
--- a/dev-java/eclipse-ecj/ChangeLog
+++ b/dev-java/eclipse-ecj/ChangeLog
@@ -1,6 +1,18 @@
 # 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.81 2012/03/12 15:13:26 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.82 2012/07/10 14:55:24 sera Exp $
+
+*eclipse-ecj-3.7.2-r1 (10 Jul 2012)
+*eclipse-ecj-3.6-r1 (10 Jul 2012)
+*eclipse-ecj-3.5.2-r1 (10 Jul 2012)
+*eclipse-ecj-3.4-r5 (10 Jul 2012)
+*eclipse-ecj-3.3.0-r4 (10 Jul 2012)
+
+  10 Jul 2012; Ralph Sennhauser <sera@gentoo.org> +eclipse-ecj-3.3.0-r4.ebuild,
+  +eclipse-ecj-3.4-r5.ebuild, +eclipse-ecj-3.5.2-r1.ebuild,
+  +eclipse-ecj-3.6-r1.ebuild, +eclipse-ecj-3.7.2-r1.ebuild:
+  Add eselect-java as possible provider of eselect ecj.
+  Don't use xargs and other cleanup.
 
   12 Mar 2012; Brent Baude <ranger@gentoo.org> eclipse-ecj-3.7.1.ebuild:
   Marking eclipse-ecj-3.7.1 ppc64 for bug 392391
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.3.0-r4.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.3.0-r4.ebuild
new file mode 100644
index 000000000000..bf5018e4d73f
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.3.0-r4.ebuild
@@ -0,0 +1,85 @@
+# 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-3.3.0-r4.ebuild,v 1.1 2012/07/10 14:55:24 sera Exp $
+
+EAPI=4
+
+inherit eutils java-pkg-2
+
+MY_PN="ecj"
+DMF="R-${PV}-200706251500"
+S="${WORKDIR}"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://archive.eclipse.org/eclipse/downloads/drops/${DMF/.0}/${MY_PN}src.zip"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="3.3"
+IUSE=""
+
+COMMON_DEPEND="|| ( app-admin/eselect-java app-admin/eselect-ecj )"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+DEPEND="<virtual/jdk-1.7
+	sys-apps/findutils
+	app-arch/unzip
+	${COMMON_DEPEND}"
+
+java_prepare() {
+	# own package
+	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java
+	rm -fr org/eclipse/jdt/internal/antadapter
+
+	# what the heck...?! java6
+	rm -fr org/eclipse/jdt/internal/compiler/tool/ \
+		org/eclipse/jdt/internal/compiler/apt/
+
+	# gcj feature
+	epatch "${FILESDIR}"/${P}-gcj.patch
+}
+
+src_compile() {
+	local javac="javac" java="java" jar="jar"
+
+	mkdir -p bootstrap
+	cp -pPR org bootstrap
+
+	einfo "bootstrapping ${MY_PN} with javac"
+
+	cd "${S}"/bootstrap
+	${javac} $(find org/ -name '*.java') || die "${MY_PN} bootstrap failed!"
+
+	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' | \
+		xargs ${jar} cf ${MY_PN}.jar
+
+	einfo "build ${MY_PN} with bootstrapped ${MY_PN}"
+
+	cd "${S}"
+	${java} -classpath bootstrap/${MY_PN}.jar \
+		org.eclipse.jdt.internal.compiler.batch.Main -encoding ISO-8859-1 org \
+		|| die "${MY_PN} build failed!"
+	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' | \
+		xargs ${jar} cf ${MY_PN}.jar
+}
+
+src_install() {
+	java-pkg_dojar ${MY_PN}.jar
+	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
+		org.eclipse.jdt.internal.compiler.batch.Main
+}
+
+pkg_postinst() {
+	einfo "To get the Compiler Adapter of ECJ for ANT..."
+	einfo " # emerge ant-eclipse-ecj"
+	echo
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.4-r5.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.4-r5.ebuild
new file mode 100644
index 000000000000..d61b127796fe
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.4-r5.ebuild
@@ -0,0 +1,91 @@
+# 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-3.4-r5.ebuild,v 1.1 2012/07/10 14:55:24 sera Exp $
+
+EAPI=4
+
+inherit java-pkg-2
+
+MY_PN="ecj"
+DMF="R-${PV}-200806172000"
+S="${WORKDIR}"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://archive.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip"
+
+IUSE="java6"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="3.4"
+
+CDEPEND="|| ( app-admin/eselect-java app-admin/eselect-ecj )"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	!java6? ( >=virtual/jdk-1.4 )
+		java6? ( >=virtual/jdk-1.6 )"
+RDEPEND="${CDEPEND}
+	!java6? ( >=virtual/jre-1.4 )
+		java6? ( >=virtual/jre-1.6 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+
+	# These have their own package.
+	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -fr org/eclipse/jdt/internal/antadapter || die
+
+	if ! use java6 ; then
+		rm -fr org/eclipse/jdt/internal/compiler/{apt,tool}/ || die
+	fi
+}
+
+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)"
+
+	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
+}
+
+src_install() {
+
+	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
+		org.eclipse.jdt.internal.compiler.batch.Main
+
+	java-pkg_dojar ${MY_PN}.jar
+}
+
+pkg_postinst() {
+	einfo "To get the Compiler Adapter of ECJ for ANT..."
+	einfo " # emerge ant-eclipse-ecj"
+	echo
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.5.2-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..a2ac05d3197e
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.5.2-r1.ebuild
@@ -0,0 +1,102 @@
+# 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-3.5.2-r1.ebuild,v 1.1 2012/07/10 14:55:24 sera Exp $
+
+EAPI=4
+
+inherit java-pkg-2
+
+MY_PN="ecj"
+DMF="R-${PV}-201002111343"
+S="${WORKDIR}"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://archive.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip"
+
+IUSE="+ant userland_GNU"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="3.5"
+
+JAVA_PKG_WANT_SOURCE=1.4
+JAVA_PKG_WANT_TARGET=1.4
+
+CDEPEND="|| ( app-admin/eselect-java app-admin/eselect-ecj )"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6
+	userland_GNU? ( sys-apps/findutils )"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.4"
+PDEPEND="ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# These have their own package.
+	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -fr org/eclipse/jdt/internal/antadapter || die
+
+	# upstream build.xml excludes this
+	rm META-INF/eclipse.inf
+}
+
+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 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/ -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 @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/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' \
+		| xargs ${jar} cf ${MY_PN}.jar
+}
+
+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
+}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.6-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.6-r1.ebuild
new file mode 100644
index 000000000000..a505dac29a29
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.6-r1.ebuild
@@ -0,0 +1,102 @@
+# 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-3.6-r1.ebuild,v 1.1 2012/07/10 14:55:24 sera Exp $
+
+EAPI=4
+
+inherit java-pkg-2
+
+MY_PN="ecj"
+DMF="R-${PV}-201006080911"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://archive.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip"
+
+IUSE="+ant userland_GNU"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="3.6"
+
+COMMON_DEP="
+	|| ( app-admin/eselect-java >=app-admin/eselect-ecj-0.3 )"
+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
+
+	# upstream build.xml excludes this
+	rm META-INF/eclipse.inf || 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 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/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
+		-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/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
+		-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
+}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild
new file mode 100644
index 000000000000..7326d29857da
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild
@@ -0,0 +1,101 @@
+# 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-3.7.2-r1.ebuild,v 1.1 2012/07/10 14:55:24 sera Exp $
+
+EAPI="4"
+
+inherit java-pkg-2
+
+MY_PN="ecj"
+DMF="R-${PV}-201202080800"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${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="3.7"
+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
+
+	# upstream build.xml excludes this
+	rm META-INF/eclipse.inf
+}
+
+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 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/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
+		-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/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
+		-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
+}