Remove unneeded libgnomeui dependency, bug #301823. Clean up old revisions.

(Portage version: 2.2_rc61/cvs/Linux x86_64)

4 files changed, 10 insertions, 181 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index afb933c3d641..432266d4c40c 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.43 2010/01/16 17:13:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.44 2010/01/24 18:55:55 eva Exp $
+
+  24 Jan 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-settings-daemon-2.24.1-r1.ebuild,
+  -gnome-settings-daemon-2.24.1-r2.ebuild,
+  gnome-settings-daemon-2.28.1.ebuild:
+  Remove unneeded libgnomeui dependency, bug #301823. Clean up old
+  revisions.
 
   16 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   gnome-settings-daemon-2.26.1-r2.ebuild:
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r1.ebuild
deleted file mode 100644
index 48bb150c1fe8..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r1.ebuild,v 1.11 2009/06/17 23:14:46 eva Exp $
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="alsa debug esd gstreamer libnotify pulseaudio"
-
-RDEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.18.0
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/gconf-2.6.1
-	>=gnome-base/libgnomekbd-2.21.4
-
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-desktop-2.23.90
-
-	libnotify? ( >=x11-libs/libnotify-0.4.3 )
-
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-3.3
-	media-libs/fontconfig
-
-	esd? ( >=media-sound/esound-0.2.28 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10.1.2
-		>=media-libs/gst-plugins-base-0.10.1.2 )
-	!gstreamer? (
-		alsa? ( >=media-libs/alsa-lib-0.99 ) )"
-# In configure: gstreamer wins over alsa
-
-DEPEND="${RDEPEND}
-	!<gnome-base/gnome-control-center-2.22
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.19
-	x11-proto/inputproto
-	x11-proto/xproto"
-
-# FIXME: pulseaudio is used to detect if system should build
-# old sound preference capplet (some braindead logic in there)
-PDEPEND="pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )"
-
-# README is empty
-DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable alsa)
-		$(use_enable debug)
-		$(use_enable esd)
-		$(use_enable gstreamer)
-		$(use_enable libnotify)
-		$(use_enable !pulseaudio legacy-sound-pref)"
-	# We use legacy-sound-pref instead of pulse because
-	# there is no gain in adding a build time dep on pulseaudio
-
-	if use esd && use pulseaudio; then
-		ewarn "You selected conflicting USE flags. Please note that USE=\"esd\""
-		ewarn "has no effect when USE=\"pulseaudio\" is selected."
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix libnotify & pulseaudio automagic dependencies
-	epatch "${FILESDIR}/${PN}-2.24.0-automagic.patch"
-
-	# Fix server-side XInput detection (Gnome bug #562977)
-	epatch "${FILESDIR}/${PN}-2.24.1-check-for-server-side-XInput.patch"
-
-	eautoreconf
-}
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r2.ebuild
deleted file mode 100644
index 0cf860ad9e15..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r2.ebuild,v 1.2 2009/06/17 23:14:46 eva Exp $
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa debug esd gstreamer libnotify pulseaudio"
-
-RDEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.18.0
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/gconf-2.6.1
-	>=gnome-base/libgnomekbd-2.21.4
-
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-desktop-2.26
-
-	libnotify? ( >=x11-libs/libnotify-0.4.3 )
-
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-3.3
-	media-libs/fontconfig
-
-	esd? ( >=media-sound/esound-0.2.28 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10.1.2
-		>=media-libs/gst-plugins-base-0.10.1.2 )
-	!gstreamer? (
-		alsa? ( >=media-libs/alsa-lib-0.99 ) )"
-# In configure: gstreamer wins over alsa
-
-DEPEND="${RDEPEND}
-	!<gnome-base/gnome-control-center-2.22
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.19
-	x11-proto/inputproto
-	x11-proto/xproto"
-
-# FIXME: pulseaudio is used to detect if system should build
-# old sound preference capplet (some braindead logic in there)
-PDEPEND="pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )"
-
-# README is empty
-DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable alsa)
-		$(use_enable debug)
-		$(use_enable esd)
-		$(use_enable gstreamer)
-		$(use_enable libnotify)
-		$(use_enable !pulseaudio legacy-sound-pref)"
-	# We use legacy-sound-pref instead of pulse because
-	# there is no gain in adding a build time dep on pulseaudio
-
-	if use esd && use pulseaudio; then
-		ewarn "You selected conflicting USE flags. Please note that USE=\"esd\""
-		ewarn "has no effect when USE=\"pulseaudio\" is selected."
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix libnotify & pulseaudio automagic dependencies
-	epatch "${FILESDIR}/${PN}-2.24.0-automagic.patch"
-
-	# Fix server-side XInput detection (Gnome bug #562977)
-	epatch "${FILESDIR}/${PN}-2.24.1-check-for-server-side-XInput.patch"
-
-	# Fix build with gnome-desktop-2.26, bug #269366
-	epatch "${FILESDIR}/${PN}-2.24.1-gnomedesktop-api.patch"
-
-	eautoreconf
-}
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.28.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.28.1.ebuild
index da04f420b141..eff276c6f591 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.28.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.28.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.28.1.ebuild,v 1.2 2010/01/10 16:55:58 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.28.1.ebuild,v 1.3 2010/01/24 18:55:55 eva Exp $
 
 EAPI="2"
 
@@ -21,12 +21,8 @@ RDEPEND=">=dev-libs/dbus-glib-0.74
 	>=x11-libs/gtk+-2.16
 	>=gnome-base/gconf-2.6.1
 	>=gnome-base/libgnomekbd-2.21.4
-
-	>=gnome-base/libgnomeui-2
 	>=gnome-base/gnome-desktop-2.26.3
 
-	libnotify? ( >=x11-libs/libnotify-0.4.3 )
-
 	x11-libs/libX11
 	x11-libs/libXi
 	x11-libs/libXrandr
@@ -35,6 +31,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.74
 	>=x11-libs/libxklavier-4.0
 	media-libs/fontconfig
 
+	libnotify? ( >=x11-libs/libnotify-0.4.3 )
 	pulseaudio? (
 		>=media-sound/pulseaudio-0.9.15
 		media-libs/libcanberra[gtk] )