fixes 93032, versioned jar, thanks too Josh Nichols <nichoj@alum.rpi.edu>

6 files changed, 64 insertions, 25 deletions

diff --git a/dev-java/gnu-regexp/ChangeLog b/dev-java/gnu-regexp/ChangeLog
index 5cd2996364c4..9e2ff1aa633d 100644
--- a/dev-java/gnu-regexp/ChangeLog
+++ b/dev-java/gnu-regexp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/gnu-regexp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-regexp/ChangeLog,v 1.10 2005/05/01 09:58:42 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-regexp/ChangeLog,v 1.11 2005/05/18 11:32:46 axxo Exp $
+
+*gnu-regexp-1.1.4-r1 (18 May 2005)
+
+  18 May 2005; Thomas Matthijs <axxo@gentoo.org> files/1.1.4/Makefile.diff,
+  gnu-regexp-1.1.4.ebuild, +gnu-regexp-1.1.4-r1.ebuild:
+  fixes 93032, versioned jar, thanks too Josh Nichols <nichoj@alum.rpi.edu>
 
   01 May 2005; Jan Brinkmann <luckyduck@gentoo.org> gnu-regexp-1.1.4.ebuild:
   stabe on ppc
diff --git a/dev-java/gnu-regexp/Manifest b/dev-java/gnu-regexp/Manifest
index 36747f88da30..a71e308c500c 100644
--- a/dev-java/gnu-regexp/Manifest
+++ b/dev-java/gnu-regexp/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 826fee077d846148ddb592f4f7c59a7f gnu-regexp-1.1.4-r1.ebuild 794
 MD5 b26bc3ec1b55715877dba9e7ab7b5b4c gnu-regexp-1.1.4.ebuild 801
 MD5 c903e3332199082a51dc9a83e6202d8d ChangeLog 1114
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 e3f41708bcacefe69992a1f46bc22fd7 files/digest-gnu-regexp-1.1.4-r1 68
 MD5 e3f41708bcacefe69992a1f46bc22fd7 files/digest-gnu-regexp-1.1.4 68
 MD5 67288abfb468ae681baad511f8415ea1 files/1.1.4/Makefile.diff 128
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCdKhh06ebR+OMO78RAkSaAKCNqxGAISWd4Zc1p8C2Sk8xUjhl6gCghIiO
-LjhbQKAIKIaFkFZSCjbWZ1M=
-=7arv
------END PGP SIGNATURE-----
diff --git a/dev-java/gnu-regexp/files/1.1.4/Makefile.diff b/dev-java/gnu-regexp/files/1.1.4/Makefile.diff
index 34bf6a7b63d6..b947f9f36aad 100644
--- a/dev-java/gnu-regexp/files/1.1.4/Makefile.diff
+++ b/dev-java/gnu-regexp/files/1.1.4/Makefile.diff
@@ -1,11 +1,19 @@
-60,63c60
-< JAVAC = jikes
-< JAVAFLAGS = -O
-< 
-< #JAVAC = javac
----
-> #JAVAC = jikes
-65a63,65
-> JAVAC = javac
-> JAVAFLAGS = -O
-> 
+--- src/Makefile	2005-05-18 13:26:10.000000000 +0200
++++ src/Makefile.new	2005-05-18 13:26:27.000000000 +0200
+@@ -57,12 +57,12 @@
+ # Change JAVAC variable to your java compiler.
+ # Change JAVAFLAGS variable to any java flags you want to compile with.
+ 
+-JAVAC = jikes
+-JAVAFLAGS = -O
+-
+-#JAVAC = javac
++#JAVAC = jikes
+ #JAVAFLAGS = -O
+ 
++JAVAC = javac
++JAVAFLAGS = -O
++
+ JAVACOMPILE = $(JAVAC) -d "$(LIBPATH)" $(JAVAFLAGSCLASSPATH) $(JAVAFLAGS)
+ 
+ # This is the directory the gnu.regexp JAR file will be installed in when
diff --git a/dev-java/gnu-regexp/files/digest-gnu-regexp-1.1.4-r1 b/dev-java/gnu-regexp/files/digest-gnu-regexp-1.1.4-r1
new file mode 100644
index 000000000000..64837e3c0f98
--- /dev/null
+++ b/dev-java/gnu-regexp/files/digest-gnu-regexp-1.1.4-r1
@@ -0,0 +1 @@
+MD5 4b5a3722f1d814ee30591ad21b519d28 gnu.regexp-1.1.4.tar.gz 164741
diff --git a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r1.ebuild b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..2df737efbeb0
--- /dev/null
+++ b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-regexp/gnu-regexp-1.1.4-r1.ebuild,v 1.1 2005/05/18 11:32:46 axxo Exp $
+
+inherit java-pkg eutils
+
+MY_P=gnu.regexp-${PV}
+DESCRIPTION="GNU regular expression package for Java"
+HOMEPAGE="http://www.cacas.org/java/gnu/regexp/"
+SRC_URI="ftp://ftp.tralfamadore.com/pub/java/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.2"
+RDEPEND=">=virtual/jre-1.2"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	epatch ${FILESDIR}/${PV}/Makefile.diff
+	cd src
+	make || die "failed too build"
+}
+
+src_install () {
+	java-pkg_newjar lib/gnu-regexp-${PV}.jar ${PN}.jar
+	dodoc README TODO
+	java-pkg_dohtml -r docs/*
+}
diff --git a/dev-java/gnu-regexp/gnu-regexp-1.1.4.ebuild b/dev-java/gnu-regexp/gnu-regexp-1.1.4.ebuild
index 7949532ea1e5..82dd6da2134a 100644
--- a/dev-java/gnu-regexp/gnu-regexp-1.1.4.ebuild
+++ b/dev-java/gnu-regexp/gnu-regexp-1.1.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-regexp/gnu-regexp-1.1.4.ebuild,v 1.11 2005/05/01 09:58:42 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-regexp/gnu-regexp-1.1.4.ebuild,v 1.12 2005/05/18 11:32:46 axxo Exp $
 
-inherit java-pkg
+inherit java-pkg eutils
 
 MY_P=gnu.regexp-${PV}
 DESCRIPTION="GNU regular expression package for Java"
@@ -20,7 +20,7 @@ RDEPEND=">=virtual/jre-1.2"
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
-	patch src/Makefile ${FILESDIR}/${PV}/Makefile.diff
+	epatch ${FILESDIR}/${PV}/Makefile.diff
 	cd src
 	make || die "failed too build"
 }