Apply a patch from Fedora CVS to fix translations. Don't run eautoreconf wrt #240958, instead only unset LINGUAS because zh matches zh_CN or zh_TW which causes CATALOG error wrt #113681.

(Portage version: 2.1.6.11/cvs/Linux x86_64)

3 files changed, 94 insertions, 6 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index a4494cac479b..dc505147e56d 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.250 2009/04/30 14:12:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.251 2009/04/30 14:49:25 ssuominen Exp $
+
+  30 Apr 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +files/xscreensaver-5.08-po-recreate.patch, xscreensaver-5.08-r1.ebuild:
+  Apply a patch from Fedora CVS to fix translations. Don't run eautoreconf
+  wrt #240958, instead only unset LINGUAS because zh matches zh_CN or zh_TW
+  which causes CATALOG error wrt #113681.
 
 *xscreensaver-5.08-r1 (30 Apr 2009)
 
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.08-po-recreate.patch b/x11-misc/xscreensaver/files/xscreensaver-5.08-po-recreate.patch
new file mode 100644
index 000000000000..61754db5e26b
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.08-po-recreate.patch
@@ -0,0 +1,80 @@
+--- xscreensaver-5.08/aclocal.m4.po	2002-05-11 10:44:33.000000000 +0900
++++ xscreensaver-5.08/aclocal.m4	2008-12-30 04:33:01.000000000 +0900
+@@ -252,7 +252,10 @@
+ 
+     AC_OUTPUT_COMMANDS(
+       [case "$CONFIG_FILES" in *po/Makefile.in*)
++         rm -f po/stamp-it po/stamp-it.tmp
++         > po/stamp-it.tmp
+         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
++        mv po/stamp-it.tmp po/stamp-it
+       esac])
+ 
+     dnl These rules are solely for the distribution goal.  While doing this
+--- xscreensaver-5.08/po/Makefile.in.in.po	2007-11-11 09:44:42.000000000 +0900
++++ xscreensaver-5.08/po/Makefile.in.in	2008-12-30 04:47:58.000000000 +0900
+@@ -190,7 +190,7 @@
+ all-yes: $(CATALOGS)
+ all-no:
+ 
+-$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
++$(GETTEXT_PACKAGE).pot: $(POTFILES)
+ 	@INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) ; \
+ 	export INTLTOOL_EXTRACT ; \
+ 	echo top_srcdir=$(top_srcdir) $(GENPOT) ; \
+@@ -274,6 +274,7 @@
+ 
+ distclean: clean
+ 	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m *.gmo *.pot
++	rm -f stamp-it
+ 
+ maintainer-clean: distclean
+ 	@echo "This command is intended for maintainers to use;"
+@@ -282,8 +283,8 @@
+ 
+ depend:
+ # fuck off.  love, jwz.
+-#distdepend: generate_potfiles_in update-po $(DISTFILES)
+-distdepend::
++distdepend: generate_potfiles_in update-po $(DISTFILES)
++#distdepend::
+ 
+ 
+ # jwz: Generates po/POTFILES.in by examining the source tree:
+@@ -292,6 +293,8 @@
+ generate_potfiles_in:
+ 	@tmp=po.$$$$ ;				\
+ 	 file=POTFILES.in ;			\
++	 echo "sleeping 3 seconds..." ;\
++	 sleep 3; \
+ 	 ( cd $(top_srcdir);			\
+ 	   echo "# Auto-generated: `LANG=C date`" ;	\
+ 	   ( grep -l '_("' driver/*.[ch] ;	\
+@@ -362,16 +365,22 @@
+ 	    && (sed -e '/^#/d' 						\
+ 		    -e "s/^\[.*\] +//" 					\
+ 		    -e '/^[ 	]*$$/d' 				\
+-		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in	\
++		    -e "s@.*@	$$posrcprefix& \\\\@" < $@.in	\
+ 		| sed -e '$$s/\\$$//') > $@-t \
+ 	    && chmod a-w $@-t \
+ 	    && mv $@-t $@ )
+ 
++Makefile: stamp-it
++	@if test ! -f $@; then \
++		rm -f stamp-it; \
++		$(MAKE) stamp-it; \
++	fi
++
+ # Please to be fucking the hell off.   This breaks "make distdepend". -jwz
+-#Makefile: Makefile.in.in ../config.status POTFILES
+-#	cd .. \
+-#	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
+-#	       $(SHELL) ./config.status
++stamp-it: Makefile.in.in ../config.status POTFILES
++	cd .. \
++	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= \
++	       $(SHELL) ./config.status
+ 
+ # Tell versions [3.59,3.63) of GNU make not to export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/x11-misc/xscreensaver/xscreensaver-5.08-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.08-r1.ebuild
index 8e062d77a29e..80e40c5c7dd7 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.08-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.08-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.08-r1.ebuild,v 1.1 2009/04/30 14:12:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.08-r1.ebuild,v 1.2 2009/04/30 14:49:25 ssuominen Exp $
 
 EAPI=2
-inherit autotools eutils flag-o-matic multilib pam
+inherit eutils flag-o-matic multilib pam
 
 DESCRIPTION="A modular screen saver and locker for the X Window System"
 SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
@@ -45,9 +45,10 @@ DEPEND="${RDEPEND}
 	xinerama? ( x11-proto/xineramaproto )"
 
 src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${FILESDIR}"/${PV}
-	epatch "${FILESDIR}"/${P}-phosphor-segv.patch #256446
-	eautoreconf #113681
+	epatch "${FILESDIR}"/${PV}/01_all_default_settings.patch \
+		"${FILESDIR}"/${PV}/03_all_glforrestfire.patch \
+		"${FILESDIR}"/${P}-phosphor-segv.patch \
+		"${FILESDIR}"/${P}-po-recreate.patch
 }
 
 src_configure() {
@@ -57,6 +58,7 @@ src_configure() {
 		append-flags -U__VEC__
 	fi
 
+	unset LINGUAS #113681
 	unset BC_ENV_ARGS #24568
 
 	econf \