Revert everything except amd64 and x86 to ~arch wrt #390025

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

8 files changed, 63 insertions, 42 deletions

diff --git a/x11-themes/fvwm-themes-extra/ChangeLog b/x11-themes/fvwm-themes-extra/ChangeLog
index d835ac22e323..9f214d0124bc 100644
--- a/x11-themes/fvwm-themes-extra/ChangeLog
+++ b/x11-themes/fvwm-themes-extra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/fvwm-themes-extra
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes-extra/ChangeLog,v 1.11 2007/02/21 22:46:52 jokey Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes-extra/ChangeLog,v 1.12 2011/11/11 17:19:12 ssuominen Exp $
+
+  11 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
+  fvwm-themes-extra-0.7.0.ebuild:
+  Revert everything except amd64 and x86 to ~arch wrt #390025
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-themes/fvwm-themes-extra/fvwm-themes-extra-0.7.0.ebuild b/x11-themes/fvwm-themes-extra/fvwm-themes-extra-0.7.0.ebuild
index 271ef36067d0..4b5adba76fd9 100644
--- a/x11-themes/fvwm-themes-extra/fvwm-themes-extra-0.7.0.ebuild
+++ b/x11-themes/fvwm-themes-extra/fvwm-themes-extra-0.7.0.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes-extra/fvwm-themes-extra-0.7.0.ebuild,v 1.13 2010/02/24 14:27:06 ssuominen Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes-extra/fvwm-themes-extra-0.7.0.ebuild,v 1.14 2011/11/11 17:19:12 ssuominen Exp $
 
 DESCRIPTION="Extra themes for fvwm-themes"
 HOMEPAGE="http://fvwm-themes.sourceforge.net/"
@@ -10,10 +8,11 @@ SRC_URI="mirror://sourceforge/fvwm-themes/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
-DEPEND="x11-themes/fvwm-themes"
+RDEPEND="x11-themes/fvwm-themes"
+DEPEND=""
 
 src_install() {
 	mkdir -p "${D}"/usr/share/fvwm/themes/
diff --git a/x11-themes/fvwm-themes/ChangeLog b/x11-themes/fvwm-themes/ChangeLog
index c6d7955caa11..c607074c551f 100644
--- a/x11-themes/fvwm-themes/ChangeLog
+++ b/x11-themes/fvwm-themes/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-themes/fvwm-themes
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/ChangeLog,v 1.18 2010/05/28 12:39:31 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/ChangeLog,v 1.19 2011/11/11 17:13:22 ssuominen Exp $
+
+  11 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> fvwm-themes-0.7.0.ebuild:
+  Revert everything except amd64 and x86 to ~arch wrt #390025
 
   28 May 2010; Kacper Kowalik <xarthisius@gentoo.org>
   fvwm-themes-0.7.0.ebuild, files/fvwm-themes-0.7.0-posix-sort.patch:
diff --git a/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild b/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild
index 80a2aaf7ab5c..29067848576b 100644
--- a/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild
+++ b/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild,v 1.17 2010/05/28 12:39:31 xarthisius Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild,v 1.18 2011/11/11 17:13:22 ssuominen Exp $
 
+EAPI=2
 inherit autotools eutils
 
 DESCRIPTION="A configuration framework for the fvwm window manager"
@@ -12,18 +11,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gnome"
 
-RDEPEND=">=x11-wm/fvwm-2.5.8"
+RDEPEND=">=x11-wm/fvwm-2.6.2"
 DEPEND="${RDEPEND}
 	gnome? ( || (
 		media-gfx/imagemagick
 		media-gfx/graphicsmagick[imagemagick] )	)"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch" \
-		"${FILESDIR}/${P}-posix-sort.patch"
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-posix-sort.patch
+
 	eautoreconf
 }
 
