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

[Samuli Suominen (ssuominen)]

ssuominen    09/04/28 16:41:10

  Modified:             metadata.xml ChangeLog xscreensaver-5.08.ebuild
  Log:
  amd64 stable and move flag-o-matic usage to src_configure where it should be.
  (Portage version: 2.1.6.11/cvs/Linux x86_64)

Revision  Changes    Path
1.10                 x11-misc/xscreensaver/metadata.xml

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

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/metadata.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- metadata.xml	24 Nov 2008 15:55:35 -0000	1.9
+++ metadata.xml	28 Apr 2009 16:41:10 -0000	1.10
@@ -3,13 +3,9 @@
 <pkgmetadata>
   <herd>desktop-misc</herd>
   <maintainer>
-    <email>ssuominen@g.o</email>
-    <name>Samuli Suominen</name>
-  </maintainer>
-  <maintainer>
     <email>jwz@×××.org</email>
     <name>Jamie Zawinski</name>
-    <description>Upstream. CC on bugzilla!</description>
+    <description>Upstream, add to bugzilla as CC for bugs.</description>
   </maintainer>
   <use>
     <flag name="new-login">Enables New Login button using gdmflexiserver (gnome-base/gdm)</flag>



1.249                x11-misc/xscreensaver/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- ChangeLog	14 Mar 2009 13:42:57 -0000	1.248
+++ ChangeLog	28 Apr 2009 16:41:10 -0000	1.249
@@ -1,6 +1,11 @@
 # 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.248 2009/03/14 13:42:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.249 2009/04/28 16:41:10 ssuominen Exp $
+
+  28 Apr 2009; Samuli Suominen <ssuominen@g.o>
+  xscreensaver-5.08.ebuild:
+  amd64 stable and move flag-o-matic usage to src_configure where it should
+  be.
 
   14 Mar 2009; Tomas Chvatal <scarabeus@g.o>
   -files/5.07/03_all_glforrestfire.patch:
@@ -25,12 +30,9 @@
   +files/5.08/02_all_no_intltool.patch, +xscreensaver-5.08.ebuild:
   Version bump.
 
-  24 Nov 2008; <ssuominen@g.o> metadata.xml:
-  Rename my old e-mail drac at gentoo.org to ssuominen at gentoo.org.
-
   20 Nov 2008; Brent Baude <ranger@g.o> -xscreensaver-5.05.ebuild,
   xscreensaver-5.07.ebuild:
-  Marking xscreensaver-5.07 ppc64 for bug 246717 and removing old files per drac
+  Marking xscreensaver-5.07 ppc64 for bug 246717 and removing old files.
 
   16 Nov 2008; Jeroen Roovers <jer@g.o> xscreensaver-5.07.ebuild:
   Stable for HPPA (bug #246717).
@@ -69,7 +71,7 @@
 
 *xscreensaver-5.06 (04 Aug 2008)
 
-  04 Aug 2008; Samuli Suominen <drac@g.o>
+  04 Aug 2008; Samuli Suominen <ssuominen@g.o>
   +files/5.06/01_all_default_settings.patch,
   +files/5.06/02_all_xinerama_function.patch, +xscreensaver-5.06.ebuild:
   Version bump. Upstream applied most of our patchset. Fix building with
@@ -77,7 +79,7 @@
 
 *xscreensaver-5.05-r1 (07 May 2008)
 
-  07 May 2008; Samuli Suominen <drac@g.o>
+  07 May 2008; Samuli Suominen <ssuominen@g.o>
   +files/5.05/01_all_default_settings.patch,
   +files/5.05/03_all_desktop_entry.patch,
   +files/5.05/05_all_offensive.patch,
@@ -116,25 +118,25 @@
   Stable on ppc64; bug #214870. Also wrap ppc/ppc64 specific filter-flags and
   append-flags in a use ppc/ppc64 statement; bug #212191
 
-  26 Mar 2008; Samuli Suominen <drac@g.o> xscreensaver-5.05.ebuild:
+  26 Mar 2008; Samuli Suominen <ssuominen@g.o> xscreensaver-5.05.ebuild:
   Fix #113681 again and mark amd64 stable wrt #214870.
 
 *xscreensaver-5.05 (02 Mar 2008)
 
-  02 Mar 2008; Samuli Suominen <drac@g.o>
+  02 Mar 2008; Samuli Suominen <ssuominen@g.o>
   +files/xscreensaver-5.05-desktop-entry.patch,
   +files/xscreensaver-5.05-posix-head.patch, -xscreensaver-5.04.ebuild,
   +xscreensaver-5.05.ebuild:
   Version bump wrt #212060, thanks to Tobias Klausmann for reporting.
 
-  28 Feb 2008; Samuli Suominen <drac@g.o>
+  28 Feb 2008; Samuli Suominen <ssuominen@g.o>
   xscreensaver-5.04-r1.ebuild:
   amd64 stable wrt #210913
 
   25 Feb 2008; Jeroen Roovers <jer@g.o> xscreensaver-5.04-r1.ebuild:
   Stable for HPPA (bug #210913).
 
-  21 Feb 2008; Samuli Suominen <drac@g.o>
+  21 Feb 2008; Samuli Suominen <ssuominen@g.o>
   files/xscreensaver-5.04-desktop-entry.patch:
   Rename desktop file to xscreensaver-properties.desktop and add NotShowIn
   GNOME to avoid duplicate entry with gnome-screensaver in Gnome environment.
@@ -159,7 +161,7 @@
 
 *xscreensaver-5.04-r1 (14 Feb 2008)
 
-  14 Feb 2008; Samuli Suominen <drac@g.o>
+  14 Feb 2008; Samuli Suominen <ssuominen@g.o>
   +files/xscreensaver-5.04-build.patch, +xscreensaver-5.04-r1.ebuild:
   Compile time fixes for bugs #209341 and #208731.
 
@@ -178,20 +180,20 @@
   31 Jan 2008; Brent Baude <ranger@g.o> xscreensaver-5.04.ebuild:
   Marking xscreensaver-5.04 ppc64 for bug 208297
 
-  29 Jan 2008; Samuli Suominen <drac@g.o> xscreensaver-5.04.ebuild:
+  29 Jan 2008; Samuli Suominen <ssuominen@g.o> xscreensaver-5.04.ebuild:
   amd64 stable
 
-  01 Jan 2008; Samuli Suominen <drac@g.o>
+  01 Jan 2008; Samuli Suominen <ssuominen@g.o>
   files/xscreensaver-5.04-nsfw.patch, xscreensaver-5.04.ebuild:
   Update offensive patch, do less.
 
-  30 Dec 2007; Samuli Suominen <drac@g.o>
+  30 Dec 2007; Samuli Suominen <ssuominen@g.o>
   +files/xscreensaver-5.04-gentoo.patch, xscreensaver-5.04.ebuild:
   Update patch. Sort ebuild.
 
 *xscreensaver-5.04 (30 Dec 2007)
 
-  30 Dec 2007; Samuli Suominen <drac@g.o>
+  30 Dec 2007; Samuli Suominen <ssuominen@g.o>
   -files/xscreensaver-5.02-gdmflexiserver.patch,
   -files/xscreensaver-5.02-nsfw.patch, -files/xscreensaver-5.02-pam.patch,
   +files/xscreensaver-5.04-desktop-entry.patch,
@@ -205,7 +207,7 @@
   20 Nov 2007; Joshua Kinard <kumba@g.o> xscreensaver-5.03.ebuild:
   Stable on mips, per #195253.
 
-  27 Oct 2007; Samuli Suominen <drac@g.o> xscreensaver-5.03.ebuild:
+  27 Oct 2007; Samuli Suominen <ssuominen@g.o> xscreensaver-5.03.ebuild:
   arm stable.
 
   14 Oct 2007; Raúl Porcel <armin76@g.o> xscreensaver-5.03.ebuild:
@@ -260,29 +262,26 @@
   xscreensaver-5.02-r2.ebuild:
   Stable on amd64 wrt bug 183048
 
-  13 Jun 2007; Samuli Suominen <drac@g.o>
+  13 Jun 2007; Samuli Suominen <ssuominen@g.o>
   +files/xscreensaver-5.02-gentoo.patch, xscreensaver-5.02-r2.ebuild:
   Stop using invalid patch hidden inside combined
   xscreensaver-5.01-gentoo.patch after consulting upstream.
 
-  13 Jun 2007; Samuli Suominen <drac@g.o> xscreensaver-5.02.ebuild,
+  13 Jun 2007; Samuli Suominen <ssuominen@g.o> xscreensaver-5.02.ebuild,
   xscreensaver-5.02-r1.ebuild, xscreensaver-5.02-r2.ebuild:
   Stop using hypertorus.xml patch since it was fixed differently. Bug 154444.
 
-  09 Jun 2007; Samuli Suominen <drac@g.o>
+  09 Jun 2007; Samuli Suominen <ssuominen@g.o>
   xscreensaver-5.02-r2.ebuild:
   --with-gle was used only by one corrupted screensaver, stop using it.
 
-  08 Jun 2007; Samuli Suominen <drac@g.o> metadata.xml:
-  Add upstream to metadata.xml per request.
-
-  07 Jun 2007; Samuli Suominen <drac@g.o>
+  07 Jun 2007; Samuli Suominen <ssuominen@g.o>
   xscreensaver-5.02-r1.ebuild:
   Stable on arm.
 
 *xscreensaver-5.02-r2 (06 Jun 2007)
 
-  06 Jun 2007; Samuli Suominen <drac@g.o>
+  06 Jun 2007; Samuli Suominen <ssuominen@g.o>
   +files/xscreensaver-5.02-pam.patch, +xscreensaver-5.02-r2.ebuild:
   Patch to fix segmentation fault with non-interactive pam by Andrea Luzzardi
   in bug 180542.
@@ -290,13 +289,13 @@
   27 May 2007; Joshua Kinard <kumba@g.o> xscreensaver-5.02-r1.ebuild:
   Stable on mips.
 
-  24 May 2007; Samuli Suominen <drac@g.o> xscreensaver-5.02.ebuild,
+  24 May 2007; Samuli Suominen <ssuominen@g.o> xscreensaver-5.02.ebuild,
   xscreensaver-5.02-r1.ebuild:
   Add missing intltool dep for bug 131701.
 
 *xscreensaver-5.02-r1 (11 May 2007)
 
-  11 May 2007; Samuli Suominen <drac@g.o>
+  11 May 2007; Samuli Suominen <ssuominen@g.o>
   +files/xscreensaver-5.02-gdmflexiserver.patch,
   +xscreensaver-5.02-r1.ebuild:
   Fix gdmflexiserver handling for bug 141627. Thanks to Michal Varady.
@@ -325,29 +324,30 @@
   02 May 2007; Markus Rothe <corsair@g.o> xscreensaver-5.02.ebuild:
   Stable on ppc64
 
-  01 May 2007; Samuli Suominen <drac@g.o>
+  01 May 2007; Samuli Suominen <ssuominen@g.o>
   +files/xscreensaver-5.02-nsfw.patch, xscreensaver-5.02.ebuild:
   Fix USE="offensive" patch.
 
 *xscreensaver-5.02 (01 May 2007)
 
-  01 May 2007; Samuli Suominen <drac@g.o> +xscreensaver-5.02.ebuild:
+  01 May 2007; Samuli Suominen <ssuominen@g.o>
+  +xscreensaver-5.02.ebuild:
   Version bump.
 
   06 Apr 2007; Peter Weller <welp@g.o> xscreensaver-5.01-r2.ebuild:
   Stable on amd64 wrt bug 167688
 
-  22 Mar 2007; Samuli Suominen <drac@g.o>
+  22 Mar 2007; Samuli Suominen <ssuominen@g.o>
   xscreensaver-5.01-r3.ebuild:
   Update branding patch.
 
 *xscreensaver-5.01-r3 (18 Mar 2007)
 
-  18 Mar 2007; Samuli Suominen <drac@g.o>
+  18 Mar 2007; Samuli Suominen <ssuominen@g.o>
   +xscreensaver-5.01-r3.ebuild:
   USE="branding" for Gentoo style Lock Screen. Patch from Niklas Närhinen.
 
-  02 Mar 2007; Samuli Suominen <drac@g.o>
+  02 Mar 2007; Samuli Suominen <ssuominen@g.o>
   xscreensaver-5.01-r2.ebuild:
   Allways install Settings .desktop for enviroments following f.d.o menu spec,
   e.g. xfce-base/xfdesktop and rox-base/xdg-menu.
@@ -355,7 +355,7 @@
   24 Feb 2007; nixnut <nixnut@g.o> xscreensaver-5.01-r2.ebuild:
   Stable on ppc wrt bug 167688
 
-  24 Feb 2007; Samuli Suominen <drac@g.o>
+  24 Feb 2007; Samuli Suominen <ssuominen@g.o>
   xscreensaver-5.01-r2.ebuild:
   Force -j1 to emake for bug 155049.
 
@@ -370,7 +370,7 @@
   xscreensaver-5.01-r2.ebuild:
   x86 stable wrt bug 167688
 
-  20 Feb 2007; Samuli Suominen <drac@g.o>
+  20 Feb 2007; Samuli Suominen <ssuominen@g.o>
   xscreensaver-5.01-r2.ebuild:
   Remove USE nls because it's not optional. Thanks to armin76 for pointing it
   out.



1.4                  x11-misc/xscreensaver/xscreensaver-5.08.ebuild

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

Index: xscreensaver-5.08.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.08.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xscreensaver-5.08.ebuild	19 Jan 2009 15:09:11 -0000	1.3
+++ xscreensaver-5.08.ebuild	28 Apr 2009 16:41:10 -0000	1.4
@@ -1,9 +1,8 @@
 # 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.ebuild,v 1.3 2009/01/19 15:09:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.08.ebuild,v 1.4 2009/04/28 16:41:10 ssuominen Exp $
 
 EAPI=2
-
 inherit autotools eutils flag-o-matic multilib pam
 
 DESCRIPTION="A modular screen saver and locker for the X Window System"
@@ -12,7 +11,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="jpeg new-login opengl pam suid xinerama"
 
 RDEPEND="x11-libs/libXmu
@@ -26,7 +25,7 @@
 	x11-apps/appres
 	media-libs/netpbm
 	>=dev-libs/libxml2-2.5
-	>=x11-libs/gtk+-2
+	>=x11-libs/gtk+-2:2
 	>=gnome-base/libglade-1.99
 	pam? ( virtual/pam )
 	jpeg? ( media-libs/jpeg )
@@ -51,6 +50,12 @@
 }
 
 src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -mabi=altivec
+		filter-flags -maltivec
+		append-flags -U__VEC__
+	fi
+
 	unset BC_ENV_ARGS #24568
 
 	econf \
@@ -81,13 +86,6 @@
 }
 
 src_compile() {
-	if use ppc || use ppc64; then
-		# Still fails to build "flurry" screensaver.
-		filter-flags -mabi=altivec
-		filter-flags -maltivec
-		append-flags -U__VEC__
-	fi
-
 	emake -j1 || die "emake failed." #155049
 }