[gentoo-commits] proj/java:master commit in: dev-java/ecj-gcj/files/, dev-java/ecj-gcj/

[gentoo-commits] proj/java:master commit in: dev-java/ecj-gcj/files/, dev-java/ecj-gcj/

[James Le Cuirot]

commit:     41ed0af89cdff072a07eb7daf20d0f165279833e
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 20 23:27:06 2015 +0000
Commit:     James Le Cuirot <chewi <AT> aura-online <DOT> co <DOT> uk>
CommitDate: Fri Mar 20 23:27:06 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=41ed0af8

ecj-gcj 4.2 is in the tree.

 dev-java/ecj-gcj/ChangeLog               |  53 ---------------
 dev-java/ecj-gcj/Manifest                |  25 -------
 dev-java/ecj-gcj/ecj-gcj-4.2.1-r1.ebuild | 113 -------------------------------
 dev-java/ecj-gcj/files/ecj-gcj.in        |  23 -------
 dev-java/ecj-gcj/metadata.xml            |   8 ---
 5 files changed, 222 deletions(-)

diff --git a/dev-java/ecj-gcj/ChangeLog b/dev-java/ecj-gcj/ChangeLog
deleted file mode 100644
index 6082603..0000000
--- a/dev-java/ecj-gcj/ChangeLog
+++ /dev/null
@@ -1,53 +0,0 @@
-# ChangeLog for dev-java/ecj-gcj
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ChangeLog,v 1.1 2010/10/31 17:29:23 caster Exp $
-
-*ecj-gcj-4.2.1-r1 (22 Jul 2013)
-
-  22 Jul 2013; Andrew John Hughes <gnu_andrew@member.fsf.org>
-  -files/ecj-gcj-3.6, -ecj-gcj-3.6.ebuild, -files/ecj-gcj-4.2,
-  -ecj-gcj-4.2.1.ebuild, +ecj-gcj-4.2.1-r1.ebuild, +files/ecj-gcj.in:
-  Remove unneeded copy of 3.6 and synchronise 4.2 with changes in main tree.
-
-*ecj-gcj-4.2.1 (19 Apr 2013)
-
-  19 Apr 2013; Andrew John Hughes <gnu_andrew@member.fsf.org> +files/ecj-gcj-4.2,
-  +ecj-gcj-4.2.1.ebuild:
-  Support ecj 4.2.1 with gcj.
-
-  08 May 2012; Ralph Sennhauser <sera@gentoo.org> ecj-gcj-3.6.ebuild:
-  Copy ~ia64 KEYWORD from main tree.
-
-*ecj-gcj-3.6 (04 Apr 2011)
-
-  04 Apr 2011; Andrew John Hughes <andrew@gentoo.org> +files/ecj-gcj-3.6,
-  +ecj-gcj-3.6.ebuild, +metadata.xml:
-  Support ecj 3.6 with gcj.
-
-*ecj-gcj-3.5.2-r2 (31 Oct 2010)
-
-  31 Oct 2010; Vlastimil Babka <caster@gentoo.org> +files/ecj-gcj-3.5,
-  +ecj-gcj-3.5.2-r2.ebuild, +metadata.xml:
-  Move from java-overlay.
-
-  14 Sep 2010; Vlastimil Babka <caster@gentoo.org> +files/ecj-gcj-3.5-r1,
-  +ecj-gcj-3.5.2-r2.ebuild:
-  Revbump to fix CLASSPATH handling, fixes e.g. build of ant-core.
-
-  01 Apr 2010; Vlastimil Babka <caster@gentoo.org> ecj-gcj-3.5.2-r1.ebuild:
-  Block the former eclipse-ecj:3.5[gcj] ebuild to prevent file collisions.
-  Downgrade eclipse-ecj:3.5 to the main tree version if you hit the block.
-
-  01 Apr 2010; Vlastimil Babka <caster@gentoo.org> +ecj-gcj-3.5.2-r1.ebuild:
-  Revbump to ensure everyone gets the changes. Remove dependencies on jdk/jre
-  and use gcj manually to compile, to break circular deps. Put back the native
-  flag (enabled by default) for troubleshooting / low memory cases.
-
-  01 Apr 2010; Andrew John Hughes <andrew@gentoo.org> -ecj-gcj-3.5.2.ebuild:
-  Use new ecj-3.5 ebuild as basis, not old native binary version.
-
-  22 Mar 2010; Vlastimil Babka <caster@gentoo.org> +ecj-gcj-3.5.2.ebuild,
-  +files/ecj-gcj, +metadata.xml:
-  New package, a subset of eclipse-ecj that can be compiled and used with
-  gcj-jdk.
-

