Finally fix all the issues in stabilization bug #253753. Thanks to Vlastimil Babka <caster@gentoo.org> for the fix. Migrated to EAPI 2.

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

4 files changed, 35 insertions, 17 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/Manifest b/dev-java/zemberek/Manifest
index 36cd3451ec86..dbe488d83094 100644
--- a/dev-java/zemberek/Manifest
+++ b/dev-java/zemberek/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX zemberek-2.1.1-classpathfix.patch 514 RMD160 687c2a79aaedb35866a025c8cb23ca13f2c0f0ef SHA1 5efc632d135a8c2189f4484d4e9463f06efb345e SHA256 a68aed859de64ae5f59cb4b4f31f4e89ed88ad895629b1e9feef9d1d1acc1687
 DIST zemberek-2.0-src.zip 1413624 RMD160 f74a5cdebcf6258ed0e848dfee7161e1a0bc19cd SHA1 8c9388eddd01521eb0b92adc9fd718feb873215e SHA256 ef26d6fef42f1ef72bc0d241019357b9c9707783634407626fe8a43178b360a4
 DIST zemberek-2.1.1-nolibs-src.zip 1196289 RMD160 bb2d103d7b40703dc4ed05ec9814a701ba812be1 SHA1 ec3caec6d157f484b9da9c7cfb1dbfaeba69b283 SHA256 0a1a9a3bb2c76c9c40a96aea81e99abc0fab1baadc31fcc975bc5b235937cca3
 EBUILD zemberek-2.0.ebuild 1399 RMD160 5d1a860349852e27a8630dd38bbedc3986ee6c09 SHA1 1ddf27af4ff2c3ea4516937f83665bbad48cfce6 SHA256 a1499432ae009c5d591d12e2548a5993226280b22e534952b389960d899b7c24
-EBUILD zemberek-2.1.1.ebuild 1725 RMD160 4aa7d0582488704bafad9657d9ddb99594e4d5bb SHA1 367355b6ca0bff1503a68a38faa9d44c08aee708 SHA256 812142904edfae1ef294c19d7484cb2e52b5d385c1282a6a4fa46040346c343d
-MISC ChangeLog 1593 RMD160 844293e4ebd8a6454078a4e8f16a7860df934741 SHA1 7b5c15795ba32fecef03ee9b85290f4a63ee60f2 SHA256 dde9a43e383c015a90a2b48fcd9bbfbbe6e096647526da67bd3ba51e15d8838f
+EBUILD zemberek-2.1.1.ebuild 1807 RMD160 4ae36b19cd53422bf41dd2466e082f88ed0326d7 SHA1 b455134ef933408efecc537a0ba5c7af63d05e25 SHA256 fac916ff9259ebbbf95da71f525d9794c64f8dab5c7a5f6546bcac62301d2242
+MISC ChangeLog 1841 RMD160 6b5302fcb6166b6e14a66b2617870d81c097bb2a SHA1 e68935430ec5539f87c36660968d4bc37928239c SHA256 91ce17f9874b2f2464826373aa567ebcfe40e34efdbd8e53287c1751eff6c727
 MISC metadata.xml 216 RMD160 05d4d9c2f1c459ea9309346016001e26bad574ce SHA1 98783559fec44d27f1294db2e9549af2fe38f1b3 SHA256 94b55a2ec67c524728d32249d59a6a1545fd37d61c83259b5f05163ca47e87e1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmzC0kACgkQRh6X64ivZaLoXACfRFxsItvjIVp/n3JE7rtqD327
-Qb8AnRCmJB9elatqQYtegnNtM0oEaRjt
-=/z2F
+iEYEARECAAYFAknwzF8ACgkQRh6X64ivZaLcMACeKrjGOurTcpacfQsvMvHlu8Cx
+1esAn2Cew6b/cVGcQSlLlIvtlL8uFZWg
+=dimZ
 -----END PGP SIGNATURE-----
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
 }