Add src_install to drop unneeded la files. Drop old revisions.

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

5 files changed, 25 insertions, 184 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 9a77707de3ec..a04044d0e7db 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.68 2011/01/30 18:42:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.69 2011/02/08 23:08:01 eva Exp $
+
+  08 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-settings-daemon-2.30.2.ebuild, -gnome-settings-daemon-2.32.0.ebuild,
+  gnome-settings-daemon-2.32.1.ebuild:
+  Add src_install to drop unneeded la files. Drop old revisions.
 
   30 Jan 2011; Raúl Porcel <armin76@gentoo.org>
   gnome-settings-daemon-2.30.2-r1.ebuild:
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index d8bbc7ae16cd..8a07311971f0 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,13 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-settings-daemon-2.32.1-lcdfilter.patch 1749 RMD160 3c3ac3aab62db8c963bb46f89b5ddc42ae699f82 SHA1 de66d2a6a5e8b7fd66def022338ba482dce4d62d SHA256 6aaf4fe50034de4c403850df25a93e371a94486af9629f4d3cc70863abbfb3ae
 AUX gnome-settings-daemon-2.32.1-netfs-monitor.patch 1753 RMD160 af98d9b35a2f9748fc86654d4f9a90a85c1c1537 SHA1 b8606ac345e367619838466d5883c0595cd6bcc8 SHA256 ba30e87b4815dca4bae74076b787a3fb9bd083923a1a8e6dee2cd95e8f4ca4e9
 DIST gnome-settings-daemon-2.30.0-gst-vol-control-support.patch 27189 RMD160 77e44583894977b6255fba168d565c5948481401 SHA1 8db1dde75b1866619d6589e989ed27fc45050c50 SHA256 0858e7fdb97086f7f0a284d535d642c23f06fb7d9fc71d9f7477dc856439a158
 DIST gnome-settings-daemon-2.30.2-gst-vol-control-support.patch.bz2 7255 RMD160 cc5c5a0f095dd0fdb321a338f0939f42f62133cd SHA1 1ece288911360df06d4f1d97166621a5e5d076c7 SHA256 0ddc872fccfd14cfac7620ca76c4333145dc67b541b6554f276c69bef267c394
 DIST gnome-settings-daemon-2.30.2.tar.bz2 1250365 RMD160 a4547cdb13c2c5dc8f690cf198853129514adaab SHA1 75fe75eaa7d6197514c1de8b8c47c869f2bade2c SHA256 7cd22dab52f52900ee13a5bc0c1a186e91d33e77f5333c4622f84d85e4eb71f4
-DIST gnome-settings-daemon-2.32.0.tar.bz2 1322416 RMD160 71e57f3f6efa5c25412b993c1f12f04e84eba8ae SHA1 c4cc7035909843472e9a5060e5cd294322999a32 SHA256 d5eb0270028f072e8d36c61e4677d55844669d9ab09d525f6c76b4980ec81c9e
 DIST gnome-settings-daemon-2.32.1.tar.bz2 1331850 RMD160 71aef9419eeca5f9fa59bb55990327c307f9ca31 SHA1 f2550acb4a9fd8f96ead1263ba5739915c303f6e SHA256 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86
 EBUILD gnome-settings-daemon-2.30.2-r1.ebuild 2272 RMD160 ca048b85b1c216c1411e6005b571dc8ce5aa0be9 SHA1 6c682db14368e446a3aba650567843b4a4329367 SHA256 dee9c6b8fae18b26fb5dc5b35a17beeabe31e76b2a98b24d611e7c2d615c209c
