remove old, with regard to the libgnomekbd requirement. everyone needs to pull at least this version to avoid problems.

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

4 files changed, 15 insertions, 241 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 5905a1b5cbc5..cf8c598b0f0d 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.95 2011/10/30 16:06:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.96 2011/10/30 16:09:26 ssuominen Exp $
+
+  30 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -gnome-settings-daemon-2.32.1.ebuild,
+  -gnome-settings-daemon-2.32.1-r1.ebuild:
+  old
 
   30 Oct 2011; Raúl Porcel <armin76@gentoo.org>
   gnome-settings-daemon-2.32.1-r2.ebuild:
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index b504de142442..de21b5eee1b1 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -17,26 +17,23 @@ AUX gnome-settings-daemon-3.0.2-wacom-touch.patch 1550 RMD160 1e32eb1d347a9b273a
 AUX gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch 1595 RMD160 70df7f86b947ed569307ac8df8ec73f0b224cef0 SHA1 0e86ec669d19597c7b36fa76cc383dfadafcb0e6 SHA256 14a6f7e5593186a41f8e0a391708b433367e9d86015f559f28a87fd39a8f3195
 AUX gnome-settings-daemon-3.2.1-WEXITSTATUS.patch 667 RMD160 7360ac29861f96fc198d47967d370062639d22ef SHA1 6ccefe15ece8970661a8e09bdac2706bb1190329 SHA256 cdbae4bc1ed795e014aa03dd59dd00971d3ae5fecfc926af31318a6889c403db
 AUX gnome-settings-daemon-3.2.1-optional-colord.patch 2934 RMD160 cefc964b1c6449807043977b81ac4f593f37b7e3 SHA1 e1fa059374a429fe532af88f3a490d0ad5a2153a SHA256 2eb0e6cffd2fc579ece5cbe36950a28e9831d63764d8b5fae89df711ead4bf52
-DIST gnome-settings-daemon-2.30.0-gst-vol-control-support.patch 27189 RMD160 77e44583894977b6255fba168d565c5948481401 SHA1 8db1dde75b1866619d6589e989ed27fc45050c50 SHA256 0858e7fdb97086f7f0a284d535d642c23f06fb7d9fc71d9f7477dc856439a158
 DIST gnome-settings-daemon-2.32.1-gst-vol-control-support.patch 26788 RMD160 059f8e3e69990cf7f6f3e63159ab8d43f2f4f78a SHA1 5a734843d2094dccdb17014485ac20171193e130 SHA256 689f6152d6e27ddc0b8080d5c8c1644b6116075ff505951631af9b7289d2f933
 DIST gnome-settings-daemon-2.32.1.tar.bz2 1331850 RMD160 71aef9419eeca5f9fa59bb55990327c307f9ca31 SHA1 f2550acb4a9fd8f96ead1263ba5739915c303f6e SHA256 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86
 DIST gnome-settings-daemon-3.0.2.tar.bz2 1578597 RMD160 a396bfe8e422586c572315981ecd7e82e629f105 SHA1 a1d617eb58edaeb2c57364b074fc1040f2317c65 SHA256 f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec
 DIST gnome-settings-daemon-3.2.1.tar.xz 1418420 RMD160 ce15088f308ae96fb10975a66bcb55bea68d6eab SHA1 1526741dbdcf20a20aa4e78df483e6df881b52b5 SHA256 1015b8a12483e91ddc67e891b66207a70339a341a051507aad9a6a15fbfcb78d
-EBUILD gnome-settings-daemon-2.32.1-r1.ebuild 3592 RMD160 840be968e22e9ccd20eb5dbe01de024e1a3b057d SHA1 6c1e15fde157bfb037faf921b35f6cac97a53187 SHA256 4ca2aa34cccd70992f33083e731f7056a8c805e3c287b148baa9cbc648ad77ed
-EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3801 RMD160 6c3931cd52962c8409f451be1922a0249f0da532 SHA1 b43fff9c7592725a5174656792fc2641c3812eee SHA256 a894840fc005c1122081fb87c06c098918b046618c3b2ae4bfe97df8c136bd9a
-EBUILD gnome-settings-daemon-2.32.1.ebuild 3221 RMD160 936a84871290b091dc7c1f65d92b5c06eb9f5dd5 SHA1 23efa449f73333872e8934f7eea743b2567fe18b SHA256 d1de887b4510cc37998a44b51f7ce880af0cf02d72e917f09c604e3cc9e3b31e
+EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3795 RMD160 cacdc9dce05376e0a3ffc09b9253223211851ac8 SHA1 fe43bf2258a82216c7e0d11c870d391c245d2e8a SHA256 c1b014122e7577e2102119d5e7b1fcba2d8e8487dfb2a7ef06f9f2d37a8a30b7
 EBUILD gnome-settings-daemon-3.0.2-r2.ebuild 3132 RMD160 1eafd36e9c157ecc60b548533d3885886a94e4e6 SHA1 4df9c1e7f314b8c2ae167f2820d463e4477052e2 SHA256 d0254eb3e7c9a8bafdda1945acd1a47a9116c648a8adeaa3338eacbf377a34da
 EBUILD gnome-settings-daemon-3.2.1.ebuild 3995 RMD160 286e899fe4310424c20637730b473ba901716c77 SHA1 f13d080d1cb856436451970edb3debeb2bc92c4f SHA256 5df33b8a8835fb48acac5d40d4522f5b6684ae7690e1f241c61b0458bb0a0968
