diff options
author | Serkan Kaba <serkan@gentoo.org> | 2009-04-23 20:15:20 +0000 |
---|---|---|
committer | Serkan Kaba <serkan@gentoo.org> | 2009-04-23 20:15:20 +0000 |
commit | 760b4a4ed068aecbf3de7c10293cbdb79af614c9 (patch) | |
tree | 49c551bc753e83a1e1ef49fcb8451e22c9c664fd /dev-java/zemberek | |
parent | Bump to 0.34, fixes #244894. Thanks to Tim Harder for the modified ebuild. (diff) | |
download | gentoo-2-760b4a4ed068aecbf3de7c10293cbdb79af614c9.tar.gz gentoo-2-760b4a4ed068aecbf3de7c10293cbdb79af614c9.tar.bz2 gentoo-2-760b4a4ed068aecbf3de7c10293cbdb79af614c9.zip |
Finally fix all the issues in stabilization bug #253753. Thanks to Vlastimil Babka <caster@gentoo.org> for the fix. Migrated to EAPI 2.
(Portage version: 2.2_rc31/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/zemberek')
-rw-r--r-- | dev-java/zemberek/ChangeLog | 7 | ||||
-rw-r--r-- | dev-java/zemberek/files/zemberek-2.1.1-classpathfix.patch | 12 | ||||
-rw-r--r-- | dev-java/zemberek/zemberek-2.1.1.ebuild | 20 |
3 files changed, 28 insertions, 11 deletions
diff --git a/dev-java/zemberek/ChangeLog b/dev-java/zemberek/ChangeLog index c7ad5b470949..0ff4e1bb1832 100644 --- a/dev-java/zemberek/ChangeLog +++ b/dev-java/zemberek/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/zemberek # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/zemberek/ChangeLog,v 1.10 2009/03/08 00:03:15 serkan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/zemberek/ChangeLog,v 1.11 2009/04/23 20:15:20 serkan Exp $ + + 23 Apr 2009; Serkan Kaba <serkan@gentoo.org> + +files/zemberek-2.1.1-classpathfix.patch, zemberek-2.1.1: + Finally fix all the issues in stabilization bug #253753. Thanks to + Vlastimil Babka <caster@gentoo.org> for the fix. Migrated to EAPI 2. 08 Mar 2009; Serkan Kaba <serkan@gentoo.org> zemberek-2.1.1: Add hamcrest-core to test dependencies. diff --git a/dev-java/zemberek/files/zemberek-2.1.1-classpathfix.patch b/dev-java/zemberek/files/zemberek-2.1.1-classpathfix.patch new file mode 100644 index 000000000000..fa6c572c1cbf --- /dev/null +++ b/dev-java/zemberek/files/zemberek-2.1.1-classpathfix.patch @@ -0,0 +1,12 @@ +diff -Nur zemberek-2.1.1-nolibs-src/build.xml zemberek-2.1.1-nolibs-src_patched/build.xml +--- zemberek-2.1.1-nolibs-src/build.xml 2008-09-01 23:07:28.000000000 +0300 ++++ zemberek-2.1.1-nolibs-src_patched/build.xml 2009-04-23 23:03:01.000000000 +0300 +@@ -42,7 +42,7 @@ + <path id="classpath.build">
+ <fileset dir="lib/dagitim"/>
+ <fileset dir="lib/gelistirme"/>
+- <fileset dir="${build.cekirdek}"/>
++ <pathelement path="${build.cekirdek}"/>
+ </path>
+
+ <!-- dagitim kutuphaneleri (eger varsa) -->
diff --git a/dev-java/zemberek/zemberek-2.1.1.ebuild b/dev-java/zemberek/zemberek-2.1.1.ebuild index 2ddf6065d518..74a3c9ae7af0 100644 --- a/dev-java/zemberek/zemberek-2.1.1.ebuild +++ b/dev-java/zemberek/zemberek-2.1.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/zemberek/zemberek-2.1.1.ebuild,v 1.2 2009/03/08 00:03:15 serkan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/zemberek/zemberek-2.1.1.ebuild,v 1.3 2009/04/23 20:15:20 serkan Exp $ -EAPI=1 +EAPI=2 JAVA_PKG_IUSE="source doc test" inherit eutils java-pkg-2 java-ant-2 @@ -31,10 +31,13 @@ DEPEND=">=virtual/jdk-1.5 ) app-arch/unzip" -src_unpack() { - unpack ${A} - cd "${S}" || die +java_prepare() { use test && java-pkg_jarfrom --build-only --into lib/gelistirme junit-4 junit.jar + # Added hamcrest-core as a workaround + # Issue spotted by Markus Meier <maekke@gentoo.org> + # See http://bugs.gentoo.org/show_bug.cgi?id=253753#c3 + use test && java-pkg_jarfrom --build-only --into lib/gelistirme hamcrest-core + epatch "${FILESDIR}"/${P}-classpathfix.patch } src_compile() { @@ -61,8 +64,5 @@ src_install() { } src_test() { - # Added hamcrest-core as a workaround - # Issue spotted by Markus Meier <maekke@gentoo.org> - # See http://bugs.gentoo.org/show_bug.cgi?id=253753#c3 - ANT_TASKS="ant-junit4 hamcrest-core" eant unit-test + ANT_TASKS="ant-junit4" eant unit-test } |