From ac93c6ab2076c54b894a5061d1a83f5d06315613 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Wed, 20 May 2009 16:03:46 +0000 Subject: Version bump, thanks to andrewktest@yandex.ru and other devs working on this in java-overlay. (Portage version: 2.2_rc33/cvs/Linux x86_64) --- dev-java/aspectwerkz/ChangeLog | 10 +- dev-java/aspectwerkz/aspectwerkz-2.0.ebuild | 80 ++++++++++++ dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild | 73 ----------- .../aspectwerkz/files/aspectwerkz-2.0-gentoo.patch | 138 +++++++++++++++++++++ 4 files changed, 226 insertions(+), 75 deletions(-) create mode 100644 dev-java/aspectwerkz/aspectwerkz-2.0.ebuild delete mode 100644 dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild create mode 100644 dev-java/aspectwerkz/files/aspectwerkz-2.0-gentoo.patch (limited to 'dev-java') diff --git a/dev-java/aspectwerkz/ChangeLog b/dev-java/aspectwerkz/ChangeLog index 27e055765acf..0b10adfdf5d9 100644 --- a/dev-java/aspectwerkz/ChangeLog +++ b/dev-java/aspectwerkz/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/aspectwerkz -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.27 2008/10/25 17:23:14 nixnut Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.28 2009/05/20 16:03:46 caster Exp $ + + 20 May 2009; Vlastimil Babka + -aspectwerkz-2.0_rc2-r2.ebuild, +aspectwerkz-2.0.ebuild, + +files/aspectwerkz-2.0-gentoo.patch: + Version bump, thanks to andrewktest@yandex.ru and other devs working on + this in java-overlay. 25 Oct 2008; nixnut aspectwerkz-2.0_rc2-r3.ebuild: Stable on ppc wrt bug 242952 diff --git a/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild b/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild new file mode 100644 index 000000000000..6185763df96e --- /dev/null +++ b/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild,v 1.3 2009/05/20 16:03:46 caster Exp $ + +EAPI=2 + +JAVA_PKG_IUSE="doc java5 source" + +inherit java-pkg-2 java-ant-2 eutils + +DESCRIPTION="AspectWerkz is a dynamic, lightweight and high-performant AOP/AOSD framework for Java." +SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip" +HOMEPAGE="http://aspectwerkz.codehaus.org" +LICENSE="LGPL-2.1" +SLOT="2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" +# bug 203268 +RESTRICT="test" + +COMMON_DEP=" + dev-java/asm:1.5 + dev-java/concurrent-util:0 + dev-java/dom4j:1 + dev-java/jrexx:0 + dev-java/trove:0 + dev-java/qdox:1.6 + dev-java/junit:0" +RDEPEND=" + !java5? ( >=virtual/jre-1.4 ) + java5? ( >=virtual/jre-1.5 ) + ${COMMON_DEP}" +DEPEND=" + !java5? ( >=virtual/jdk-1.4 ) + java5? ( >=virtual/jdk-1.5 ) + ${COMMON_DEP} + app-arch/unzip" + +java_prepare() { + # unit tests need this + chmod +x "bin/${PN}" || die + epatch "${FILESDIR}/${P}-gentoo.patch" + + find . -name '*.jar' -delete || die + + cd "${S}/lib" + java-pkg_jar-from asm-1.5 + java-pkg_jar-from concurrent-util + java-pkg_jar-from dom4j-1 + java-pkg_jar-from jrexx + java-pkg_jar-from junit + java-pkg_jar-from trove + java-pkg_jar-from qdox-1.6 +} + +_eant() { + local antflags + use java5 && antflags="-Djava.version=1.5" || antflags="-Djava.version=1.4" + eant ${antflags} "${@}" + +} + +src_compile() { + _eant dist #precompiled javadocs +} + +src_test() { + _eant test +} + +src_install() { + use source && java-pkg_dosrc src/* + # other stuff besides javadoc here too + use doc && java-pkg_dohtml -r docs/* + + cd lib + for jar in ${PN}*.jar; do + java-pkg_newjar ${jar} ${jar/-${PV}} + done +} diff --git a/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild b/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild deleted file mode 100644 index 671e2e88a5bd..000000000000 --- a/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild,v 1.12 2008/03/30 17:12:41 corsair Exp $ - -JAVA_PKG_BSFIX="off" -# no rewriting required since we patch build.xml to contain target/source - -inherit java-pkg-2 eutils java-ant-2 - -DESCRIPTION="AspectWerkz is a dynamic, lightweight and high-performant AOP/AOSD framework for Java." -SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P/_rc/.RC}.zip" -HOMEPAGE="http://aspectwerkz.codehaus.org" -LICENSE="LGPL-2.1" -SLOT="2" -KEYWORDS="amd64 ppc ~ppc64 x86" -RDEPEND=">=virtual/jre-1.3 - =dev-java/asm-1.5* - dev-java/bcel - dev-java/concurrent-util - =dev-java/dom4j-1* - =dev-java/javassist-2* - dev-java/jrexx - =dev-java/junit-3.8* - >=dev-java/junitperf-1.9.1 - dev-java/trove - dev-java/qdox" -DEPEND="java5? ( >=virtual/jdk-1.5 ) - !java5? ( >=virtual/jdk-1.3 ) - >=dev-java/java-config-2.0.31 - ${RDEPEND} - >=dev-java/ant-core-1.5 - app-arch/unzip - source? ( app-arch/zip )" -IUSE="java5 source" - -S=${WORKDIR}/aw_2_0_2 - -# These fail -RESTRICT="test" - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}"/${P}-gentoo.patch - epatch "${FILESDIR}"/${P}-jdk15.patch - - find . -name '*.jar' -exec rm {} \; || die - cd "${S}"/lib - #rm *.jar - java-pkg_jar-from asm-1.5 - java-pkg_jar-from bcel - java-pkg_jar-from concurrent-util - java-pkg_jar-from dom4j-1 - java-pkg_jar-from javassist-2 - java-pkg_jar-from jrexx - java-pkg_jar-from junit - java-pkg_jar-from junitperf - java-pkg_jar-from trove - java-pkg_jar-from qdox-1.6 -} - -src_compile() { - local antflags - use "!java5" && antflags="-Dnojdk15=true" - eant ${antflags} dist || die "eant failed" -} - -src_install() { - java-pkg_dojar lib/${PN}*.jar - - use source && java-pkg_dosrc src/* -} diff --git a/dev-java/aspectwerkz/files/aspectwerkz-2.0-gentoo.patch b/dev-java/aspectwerkz/files/aspectwerkz-2.0-gentoo.patch new file mode 100644 index 000000000000..0c7e99a33817 --- /dev/null +++ b/dev-java/aspectwerkz/files/aspectwerkz-2.0-gentoo.patch @@ -0,0 +1,138 @@ +--- build.xml.orig 2005-03-10 12:05:48.000000000 +0300 ++++ build.xml 2006-01-28 12:22:12.436634250 +0300 +@@ -44,8 +44,6 @@ + + + +- +- + + + +@@ -124,7 +122,7 @@ + + + +- ++ + + + +@@ -156,12 +154,6 @@ + + + +- +- +- +- +- +- + + + +@@ -253,49 +245,36 @@ + + + +- ++ + + + +- ++ + + + +- +- +- +- +- ++ ++ + + +- ++ + + +- ++ + + + +- ++ + + + +- +- +- +- +- +- +- +- +- +- +- ++ ++ + + +- +- +- ++ ++ + + + +@@ -308,32 +287,32 @@ + + + +- ++ + + +- +- +- ++ ++ ++ + +- ++ + + + + + + + +- ++ + + +- ++ + + +- +- +- ++ ++ ++ + +- ++ + + + -- cgit v1.2.3-65-gdbad