Revbump to avoid bundling of unit tests in the jar. Migrate to EAPI 1.

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

4 files changed, 40 insertions, 12 deletions

diff --git a/dev-java/jflex/ChangeLog b/dev-java/jflex/ChangeLog
index 631fb10678fe..bc035f5b8c13 100644
--- a/dev-java/jflex/ChangeLog
+++ b/dev-java/jflex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jflex
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.3 2008/01/10 22:34:32 caster Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.4 2009/01/31 14:27:08 serkan Exp $
+
+*jflex-1.4.1-r1 (31 Jan 2009)
+
+  31 Jan 2009; Serkan Kaba <serkan@gentoo.org>
+  files/jflex-1.4.1-build.xml.patch, -jflex-1.4.1.ebuild,
+  +jflex-1.4.1-r1.ebuild:
+  Revbump to avoid bundling of unit tests in the jar. Migrate to EAPI 1.
 
   10 Jan 2008; Vlastimil Babka <caster@gentoo.org> jflex-1.4.1.ebuild:
   Restrict junit dependency.
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index 74fad30f8279..5b38b484f013 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,5 +1,15 @@
-AUX jflex-1.4.1-build.xml.patch 885 RMD160 114292eddcdeb7fe3629093e3e33adda1df666b8 SHA1 1a45c8e6b4c1aff1e32d8cd9e8e776fd29b6d9e1 SHA256 3c4df82c3b0ce4eec17397fd107f15d705a8320f9cf25699689e7910aac14e2a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX jflex-1.4.1-build.xml.patch 1216 RMD160 c6f940fb8a71da4765116026cfb01b7cefb377d6 SHA1 ea04040dee246175f51e08fc2fd2da2f65b65fd1 SHA256 2b57811076497845bae61a0ea46026e2aaa92da14014a6ee57b2931202a3b9b9
 DIST jflex-1.4.1.tar.gz 986546 RMD160 043a78f092e2c89253e4c53c6cd8c37aafaf05ed SHA1 274ced17ce5e9709cdc177ea4e5096c697fee1e5 SHA256 6b70a95208b301ca6abcd80fb93c60de006b5b5d4fc9a7d63848bdf0c2e6973a
-EBUILD jflex-1.4.1.ebuild 1931 RMD160 48296d4a88723df1f7d2f5032387c95179664697 SHA1 4a0f61cde31bba17db156266a300c6f1f8061e6a SHA256 f775a61270795f2548872f5ab3fb6b1b7c407757f0a16b7f145055eda9ed3279
-MISC ChangeLog 645 RMD160 5bdd525581b279b07b4c2171c0c8b06741c9619f SHA1 b1ab892bd6959e73d48c56865bdbde229c6f49f0 SHA256 e8d8b79c765cc26e73a56d4bff85edfd984a655d81502250dcad221992aa47dc
+EBUILD jflex-1.4.1-r1.ebuild 1943 RMD160 a0d6714d34c113b8150fe5703874230f00795292 SHA1 bf280513b974b0284d36e6dcd867b35b6b5b2a2a SHA256 142f67f97b5f87f0b9913ecdb0b7503bdb6e8997dab504987e6042b5437e83b8
+MISC ChangeLog 881 RMD160 9ea8ab5aa5d6166854388ddc5eb2d9d64eb0340b SHA1 ea2ad937db2497dbf5ac128de689a0c57344538c SHA256 2dff9788686c6129e17c033cfce3d8747221e38cacb629592c8b43b78d9afe00
 MISC metadata.xml 290 RMD160 73898cd06f7e7ed62b4337ee955536899ae816c8 SHA1 592dac280e41c85b85f7b8bf082b707d45b16dda SHA256 e365b92e59f17ebb03d11d7c77908f81b3dd4cf230ff5817bf783228f144ae92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmEX8UACgkQRh6X64ivZaJz4QCfcrbr0kxeSBUpyptfvMNt41ZM
+NAsAn1cBdi+PHyyxY0vnUOyArGYPBE3N
+=8j2g
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jflex/files/jflex-1.4.1-build.xml.patch b/dev-java/jflex/files/jflex-1.4.1-build.xml.patch
index 36cf85cb47f2..8353cbe52a76 100644
--- a/dev-java/jflex/files/jflex-1.4.1-build.xml.patch
+++ b/dev-java/jflex/files/jflex-1.4.1-build.xml.patch
@@ -1,5 +1,5 @@
---- build.xml	2007-05-21 17:01:26.000000000 +0200
-+++ build-neww.xml	2007-05-21 17:02:02.000000000 +0200
+--- build.xml	2009-01-31 16:14:57.000000000 +0200
++++ build.xml.fixed	2009-01-31 16:17:14.000000000 +0200
 @@ -35,7 +35,7 @@
  
    <target name="declare" description="define tasks for jflex and cup">
@@ -18,3 +18,13 @@
    </target>
  
    <target name="copy" description="copy resources to build dir">
+@@ -79,7 +79,8 @@
+ 
+   <target name="jar" depends="compile,copy" description="make JFlex.jar">
+     <jar basedir="../lib" 
+-    	 includes="JFlex/**,java_cup/**,skeleton" 
++    	 includes="JFlex/**,java_cup/**,skeleton"
++    	 excludes="JFlex/tests/*" 
+     	 jarfile="../lib/JFlex.jar" 
+     	 manifest="manifest"/>
+   </target>
diff --git a/dev-java/jflex/jflex-1.4.1.ebuild b/dev-java/jflex/jflex-1.4.1-r1.ebuild
index 99170f34c87c..23cb48a0b2cc 100644
--- a/dev-java/jflex/jflex-1.4.1.ebuild
+++ b/dev-java/jflex/jflex-1.4.1-r1.ebuild
@@ -1,10 +1,11 @@
-# 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/jflex/jflex-1.4.1.ebuild,v 1.2 2008/01/10 22:34:32 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.4.1-r1.ebuild,v 1.1 2009/01/31 14:27:08 serkan Exp $
 
 # Currently, this package uses an included JFlex.jar file to bootstrap.
 # Upstream was contacted and this bootstrap is really needed. The only way to avoid it would be to use a supplied pre-compiled .scanner file.
 
+EAPI="1"
 JAVA_PKG_IUSE="source"
 
 inherit java-pkg-2 java-ant-2
@@ -18,11 +19,11 @@ KEYWORDS="~x86 ~amd64"
 RDEPEND=">=virtual/jre-1.4
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 	>=dev-java/ant-core-1.7.0
-	>=dev-java/javacup-0.11a_beta20060608"
+	>=dev-java/javacup-0.11a_beta20060608:0"
 
 DEPEND=">=virtual/jdk-1.4
-	=dev-java/junit-3.8*
-	>=dev-java/javacup-0.11a_beta20060608"
+	dev-java/junit:0
+	>=dev-java/javacup-0.11a_beta20060608:0"
 
 IUSE="doc source vim-syntax"