summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Noël Rivasseau <elvanor@gentoo.org>2009-02-13 12:02:02 +0000
committerJean-Noël Rivasseau <elvanor@gentoo.org>2009-02-13 12:02:02 +0000
commit2bd1a6e4c87893bdd1f19b5094223fa196f0e36c (patch)
treef1c896fdcad75ebc1be09a7d26ec61e2708ecd77 /dev-java
parentFix typo. (diff)
downloadhistorical-2bd1a6e4c87893bdd1f19b5094223fa196f0e36c.tar.gz
historical-2bd1a6e4c87893bdd1f19b5094223fa196f0e36c.tar.bz2
historical-2bd1a6e4c87893bdd1f19b5094223fa196f0e36c.zip
Removed gcj support for ecilpse-ecj in main tree (#237689).
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.26.7 i686
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/eclipse-ecj/ChangeLog9
-rw-r--r--dev-java/eclipse-ecj/Manifest4
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-3.4-r4.ebuild92
-rwxr-xr-xdev-java/eclipse-ecj/files/ecj-3.48
4 files changed, 102 insertions, 11 deletions
diff --git a/dev-java/eclipse-ecj/ChangeLog b/dev-java/eclipse-ecj/ChangeLog
index f52494816332..b2c3f80045cb 100644
--- a/dev-java/eclipse-ecj/ChangeLog
+++ b/dev-java/eclipse-ecj/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-java/eclipse-ecj
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.52 2009/02/11 20:22:49 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.53 2009/02/13 12:02:01 elvanor Exp $
+
+*eclipse-ecj-3.4-r4 (13 Feb 2009)
+
+ 13 Feb 2009; Jean-Noël Rivasseau <elvanor@gentoo.org> -files/ecj-3.4,
+ +eclipse-ecj-3.4-r4.ebuild:
+ Bump to fix #237689 by actually removing support for gcj. gcj support is
+ still available in the overlay.
11 Feb 2009; Jean-Noël Rivasseau <elvanor@gentoo.org>
eclipse-ecj-3.3.0-r2.ebuild, eclipse-ecj-3.3.0-r3.ebuild,
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 6407779c37ad..6c2dc5229a2a 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,6 +1,5 @@
AUX compiler-settings-3.2 258 RMD160 40710ab16453db1f23433a9e74637662e917c159 SHA1 28f78c5e169bfdc6f81441d96e3734c9eeed80db SHA256 ca705f626f3871697afc65b90f7844479b8846d8e969e4ead107615a0ef168e9
AUX ecj-3.3 290 RMD160 2dfe9771f0b905052a9ae37a0dba84d0041288de SHA1 15167ae40c53c6a19fcce2f66502ebbf87509826 SHA256 d24c6dcd12a59ca9ba8d90cb7ff1f3dbc45fbef2ae1f277194465ebd063c8fa4
-AUX ecj-3.4 213 RMD160 ca988aa4ae8965b5f8c41e0dbcf87d3f7e86d07a SHA1 55a308d8deb46bfe05e49ee095776ba89ce23f3f SHA256 5e56e4bdda1f90000fe157fd82083d36b8affd7258c694e797f2c54b01eb6d53
AUX eclipse-ecj-3.2-build-gentoo.patch 1877 RMD160 027003513593a3b880bff73a012f73959c674be5 SHA1 5e2a5f0b0f484e147665c48bb38e2df1401823e5 SHA256 086abbf990543dcbf511567a2f663e53f932e825c75600745771c7d3f5739bd3
AUX eclipse-ecj-3.3.0-gcj.patch 20084 RMD160 08944cef146676d9d7fddc46727bc172d75cdcb5 SHA1 900ccaaec2db0012defc016c65088f979a35e145 SHA256 6c5ffcefdc385305f01b63fcb7088b04698b5d1b8d9db54d058ffcf2252460e8
DIST ecjsrc-3.4.zip 1280774 RMD160 8d12a84b9ff2b8df252bdc06309558559ce91d2e SHA1 dbf3300205717c165a1b1ec36af4c3fd1e45888b SHA256 a6ce5f0682462e85e5e47229e5b16555f74c60188fa0bb17536beb1138c537b4
@@ -11,5 +10,6 @@ EBUILD eclipse-ecj-3.2.2.ebuild 1747 RMD160 5b446eeeb6d23d0fe264d690d4e5d792ebcf
EBUILD eclipse-ecj-3.3.0-r2.ebuild 1903 RMD160 48f8ee893e6fba2d6cc7e046f68b5275fef75562 SHA1 bff96d6ff01a12518e523fdbd3ae40f206ef5548 SHA256 d84f3980ef5a6707040677eaa0e9448c80075ac91d72983488fd7d6bed035fb3
EBUILD eclipse-ecj-3.3.0-r3.ebuild 2122 RMD160 9443e36769093c43db9397f89598f0f85a2a10b5 SHA1 7af95bb50f9d4a50c7035065f07f29ce19eb3426 SHA256 dbc2d6ae6ecdc2c89c927dbeaf246f4811eb4dfe2fb3e07ff2023c4647c1992b
EBUILD eclipse-ecj-3.4-r3.ebuild 3159 RMD160 99ef5f4deed5a3dd9c37fbe76da4f6ff70a6cdea SHA1 0652125b44373bd7ffb5c73dc7406dbb77c70482 SHA256 d107a926bf112ded0901acc7172468b33030f5ac97ce71adb2be588a18dbf586
-MISC ChangeLog 7737 RMD160 b3930016ec6882ac46f8647a86210c01368989a3 SHA1 075e77ccaf7d232ea8b69115ce2e18b4ae6c6312 SHA256 10ecbf32366f1ee37f01a8f733f34b8cbefd21acc5325829f0f0a420cff81d6d
+EBUILD eclipse-ecj-3.4-r4.ebuild 2271 RMD160 68c940a1781b2cc56284b8e2983ba04026b53cf0 SHA1 f53ffca1995f27f8074531cddd3e1e9c9b1f6a4a SHA256 06f5bf6b6dc8583a106009580bdcc8cf66037266998bbf19f3aadf028b78399f
+MISC ChangeLog 7985 RMD160 680b8f57aa48f182ca821fd27ed1ad44965f27ec SHA1 982c170f9ff94a54cc2e74f4df276696a2d6402a SHA256 6c392be0dfaa3580810ef0002bb66f8588fd99c7ea9c60cd8c6a742fc7dac403
MISC metadata.xml 471 RMD160 08157ecf22a49769d6b1bd7f07f3ed2006033d7c SHA1 a703452dd08cbc95a192d27d3d79699309586082 SHA256 60e14a372db0a00cfa3f87152c20e658a55acc28b55a1d7888d2d44b847f6007
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.4-r4.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.4-r4.ebuild
new file mode 100644
index 000000000000..27b2349dec86
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.4-r4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2009 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-r4.ebuild,v 1.1 2009/02/13 12:02:01 elvanor Exp $
+
+EAPI=2
+
+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://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip"
+
+IUSE="java6"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+SLOT="3.4"
+
+CDEPEND=">=app-admin/eselect-ecj-0.3"
+
+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/files/ecj-3.4 b/dev-java/eclipse-ecj/files/ecj-3.4
deleted file mode 100755
index 745391d325d4..000000000000
--- a/dev-java/eclipse-ecj/files/ecj-3.4
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 2008 Andrew John Hughes
-#
-# Licensed under the GNU General Public License, v2
-
-LD_LIBRARY_PATH=$(gcc-config -L $(ls -1r /etc/env.d/gcc/*4.3.?|head -1)) /usr/bin/native_ecj-3.4 "${@}"
-