Version bump.
authorSerkan Kaba <serkan@gentoo.org>
Sun, 28 Feb 2010 10:16:03 +0000 (10:16 +0000)
committerSerkan Kaba <serkan@gentoo.org>
Sun, 28 Feb 2010 10:16:03 +0000 (10:16 +0000)
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

dev-java/dbus-java/ChangeLog
dev-java/dbus-java/dbus-java-2.7.ebuild [new file with mode: 0644]
dev-java/libmatthew-java/ChangeLog
dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch [new file with mode: 0644]
dev-java/libmatthew-java/libmatthew-java-0.7.2.ebuild [new file with mode: 0644]

index d01adbc1ec8be7900187b56cc3d20d764dc721b4..6d103545b5666aafd11756c308782619dba170a0 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/dbus-java
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/ChangeLog,v 1.8 2009/04/29 17:53:35 serkan Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/ChangeLog,v 1.9 2010/02/28 10:16:03 serkan Exp $
+
+*dbus-java-2.7 (28 Feb 2010)
+
+  28 Feb 2010; Serkan Kaba <serkan@gentoo.org> +dbus-java-2.7.ebuild:
+  Version bump.
 
 *dbus-java-2.6 (29 Apr 2009)
 
diff --git a/dev-java/dbus-java/dbus-java-2.7.ebuild b/dev-java/dbus-java/dbus-java-2.7.ebuild
new file mode 100644 (file)
index 0000000..5487af1
--- /dev/null
@@ -0,0 +1,97 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/dbus-java-2.7.ebuild,v 1.1 2010/02/28 10:16:03 serkan Exp $
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+inherit eutils java-pkg-2
+
+DESCRIPTION="Java bindings for the D-Bus messagebus."
+HOMEPAGE="http://dbus.freedesktop.org/"
+SRC_URI="http://dbus.freedesktop.org/releases/dbus-java/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 AFL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=virtual/jre-1.5
+       >=dev-java/libmatthew-java-0.7-r1"
+
+DEPEND=">=virtual/jdk-1.5
+       app-text/docbook-sgml-utils
+       dev-java/libmatthew-java
+       sys-devel/gettext
+       doc? (
+               dev-tex/tex4ht
+               dev-texlive/texlive-latexextra
+       )"
+
+java_prepare() {
+       epatch "${FILESDIR}/${PN}-2.5.1-jarfixes.patch"
+}
+
+src_compile() {
+       local debug="disable"
+       use debug && debug="enable"
+       local libdir=$(dirname $(java-pkg_getjar libmatthew-java unix.jar))
+       emake -j1 JCFLAGS="$(java-pkg_javac-args)" \
+               STRIP=echo DEBUG=${debug} JAVAUNIXJARDIR=${libdir} bin || die "emake failed"
+
+       for i in *.sgml; do
+               docbook2man $i || die;
+               mv DBUS-JAVA.1 $(echo $i | sed 's/sgml/1/g') || die;
+       done
+
+       if use doc; then
+               emake doc || die "emake doc failed"
+       fi
+}
+
+src_install() {
+       local debug="disable"
+       use debug && debug="enable"
+       for jar in unix debug-${debug}; do
+               java-pkg_register-dependency libmatthew-java ${jar}.jar
+       done
+       java-pkg_newjar lib${P}.jar dbus.jar
+       java-pkg_newjar dbus-java-viewer-${PV}.jar dbus-java-viewer.jar
+       java-pkg_newjar dbus-java-bin-${PV}.jar dbus-java-bin.jar
+       local javaargs='-DPid=$$'
+       javaargs="${javaargs} -DVersion=${PV}"
+
+       java-pkg_dolauncher CreateInterface \
+               --main org.freedesktop.dbus.bin.CreateInterface \
+               --java_args "${javaargs}"
+
+       java-pkg_dolauncher DBusViewer \
+               --main org.freedesktop.dbus.viewer.DBusViewer \
+               --java_args "${javaargs}"
+
+       java-pkg_dolauncher ListDBus \
+               --main org.freedesktop.dbus.bin.ListDBus \
+               --java_args "${javaargs}"
+
+       java-pkg_dolauncher DBusDaemon \
+               --main org.freedesktop.dbus.bin.DBusDaemon \
+               --java_args "${javaargs}"
+
+       java-pkg_dolauncher DBusCall \
+               --main org.freedesktop.dbus.bin.Caller \
+               --java_args "${javaargs}"
+
+       doman *.1
+       dodoc INSTALL changelog AUTHORS README || die
+       use source && java-pkg_dosrc org/
+       use doc && java-pkg_dojavadoc doc/api
+       use doc && java-pkg_dohtml doc/dbus-java/*
+}
+
+src_test() {
+       local debug="disable"
+       use debug && debug="enable"
+       local libdir=$(dirname $(java-pkg_getjar libmatthew-java unix.jar))
+       emake -j1 JCFLAGS="$(java-pkg_javac-args) -encoding UTF-8" \
+               DEBUG=${debug} JAVAUNIXJARDIR=${libdir} JAVAUNIXLIBDIR=/usr/lib/libmatthew-java check || die "emake check failed"
+}
index 7a411b8c8ba9935e02ba75dad96b7d17f3571bf1..fb4dde7bf213073b2ed8dcb9d693e4a1598d112f 100644 (file)
@@ -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 (file)
index 0000000..40fde3d
--- /dev/null
@@ -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 (file)
index 0000000..7e3d047
--- /dev/null
@@ -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
+}