alpha/ia64/sparc stable wrt #349053

(Portage version: 2.1.9.39/cvs/Linux x86_64)

4 files changed, 7 insertions, 69 deletions

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