diff --git a/dev-java/ecj-gcj/Manifest b/dev-java/ecj-gcj/Manifest
deleted file mode 100644
index 45b351e..0000000
--- a/dev-java/ecj-gcj/Manifest
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX ecj-gcj.in 840 SHA256 da96a9d9ddfd1d62e05c34df073c5e9ca96a7950e3ce3f8e3a3fd2e908de9c3d SHA512 7ed6620090643f31f33762a1fe8f0024518bb808bf8aa2e8bfc8f9c0475e41f699670939bfa945a48aa5f5fad61b557a9e315c2781103717c2a6a1bd67a048a1 WHIRLPOOL db068d94d11555a28fca40bc8d5600baf75791224011b4f87895b5a9780e39674cecd238ffc86364487aab7d63fa58060b5e5c220fa4ba9dc372d8f50627c8f3
-DIST ecjsrc-4.2.1.jar 1417043 SHA256 d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf WHIRLPOOL 3f91bbf654d8ce0621e3ce21b5a1fce5058c86ad1dd24f89269aba6716945bff8686b6e1829c602864c15f62b45c65f5d5fe0430052dd2419da7e0c0225c95d5
-EBUILD ecj-gcj-4.2.1-r1.ebuild 3060 SHA256 2257e849f0a47a2aa4399c8765a6707ed79b64633f7393549cfa372483e7f643 SHA512 5d8c84bf60a9f80b4ca02e8642a4f899eb043347cc6225d5d4e72f9e5d28fbcda9caa87eb54580e454c2cc986b2bf12167a22b1a6fee8ef00946d11168edf8c0 WHIRLPOOL 97029e6780fc796f87b043f761836ece550d61e3ca3b64773b0042a918fdcd45eec812582de418cd7c6c91d84c5b225adf154ba16fc465445c964ac1bd341b02
-MISC ChangeLog 2167 SHA256 b8dbd28b31eeb7ab6059453d7dd1d00da0345091108f13c8cc8d3bf221eea64d SHA512 69d446dfe809c3679f6141b4330f8a47dcb14249256a498c1515fb493b5a89cc87b6c2c084658d235d0d3b0653ee71ab22803b4c4265971936ea6fb7b4efead3 WHIRLPOOL f4af8546e25dbfbce32aa8714b5aeb751b00a7457a75c7fbe6e9188e611060dca804a5bd43c0716da2e9a5f3149680649362685bcf99575c11b5e3c13d3071d1
-MISC metadata.xml 328 SHA256 11219fb9b559b3e9737938e679434957b00c212473c71995cc4deeb734e60399 SHA512 03e7d5b09b8347761e6dfad2bd0b8ae74962468cee5d0d16323ecf255e6bd9cd77380bc93bbb42f2af80fd460b0ef9b9de24fe528bb034ad741eedbd29f97e89 WHIRLPOOL c155e5aa02f4b66d56533716a258c394df176ea59b0dc8ccac00283418a6ecf36ef5a3cf48e4384b7d2ee5bda5b63f8e43d3ece0d8176f8dc3bbdde4c4a220a7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCAAGBQJR7UA6AAoJEDuWpXgki9wHIhMP/RCgF5jL5vReSAM2mBvjU4Jm
-qO69kfuPUoUE9aDIRkDoGcCVOmaZ65N9Fz+dta5L+NIFWS5ZhIr9ffOSkkTorn/L
-Ma2AJYSR7z+fME25/XpPTjVEmC8/ytzGyjbBB+QFHmeFe/P02HNVb4y+TDLojk6c
-QzrIqW+7hAs6bhg8+aNWl6fAwIOvUPux/W4Qv+4mhYcCDvJi0XWcSDy58Smszs4T
-9cn54iYKdI3Jh8cFa/CDCovikC3Y8wBFLd+Fgo2+zoW0schadmL7MczlEkDeWPVc
-bp8iXsHb+3iVpPeCeZladkjGcyBhmuWemvh3dIuLMO1Iw5EoVKiGKl7hp/Amo2t4
-oF1jwbPCP3U5YDKz+OXH9L/wLqbnqv2q19szYElyGpif5rC8OuwZtQ4cfj2qFS3a
-XzRcHE+yBZEXnaT75X7er7yqn68ylB57g44E5Tmr74TEYdUmN1TMjHkLDJhB6Ck1
-86bPeisEkSQTqsTmqWT+VmYQZhZBgk8uV+UHviKRatIs+XSp3+OMdPUew5uvcfLA
-3kwJyrz3r19NXdXkoZKpWweH0cIsdNMHWw9UbMTlSyd/8+zEX6boKfFmt84hMJzr
-sM1I0QaE+iRmVGCimbDxb6GMcc5teoXgF+N3wUVx+1261k5t9u/sd6SEWl1SfDyn
-9CJFi1V1Ohp8LN1AHK3V
-=Ca/3
------END PGP SIGNATURE-----

