dev-java/eclipse-ecj: fixed bug #382511 and removed old version

(Portage version: 2.1.10.29/cvs/Linux x86_64)

4 files changed, 13 insertions, 111 deletions

diff --git a/dev-java/eclipse-ecj/ChangeLog b/dev-java/eclipse-ecj/ChangeLog
index b058893c6df8..ebd4d1ac2985 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.71 2010/12/21 07:40:35 ali_bush Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.72 2011/10/19 15:44:02 fordfrog Exp $
+
+  19 Oct 2011; Miroslav Šulc <fordfrog@gentoo.org> -eclipse-ecj-3.5.1.ebuild,
+  eclipse-ecj-3.5.2.ebuild, eclipse-ecj-3.6.ebuild:
+  Fixed links to source files (bug #382511, thanks to Sebastián Magrí
+  <sebasmagri@gmail.com> for the links), and removed old version
 
 *eclipse-ecj-3.6 (21 Dec 2010)
 
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.5.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.5.1.ebuild
deleted file mode 100644
index 79f364c40907..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-3.5.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2010 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.1.ebuild,v 1.5 2010/01/23 14:06:09 aballier Exp $
-
-EAPI=2
-
-inherit java-pkg-2
-
-MY_PN="ecj"
-DMF="R-${PV}-200909170800"
-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="+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"
-
-CDEPEND=">=app-admin/eselect-ecj-0.3"
-
-JAVA_PKG_WANT_SOURCE=1.4
-JAVA_PKG_WANT_TARGET=1.4
-
-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.5.2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.5.2.ebuild
index a878af5f4aaf..35d8e40f0c23 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-3.5.2.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.ebuild,v 1.5 2010/11/05 19:50:18 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.5.2.ebuild,v 1.6 2011/10/19 15:44:02 fordfrog Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ 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"
+SRC_URI="http:/archive.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip"
 
 IUSE="+ant userland_GNU"
 
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.6.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.6.ebuild
index 51a5ece58bfc..45a4437e132b 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-3.6.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.ebuild,v 1.1 2010/12/21 07:40:35 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.6.ebuild,v 1.2 2011/10/19 15:44:02 fordfrog Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ 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"
+SRC_URI="http://archive.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip"
 
 IUSE="+ant userland_GNU"