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

(Portage version: 2.2.0_alpha21/cvs/Linux x86_64)

4 files changed, 13 insertions, 179 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/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