diff --git a/dev-java/ecj-gcj/ecj-gcj-4.2.1-r1.ebuild b/dev-java/ecj-gcj/ecj-gcj-4.2.1-r1.ebuild
deleted file mode 100644
index aabfd2d..0000000
--- a/dev-java/ecj-gcj/ecj-gcj-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2013 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.5.2-r2.ebuild,v 1.1 2010/10/31 17:29:23 caster Exp $
-
-EAPI=5
-
-inherit java-pkg-2 prefix toolchain-funcs
-
-MY_PN="ecj"
-DMF="R-${PV}-201209141800"
-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/drops4/${DMF}/${MY_PN}src-${PV}.jar"
-
-LICENSE="EPL-1.0"
-SLOT="4.2"
-KEYWORDS="~amd64"
-IUSE="+native userland_GNU"
-
-COMMON_DEPEND="
-	sys-devel/gcc[gcj]
-	|| ( app-admin/eselect-java >=app-admin/eselect-ecj-0.6 )"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	!dev-java/eclipse-ecj:3.5[gcj]"
-
-S="${WORKDIR}"
-
-# for compatibility with java eclass functions
-JAVA_PKG_WANT_SOURCE=1.4
-JAVA_PKG_WANT_TARGET=1.4
-
-MY_PS="${MY_PN}-${SLOT}"
-
-java_prepare() {
-	# 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 gcj
-	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' -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 org || die
-	find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' -o -name '*.inf' -o -name '*.props' \) \
-		-exec ${jar} cf ${MY_PN}.jar {} + || die
-
-	if use native; then
-		einfo "Building native ${MY_PS} library, patience needed ..."
-		${gcj} ${CFLAGS} ${LDFLAGS} -findirect-dispatch -shared -fPIC -Wl,-Bsymbolic \
-			-o ${MY_PS}.so ${MY_PN}.jar || die
-	fi
-}
-
-src_install() {
-	java-pkg_dojar ${MY_PN}.jar
-
-	sed -e "s|@SLOT@|${SLOT}|" \
-		"${FILESDIR}/${PN}.in" \
-		> "${T}"/${PN}-${SLOT} || die
-	eprefixify "${T}/${PN}-${SLOT}"
-	dobin  "${T}/${PN}-${SLOT}"
-
-	use native && dolib.so ${MY_PS}.so
-}
-
-pkg_postinst() {
-	if use native; then
-		$(gcc-config -B)/gcj-dbtool -a $(gcj-dbtool -p) \
-			"${EPREFIX}"/usr/share/${PN}-${SLOT}/lib/ecj.jar \
-			"${EPREFIX}"/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
-}

diff --git a/dev-java/ecj-gcj/files/ecj-gcj.in b/dev-java/ecj-gcj/files/ecj-gcj.in
deleted file mode 100755
index 4f838d5..0000000
--- a/dev-java/ecj-gcj/files/ecj-gcj.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# /usr/bin/gij was installed by gcj-jdk in the past and is now handled by
-# gcc-config, fall back to gcc-config to locate the binary should the
-# symlink/wrapper-binary not yet exists.
-GIJ_BIN="@GENTOO_PORTAGE_EPREFIX@/usr/bin/gij"
-if [[ ! -f ${GIJ_BIN} ]]; then
-	GIJ_BIN="$(gcc-config -B)/gij"
-fi
-if [[ ! -f ${GIJ_BIN} ]]; then
-	echo "gij not found! check that gcc is compiled with gcj flag"
-	exit 1
-fi
-# calling java-config would be an unnecessary slowdown here
-
-# 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="@GENTOO_PORTAGE_EPREFIX@/usr/share/ecj-gcj-@SLOT@/lib/ecj.jar"
-if [[ -n "${CLASSPATH}" ]]; then
-	ecj_cp="${ecj_cp}:${CLASSPATH}"
-fi
-
-${GIJ_BIN} -classpath "${ecj_cp}" org.eclipse.jdt.internal.compiler.batch.Main "${@}"

diff --git a/dev-java/ecj-gcj/metadata.xml b/dev-java/ecj-gcj/metadata.xml
deleted file mode 100644
index b16b316..0000000
--- a/dev-java/ecj-gcj/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>java</herd>
-<use>
-	<flag name="native">Build a native binary along with the jar. Provides faster execution time, but needs about 1G memory and some patience to compile.</flag>
-</use>
-</pkgmetadata>