-MISC ChangeLog 18077 RMD160 60abcb47ea8d61165c54b3f9f17892966252bb8d SHA1 d0685e5632e4284c39bc6692ee19b4c72a24f891 SHA256 9a5b155578442e5d2581d5d6318fda9a56242d395483078ccf45a5b32b51e65e
+MISC ChangeLog 18354 RMD160 95012ef7bd29786cbff2b5595b244dda9432a6ed SHA1 6ccadaf383c6e4c216c358ab1028c969082e15d1 SHA256 f7968b76af6baf26c38e49a43163fd67f63b726353993b5255835af0afd1f392
 MISC metadata.xml 507 RMD160 da190ee6888fff3a8db0629c5c45ebd2235bf3fe SHA1 f7e7d8aa01ccdb946e6f7055992ac7f1da807815 SHA256 095c7487bf2ebadd2b70038c9f65724c2c4c6860a5b0da0096264e50a4e36480
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOrEqyAAoJEEdUh39IaPFNkf4H/3x4PXsbUP93Kabav27V0K8S
-Lxfj5V/4rB27VgnYRvhtuYdfAbZdyFU4o3N7/urIqKxABv1fbKNcnvWCX/sOVDvu
-NgEzrE+isyAwe9MmqY9uQ7Q093kTf/SM7C7hAU9XOtPfezY+sx5unk2NQDYFpB5T
-uULEPQ6+ZZdV9L6+GtL7T9FPi92awUjIT9BwO0j0Z8QeBDLxYCYcbFVpxtpqy2Hb
-IBeGZwLeg3ltiFbTYlPRzVM9ctVU4y8eSeVr0eYUyWivKDs70aZ1j6JwP/giM2hj
-4vlLzfjsazVYehxhQcdUFPitevAPyaLRrvZZt9K8PTbgxfUaTMuCJd1ghmfPWyA=
-=dTAH
+iQEcBAEBAgAGBQJOrXa8AAoJEEdUh39IaPFNDMgH/3pWGjaVT+KkKzPzLcL+3qhL
+Dx9dhVkkHt3yn8gKbWU3dCMqsTW7diK1lQnAZTgxE4TlhGmfdyort4md6/gCzakv
+Xugut+0+75nFhWUUY8UOib1C/SWqjtAIDyr1CpWLdKpthmT1mPWz2KVSqhreLWV8
+GOJ1tDKIo62txyTyVEGSrPJnkrvS8rzAEqkwHR5Ogse/ifXsWAFwxvLhasb9eMn5
+xtnwPf6+7PH0t7XcvKL6kayKhxxp4+/81iU1fmBCdJnCPH9STNNIsCYszSwXUmRo
+oqPfB6XzGdqyHVjFPTRDO5RzCVJKUZ4troiwvkUBEa+um9VbSJ+RWPdBkWumtyk=
+=N80D
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r1.ebuild
deleted file mode 100644
index 75661afed441..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2011 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.32.1-r1.ebuild,v 1.7 2011/10/05 17:21:50 xarthisius Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="http://www.gnome.org"
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/gnome-settings-daemon-2.32.1-gst-vol-control-support.patch"
-
-# Old patches:
-# 	mirror://gentoo/${PN}-2.30.0-gst-vol-control-support.patch" -> this causes bug #327609
-# 	mirror://gentoo/${PN}-2.30.2-gst-vol-control-support.patch.bz2" -> this patch has worse problems like bug #339732
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug libnotify policykit pulseaudio smartcard"
-
-# libgnomekbd-2.91 breaks API/ABI
-RDEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.21.2:2
-	>=gnome-base/gconf-2.6.1:2
-	>=gnome-base/libgnomekbd-2.31.2
-	<gnome-base/libgnomekbd-2.91.0
-	>=gnome-base/gnome-desktop-2.29.92:2
-
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-5.0
-	media-libs/fontconfig
-
-	libnotify? ( >=x11-libs/libnotify-0.4.3 )
-	policykit? (
-		>=sys-auth/polkit-0.91
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-1.1.2 )
-	pulseaudio? (
-		>=media-sound/pulseaudio-0.9.15
-		media-libs/libcanberra[gtk] )
-	!pulseaudio? (
-		>=media-libs/gstreamer-0.10.1.2:0.10
-		>=media-libs/gst-plugins-base-0.10.1.2:0.10 )
-	smartcard? ( >=dev-libs/nss-3.11.2 )"
-
-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"
-
-pkg_setup() {
-	# README is empty
-	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable debug)
-		$(use_with libnotify)
-		$(use_enable policykit polkit)
-		$(use_enable pulseaudio pulse)
-		$(use_enable !pulseaudio gstreamer)
-		$(use_enable smartcard smartcard-support)"
-
-	if use pulseaudio; then
-		elog "Building volume media keys using Pulseaudio"
-	else
-		elog "Building volume media keys using GStreamer"
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# libnotify-0.7.1 compatibility patches
-	epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-0.7.patch
-	epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-init.patch
-
-	# Restore gstreamer volume control support, upstream bug #571145
-	# Keep using old patch as it doesn't cause problems like bug #339732
-#	epatch "${WORKDIR}/${PN}-2.30.2-gst-vol-control-support.patch"
-#	echo "plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c" >> po/POTFILES.in
-	# We use now debian patch as looks to fix bug #327609
-#	epatch "${DISTDIR}/${PN}-2.30.0-gst-vol-control-support.patch"
-	epatch "${DISTDIR}/${PN}-2.32.1-gst-vol-control-support.patch"
-
-	# More network filesystems not to monitor, upstream bug #606421
-	epatch "${FILESDIR}/${PN}-2.32.1-netfs-monitor.patch"
-
-	# xsettings: Export Xft.lcdfilter for OO.o's benefit, upstream bug #631924
-	epatch "${FILESDIR}/${PN}-2.32.1-lcdfilter.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! use pulseaudio; then
-		elog "GStreamer volume control support is a feature powered by Gentoo GNOME Team"
-		elog "PLEASE DO NOT report bugs upstream, report on https://bugs.gentoo.org instead"
-	fi
-}
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1.ebuild
deleted file mode 100644
index 5e6304477e89..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2011 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.32.1.ebuild,v 1.10 2011/04/07 15:40:02 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="http://www.gnome.org"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-2.30.0-gst-vol-control-support.patch"
-# mirror://gentoo/${PN}-2.30.2-gst-vol-control-support.patch.bz2"
-# New patch has other problems like bug #339732
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug libnotify policykit pulseaudio smartcard"
-
-# libgnomekbd-2.91 breaks API/ABI
-RDEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.21.2:2
-	>=gnome-base/gconf-2.6.1:2
-	>=gnome-base/libgnomekbd-2.31.2
-	<gnome-base/libgnomekbd-2.91.0
-	>=gnome-base/gnome-desktop-2.29.92:2
-
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-5.0
-	media-libs/fontconfig
-
-	libnotify? ( >=x11-libs/libnotify-0.4.3 )
-	policykit? (
-		>=sys-auth/polkit-0.91
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-1.1.2 )
-	pulseaudio? (
-		>=media-sound/pulseaudio-0.9.15
-		media-libs/libcanberra[gtk] )
-	!pulseaudio? (
-		>=media-libs/gstreamer-0.10.1.2:0.10
-		>=media-libs/gst-plugins-base-0.10.1.2:0.10 )
-	smartcard? ( >=dev-libs/nss-3.11.2 )"
-
-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"
-
-pkg_setup() {
-	# README is empty
-	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable debug)
-		$(use_with libnotify)
-		$(use_enable policykit polkit)
-		$(use_enable pulseaudio pulse)
-		$(use_enable !pulseaudio gstreamer)
-		$(use_enable smartcard smartcard-support)"
-
-	if use pulseaudio; then
-		elog "Building volume media keys using Pulseaudio"
-	else
-		elog "Building volume media keys using GStreamer"
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-
-	# Restore gstreamer volume control support, upstream bug #571145
-	# Keep using old patch as it doesn't cause problems like bug #339732
-	#epatch "${WORKDIR}/${PN}-2.30.2-gst-vol-control-support.patch"
-	#echo "plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c" >> po/POTFILES.in
-
-	epatch "${DISTDIR}/${PN}-2.30.0-gst-vol-control-support.patch"
-
-	# More network filesystems not to monitor, upstream bug #606421
-	epatch "${FILESDIR}/${PN}-2.32.1-netfs-monitor.patch"
-
-	# xsettings: Export Xft.lcdfilter for OO.o's benefit, upstream bug #631924
-	epatch "${FILESDIR}/${PN}-2.32.1-lcdfilter.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! use pulseaudio; then
-		elog "GStreamer volume control support is a feature powered by Gentoo GNOME Team"
-		elog "PLEASE DO NOT report bugs upstream, report on https://bugs.gentoo.org instead"
-	fi
-}