@@ -31,9 +32,9 @@ src_configure() {
 	econf $(use_enable gnome gnome-icons)
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
 
 pkg_postinst() {
diff --git a/x11-themes/fvwm_icons/ChangeLog b/x11-themes/fvwm_icons/ChangeLog
index 5b200538f3fb..428b74355c39 100644
--- a/x11-themes/fvwm_icons/ChangeLog
+++ b/x11-themes/fvwm_icons/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-themes/fvwm_icons
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm_icons/ChangeLog,v 1.12 2007/08/07 11:53:22 uberlord Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm_icons/ChangeLog,v 1.13 2011/11/11 17:16:53 ssuominen Exp $
+
+  11 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> fvwm_icons-1.0.ebuild:
+  Revert everything except amd64 and x86 to ~arch wrt #390025
 
   07 Aug 2007; Roy Marples <uberlord@gentoo.org> fvwm_icons-1.0.ebuild:
   Keyworded ~x86-fbsd, #141142 thanks to Robert Annessi
diff --git a/x11-themes/fvwm_icons/fvwm_icons-1.0.ebuild b/x11-themes/fvwm_icons/fvwm_icons-1.0.ebuild
index 37e2ac6c8303..aeefbcfdbe1b 100644
--- a/x11-themes/fvwm_icons/fvwm_icons-1.0.ebuild
+++ b/x11-themes/fvwm_icons/fvwm_icons-1.0.ebuild
@@ -1,18 +1,22 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm_icons/fvwm_icons-1.0.ebuild,v 1.16 2010/02/24 14:52:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm_icons/fvwm_icons-1.0.ebuild,v 1.17 2011/11/11 17:16:53 ssuominen Exp $
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="Icons for use with FVWM"
-SRC_URI="http://www.fvwm.org/generated/icon_download/fvwm_icons.tar.bz2"
 HOMEPAGE="http://www.fvwm.org/"
-IUSE=""
-DEPEND="x11-wm/fvwm"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-SLOT="0"
+SRC_URI="http://www.fvwm.org/generated/icon_download/fvwm_icons.tar.bz2"
+
 LICENSE="GPL-2 FVWM"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-wm/fvwm-2.6.2"
+DEPEND=""
+
+S=${WORKDIR}/${PN}
 
-src_install () {
+src_install() {
 	dodir /usr/share/icons/fvwm
 	insinto /usr/share/icons/fvwm
 	doins "${S}"/*
diff --git a/x11-themes/fvwm_sounds/ChangeLog b/x11-themes/fvwm_sounds/ChangeLog
index 5e3d46ecc963..d6e89f541942 100644
--- a/x11-themes/fvwm_sounds/ChangeLog
+++ b/x11-themes/fvwm_sounds/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-themes/fvwm_sounds
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm_sounds/ChangeLog,v 1.14 2006/08/18 02:26:40 mcummings Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm_sounds/ChangeLog,v 1.15 2011/11/11 17:11:38 ssuominen Exp $
+
+  11 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> fvwm_sounds-1.0.ebuild:
+  Revert everything except amd64 and x86 to ~arch wrt #390025
 
   18 Aug 2006; Michael Cummings <mcummings@gentoo.org>
   fvwm_sounds-1.0.ebuild:
diff --git a/x11-themes/fvwm_sounds/fvwm_sounds-1.0.ebuild b/x11-themes/fvwm_sounds/fvwm_sounds-1.0.ebuild
index 05349d1e050f..e37ff1a60da0 100644
--- a/x11-themes/fvwm_sounds/fvwm_sounds-1.0.ebuild
+++ b/x11-themes/fvwm_sounds/fvwm_sounds-1.0.ebuild
@@ -1,18 +1,22 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm_sounds/fvwm_sounds-1.0.ebuild,v 1.18 2010/02/24 14:52:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm_sounds/fvwm_sounds-1.0.ebuild,v 1.19 2011/11/11 17:11:38 ssuominen Exp $
 
-S=${WORKDIR}
 DESCRIPTION="Sounds for use with FVWM"
-SRC_URI="http://www.fvwm.org/generated/sounds_download/fvwm_sounds.tgz"
 HOMEPAGE="http://www.fvwm.org/"
-IUSE=""
-DEPEND="x11-wm/fvwm"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-SLOT="0"
+SRC_URI="http://www.fvwm.org/generated/sounds_download/fvwm_sounds.tgz"
+
 LICENSE="GPL-2 FVWM"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE=""
+
+RDEPEND=">=x11-wm/fvwm-2.6.2"
+DEPEND=""
+
+S=${WORKDIR}
 
-src_install () {
+src_install() {
 	dodir /usr/share/sounds/fvwm
 	insinto /usr/share/sounds/fvwm
 	doins "${S}"/*