From: Miroslav Šulc Date: Wed, 19 Oct 2011 15:44:02 +0000 (+0000) Subject: dev-java/eclipse-ecj: fixed bug #382511 and removed old version X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b43509812748be5044fc3b7795233af62a170cb7;p=gentoo.git dev-java/eclipse-ecj: fixed bug #382511 and removed old version Package-Manager: portage-2.1.10.29/cvs/Linux x86_64 --- 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 -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í + for the links), and removed old version *eclipse-ecj-3.6 (21 Dec 2010) diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest index 93f1ea506840..514897ac9419 100644 --- a/dev-java/eclipse-ecj/Manifest +++ b/dev-java/eclipse-ecj/Manifest @@ -1,13 +1,11 @@ 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 -DIST ecjsrc-3.5.1.zip 1297603 RMD160 3fd56790edc323fd10439eaf778b8489b641d637 SHA1 83b14c20a82079ff9dd3c42c4eee56db4c175723 SHA256 27639423e565c6b6ee5184f174447151aebdf5ef669c1bd73185e9b85515d4ee DIST ecjsrc-3.5.2.zip 1298691 RMD160 f6dc987418682dd9d776a692383a37497656fc04 SHA1 7d79ac9602ffa825f6f3ea8ab5a3387b687f5215 SHA256 4ae91449962b1e2781b70713e299f9fa16fb1ce25a4d2bb335c13b55c08d6d74 DIST ecjsrc-3.6.zip 1310484 RMD160 82d9980aa4e6be1014d1bac396cceb2ab304cee3 SHA1 9bfda69c7c8528ecfe1b6cbcbe976b642069ca9c SHA256 bc2d624c5ca135d593c71a677674509f5801998ffe98c386749d15a46ee69242 DIST ecjsrc.zip 1215250 RMD160 938320ae54050e322bbb98c78b0e86d241862153 SHA1 e08a27fd77e5ac7af8f2c84beed175cd3fdd0c60 SHA256 f41194a9580023afd11d18b82f6815b064af83c4f9ca407a40cd8d960bd112cc EBUILD eclipse-ecj-3.3.0-r3.ebuild 2169 RMD160 1d1e62b1fff065c140c7bfff617ea5b1ab0e3a8e SHA1 0eb94d8c20f6c8f62680aa192bbf42b261977029 SHA256 2f1825ef008af7f434260e5c74596ef0a138d792a26ed26b38a0ab77c570bc45 EBUILD eclipse-ecj-3.4-r4.ebuild 2315 RMD160 264899a81c4722f1272242fbf3e1d93b07653ae5 SHA1 00092357e5524612e96a48d9a55650321a4a9f58 SHA256 7d7654a4370b8f8e9c710da90dc5f2f28f3d1b1e98875bb103e6efce575d6a9d -EBUILD eclipse-ecj-3.5.1.ebuild 2861 RMD160 d4b58a4bc67df442a6b07dc4dd0811077c575168 SHA1 672f1c5a21c9e36998d3217ab69c646442ca3c02 SHA256 d7ce64c153e6007a3550044e85fd6d07d33d3b32b813ad93a09721ee8018fcbb -EBUILD eclipse-ecj-3.5.2.ebuild 2858 RMD160 e8583131cb1e19fdaec0a1f9fb83127e48033f52 SHA1 79f20660556f883d7ccc801296980e514b71d537 SHA256 abc8322a3c6929005e67e5c7849f6cf13e1be087b19173cd371c7ce3e677ed7d -EBUILD eclipse-ecj-3.6.ebuild 2861 RMD160 5535aeebcc110a3802edff1c151f5c453f633795 SHA1 7848aef68de8f8806c47d41fe7b5e51bc6fac8e4 SHA256 b8b7eed9904283167cec254688ad3409036ef33d1b3b79c82187c2392fe9b7c3 -MISC ChangeLog 10647 RMD160 95971693a097664e6f7b26941fbadd35890a9bd0 SHA1 616b5a5f0d8b986dcc91174b650db889e85bf0e8 SHA256 30af487cbee8b3622f927d91d15d95af196da7d7f6adcd822b09aac86ac37bf0 +EBUILD eclipse-ecj-3.5.2.ebuild 2857 RMD160 043ddd861ee4d291ce9bd0cfb1cd40551b6babdd SHA1 ede54595335f97e36f87ecb035d28ccea766e61f SHA256 b902de5d08f7747e458f9537d26c2d96e1a87c144d0fd9420be1e6526ae05255 +EBUILD eclipse-ecj-3.6.ebuild 2860 RMD160 b44c1a2fe200a93523badb273b0c0c152a69c448 SHA1 1fab52ebac83928f2b9e83054668d1a49c650fb6 SHA256 0032e352917a487115d31ea1d6088a1ab6a4b9e5d58317e26a4b9c830ff82b54 +MISC ChangeLog 10916 RMD160 58c1f90187aba066b34f55ed79a234be3db2f8b4 SHA1 83013cdb0349faa4e33c64406f505506d3f678c1 SHA256 2a4b27640387a9b39c5032010d8cf8a235f530fb39c319501bdf1b83d1731754 MISC metadata.xml 570 RMD160 c3773d8e931a0e7a00eeb494f1f8f68cc1f799ed SHA1 71c2b881dc7b6733567777051b079745f3c2d70a SHA256 dd2a09440442264363911b455040196cbb42763fbacbb135c07b3f0de44a1e3a 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"