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

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 22 insertions, 186 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/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 48685fb6e25c..7ea4c2395d3d 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,15 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-settings-daemon-2.24.0-automagic.patch 1656 RMD160 895fe60a74854d14229fa81fb534dc2379b3de8c SHA1 dfbfdc227104cc4339e8ff4c5bc8d3208a18f09c SHA256 ebf248ccbe911200ff256df37345f07c2291caf165b16331e6916ccf24be003d
 AUX gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch 721 RMD160 0a852a0d0027d05b6086e69cc41468edf5d82192 SHA1 07f8e843740d145cc2fc0dd328435586567fbcb9 SHA256 03d5f3e46baff9f4472410e0d2a58477908af23de2148cb3cd9b202121b60663
 AUX gnome-settings-daemon-2.24.1-gnomedesktop-api.patch 2873 RMD160 8545d4e60fdc72f4153732eadfb93aecee282aed SHA1 e0711aa4382ce93b38a50357530371014a3e6de4 SHA256 9c569aaa2bd9c48771c3c13768a071c3dc999abb0def0e6cac59c7f1976a9996
 AUX gnome-settings-daemon-2.26.1-crash-default-sink-change.patch 1212 RMD160 684648d8336370f1b3c356d39e8b79f5e740c36a SHA1 0aa4f61332f751003b280647b37fd9fc5add93e3 SHA256 86515630893732368bac39cd44362b3c13db6f058ca5940a6ae2e1f4c4fdc4f0
-DIST gnome-settings-daemon-2.24.1.tar.bz2 1131518 RMD160 27d432cd217a836fcef0deac5f80f638a73cda7c SHA1 d0dbf6ba82cdc1e814d6c46bdc363e61ee9fd0f3 SHA256 a2a5132a5b9d0bef52010ea45b14560b6344f591ce3296ed555165332cce9a70
 DIST gnome-settings-daemon-2.26.1-readd-gst-vol-control-support.patch.bz2 7669 RMD160 dc616c73606981af7f47e01973d2f1881fceed04 SHA1 e0194dc45dbfd57da9eead92f4c9c0e586f8eb9f SHA256 4bb694a0ea484c6d74baf2e252c6e9ddb153a3467b480fe55ba18373312fda81
 DIST gnome-settings-daemon-2.26.1.tar.bz2 1084129 RMD160 5cca5fdcbf144d6fc950c5b5f7d5f1304168f4bd SHA1 0c2cef37a0a3333c314a8205cefea9edb8f0669a SHA256 4dff1daa84fe485e302f61286df1dd188292302ee792ddb4fb1c34e65aea0a80
 DIST gnome-settings-daemon-2.28.0-gst-vol-control-support.patch.lzma 6824 RMD160 225250f3fc8791eb9e77eedea1a6a768fc410947 SHA1 492b2e5dadbce83a77482007ba0863386f1d6b95 SHA256 a769b0dcd3dd98242bbc5a66cf8d7f5bbedfca50dc0c517c565bad8b91adb75d
 DIST gnome-settings-daemon-2.28.1.tar.bz2 1174173 RMD160 f73e361e92101f5ca03f6634d1165b0b5ab686f0 SHA1 2fd672a3c85a33d49522ff0938dbd04a842ac768 SHA256 1267ef7d4069189b6bd05b915586b5b323688a136d394e571d29991d59bbadb2
-EBUILD gnome-settings-daemon-2.24.1-r1.ebuild 2363 RMD160 e3da03a7077faa4952ebec4b2334b329b7e8be96 SHA1 831776c2a099e3cb58fab10ba6b76aa70f9ec9ce SHA256 efa82d6f58dd0970f7f245618c8480642389bb3c972afd00bfec0440455c8050
-EBUILD gnome-settings-daemon-2.24.1-r2.ebuild 2478 RMD160 fd9e9524d98c2100d3cc24e4538e7d6889beb471 SHA1 ff0f72094197758414b8e43796724622980749b1 SHA256 6a30a60c34050d82667f60dd5279487d9198e1b2e35cb4bb09aec5d338ab9b74
 EBUILD gnome-settings-daemon-2.26.1-r2.ebuild 2075 RMD160 37871c1a520edf5a24b45c545ec212b07a4e0e15 SHA1 534ed6062f3ee20e8ba793fd2999c14c7ff4ccb2 SHA256 56f248061808e633d2d48c0320974f294e49309b20943ac490b758af6ffe7919
-EBUILD gnome-settings-daemon-2.28.1.ebuild 2277 RMD160 ada6ff55ce20acd4fb6c43d25f21c823cc35b9ab SHA1 6842f0b06aff114e224a17380b2b548fbb683f0a SHA256 42343fb6661090168fa6aa1bfa5cdd7e215d63845c9d2f79f4cb42d0f9de1a34
-MISC ChangeLog 7640 RMD160 5bb7e21f78f5fa12ee4bbf7dbc0aacce41514f17 SHA1 e870feff4bb36ab4a5c20c91a155fac64c85470a SHA256 736a3c3d6fd9ce6fd22fbea8fa9b3acfd19ffa5cb5ac4197756ed44e02613871
+EBUILD gnome-settings-daemon-2.28.1.ebuild 2246 RMD160 8ca0fcaf5e01c31156e21ccc1f6bd0b39c823d6a SHA1 61b24555b2f5c3e84a5a2237f61183b209b63ecc SHA256 8bbc87f91311a28016f82c051cd602ff12a94dc90831a5b76472157a7ba80d55
+MISC ChangeLog 7896 RMD160 de169952c0658f3ddc6003c814512b8608fa69f3 SHA1 4ea6963ac97c280c375e6c2cc0efd2bdb792a056 SHA256 1a17bcab805334866f6840c16e6d311894578335ced292458656d654674ca0be
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktcl8EACgkQ1fmVwcYIWAbBrACeI8IyS9ZktQvEAalOPDNAjNZh
+nv8An2NYisA3ibaD3FN1OmfdLN+8Dilb
+=wdHR
+-----END PGP SIGNATURE-----
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] )