amd64 stable and move flag-o-matic usage to src_configure where it should be.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 47 insertions, 53 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index beefa4fa71eb..b49a56711f5c 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -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@gentoo.org>
+  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@gentoo.org>
   -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@gentoo.org> metadata.xml:
-  Rename my old e-mail drac at gentoo.org to ssuominen at gentoo.org.
-
   20 Nov 2008; Brent Baude <ranger@gentoo.org> -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@gentoo.org> 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@gentoo.org>
+  04 Aug 2008; Samuli Suominen <ssuominen@gentoo.org>
   +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@gentoo.org>
+  07 May 2008; Samuli Suominen <ssuominen@gentoo.org>
   +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@gentoo.org> xscreensaver-5.05.ebuild:
+  26 Mar 2008; Samuli Suominen <ssuominen@gentoo.org> 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@gentoo.org>
+  02 Mar 2008; Samuli Suominen <ssuominen@gentoo.org>
   +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@gentoo.org>
+  28 Feb 2008; Samuli Suominen <ssuominen@gentoo.org>
   xscreensaver-5.04-r1.ebuild:
   amd64 stable wrt #210913
 
   25 Feb 2008; Jeroen Roovers <jer@gentoo.org> xscreensaver-5.04-r1.ebuild:
   Stable for HPPA (bug #210913).
 
-  21 Feb 2008; Samuli Suominen <drac@gentoo.org>
+  21 Feb 2008; Samuli Suominen <ssuominen@gentoo.org>
   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@gentoo.org>
+  14 Feb 2008; Samuli Suominen <ssuominen@gentoo.org>
   +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@gentoo.org> xscreensaver-5.04.ebuild:
   Marking xscreensaver-5.04 ppc64 for bug 208297
 
-  29 Jan 2008; Samuli Suominen <drac@gentoo.org> xscreensaver-5.04.ebuild:
+  29 Jan 2008; Samuli Suominen <ssuominen@gentoo.org> xscreensaver-5.04.ebuild:
   amd64 stable
 
-  01 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  01 Jan 2008; Samuli Suominen <ssuominen@gentoo.org>
   files/xscreensaver-5.04-nsfw.patch, xscreensaver-5.04.ebuild:
   Update offensive patch, do less.
 
-  30 Dec 2007; Samuli Suominen <drac@gentoo.org>
+  30 Dec 2007; Samuli Suominen <ssuominen@gentoo.org>
   +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@gentoo.org>
+  30 Dec 2007; Samuli Suominen <ssuominen@gentoo.org>
   -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@gentoo.org> xscreensaver-5.03.ebuild:
   Stable on mips, per #195253.
 
-  27 Oct 2007; Samuli Suominen <drac@gentoo.org> xscreensaver-5.03.ebuild:
+  27 Oct 2007; Samuli Suominen <ssuominen@gentoo.org> xscreensaver-5.03.ebuild:
   arm stable.
 
   14 Oct 2007; Raúl Porcel <armin76@gentoo.org> 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@gentoo.org>
+  13 Jun 2007; Samuli Suominen <ssuominen@gentoo.org>
   +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@gentoo.org> xscreensaver-5.02.ebuild,
+  13 Jun 2007; Samuli Suominen <ssuominen@gentoo.org> 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@gentoo.org>
+  09 Jun 2007; Samuli Suominen <ssuominen@gentoo.org>
   xscreensaver-5.02-r2.ebuild:
   --with-gle was used only by one corrupted screensaver, stop using it.
 
-  08 Jun 2007; Samuli Suominen <drac@gentoo.org> metadata.xml:
-  Add upstream to metadata.xml per request.
-
-  07 Jun 2007; Samuli Suominen <drac@gentoo.org>
+  07 Jun 2007; Samuli Suominen <ssuominen@gentoo.org>
   xscreensaver-5.02-r1.ebuild:
   Stable on arm.
 
 *xscreensaver-5.02-r2 (06 Jun 2007)
 
-  06 Jun 2007; Samuli Suominen <drac@gentoo.org>
+  06 Jun 2007; Samuli Suominen <ssuominen@gentoo.org>
   +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@gentoo.org> xscreensaver-5.02-r1.ebuild:
   Stable on mips.
 
-  24 May 2007; Samuli Suominen <drac@gentoo.org> xscreensaver-5.02.ebuild,
+  24 May 2007; Samuli Suominen <ssuominen@gentoo.org> 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@gentoo.org>
+  11 May 2007; Samuli Suominen <ssuominen@gentoo.org>
   +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@gentoo.org> xscreensaver-5.02.ebuild:
   Stable on ppc64
 
-  01 May 2007; Samuli Suominen <drac@gentoo.org>
+  01 May 2007; Samuli Suominen <ssuominen@gentoo.org>
   +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@gentoo.org> +xscreensaver-5.02.ebuild:
+  01 May 2007; Samuli Suominen <ssuominen@gentoo.org>
+  +xscreensaver-5.02.ebuild:
   Version bump.
 
   06 Apr 2007; Peter Weller <welp@gentoo.org> xscreensaver-5.01-r2.ebuild:
   Stable on amd64 wrt bug 167688
 
-  22 Mar 2007; Samuli Suominen <drac@gentoo.org>
+  22 Mar 2007; Samuli Suominen <ssuominen@gentoo.org>
   xscreensaver-5.01-r3.ebuild:
   Update branding patch.
 
 *xscreensaver-5.01-r3 (18 Mar 2007)
 
-  18 Mar 2007; Samuli Suominen <drac@gentoo.org>
+  18 Mar 2007; Samuli Suominen <ssuominen@gentoo.org>
   +xscreensaver-5.01-r3.ebuild:
   USE="branding" for Gentoo style Lock Screen. Patch from Niklas Närhinen.
 
-  02 Mar 2007; Samuli Suominen <drac@gentoo.org>
+  02 Mar 2007; Samuli Suominen <ssuominen@gentoo.org>
   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@gentoo.org> xscreensaver-5.01-r2.ebuild:
   Stable on ppc wrt bug 167688
 
-  24 Feb 2007; Samuli Suominen <drac@gentoo.org>
+  24 Feb 2007; Samuli Suominen <ssuominen@gentoo.org>
   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@gentoo.org>
+  20 Feb 2007; Samuli Suominen <ssuominen@gentoo.org>
   xscreensaver-5.01-r2.ebuild:
   Remove USE nls because it's not optional. Thanks to armin76 for pointing it
   out.
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index ab06822f1b91..43b6767945f2 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -6,6 +6,6 @@ AUX 5.08/03_all_glforrestfire.patch 518 RMD160 29a69330d3f62c8285f3983e7e925302e
 DIST xscreensaver-5.07.tar.gz 5513131 RMD160 d2fee54c3138c717433f5a6ca9a098028082af95 SHA1 82c611ab271807ad871aa46a3a7f6b95706d31aa SHA256 8c50a74c07b1fffcbb20bd79e3ee92f1f52191e5a187433bb49964ccf94badb6
 DIST xscreensaver-5.08.tar.gz 5466460 RMD160 f37ba887a656a4ffd14f3809de3269806271352d SHA1 4e6889d7171eaf18b856c484a87d5701787e5dc6 SHA256 638cb1455cd5fe0c95f53cf048b9b46f5b0ccce026c39246d0dc65ebb09ca9dd
 EBUILD xscreensaver-5.07.ebuild 2667 RMD160 6259a3fef0155424ca6f2c24b98344e0d0421a98 SHA1 1734f61f1ad79deb7f636293a034bb9244fed134 SHA256 d1957f4fbdb055471487023048b2b28145b6b6f34ae06840600f0113de415f6b
-EBUILD xscreensaver-5.08.ebuild 2633 RMD160 2792ec66a2a788fd7679b3f77f7d9f70bb40d76b SHA1 f9893fa5f57b98a84d2fb4fa6241aadc706d4d87 SHA256 f9cb6afdc6077341088a1e991a0496648f8e0dfb5a188bdf91331e2278f9d620
-MISC ChangeLog 40863 RMD160 f71b771014cffc461632855307141cc260dad335 SHA1 68b90549515007490f419b88009a17269664f841 SHA256 56a5b46d1d7fde50e133ade17bf4edf207ef5b66a5b565fb0120d069e8534665
-MISC metadata.xml 536 RMD160 6e7cad2c4791ecf9ffc7d8ab1e0a4f83aebc9ba8 SHA1 487b8b789188c77f54af4ad167e4a6cb2a008739 SHA256 9f23f751a07c2a23e40a33146dd05e79d0fa4a4ecc84c0e8199877cc458b9f76
+EBUILD xscreensaver-5.08.ebuild 2586 RMD160 d2c918065b5096067b88fbcf8aa4430b664617f5 SHA1 b9a31b043622798dc60a7eb6f21ee33404e37776 SHA256 9bb431b105c3d0ef281b30fd1607a8901b1ecbffd203764acc855e8e17c8aa45
+MISC ChangeLog 40921 RMD160 3de39fb4e6f7db26602283bd46d84e09bea29060 SHA1 4b583b8f218b6e652225f5235cb323e635a6fe50 SHA256 a17711de3c885d79d858f6b08ce08bd3bc943669a6d4403a9a01e309aaeff090
+MISC metadata.xml 448 RMD160 53a59f7e462fa8a90b1756a85659855c53402e9d SHA1 7cea2f7e7ef26fd4b9598164efab077cf2c606cd SHA256 dd68ded20236cd8fd643730ffe54b297a64a971442d1d4d842cd12c1168dbc73
diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index 29f799fb46c4..50e9a90a658f 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -3,13 +3,9 @@
 <pkgmetadata>
   <herd>desktop-misc</herd>
   <maintainer>
-    <email>ssuominen@gentoo.org</email>
-    <name>Samuli Suominen</name>
-  </maintainer>
-  <maintainer>
     <email>jwz@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>
diff --git a/x11-misc/xscreensaver/xscreensaver-5.08.ebuild b/x11-misc/xscreensaver/xscreensaver-5.08.ebuild
index 4936e405aea2..db225cbf7512 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.08.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.08.ebuild
@@ -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 @@ HOMEPAGE="http://www.jwz.org/xscreensaver"
 
 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 @@ RDEPEND="x11-libs/libXmu
 	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_prepare() {
 }
 
 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_configure() {
 }
 
 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
 }