summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerkan Kaba <serkan@gentoo.org>2008-11-28 05:18:29 +0000
committerSerkan Kaba <serkan@gentoo.org>2008-11-28 05:18:29 +0000
commit3db295c994a1423b92191283ca483304001a984d (patch)
treeafc583a2ed371ce2c94f5c336f3212e815bd1ab4 /dev-java/dbus-java
parentFix building w/ gcc-4.3. Bug #228839. (diff)
downloadgentoo-2-3db295c994a1423b92191283ca483304001a984d.tar.gz
gentoo-2-3db295c994a1423b92191283ca483304001a984d.tar.bz2
gentoo-2-3db295c994a1423b92191283ca483304001a984d.zip
Version bump. Remove old.
(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)
Diffstat (limited to 'dev-java/dbus-java')
-rw-r--r--dev-java/dbus-java/ChangeLog10
-rw-r--r--dev-java/dbus-java/dbus-java-2.5.1.ebuild (renamed from dev-java/dbus-java/dbus-java-2.5.ebuild)4
-rw-r--r--dev-java/dbus-java/files/dbus-java-2.5.1-jarfixes.patch (renamed from dev-java/dbus-java/files/dbus-java-2.4-jarfixes.patch)9
3 files changed, 16 insertions, 7 deletions
diff --git a/dev-java/dbus-java/ChangeLog b/dev-java/dbus-java/ChangeLog
index 8c7341128614..0f56c524cf9d 100644
--- a/dev-java/dbus-java/ChangeLog
+++ b/dev-java/dbus-java/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for dev-java/dbus-java
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/ChangeLog,v 1.3 2008/07/26 07:47:04 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/ChangeLog,v 1.4 2008/11/28 05:18:29 serkan Exp $
+
+*dbus-java-2.5.1 (28 Nov 2008)
+
+ 28 Nov 2008; Serkan Kaba <serkan@gentoo.org>
+ -files/dbus-java-2.4-jarfixes.patch,
+ +files/dbus-java-2.5.1-jarfixes.patch, -dbus-java-2.5.ebuild,
+ +dbus-java-2.5.1.ebuild:
+ Version bump. Remove old.
26 Jul 2008; Markus Rothe <corsair@gentoo.org> dbus-java-2.5.ebuild:
Added ~ppc; bug #232411
diff --git a/dev-java/dbus-java/dbus-java-2.5.ebuild b/dev-java/dbus-java/dbus-java-2.5.1.ebuild
index 990e163f18f8..ddceba281375 100644
--- a/dev-java/dbus-java/dbus-java-2.5.ebuild
+++ b/dev-java/dbus-java/dbus-java-2.5.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 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.5.ebuild,v 1.3 2008/07/26 07:47:04 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/dbus-java-2.5.1.ebuild,v 1.1 2008/11/28 05:18:29 serkan Exp $
JAVA_PKG_IUSE="doc source"
inherit eutils java-pkg-2
@@ -29,7 +29,7 @@ DEPEND=">=virtual/jdk-1.5
src_unpack() {
unpack ${A}
cd "${S}" || die
- epatch "${FILESDIR}/${PN}-2.4-jarfixes.patch"
+ epatch "${FILESDIR}/${P}-jarfixes.patch"
}
src_compile() {
diff --git a/dev-java/dbus-java/files/dbus-java-2.4-jarfixes.patch b/dev-java/dbus-java/files/dbus-java-2.5.1-jarfixes.patch
index edde1b6f90db..cd49726b6403 100644
--- a/dev-java/dbus-java/files/dbus-java-2.4-jarfixes.patch
+++ b/dev-java/dbus-java/files/dbus-java-2.5.1-jarfixes.patch
@@ -1,10 +1,11 @@
---- Makefile 2008-01-10 17:49:28.000000000 +0200
-+++ Makefile.patched 2008-02-19 22:19:49.000000000 +0200
-@@ -82,17 +82,13 @@
+diff -Nur dbus-java-2.5.1/Makefile dbus-java-2.5.1_patched/Makefile
+--- dbus-java-2.5.1/Makefile 2008-07-21 13:44:10.000000000 +0300
++++ dbus-java-2.5.1_patched/Makefile 2008-11-28 07:10:30.000000000 +0200
+@@ -87,17 +87,13 @@
sed -n '/_(/s/.*_("\([^"]*\)").*/\1/p' $^ | sort -u | sed 's/\(.*\)/msgid "\1"\nmsgstr "\1"/' >> $@
libdbus-java-$(VERSION).jar: .classes
-- echo "Class-Path: ${JAVAUNIXJARDIR}/unix.jar ${JAVAUNIXJARDIR}/debug-$(DEBUG).jar" > Manifest
+- echo "Class-Path: ${JAVAUNIXJARDIR}/unix.jar ${JAVAUNIXJARDIR}/hexdump.jar ${JAVAUNIXJARDIR}/debug-$(DEBUG).jar" > Manifest
- (cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/*.class org/freedesktop/*.class org/freedesktop/dbus/types/*.class org/freedesktop/dbus/exceptions/*.class *localized*class)
+ (cd classes; $(JAR) -cf ../$@ org/freedesktop/dbus/*.class org/freedesktop/*.class org/freedesktop/dbus/types/*.class org/freedesktop/dbus/exceptions/*.class *localized*class)
dbus-java-test-$(VERSION).jar: .testclasses