[gentoo-commits] gentoo-x86 commit in x11-misc/xscreensaver: xscreensaver-5.08-r1.ebuild ChangeLog

[Samuli Suominen (ssuominen)]

ssuominen    09/04/30 14:49:25

  Modified:             xscreensaver-5.08-r1.ebuild ChangeLog
  Log:
  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)

Revision  Changes    Path
1.2                  x11-misc/xscreensaver/xscreensaver-5.08-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.08-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.08-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.08-r1.ebuild?r1=1.1&r2=1.2

Index: xscreensaver-5.08-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.08-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xscreensaver-5.08-r1.ebuild	30 Apr 2009 14:12:43 -0000	1.1
+++ xscreensaver-5.08-r1.ebuild	30 Apr 2009 14:49:25 -0000	1.2
@@ -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 @@
 	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 @@
 		append-flags -U__VEC__
 	fi
 
+	unset LINGUAS #113681
 	unset BC_ENV_ARGS #24568
 
 	econf \



1.251                x11-misc/xscreensaver/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/ChangeLog?rev=1.251&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/ChangeLog?rev=1.251&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/ChangeLog?r1=1.250&r2=1.251

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- ChangeLog	30 Apr 2009 14:12:43 -0000	1.250
+++ ChangeLog	30 Apr 2009 14:49:25 -0000	1.251
@@ -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@g.o>
+  +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)