-EBUILD gnome-settings-daemon-2.30.2.ebuild 2208 RMD160 5e4d0b2340000ff3cb56a26bf7545f59e62b415c SHA1 de5444020fd1cdd912d2a3d4b84284610ad8659a SHA256 e74e3c8813001a3aa67c8a89c646c365495d5cc432d24b0839cb0d1aae9e8e22
-EBUILD gnome-settings-daemon-2.32.0.ebuild 2537 RMD160 8d4a5127101fcbb99f16eef4a6a91274756bd5fc SHA1 1e195c2bcb56e57e656236fe93329b0cc3baa5fc SHA256 bc26fd60143f2548a2169aac5a8000c00931cf70cfd104971820717ae6803e3e
-EBUILD gnome-settings-daemon-2.32.1.ebuild 3026 RMD160 dfde452c580e76125f6d45ff826f004a137ddc99 SHA1 ad7bb43021e45b873550e9bd2dec248aeb3037a3 SHA256 eeadec214241a14177e439c09a0efc9e9ec7fb7e8e500f81da1f8fa98d3a36ba
-MISC ChangeLog 12974 RMD160 9a7750d2c99921c40d404b4705e2747d5fc35fe6 SHA1 9b0bf8235727c3d0ce440c5ebbc77c1a1fa3d7e7 SHA256 21cf6bcd084fa3d6b2b5cb7780374d472777c6b632d6d6188341603f18a2a650
+EBUILD gnome-settings-daemon-2.32.1.ebuild 3098 RMD160 ea886353293b0da070afeb794098232e40af832a SHA1 bd873b1f127d4e825b88749c63c4271744c0ccb4 SHA256 bd1ce8f806b469e563bb60a08eb8af96442ef7c4f421a33733dc3d8b3da4ffe4
+MISC ChangeLog 13207 RMD160 54171e6cc8b6eec2fa1e2dcf64829af873a6f1bf SHA1 3b9ca3aabdcd37436573c809e6b04600952a126a SHA256 b4298bdf2b0b9f920469409061eef20a7164e5ad00719b25858e2179fa0eaf17
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1RzN0ACgkQ1fmVwcYIWAZXVgCdGltHPAclgxqO7GeYUbW9UwJq
+jPEAmQE0VgfXEQG1I5wwq5mJRiy2I5n0
+=YSFU
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.30.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.30.2.ebuild
deleted file mode 100644
index bfe352466748..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.30.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.30.2.ebuild,v 1.5 2010/10/14 21:46:29 maekke Exp $
-
-EAPI="2"
-
-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"
-
-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 pulseaudio"
-
-RDEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.18.0
-	>=x11-libs/gtk+-2.16
-	>=gnome-base/gconf-2.6.1
-	>=gnome-base/libgnomekbd-2.29.5
-	>=gnome-base/gnome-desktop-2.29.92
-
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-5.0
-	media-libs/fontconfig
-
-	libnotify? ( >=x11-libs/libnotify-0.4.3 )
-	pulseaudio? (
-		>=media-sound/pulseaudio-0.9.15
-		media-libs/libcanberra[gtk] )
-	!pulseaudio? (
-		>=media-libs/gstreamer-0.10.1.2
-		>=media-libs/gst-plugins-base-0.10.1.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"
-
-# README is empty
-DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable debug)
-		$(use_with libnotify)
-		$(use_enable pulseaudio pulse)
-		$(use_enable !pulseaudio gstreamer)"
-
-	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
-
-	# Restore gstreamer volume control support, upstream bug #571145
-	epatch "${DISTDIR}/${PN}-2.30.0-gst-vol-control-support.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-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.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.0.ebuild
deleted file mode 100644
index 36c19601daae..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.32.0.ebuild,v 1.3 2010/11/02 02:32:24 ford_prefect 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.2-gst-vol-control-support.patch.bz2"
-
-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"
-
-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
-	>=gnome-base/libgnomekbd-2.31.2
-	>=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
-		>=media-libs/gst-plugins-base-0.10.1.2 )
-	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
-
-	# Restore gstreamer volume control support, upstream bug #571145
-	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
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-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
index fadc4cf6fbab..d91921927f66 100644
--- 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
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.1 2010/12/04 16:50:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1.ebuild,v 1.2 2011/02/08 23:08:01 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -93,6 +93,11 @@ src_prepare() {
 	eautoreconf
 }
 
+src_install() {
+	gnome2_src_install
+	find "${ED}" -name "*.la" -delete
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst