alpha/ia64/sparc stable wrt #349053

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

17 files changed, 31 insertions, 291 deletions

diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog
index 71c9ca9202b1..0dfa65edf4ac 100644
--- a/xfce-base/thunar/ChangeLog
+++ b/xfce-base/thunar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/thunar
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.114 2011/02/05 18:49:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.115 2011/02/14 19:41:48 ssuominen Exp $
+
+  14 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> thunar-1.2.0.ebuild:
+  alpha/ia64/sparc stable wrt #349053
 
   05 Feb 2011; Markus Meier <maekke@gentoo.org> thunar-1.2.0.ebuild:
   arm stable, bug #349053
diff --git a/xfce-base/thunar/thunar-1.0.2.ebuild b/xfce-base/thunar/thunar-1.0.2.ebuild
deleted file mode 100644
index ef64f771768e..000000000000
--- a/xfce-base/thunar/thunar-1.0.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.0.2.ebuild,v 1.13 2011/02/07 19:06:57 ssuominen Exp $
-
-EAPI=3
-MY_P=${P/t/T}
-inherit virtualx xfconf
-
-DESCRIPTION="File manager for Xfce4"
-HOMEPAGE="http://thunar.xfce.org"
-SRC_URI="mirror://xfce/src/xfce/${PN}/1.0/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dbus debug doc exif gnome hal pcre startup-notification +xfce_plugins_trash"
-
-RDEPEND=">=dev-lang/perl-5.6
-	>=dev-libs/glib-2.6:2
-	>=dev-util/desktop-file-utils-0.14
-	>=media-libs/freetype-2
-	virtual/jpeg
-	>=media-libs/libpng-1.4
-	virtual/fam
-	>=x11-libs/gtk+-2.6:2
-	x11-libs/libSM
-	>=x11-misc/shared-mime-info-0.20
-	>=xfce-base/exo-0.3.92[hal?]
-	<xfce-base/exo-0.5
-	>=xfce-base/libxfce4util-4.6
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( >=media-libs/libexif-0.6 )
-	hal? ( dev-libs/dbus-glib
-		sys-apps/hal )
-	gnome? ( gnome-base/gconf )
-	pcre? ( >=dev-libs/libpcre-6 )
-	startup-notification? ( x11-libs/startup-notification )
-	xfce_plugins_trash? ( dev-libs/dbus-glib
-		>=xfce-base/xfce4-panel-4.6 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	sys-devel/gettext
-	doc? ( dev-libs/libxslt )"
-
-pkg_setup() {
-	XFCONF="--disable-dependency-tracking
-		$(use_enable dbus)
-		$(use_enable gnome gnome-thumbnailers)
-		$(use_enable startup-notification)
-		$(use_enable doc xsltproc)
-		$(use_enable exif)
-		$(use_enable pcre)
-		$(use_enable debug)"
-
-	if use hal; then
-		XFCONF="${XFCONF} --enable-dbus --with-volume-manager=hal"
-	else
-		XFCONF="${XFCONF} --with-volume-manager=none"
-	fi
-
-	if use xfce_plugins_trash; then
-		XFCONF="${XFCONF} --enable-dbus"
-	else
-		XFCONF="${XFCONF} --disable-tpa-plugin"
-	fi
-	DOCS="AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO"
-}
-
-src_test() {
-	Xemake check || die
-}
diff --git a/xfce-base/thunar/thunar-1.2.0.ebuild b/xfce-base/thunar/thunar-1.2.0.ebuild
index e9c101c7dc02..ee5b0daa7d0c 100644
--- a/xfce-base/thunar/thunar-1.2.0.ebuild
+++ b/xfce-base/thunar/thunar-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.2.0.ebuild,v 1.4 2011/02/05 18:49:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.2.0.ebuild,v 1.5 2011/02/14 19:41:48 ssuominen Exp $
 
 EAPI=3
 inherit virtualx xfconf
@@ -13,7 +13,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/1.2/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="dbus debug exif libnotify pcre startup-notification test +xfce_plugins_trash udev"
 
 GVFS_DEPEND=">=gnome-base/gvfs-1.6.4-r2"
diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog
index fa883b97a2ea..0fbf2a6a70d2 100644
--- a/xfce-base/xfce-utils/ChangeLog
+++ b/xfce-base/xfce-utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/xfce-utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.175 2011/02/05 18:42:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.176 2011/02/14 19:33:15 ssuominen Exp $
+
+  14 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> xfce-utils-4.8.0.ebuild:
+  alpha/ia64/sparc stable wrt #349053
 
   05 Feb 2011; Markus Meier <maekke@gentoo.org> xfce-utils-4.8.0.ebuild:
   arm stable, bug #349053
diff --git a/xfce-base/xfce-utils/files/Gentoo b/xfce-base/xfce-utils/files/Gentoo
deleted file mode 100644
index f1920e263117..000000000000
--- a/xfce-base/xfce-utils/files/Gentoo
+++ /dev/null
@@ -1,9 +0,0 @@
-Gentoo Xfce Team is <xfce@gentoo.org>
-
-Maintainers are:
-
-Jeremy Olexa <darkside@gentoo.org>
-Christoph Mende <angelos@gentoo.org>
-Samuli Suominen <ssuominen@gentoo.org>
-
-Bugs should be reported to Gentoo BTS at: http://bugs.gentoo.org/
diff --git a/xfce-base/xfce-utils/xfce-utils-4.6.2.ebuild b/xfce-base/xfce-utils/xfce-utils-4.6.2.ebuild
deleted file mode 100644
index 10f2ec0ece3b..000000000000
--- a/xfce-base/xfce-utils/xfce-utils-4.6.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.6.2.ebuild,v 1.12 2010/09/06 17:48:42 ssuominen Exp $
-
-EAPI=3
-inherit xfconf
-
-DESCRIPTION="Collection of utils for Xfce4"
-HOMEPAGE="http://www.xfce.org/projects/xfce-utils/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/4.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dbus debug +lock"
-
-RDEPEND="x11-apps/xrdb
-	x11-libs/libX11
-	>=dev-libs/glib-2.6:2
-	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfce4util-4.6
-	>=xfce-base/libxfcegui4-4.6
-	>=xfce-base/xfconf-4.6
-	dbus? ( >=dev-libs/dbus-glib-0.70 )
-	lock? ( || ( x11-misc/xscreensaver
-		gnome-extra/gnome-screensaver
-		x11-misc/xlockmore ) )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	XFCONF="--disable-dependency-tracking
-		$(use_enable dbus)
-		$(use_enable debug)
-		--with-vendor-info=Gentoo
-		--with-xsession-prefix=${EPREFIX}/usr"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_install() {
-	xfconf_src_install
-	insinto /usr/share/xfce4
-	doins "${FILESDIR}"/Gentoo || die "doins failed"
-	echo startxfce4 > "${T}"/Xfce4
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/Xfce4 || die "doexe failed"
-}
-
-pkg_postinst() {
-	elog "Run Xfce4 from your favourite Display Manager by using"
-	elog "XSESSION=\"Xfce4\" in /etc/rc.conf"
-}
diff --git a/xfce-base/xfce-utils/xfce-utils-4.8.0.ebuild b/xfce-base/xfce-utils/xfce-utils-4.8.0.ebuild
index 35decb40da90..a06312f78ed6 100644
--- a/xfce-base/xfce-utils/xfce-utils-4.8.0.ebuild
+++ b/xfce-base/xfce-utils/xfce-utils-4.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.8.0.ebuild,v 1.5 2011/02/05 18:42:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.8.0.ebuild,v 1.6 2011/02/14 19:33:15 ssuominen Exp $
 
 EAPI=3
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/4.8/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="dbus debug +lock"
 
 COMMON_DEPEND="x11-libs/libX11
diff --git a/xfce-base/xfce4-meta/ChangeLog b/xfce-base/xfce4-meta/ChangeLog
index be6f76ed7b06..54f762f20c2d 100644
--- a/xfce-base/xfce4-meta/ChangeLog
+++ b/xfce-base/xfce4-meta/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/xfce4-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/ChangeLog,v 1.21 2011/02/05 18:51:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/ChangeLog,v 1.22 2011/02/14 19:43:37 ssuominen Exp $
+
+  14 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> xfce4-meta-4.8.ebuild:
+  alpha/ia64/sparc stable wrt #349053
 
   05 Feb 2011; Markus Meier <maekke@gentoo.org> xfce4-meta-4.8.ebuild:
   arm stable, bug #349053
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.6.2.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.6.2.ebuild
deleted file mode 100644
index dadb3b4db231..000000000000
--- a/xfce-base/xfce4-meta/xfce4-meta-4.6.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/xfce4-meta-4.6.2.ebuild,v 1.9 2011/02/04 18:01:59 ssuominen Exp $
-
-EAPI=3
-
-DESCRIPTION="Xfce4 Desktop Environment (meta package)"
-HOMEPAGE="http://www.xfce.org/"
-SRC_URI=""
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="minimal +session +svg"
-
-RDEPEND="x11-themes/gtk-engines-xfce
-	>=xfce-base/xfce4-panel-${PV}
-	>=xfce-base/xfwm4-${PV}
-	>=xfce-base/xfce-utils-${PV}
-	>=xfce-base/xfdesktop-${PV}
-	>=xfce-base/xfce4-settings-${PV}
-	x11-themes/hicolor-icon-theme
-	!minimal? ( media-fonts/dejavu
-		x11-themes/xfce4-icon-theme )
-	session? ( >=xfce-base/xfce4-session-${PV} )
-	svg? ( gnome-base/librsvg )"
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild
index 13a8bc399034..aa350e40a78c 100644
--- a/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild
+++ b/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild,v 1.6 2011/02/05 18:51:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild,v 1.7 2011/02/14 19:43:37 ssuominen Exp $
 
 EAPI=3
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="minimal +session +svg"
 
 RDEPEND="x11-themes/gtk-engines-xfce
diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index 3b523f4619f2..8ce4e74f34b3 100644
--- a/xfce-base/xfce4-settings/ChangeLog
+++ b/xfce-base/xfce4-settings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfce4-settings
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.69 2011/02/12 20:57:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.70 2011/02/14 19:29:55 ssuominen Exp $
+
+  14 Feb 2011; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-settings-4.8.0.ebuild:
+  alpha/ia64/sparc stable wrt #349053
 
   12 Feb 2011; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-settings-4.6.5.ebuild, xfce4-settings-4.8.0.ebuild,
diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.6.3-exo.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.6.3-exo.patch
deleted file mode 100644
index 2536af7bff87..000000000000
--- a/xfce-base/xfce4-settings/files/xfce4-settings-4.6.3-exo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur xfce4-settings-4.6.3.orig/configure.ac xfce4-settings-4.6.3/configure.ac
---- xfce4-settings-4.6.3.orig/configure.ac	2009-09-29 01:50:13.000000000 +0300
-+++ xfce4-settings-4.6.3/configure.ac	2009-10-24 19:25:21.000000000 +0300
-@@ -77,7 +77,8 @@
- dnl ***********************************
- dnl *** Check for required packages ***
- dnl ***********************************
--XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.100])
-+XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.100], [],
-+  [XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])])
- XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
- XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.12.0])
- XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.12.0])
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.6.5.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.6.5.ebuild
deleted file mode 100644
index 6f29bff211d8..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.6.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.6.5.ebuild,v 1.12 2011/02/12 20:57:36 ssuominen Exp $
-
-EAPI=3
-EAUTORECONF=yes
-inherit xfconf
-
-DESCRIPTION="Settings daemon for Xfce4"
-HOMEPAGE="http://www.xfce.org"
-SRC_URI="mirror://xfce/src/xfce/${PN}/4.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug +xklavier libcanberra libnotify"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	>=dev-libs/dbus-glib-0.34
-	>=gnome-base/libglade-2
-	>=x11-libs/gtk+-2.10:2
-	>=x11-libs/libX11-1
-	>=x11-libs/libXcursor-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.1
-	>=x11-libs/libwnck-2.12
-	>=xfce-base/libxfce4util-4.6
-	>=xfce-base/libxfcegui4-4.6
-	>=xfce-base/xfconf-4.6
-	>=xfce-base/exo-0.3.100
-	libnotify? ( <x11-libs/libnotify-0.7 )
-	xklavier? ( >=x11-libs/libxklavier-0.3 )
-	libcanberra? ( media-libs/libcanberra )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	dev-util/pkgconfig
-	x11-proto/inputproto
-	x11-proto/xf86vidmodeproto"
-
-pkg_setup() {
-	XFCONF=(
-		--disable-dependency-tracking
-		$(use_enable libnotify)
-		$(use_enable xklavier libxklavier)
-		$(use_enable libcanberra sound-settings)
-		$(xfconf_use_debug)
-		)
-
-	DOCS="AUTHORS ChangeLog NEWS TODO"
-
-	PATCHES=( "${FILESDIR}"/${PN}-4.6.3-exo.patch )
-}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.8.0.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.8.0.ebuild
index 2da18cff26a4..20c48d0cae25 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.8.0.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.8.0.ebuild,v 1.7 2011/02/12 20:57:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.8.0.ebuild,v 1.8 2011/02/14 19:29:55 ssuominen Exp $
 
 EAPI=3
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/4.8/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug +xklavier libcanberra libnotify"
 
 RDEPEND=">=dev-libs/glib-2.16:2
diff --git a/xfce-base/xfwm4/ChangeLog b/xfce-base/xfwm4/ChangeLog
index 95ade6e615f0..042e0cae9049 100644
--- a/xfce-base/xfwm4/ChangeLog
+++ b/xfce-base/xfwm4/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/xfwm4
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.163 2011/02/05 18:47:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.164 2011/02/14 19:37:13 ssuominen Exp $
+
+  14 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> xfwm4-4.8.0.ebuild:
+  alpha/ia64/sparc stable wrt #349053
 
   05 Feb 2011; Markus Meier <maekke@gentoo.org> xfwm4-4.8.0.ebuild:
   arm stable, bug #349053
diff --git a/xfce-base/xfwm4/xfwm4-4.6.2.ebuild b/xfce-base/xfwm4/xfwm4-4.6.2.ebuild
deleted file mode 100644
index 700df837357b..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.6.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.6.2.ebuild,v 1.11 2010/09/06 17:49:55 ssuominen Exp $
-
-EAPI=3
-inherit xfconf
-
-DESCRIPTION="Window manager for Xfce4"
-HOMEPAGE="http://www.xfce.org/projects/xfwm4/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/4.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug startup-notification +xcomposite"
-
-RDEPEND=">=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-2.10:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXpm
-	x11-libs/pango
-	>=x11-libs/libwnck-2.12
-	>=xfce-base/libxfce4util-4.6
-	>=xfce-base/libxfcegui4-4.6
-	>=xfce-base/xfconf-4.6
-	startup-notification? ( x11-libs/startup-notification )
-	xcomposite? ( x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXfixes )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	XFCONF="--disable-dependency-tracking
-		$(use_enable startup-notification)
-		--enable-xsync
-		--enable-render
-		--enable-randr
-		$(use_enable xcomposite compositor)
-		$(use_enable debug)"
-	DOCS="AUTHORS ChangeLog COMPOSITOR NEWS README TODO"
-}
diff --git a/xfce-base/xfwm4/xfwm4-4.8.0.ebuild b/xfce-base/xfwm4/xfwm4-4.8.0.ebuild
index a829af8cfd3a..f0fd67a37ad6 100644
--- a/xfce-base/xfwm4/xfwm4-4.8.0.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.8.0.ebuild,v 1.5 2011/02/05 18:47:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.8.0.ebuild,v 1.6 2011/02/14 19:37:13 ssuominen Exp $
 
 EAPI=3
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/4.8/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug startup-notification +xcomposite"
 
 RDEPEND=">=dev-libs/glib-2.10:2