gettext patch adjustment -- now it works :P

3 files changed, 19 insertions, 24 deletions

diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index 7bb952b0a6f4..25d9d92ab9a2 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,5 +1,5 @@
 MD5 5618f4d14fd98b813b7be2b4df0087e7 xmms-1.2.7-r21.ebuild 4830
-MD5 1fbea1b6ee32ba22b6e70cda25bc7f00 xmms-1.2.7-r23.ebuild 5178
+MD5 60fe60be44cac79ab1b9b6d4c4b154d8 xmms-1.2.7-r23.ebuild 5179
 MD5 17680ff662d5980dc9c50f5469ca637d xmms-1.2.7-r20.ebuild 4950
 MD5 90740c69a0e1cdd3a65b037af5fe8a5a xmms-1.2.7-r22.ebuild 4989
 MD5 015c1a2e480c3ba66d81fcaf4feb6026 ChangeLog 10648
@@ -11,7 +11,7 @@ MD5 3268d7f38e954fd7ab541fa9e6f385ca files/digest-xmms-1.2.7-r22 130
 MD5 3268d7f38e954fd7ab541fa9e6f385ca files/digest-xmms-1.2.7-r23 130
 MD5 6361ee5e5b5402155308b62a1d1fde9a files/xmms-sigterm.patch 1002
 MD5 2b20eda67dba56621f05441eaa0ffab8 files/xmms-jump.patch 3013
-MD5 2df4e90fd2691fc50d74057ae531e81e files/xmms-gettext-fix.patch 774
+MD5 6340b8dd3175d70be72d527727ac1ef0 files/xmms-gettext-fix.patch 393
 MD5 b4d1fd03bbe7ceb4b756394354b3956e files/xmms-russian-charset.patch 110410
 MD5 a03fa7e2151194a6db4850897d16d128 files/xmms-1.2.7-mpg123j.patch 9333
 MD5 3137a462e1b8c82c5c2a8d7c4d983ee9 files/xmms-ipv6-20020408-nommx.patch 9214
diff --git a/media-sound/xmms/files/xmms-gettext-fix.patch b/media-sound/xmms/files/xmms-gettext-fix.patch
index 6abbaeea929e..68033840c010 100644
--- a/media-sound/xmms/files/xmms-gettext-fix.patch
+++ b/media-sound/xmms/files/xmms-gettext-fix.patch
@@ -1,17 +1,11 @@
-Index: files/xmms-gettext-fix.diff
-===================================================================
-RCS file: files/xmms-gettext-fix.diff
-diff -N files/xmms-gettext-fix.diff
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ files/xmms-gettext-fix.diff	16 Jul 2003 13:20:49 -0000
-@@ -0,0 +1,10 @@
-+--- xmms-1.2.7/po/Makefile.in.in.orig	2003-07-16 14:11:06.000000000 +0200
-++++ xmms-1.2.7/po/Makefile.in.in	2003-07-16 14:12:54.000000000 +0200
-+@@ -88,6 +88,7 @@
-+ 	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
-+ 	  --add-comments --keyword=_ --keyword=N_ \
-+ 	  --files-from=$(srcdir)/POTFILES.in \
-++	  --from-code=iso-8859-1 \
-+ 	&& test ! -f $(PACKAGE).po \
-+ 	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
-+ 		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
+--- po/Makefile.in.in.old	2003-07-18 02:04:17.000000000 -0700
++++ po/Makefile.in.in	2003-07-18 02:05:03.000000000 -0700
+@@ -34,7 +34,7 @@
+ GENCAT = @GENCAT@
+ GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
+ MSGFMT = @MSGFMT@
+-XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
++XGETTEXT = PATH=../src:$$PATH @XGETTEXT@ --language=C --from-code=iso-8859-1
+ MSGMERGE = PATH=../src:$$PATH msgmerge
+ 
+ DEFS = @DEFS@
diff --git a/media-sound/xmms/xmms-1.2.7-r23.ebuild b/media-sound/xmms/xmms-1.2.7-r23.ebuild
index d73dcfb77c0f..9a3311ec4257 100644
--- a/media-sound/xmms/xmms-1.2.7-r23.ebuild
+++ b/media-sound/xmms/xmms-1.2.7-r23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r23.ebuild,v 1.1 2003/07/18 08:25:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r23.ebuild,v 1.2 2003/07/18 09:17:01 seemant Exp $
 
 inherit libtool flag-o-matic eutils
 filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -80,16 +80,17 @@ src_unpack() {
 		chmod +x ${S}/config.rpath
 	fi
 
-	if use nls; then
-		epatch ${FILESDIR}/${PN}-gettext-fix.patch
-	fi
-
 	# Add /usr/local/share/xmms/Skins to the search path for skins
 	epatch ${FILESDIR}/${PN}-fhs-skinsdir.patch
 
 	# We run automake and autoconf here else we get a lot of warning/errors.
 	# I have tested this with gcc-2.95.3 and gcc-3.1.
 	elibtoolize
+
+	if use nls; then
+		epatch ${FILESDIR}/${PN}-gettext-fix.patch
+	fi
+
 	echo ">>> Reconfiguring..."
 	for x in ${S} ${S}/libxmms
 	do