diff options
author | Miroslav Šulc <fordfrog@gentoo.org> | 2011-10-19 18:45:13 +0000 |
---|---|---|
committer | Miroslav Šulc <fordfrog@gentoo.org> | 2011-10-19 18:45:13 +0000 |
commit | d67c5327c8d302eb675372c2990c2b415be41c76 (patch) | |
tree | 76192bb7f549998bb757332b799c9a25fd106f0b /dev-java | |
parent | move back to linuxtv-dvb-header; stable x86, #384733 #387313 (diff) | |
download | gentoo-2-d67c5327c8d302eb675372c2990c2b415be41c76.tar.gz gentoo-2-d67c5327c8d302eb675372c2990c2b415be41c76.tar.bz2 gentoo-2-d67c5327c8d302eb675372c2990c2b415be41c76.zip |
dev-java/ant-eclipse-ecj: fixed bug #378985
(Portage version: 2.1.10.29/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/ant-eclipse-ecj/ChangeLog | 9 | ||||
-rw-r--r-- | dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.6-r1.ebuild | 51 | ||||
-rw-r--r-- | dev-java/ant-eclipse-ecj/files/ecj-3.6 | 6 |
3 files changed, 62 insertions, 4 deletions
diff --git a/dev-java/ant-eclipse-ecj/ChangeLog b/dev-java/ant-eclipse-ecj/ChangeLog index 1b4e38353ebb..218a8c5e72e1 100644 --- a/dev-java/ant-eclipse-ecj/ChangeLog +++ b/dev-java/ant-eclipse-ecj/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/ant-eclipse-ecj # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-eclipse-ecj/ChangeLog,v 1.24 2011/10/19 18:22:29 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-eclipse-ecj/ChangeLog,v 1.25 2011/10/19 18:45:13 fordfrog Exp $ + +*ant-eclipse-ecj-3.6-r1 (19 Oct 2011) + + 19 Oct 2011; Miroslav Šulc <fordfrog@gentoo.org> files/ecj-3.6, + +ant-eclipse-ecj-3.6-r1.ebuild: + Fixed compiler settings (bug #378985, thanks to William L. Thomson Jr. + <wlt@obsidian-studios.com> for the fix) 19 Oct 2011; Miroslav Šulc <fordfrog@gentoo.org> -ant-eclipse-ecj-3.5.1.ebuild: diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.6-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.6-r1.ebuild new file mode 100644 index 000000000000..f18b8650119c --- /dev/null +++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.6-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.6-r1.ebuild,v 1.1 2011/10/19 18:45:13 fordfrog Exp $ + +EAPI=4 + +inherit java-pkg-2 + +DMF="R-${PV}-201006080911" +S="${WORKDIR}" + +DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler" +HOMEPAGE="http://www.eclipse.org/" +SRC_URI="http://archive.eclipse.org/eclipse/downloads/drops/${DMF/.0}/ecjsrc-${PV}.zip" + +LICENSE="EPL-1.0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +SLOT="3.6" +IUSE="" + +RDEPEND=">=virtual/jre-1.4 + ~dev-java/eclipse-ecj-${PV} + >=dev-java/ant-core-1.7" +DEPEND="${RDEPEND} + app-arch/unzip + >=virtual/jdk-1.4" + +src_unpack() { + unpack ${A} + mkdir -p src/org/eclipse/jdt/{core,internal} + cp org/eclipse/jdt/core/JDTCompilerAdapter.java \ + src/org/eclipse/jdt/core || die + cp -r org/eclipse/jdt/internal/antadapter \ + src/org/eclipse/jdt/internal || die + rm -fr about* org +} + +src_compile() { + cd src + java-pkg_filter-compiler jikes + ejavac -classpath "$(java-pkg_getjars ant-core,eclipse-ecj-${SLOT})" \ + $(find org/ -name '*.java') || die "ejavac failed!" + find org/ -name '*.class' -o -name '*.properties' | \ + xargs jar cf "${S}/${PN}.jar" || die "jar failed!" +} + +src_install() { + java-pkg_dojar ${PN}.jar + insinto /usr/share/java-config-2/compiler + doins "${FILESDIR}/ecj-${SLOT}" +} diff --git a/dev-java/ant-eclipse-ecj/files/ecj-3.6 b/dev-java/ant-eclipse-ecj/files/ecj-3.6 index a15e7705d7a5..966b78449e90 100644 --- a/dev-java/ant-eclipse-ecj/files/ecj-3.6 +++ b/dev-java/ant-eclipse-ecj/files/ecj-3.6 @@ -1,7 +1,7 @@ -JAVAC="/usr/bin/ecj-3.5" -PACKAGE="=dev-java/ant-eclipse-ecj-3.5*" +JAVAC="/usr/bin/ecj-3.6" +PACKAGE="=dev-java/ant-eclipse-ecj-3.6*" SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7" SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7" ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter" -ANT_BUILD_COMPILER_DEPS="eclipse-ecj-3.5,ant-eclipse-ecj-3.5" +ANT_BUILD_COMPILER_DEPS="eclipse-ecj-3.6,ant-eclipse-ecj-3.6" GENERATION="2" |