Version bump.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 121 insertions, 2 deletions

diff --git a/dev-java/libmatthew-java/ChangeLog b/dev-java/libmatthew-java/ChangeLog
index 7a411b8c8ba9..fb4dde7bf213 100644
--- a/dev-java/libmatthew-java/ChangeLog
+++ b/dev-java/libmatthew-java/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/libmatthew-java
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/ChangeLog,v 1.7 2009/01/23 17:53:58 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/ChangeLog,v 1.8 2010/02/28 10:14:17 serkan Exp $
+
+*libmatthew-java-0.7.2 (28 Feb 2010)
+
+  28 Feb 2010; Serkan Kaba <serkan@gentoo.org>
+  +libmatthew-java-0.7.2.ebuild,
+  +files/libmatthew-java-0.7.2-makefile-fixes.patch:
+  Version bump.
 
   23 Jan 2009; Brent Baude <ranger@gentoo.org> libmatthew-java-0.7.1.ebuild:
   Marking libmatthew-java-0.7.1 ppc64 for bug 253054
diff --git a/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch b/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch
new file mode 100644
index 000000000000..40fde3db649c
--- /dev/null
+++ b/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch
@@ -0,0 +1,68 @@
+diff -Nur libmatthew-java-0.7.2/Makefile libmatthew-java-0.7.2_patched/Makefile
+--- libmatthew-java-0.7.2/Makefile	2009-04-05 12:46:42.000000000 +0300
++++ libmatthew-java-0.7.2_patched/Makefile	2010-02-28 12:07:15.000000000 +0200
+@@ -6,13 +6,13 @@
+ CC?=gcc
+ LD?=gcc
+ JPPFLAGS+=-C -P
+-CFLAGS+=-Wall -Os -pedantic -Werror
++CFLAGS+=-Wall -pedantic -Werror
+ CSTD?=-std=c99
+ CSHAREFLAG+=-fpic -fno-stack-protector
+ GCJJNIFLAG=-fjni
+ JVERCFLAGS+=-source 1.5
+ JCFLAGS+=
+-INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
++INCLUDES=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+ JAVADOCFLAGS?=-quiet -author -link http://java.sun.com/j2se/1.4.2/docs/api/
+ 
+ LDVER?=$(shell ld -v | cut -d' ' -f1)
+@@ -20,9 +20,8 @@
+ 
+ ifeq ($(LDVER),GNU)
+ LDSHAREFLAGS+=-fpic -shared
+-else
+-LDSHAREFLAGS+=-lc
+ endif
++LDLIBS=-lc
+ 
+ PREFIX?=/usr/local
+ JARDIR?=$(PREFIX)/share/java
+@@ -62,12 +61,7 @@
+ io-$(IOVER).jar: .classes
+ 	(cd classes; $(JAR) cf ../$@ cx/ath/matthew/io/*class)
+ unix-$(UNIXVER).jar: .classes
+-ifeq ($(DEBUG),enable)
+-	echo "Class-Path: $(JARDIR)/debug-$(DEBUG).jar" > Manifest
+-else
+-	echo "Class-Path: " > Manifest
+-endif
+-	(cd classes; $(JAR) cfm ../$@ ../Manifest cx/ath/matthew/unix/*class)
++	(cd classes; $(JAR) cf ../$@ cx/ath/matthew/unix/*class)
+ 
+ hexdump-$(HEXVER).jar: .classes
+ 	(cd classes; $(JAR) cf ../$@ cx/ath/matthew/utils/Hexdump.class)
+@@ -75,7 +69,7 @@
+ %.o: %.c %.h
+ 	$(CC) $(CFLAGS) $(CSTD) $(CSHAREFLAG) $(INCLUDES) -c -o $@ $<
+ lib%.so: %.o
+-	$(CC) $(LDFLAGS) $(LDSHAREFLAGS) -o $@ $<
++	$(CC) $(LDFLAGS) $(LDSHAREFLAGS) -o $@ $< $(LDLIBS)
+ unix-java.h: .classes
+ 	$(JAVAH) -classpath classes -o $@ cx.ath.matthew.unix.UnixServerSocket cx.ath.matthew.unix.UnixSocket cx.ath.matthew.unix.USInputStream cx.ath.matthew.unix.USOutputStream
+ cgi-java.h: .classes
+@@ -91,12 +85,10 @@
+ 
+ debug-enable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
+ 	make .enabledebug
+-	echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
+-	(cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
++	(cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class)
+ debug-disable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
+ 	make .disabledebug
+-	echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
+-	(cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
++	(cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class)
+ .enabledebug: cx/ath/matthew/debug/Debug.jpp 
+ 	mkdir -p classes
+ 	cpp $(PPFLAGS) $(JPPFLAGS) -DDEBUGSETTING=true < cx/ath/matthew/debug/Debug.jpp > cx/ath/matthew/debug/Debug.java
diff --git a/dev-java/libmatthew-java/libmatthew-java-0.7.2.ebuild b/dev-java/libmatthew-java/libmatthew-java-0.7.2.ebuild
new file mode 100644
index 000000000000..7e3d0476c67f
--- /dev/null
+++ b/dev-java/libmatthew-java/libmatthew-java-0.7.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/libmatthew-java-0.7.2.ebuild,v 1.1 2010/02/28 10:14:17 serkan Exp $
+
+JAVA_PKG_IUSE="doc source"
+inherit eutils java-pkg-2 flag-o-matic toolchain-funcs
+
+DESCRIPTION="A selection of libraries for Java"
+HOMEPAGE="http://www.matthew.ath.cx/projects/java/"
+SRC_URI="http://www.matthew.ath.cx/projects/java/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-makefile-fixes.patch
+	rm -v "${S}"/cx/ath/matthew/debug/Debug.java || die "rm failed"
+}
+
+src_compile() {
+	LDFLAGS="$(raw-ldflags)" \
+	CC=$(tc-getCC) LD=$(tc-getLD) INCLUDES="$(java-pkg_get-jni-cflags)" \
+		emake -j1 JARDIR=/usr/share/libmatthew-java/lib JCFLAGS="$(java-pkg_javac-args)" all $(usev doc) || die "emake failed"
+}
+
+src_install() {
+	java-pkg_newjar cgi-0.5.jar cgi.jar
+	java-pkg_newjar debug-disable-1.1.jar debug-disable.jar
+	java-pkg_newjar debug-enable-1.1.jar debug-enable.jar
+	java-pkg_newjar hexdump-0.2.jar hexdump.jar
+	java-pkg_newjar io-0.1.jar io.jar
+	java-pkg_newjar unix-0.5.jar unix.jar
+	java-pkg_doso libcgi-java.so
+	java-pkg_doso libunix-java.so
+	dodoc INSTALL changelog README || die
+	use source && java-pkg_dosrc cx/
+	use doc && java-pkg_dojavadoc doc
+}