public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, app-misc/the-board/, x11-libs/mx/, ...
@ 2011-02-07 18:55 Nirbheek Chauhan
  0 siblings, 0 replies; only message in thread
From: Nirbheek Chauhan @ 2011-02-07 18:55 UTC (permalink / raw
  To: gentoo-commits

commit:     276012a16110c9c2a4353c96cc7f02311c20940c
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  7 18:03:36 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 18:16:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=276012a1

Drop .la files from all GNOME 3 ebuilds

* Move gnome2-la.eclass functionality into gnome2.eclass
  - GNOME2_LA_PUNT will remove *all* .la files
* Use posix-compatible find command
* Some ebuilds don't use gnome2, so remove manually there

---
 app-arch/file-roller/file-roller-2.91.6.ebuild     |    9 +-----
 app-arch/file-roller/file-roller-9999.ebuild       |    9 +-----
 app-cdr/brasero/brasero-2.91.6.ebuild              |    8 +----
 app-cdr/brasero/brasero-9999.ebuild                |    8 +----
 .../seahorse-plugins-2.91.0_pre20110114.ebuild     |    5 +--
 .../seahorse-plugins/seahorse-plugins-9999.ebuild  |    5 +--
 app-crypt/seahorse/seahorse-2.91.4.ebuild          |   15 +++++----
 app-crypt/seahorse/seahorse-9999.ebuild            |    8 +---
 app-editors/gedit/gedit-2.91.6.ebuild              |    8 +----
 app-editors/gedit/gedit-9999.ebuild                |   11 ++-----
 app-misc/the-board/the-board-0.1.1.1.ebuild        |    1 +
 app-misc/the-board/the-board-9999.ebuild           |    1 +
 app-text/evince/evince-2.91.6.ebuild               |    6 +---
 app-text/evince/evince-9999.ebuild                 |    6 +---
 dev-cpp/gtkmm/gtkmm-2.99.3.ebuild                  |    1 +
 dev-libs/folks/folks-0.3.1.ebuild                  |    8 +---
 dev-libs/gjs/gjs-0.7.10.ebuild                     |    5 +--
 dev-libs/gjs/gjs-9999.ebuild                       |    5 +--
 dev-libs/libgweather/libgweather-2.91.6.ebuild     |   19 +++++------
 dev-libs/libgweather/libgweather-9999.ebuild       |   19 +++++------
 dev-libs/libpeas/libpeas-0.7.1.ebuild              |    6 +---
 dev-libs/libpeas/libpeas-9999.ebuild               |    6 +---
 dev-libs/libunique/libunique-2.91.4.ebuild         |   17 +++++-----
 dev-libs/seed/seed-2.31.91.ebuild                  |    4 ++-
 eclass/gnome2-la.eclass                            |   33 --------------------
 eclass/gnome2.eclass                               |   11 ++++++
 .../gnome-control-center-2.91.6.ebuild             |    8 +----
 .../gnome-control-center-9999.ebuild               |    8 +----
 .../gnome-desktop/gnome-desktop-2.91.6.1.ebuild    |    4 ++-
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |    4 ++-
 .../gnome-keyring/gnome-keyring-2.91.4.ebuild      |   17 +++++-----
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |   10 +-----
 gnome-base/gnome-menus/gnome-menus-2.91.6.ebuild   |    1 +
 gnome-base/gnome-panel/gnome-panel-2.91.6.ebuild   |    1 +
 .../gnome-settings-daemon-2.91.9.ebuild            |    1 +
 .../gnome-settings-daemon-9999.ebuild              |    1 +
 gnome-base/gvfs/gvfs-1.7.2.ebuild                  |    3 +-
 gnome-base/gvfs/gvfs-9999.ebuild                   |    3 +-
 gnome-base/libgnomekbd/libgnomekbd-2.91.5.ebuild   |    3 +-
 gnome-base/libgnomekbd/libgnomekbd-9999.ebuild     |    3 +-
 gnome-base/nautilus/nautilus-2.91.9.ebuild         |    6 +---
 gnome-base/nautilus/nautilus-9999.ebuild           |    6 +---
 .../evolution-data-server-2.91.6.ebuild            |    2 +-
 .../evolution-data-server-9999.ebuild              |    2 +-
 gnome-extra/gnome-games/gnome-games-2.91.5.ebuild  |    3 +-
 gnome-extra/gnome-utils/gnome-utils-2.91.2.ebuild  |    6 +---
 gnome-extra/gnome-utils/gnome-utils-9999.ebuild    |    6 +---
 gnome-extra/gtkhtml/gtkhtml-3.32.1-r200.ebuild     |    4 +--
 gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild          |    7 +---
 gnome-extra/gucharmap/gucharmap-2.33.2.ebuild      |    6 +---
 gnome-extra/nm-applet/nm-applet-0.8.2-r300.ebuild  |    1 +
 gnome-extra/nm-applet/nm-applet-9999.ebuild        |    1 +
 mail-client/evolution/evolution-2.91.6.ebuild      |    7 +---
 mail-client/evolution/evolution-9999.ebuild        |    7 +---
 media-gfx/eog/eog-2.91.7.ebuild                    |    8 +---
 media-gfx/eog/eog-9999.ebuild                      |    8 +---
 media-libs/libcanberra/libcanberra-0.26-r2.ebuild  |    1 +
 .../libgnome-media-profiles-2.91.2.ebuild          |    2 +
 media-sound/rhythmbox/rhythmbox-0.13.3.ebuild      |    8 +----
 media-sound/rhythmbox/rhythmbox-9999.ebuild        |    8 +----
 media-video/totem/totem-2.91.5.ebuild              |    8 +----
 media-video/totem/totem-9999.ebuild                |    9 +----
 net-libs/gtk-vnc/gtk-vnc-0.4.2-r300.ebuild         |    3 ++
 net-libs/libepc/libepc-0.3.11.ebuild               |    1 +
 net-libs/webkit-gtk/webkit-gtk-1.3.11-r200.ebuild  |    3 ++
 net-libs/webkit-gtk/webkit-gtk-1.3.11.ebuild       |    3 ++
 net-misc/vinagre/vinagre-9999.ebuild               |    3 +-
 .../gnome-bluetooth/gnome-bluetooth-2.91.5.ebuild  |    7 +---
 .../gnome-bluetooth/gnome-bluetooth-9999.ebuild    |    7 +---
 .../gnome-disk-utility-2.91.6.ebuild               |   13 ++++---
 ....91.6.ebuild => gnome-disk-utility-9999.ebuild} |   23 ++++++++------
 x11-libs/gtksourceview/gtksourceview-2.91.4.ebuild |    1 +
 x11-libs/gtksourceview/gtksourceview-9999.ebuild   |    1 +
 x11-libs/mx/mx-1.1.4.ebuild                        |    1 +
 x11-libs/vte/vte-0.27.5.ebuild                     |    1 +
 x11-libs/vte/vte-9999.ebuild                       |    1 +
 .../gtk-engines-clearlooks-2.91.5.ebuild           |    9 +----
 x11-themes/gtk-engines/gtk-engines-2.91.1.ebuild   |    7 +---
 x11-wm/mutter/mutter-2.91.6.ebuild                 |    3 +-
 x11-wm/mutter/mutter-9999.ebuild                   |    3 +-
 80 files changed, 174 insertions(+), 333 deletions(-)

diff --git a/app-arch/file-roller/file-roller-2.91.6.ebuild b/app-arch/file-roller/file-roller-2.91.6.ebuild
index 90365b9..be1abd5 100644
--- a/app-arch/file-roller/file-roller-2.91.6.ebuild
+++ b/app-arch/file-roller/file-roller-2.91.6.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit eutils gnome2
 
@@ -53,14 +54,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch
 }
 
-src_install() {
-	gnome2_src_install
-	if use nautilus; then
-		find "${ED}"usr/$(get_libdir)/nautilus -name "*.la" -delete \
-			|| die "la file removal failed"
-	fi
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 

diff --git a/app-arch/file-roller/file-roller-9999.ebuild b/app-arch/file-roller/file-roller-9999.ebuild
index 90365b9..be1abd5 100644
--- a/app-arch/file-roller/file-roller-9999.ebuild
+++ b/app-arch/file-roller/file-roller-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit eutils gnome2
 
@@ -53,14 +54,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch
 }
 
-src_install() {
-	gnome2_src_install
-	if use nautilus; then
-		find "${ED}"usr/$(get_libdir)/nautilus -name "*.la" -delete \
-			|| die "la file removal failed"
-	fi
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 

diff --git a/app-cdr/brasero/brasero-2.91.6.ebuild b/app-cdr/brasero/brasero-2.91.6.ebuild
index 91e2dbf..372b4f9 100644
--- a/app-cdr/brasero/brasero-2.91.6.ebuild
+++ b/app-cdr/brasero/brasero-2.91.6.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2 multilib
 
@@ -93,13 +94,6 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
-src_install() {
-	gnome2_src_install
-
-	# Remove useless .la files
-	find "${ED}" -iname '*.la' || die
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 

diff --git a/app-cdr/brasero/brasero-9999.ebuild b/app-cdr/brasero/brasero-9999.ebuild
index 91e2dbf..372b4f9 100644
--- a/app-cdr/brasero/brasero-9999.ebuild
+++ b/app-cdr/brasero/brasero-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2 multilib
 
@@ -93,13 +94,6 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
-src_install() {
-	gnome2_src_install
-
-	# Remove useless .la files
-	find "${ED}" -iname '*.la' || die
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 

diff --git a/app-crypt/seahorse-plugins/seahorse-plugins-2.91.0_pre20110114.ebuild b/app-crypt/seahorse-plugins/seahorse-plugins-2.91.0_pre20110114.ebuild
index eb415f0..d000b91 100644
--- a/app-crypt/seahorse-plugins/seahorse-plugins-2.91.0_pre20110114.ebuild
+++ b/app-crypt/seahorse-plugins/seahorse-plugins-2.91.0_pre20110114.ebuild
@@ -1,8 +1,9 @@
-# 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/app-crypt/seahorse-plugins/seahorse-plugins-2.30.1-r1.ebuild,v 1.7 2010/10/17 15:26:51 armin76 Exp $
 
 EAPI="2"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2
 
@@ -77,8 +78,6 @@ src_prepare() {
 src_install() {
 	gnome2_src_install
 
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-
 	exeinto /etc/X11/xinit/xinitrc.d/
 	doexe "${FILESDIR}/70-seahorse-agent" || die "doexe failed"
 }

diff --git a/app-crypt/seahorse-plugins/seahorse-plugins-9999.ebuild b/app-crypt/seahorse-plugins/seahorse-plugins-9999.ebuild
index 98d4558..13039ff 100644
--- a/app-crypt/seahorse-plugins/seahorse-plugins-9999.ebuild
+++ b/app-crypt/seahorse-plugins/seahorse-plugins-9999.ebuild
@@ -1,8 +1,9 @@
-# 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/app-crypt/seahorse-plugins/seahorse-plugins-2.30.1-r1.ebuild,v 1.7 2010/10/17 15:26:51 armin76 Exp $
 
 EAPI="2"
+GNOME2_LA_PUNT="yes"
 
 inherit eutils gnome2
 
@@ -63,8 +64,6 @@ src_prepare() {
 src_install() {
 	gnome2_src_install
 
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-
 	exeinto /etc/X11/xinit/xinitrc.d/
 	doexe "${FILESDIR}/70-seahorse-agent" || die "doexe failed"
 }

diff --git a/app-crypt/seahorse/seahorse-2.91.4.ebuild b/app-crypt/seahorse/seahorse-2.91.4.ebuild
index 9bd18db..4b1fcca 100644
--- a/app-crypt/seahorse/seahorse-2.91.4.ebuild
+++ b/app-crypt/seahorse/seahorse-2.91.4.ebuild
@@ -1,9 +1,10 @@
-# 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/app-crypt/seahorse/seahorse-2.32.0.ebuild,v 1.1 2010/10/17 19:12:26 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
@@ -12,8 +13,13 @@ HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="avahi debug doc +introspection ldap libnotify test"
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
 
 # Pull in libnotify-0.7 because it's controlled via an automagic ifdef
 # Need seahorse-plugins git snapshot
@@ -75,11 +81,6 @@ src_prepare() {
 		-i configure.in configure || die "sed failed"
 }
 
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if ! has app-crypt/seahorse-plugins; then

diff --git a/app-crypt/seahorse/seahorse-9999.ebuild b/app-crypt/seahorse/seahorse-9999.ebuild
index c689a65..4b1fcca 100644
--- a/app-crypt/seahorse/seahorse-9999.ebuild
+++ b/app-crypt/seahorse/seahorse-9999.ebuild
@@ -1,9 +1,10 @@
-# 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/app-crypt/seahorse/seahorse-2.32.0.ebuild,v 1.1 2010/10/17 19:12:26 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
@@ -80,11 +81,6 @@ src_prepare() {
 		-i configure.in configure || die "sed failed"
 }
 
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if ! has app-crypt/seahorse-plugins; then

diff --git a/app-editors/gedit/gedit-2.91.6.ebuild b/app-editors/gedit/gedit-2.91.6.ebuild
index d12803b..dcb1d87 100644
--- a/app-editors/gedit/gedit-2.91.6.ebuild
+++ b/app-editors/gedit/gedit-2.91.6.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="2"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
 PYTHON_DEPEND="2"
 
 inherit gnome2 python eutils
@@ -68,13 +69,6 @@ pkg_setup() {
 		$(use_enable spell)"
 }
 
-src_install() {
-	gnome2_src_install
-
-	# Installed for plugins, but they're dlopen()-ed
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 	python_mod_optimize /usr/$(get_libdir)/gedit/plugins

diff --git a/app-editors/gedit/gedit-9999.ebuild b/app-editors/gedit/gedit-9999.ebuild
index dfbd132..dcb1d87 100644
--- a/app-editors/gedit/gedit-9999.ebuild
+++ b/app-editors/gedit/gedit-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="2"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
 PYTHON_DEPEND="2"
 
 inherit gnome2 python eutils
@@ -26,7 +27,7 @@ fi
 # X libs are not needed for OSX (aqua)
 RDEPEND=">=x11-libs/libSM-1.0
 	>=dev-libs/libxml2-2.5.0
-	>=dev-libs/glib-2.25.15
+	>=dev-libs/glib-2.27.92
 	>=x11-libs/gtk+-2.99.0:3[introspection?]
 	>=x11-libs/gtksourceview-2.91.1:3.0[introspection?]
 	>=dev-libs/libpeas-0.7.0[gtk]
@@ -34,6 +35,7 @@ RDEPEND=">=x11-libs/libSM-1.0
 	dev-python/pygobject[introspection]
 	gnome-base/gsettings-desktop-schemas
 	x11-libs/libX11
+	x11-libs/libICE
 	x11-libs/libSM
 
 	gvfs? ( gnome-base/gvfs )
@@ -67,13 +69,6 @@ pkg_setup() {
 		$(use_enable spell)"
 }
 
-src_install() {
-	gnome2_src_install
-
-	# Installed for plugins, but they're dlopen()-ed
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 	python_mod_optimize /usr/$(get_libdir)/gedit/plugins

diff --git a/app-misc/the-board/the-board-0.1.1.1.ebuild b/app-misc/the-board/the-board-0.1.1.1.ebuild
index e270676..34172ff 100644
--- a/app-misc/the-board/the-board-0.1.1.1.ebuild
+++ b/app-misc/the-board/the-board-0.1.1.1.ebuild
@@ -3,6 +3,7 @@
 # $Header: $
 
 EAPI="3"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 

diff --git a/app-misc/the-board/the-board-9999.ebuild b/app-misc/the-board/the-board-9999.ebuild
index e270676..34172ff 100644
--- a/app-misc/the-board/the-board-9999.ebuild
+++ b/app-misc/the-board/the-board-9999.ebuild
@@ -3,6 +3,7 @@
 # $Header: $
 
 EAPI="3"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 

diff --git a/app-text/evince/evince-2.91.6.ebuild b/app-text/evince/evince-2.91.6.ebuild
index 132e0ec..e94c39c 100644
--- a/app-text/evince/evince-2.91.6.ebuild
+++ b/app-text/evince/evince-2.91.6.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2
 
@@ -103,8 +104,3 @@ src_prepare() {
 
 	gnome2_src_prepare
 }
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of lafiles failed"
-}

diff --git a/app-text/evince/evince-9999.ebuild b/app-text/evince/evince-9999.ebuild
index 132e0ec..e94c39c 100644
--- a/app-text/evince/evince-9999.ebuild
+++ b/app-text/evince/evince-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2
 
@@ -103,8 +104,3 @@ src_prepare() {
 
 	gnome2_src_prepare
 }
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of lafiles failed"
-}

diff --git a/dev-cpp/gtkmm/gtkmm-2.99.3.ebuild b/dev-cpp/gtkmm/gtkmm-2.99.3.ebuild
index ae2d1ce..055fad9 100644
--- a/dev-cpp/gtkmm/gtkmm-2.99.3.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.99.3.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 

diff --git a/dev-libs/folks/folks-0.3.1.ebuild b/dev-libs/folks/folks-0.3.1.ebuild
index 0b7c707..9f77556 100644
--- a/dev-libs/folks/folks-0.3.1.ebuild
+++ b/dev-libs/folks/folks-0.3.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
@@ -43,8 +44,3 @@ src_prepare() {
 	# Test suite is badly broken, even from git repo
 	sed 's/tests//' -i Makefile.am Makefile.in || die "sed failed"
 }
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "la files removal failed"
-}

diff --git a/dev-libs/gjs/gjs-0.7.10.ebuild b/dev-libs/gjs/gjs-0.7.10.ebuild
index c4e23f8..bb70c75 100644
--- a/dev-libs/gjs/gjs-0.7.10.ebuild
+++ b/dev-libs/gjs/gjs-0.7.10.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2"
 
 inherit gnome2 python
@@ -55,6 +56,4 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins ${S}/examples/* || die "doins examples failed!"
 	fi
-
-	find "${ED}" -name "*.la" -delete || die "la files removal failed"
 }

diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild
index c4e23f8..bb70c75 100644
--- a/dev-libs/gjs/gjs-9999.ebuild
+++ b/dev-libs/gjs/gjs-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2"
 
 inherit gnome2 python
@@ -55,6 +56,4 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins ${S}/examples/* || die "doins examples failed!"
 	fi
-
-	find "${ED}" -name "*.la" -delete || die "la files removal failed"
 }

diff --git a/dev-libs/libgweather/libgweather-2.91.6.ebuild b/dev-libs/libgweather/libgweather-2.91.6.ebuild
index cc3781a..3454ee3 100644
--- a/dev-libs/libgweather/libgweather-2.91.6.ebuild
+++ b/dev-libs/libgweather/libgweather-2.91.6.ebuild
@@ -2,10 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-2.30.3.ebuild,v 1.3 2010/11/14 23:05:07 eva Exp $
 
-EAPI="2"
+EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
-inherit autotools gnome2
+inherit gnome2
 
 DESCRIPTION="Library to access weather information from online services"
 HOMEPAGE="http://www.gnome.org/"
@@ -22,8 +23,6 @@ fi
 
 # libsoup-gnome is to be used because libsoup[gnome] might not
 # get libsoup-gnome installed by the time ${P} is built
-#
-# Need libgweather:2 for the icons, see src_install below
 RDEPEND=">=x11-libs/gtk+-2.90.0:3[introspection?]
 	>=dev-libs/glib-2.13
 	>=gnome-base/gconf-2.8
@@ -44,10 +43,8 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog MAINTAINERS NEWS"
 
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-locations-compression
-		--disable-maintainer-mode
-		--disable-all-translations-in-one-xml
-		--disable-static"
-}
+G2CONF="${G2CONF}
+	--enable-locations-compression
+	--disable-maintainer-mode
+	--disable-all-translations-in-one-xml
+	--disable-static"

diff --git a/dev-libs/libgweather/libgweather-9999.ebuild b/dev-libs/libgweather/libgweather-9999.ebuild
index cc3781a..3454ee3 100644
--- a/dev-libs/libgweather/libgweather-9999.ebuild
+++ b/dev-libs/libgweather/libgweather-9999.ebuild
@@ -2,10 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-2.30.3.ebuild,v 1.3 2010/11/14 23:05:07 eva Exp $
 
-EAPI="2"
+EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
-inherit autotools gnome2
+inherit gnome2
 
 DESCRIPTION="Library to access weather information from online services"
 HOMEPAGE="http://www.gnome.org/"
@@ -22,8 +23,6 @@ fi
 
 # libsoup-gnome is to be used because libsoup[gnome] might not
 # get libsoup-gnome installed by the time ${P} is built
-#
-# Need libgweather:2 for the icons, see src_install below
 RDEPEND=">=x11-libs/gtk+-2.90.0:3[introspection?]
 	>=dev-libs/glib-2.13
 	>=gnome-base/gconf-2.8
@@ -44,10 +43,8 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog MAINTAINERS NEWS"
 
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-locations-compression
-		--disable-maintainer-mode
-		--disable-all-translations-in-one-xml
-		--disable-static"
-}
+G2CONF="${G2CONF}
+	--enable-locations-compression
+	--disable-maintainer-mode
+	--disable-all-translations-in-one-xml
+	--disable-static"

diff --git a/dev-libs/libpeas/libpeas-0.7.1.ebuild b/dev-libs/libpeas/libpeas-0.7.1.ebuild
index d7d3eb4..4af670d 100644
--- a/dev-libs/libpeas/libpeas-0.7.1.ebuild
+++ b/dev-libs/libpeas/libpeas-0.7.1.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.5"
 WANT_AUTOMAKE="1.11"
 
@@ -42,8 +43,3 @@ pkg_setup() {
 		--disable-gtk2-test-build
 		--disable-seed"
 }
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "la files removal failed"
-}

diff --git a/dev-libs/libpeas/libpeas-9999.ebuild b/dev-libs/libpeas/libpeas-9999.ebuild
index d7d3eb4..4af670d 100644
--- a/dev-libs/libpeas/libpeas-9999.ebuild
+++ b/dev-libs/libpeas/libpeas-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.5"
 WANT_AUTOMAKE="1.11"
 
@@ -42,8 +43,3 @@ pkg_setup() {
 		--disable-gtk2-test-build
 		--disable-seed"
 }
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "la files removal failed"
-}

diff --git a/dev-libs/libunique/libunique-2.91.4.ebuild b/dev-libs/libunique/libunique-2.91.4.ebuild
index 42d55e5..97b3db9 100644
--- a/dev-libs/libunique/libunique-2.91.4.ebuild
+++ b/dev-libs/libunique/libunique-2.91.4.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="2"
 WANT_AUTOMAKE="1.11"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2 virtualx autotools
 
@@ -31,6 +32,13 @@ DOCS="AUTHORS NEWS ChangeLog README TODO"
 src_prepare() {
 	gnome2_src_prepare
 
+	# --disable-dbus means gdbus is used instead of dbus-glib
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-maintainer-flags
+		--disable-dbus
+		$(use_enable introspection)"
+
 	# Put docs in a versioned directory, from upstream bug #623454
 	epatch "${FILESDIR}/${PN}-2.90.1-parallel-docs-install.patch"
 
@@ -50,12 +58,3 @@ src_test() {
 	cp "${FILESDIR}/run-tests" . || die "Unable to cp \${FILESDIR}/run-tests"
 	Xemake -f run-tests || die "Tests failed"
 }
-
-pkg_setup() {
-	# --disable-dbus means gdbus is used instead of dbus-glib
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-maintainer-flags
-		--disable-dbus
-		$(use_enable introspection)"
-}

diff --git a/dev-libs/seed/seed-2.31.91.ebuild b/dev-libs/seed/seed-2.31.91.ebuild
index 63a25e1..ba28efd 100644
--- a/dev-libs/seed/seed-2.31.91.ebuild
+++ b/dev-libs/seed/seed-2.31.91.ebuild
@@ -4,7 +4,9 @@
 
 EAPI="2"
 WANT_AUTOMAKE="1.11"
-inherit autotools gnome2
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
 
 DESCRIPTION="Javascript bindings for Webkit-GTK and GNOME libraries"
 HOMEPAGE="http://live.gnome.org/Seed"

diff --git a/eclass/gnome2-la.eclass b/eclass/gnome2-la.eclass
deleted file mode 100644
index e9506c3..0000000
--- a/eclass/gnome2-la.eclass
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-#
-# gnome2-la.eclass
-#
-# Original Author: Nirbheek Chauhan <nirbheek@gentoo.org>
-# Purpose: Temporary eclass for facilitating .la file removal
-#
-# Only for usage in the overlay. This eclass will be redundant once this feature
-# is reviewed and patched into gnome2.eclass (in-tree)
-#
-
-inherit gnome2
-
-EXPORT_FUNCTIONS src_install
-
-# Remove .la files in src_install?
-G2PUNT_LA=${G2PUNT_LA:-"no"}
-
-gnome2-la_src_install() {
-	gnome2_src_install
-
-	# Remove .la files if they're unneeded
-	# Be *absolutely* sure before doing this and read
-	# http://dev.gentoo.org/~nirbheek/gnome/gnome-policy.xml#doc_chap3
-	if [[ "${G2PUNT_LA}" = "yes" ]]; then
-		ebegin "Removing .la files"
-		find "${D}" -name '*.la' -delete
-		eend
-	fi
-}

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 56e43eb..a335698 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -27,6 +27,10 @@ esac
 # Extra configure opts passed to econf
 G2CONF=${G2CONF:-""}
 
+# Should we delete all the .la files?
+# Do NOT use without due consideration
+GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"}
+
 # Extra options passed to elibtoolize
 ELTCONF=${ELTCONF:-""}
 
@@ -128,6 +132,13 @@ gnome2_src_install() {
 
 	# Make sure this one doesn't get in the portage db
 	rm -fr "${ED}/usr/share/applications/mimeinfo.cache"
+
+	# Delete all .la files
+	if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
+		ebegin "Removing .la files"
+		find "${D}" -name '*.la' -exec rm -f '{}' + || die
+		eend
+	fi
 }
 
 gnome2_pkg_preinst() {

diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.6.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.6.ebuild
index 9c63f36..82fd020 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.91.6.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.6.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
 
 inherit gnome2
 
@@ -85,10 +86,3 @@ pkg_setup() {
 		--disable-schemas-install"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }
-
-src_install() {
-	gnome2_src_install
-	# gmodule is used to load plugins
-	# (on POSIX systems gmodule uses dlopen)
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}

diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
index 9c63f36..82fd020 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
 
 inherit gnome2
 
@@ -85,10 +86,3 @@ pkg_setup() {
 		--disable-schemas-install"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }
-
-src_install() {
-	gnome2_src_install
-	# gmodule is used to load plugins
-	# (on POSIX systems gmodule uses dlopen)
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}

diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.91.6.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.91.6.1.ebuild
index 7ac8302..ca8d2b8 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.91.6.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.91.6.1.ebuild
@@ -3,7 +3,9 @@
 # $Header: $
 
 EAPI="2"
-inherit gnome2 autotools eutils
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
 
 DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
 HOMEPAGE="http://www.gnome.org/"

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index 7ac8302..ca8d2b8 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -3,7 +3,9 @@
 # $Header: $
 
 EAPI="2"
-inherit gnome2 autotools eutils
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
 
 DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
 HOMEPAGE="http://www.gnome.org/"

diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild
index f3e0b25..ab6a9db 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2 multilib pam virtualx
 
@@ -12,8 +13,14 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="debug doc pam test"
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+fi
+
 # USE=valgrind is probably not a good idea for the tree
 
 RDEPEND=">=dev-libs/glib-2.25:2
@@ -69,14 +76,6 @@ src_prepare() {
 		-i configure.in configure || die "sed 2 failed"
 }
 
-src_install() {
-	gnome2_src_install
-	if use pam; then
-		find "${ED}"/$(get_libdir)/security -name "*.la" -delete \
-			|| die "la file removal failed"
-	fi
-}
-
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	Xemake check || die "emake check failed!"

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index a61449c..ab6a9db 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2 multilib pam virtualx
 
@@ -12,7 +13,6 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-
 IUSE="debug doc pam test"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
@@ -76,14 +76,6 @@ src_prepare() {
 		-i configure.in configure || die "sed 2 failed"
 }
 
-src_install() {
-	gnome2_src_install
-	if use pam; then
-		find "${ED}"/$(get_libdir)/security -name "*.la" -delete \
-			|| die "la file removal failed"
-	fi
-}
-
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	Xemake check || die "emake check failed!"

diff --git a/gnome-base/gnome-menus/gnome-menus-2.91.6.ebuild b/gnome-base/gnome-menus/gnome-menus-2.91.6.ebuild
index 8ed26b2..39ed608 100644
--- a/gnome-base/gnome-menus/gnome-menus-2.91.6.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-2.91.6.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 PYTHON_DEPEND="python? 2:2.4"
 SUPPORT_PYTHON_ABIS="1"

diff --git a/gnome-base/gnome-panel/gnome-panel-2.91.6.ebuild b/gnome-base/gnome-panel/gnome-panel-2.91.6.ebuild
index 6042c22..c676303 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.91.6.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.91.6.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.9.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.9.ebuild
index 06e26c3..cf9183c 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.9.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.9.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2
 

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index 06e26c3..cf9183c 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2
 

diff --git a/gnome-base/gvfs/gvfs-1.7.2.ebuild b/gnome-base/gvfs/gvfs-1.7.2.ebuild
index 5fbee0c..cab2f33 100644
--- a/gnome-base/gvfs/gvfs-1.7.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.7.2.ebuild
@@ -1,9 +1,10 @@
-# 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/gvfs/gvfs-1.6.4-r1.ebuild,v 1.1 2010/10/05 08:49:12 pacho Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools bash-completion gnome2 eutils
 

diff --git a/gnome-base/gvfs/gvfs-9999.ebuild b/gnome-base/gvfs/gvfs-9999.ebuild
index 5fbee0c..cab2f33 100644
--- a/gnome-base/gvfs/gvfs-9999.ebuild
+++ b/gnome-base/gvfs/gvfs-9999.ebuild
@@ -1,9 +1,10 @@
-# 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/gvfs/gvfs-1.6.4-r1.ebuild,v 1.1 2010/10/05 08:49:12 pacho Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools bash-completion gnome2 eutils
 

diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.91.5.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.91.5.ebuild
index 9b6a740..1ea9565 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-2.91.5.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-2.91.5.ebuild
@@ -1,9 +1,10 @@
-# 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/libgnomekbd/libgnomekbd-2.32.0.ebuild,v 1.2 2010/10/20 21:29:54 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 

diff --git a/gnome-base/libgnomekbd/libgnomekbd-9999.ebuild b/gnome-base/libgnomekbd/libgnomekbd-9999.ebuild
index 9b6a740..1ea9565 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-9999.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-9999.ebuild
@@ -1,9 +1,10 @@
-# 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/libgnomekbd/libgnomekbd-2.32.0.ebuild,v 1.2 2010/10/20 21:29:54 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 

diff --git a/gnome-base/nautilus/nautilus-2.91.9.ebuild b/gnome-base/nautilus/nautilus-2.91.9.ebuild
index eeda616..ddc9993 100644
--- a/gnome-base/nautilus/nautilus-2.91.9.ebuild
+++ b/gnome-base/nautilus/nautilus-2.91.9.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="2"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2 virtualx
 
@@ -91,11 +92,6 @@ src_test() {
 	Xemake check || die "Test phase failed"
 }
 
-src_install() {
-	gnome2_src_install
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 

diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild
index eeda616..ddc9993 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="2"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2 virtualx
 
@@ -91,11 +92,6 @@ src_test() {
 	Xemake check || die "Test phase failed"
 }
 
-src_install() {
-	gnome2_src_install
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.91.6.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.91.6.ebuild
index 7ae85cc..085711c 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.91.6.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.91.6.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx
 
@@ -100,7 +101,6 @@ src_prepare() {
 
 src_install() {
 	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "la files removal failed"
 
 	if use ldap; then
 		MY_MAJORV=$(get_version_component_range 1-2)

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
index 7ae85cc..085711c 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx
 
@@ -100,7 +101,6 @@ src_prepare() {
 
 src_install() {
 	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "la files removal failed"
 
 	if use ldap; then
 		MY_MAJORV=$(get_version_component_range 1-2)

diff --git a/gnome-extra/gnome-games/gnome-games-2.91.5.ebuild b/gnome-extra/gnome-games/gnome-games-2.91.5.ebuild
index 680f9b5..60017d9 100644
--- a/gnome-extra/gnome-games/gnome-games-2.91.5.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.91.5.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 WANT_AUTOMAKE="1.11"
 
 # make sure games is inherited first so that the gnome2
@@ -81,7 +82,7 @@ pkg_setup() {
 		--disable-schemas-compile
 		$(use_enable sound)
 		$(use_enable introspection)"
-	
+
 	# Should be after $(use_enable introspection), but before --enable-omitgames
 	use clutter && G2CONF="${G2CONF} --enable-introspection"
 

diff --git a/gnome-extra/gnome-utils/gnome-utils-2.91.2.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.91.2.ebuild
index 0cb1c35..4e38ae1 100644
--- a/gnome-extra/gnome-utils/gnome-utils-2.91.2.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-2.91.2.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
@@ -72,8 +73,3 @@ src_prepare() {
 		sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed 2 failed"
 	fi
 }
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}

diff --git a/gnome-extra/gnome-utils/gnome-utils-9999.ebuild b/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
index 0cb1c35..4e38ae1 100644
--- a/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
@@ -72,8 +73,3 @@ src_prepare() {
 		sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed 2 failed"
 	fi
 }
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}

diff --git a/gnome-extra/gtkhtml/gtkhtml-3.32.1-r200.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.32.1-r200.ebuild
index 81e819e..b82b3fc 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.32.1-r200.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.32.1-r200.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2 eutils
 
@@ -44,7 +45,4 @@ src_install() {
 
 	# Don't clash with gtkhtml:4.0
 	rm -vf "${ED}/usr/bin/gtkhtml-editor-test" || die
-
-	# Remove .la files since old will be removed anyway while updating
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
 }

diff --git a/gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild
index 9ac4877..00d0f2f 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2 eutils
 
@@ -38,9 +39,3 @@ pkg_setup() {
 		--disable-deprecated-warning-flags"
 	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
 }
-
-src_install() {
-	gnome2_src_install
-	# Remove .la files since old will be removed anyway while updating
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}

diff --git a/gnome-extra/gucharmap/gucharmap-2.33.2.ebuild b/gnome-extra/gucharmap/gucharmap-2.33.2.ebuild
index 518a23d..9bf7e55 100644
--- a/gnome-extra/gucharmap/gucharmap-2.33.2.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-2.33.2.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
@@ -45,8 +46,3 @@ pkg_setup() {
 		$(use_enable cjk unihan)"
 	DOCS="ChangeLog NEWS README TODO"
 }
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}

diff --git a/gnome-extra/nm-applet/nm-applet-0.8.2-r300.ebuild b/gnome-extra/nm-applet/nm-applet-0.8.2-r300.ebuild
index dd72cae..3bf5ac8 100644
--- a/gnome-extra/nm-applet/nm-applet-0.8.2-r300.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.8.2-r300.ebuild
@@ -3,6 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.2.ebuild,v 1.1 2010/11/10 13:05:32 dagger Exp $
 
 EAPI="2"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2 eutils autotools
 

diff --git a/gnome-extra/nm-applet/nm-applet-9999.ebuild b/gnome-extra/nm-applet/nm-applet-9999.ebuild
index 428be42..73de4c1 100644
--- a/gnome-extra/nm-applet/nm-applet-9999.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-9999.ebuild
@@ -3,6 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.2.ebuild,v 1.1 2010/11/10 13:05:32 dagger Exp $
 
 EAPI="2"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 

diff --git a/mail-client/evolution/evolution-2.91.6.ebuild b/mail-client/evolution/evolution-2.91.6.ebuild
index 0576cd0..2524dda 100644
--- a/mail-client/evolution/evolution-2.91.6.ebuild
+++ b/mail-client/evolution/evolution-2.91.6.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.4"
 
 inherit autotools flag-o-matic gnome2 python versionator
@@ -161,12 +162,6 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
-src_install() {
-	gnome2_src_install
-
-	find "${ED}" -name "*.la" -delete || die "la files removal failed"
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 

diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index a4cbd88..266e282 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.4"
 
 inherit autotools flag-o-matic gnome2 python versionator
@@ -158,12 +159,6 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
-src_install() {
-	gnome2_src_install
-
-	find "${ED}" -name "*.la" -delete || die "la files removal failed"
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 

diff --git a/media-gfx/eog/eog-2.91.7.ebuild b/media-gfx/eog/eog-2.91.7.ebuild
index 210045c..a9e1e05 100644
--- a/media-gfx/eog/eog-2.91.7.ebuild
+++ b/media-gfx/eog/eog-2.91.7.ebuild
@@ -1,9 +1,10 @@
-# 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/media-gfx/eog/eog-2.32.1.ebuild,v 1.1 2010/11/28 23:00:08 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
@@ -60,8 +61,3 @@ pkg_setup() {
 		--disable-schemas-compile"
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
 }
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "la files removal failed"
-}

diff --git a/media-gfx/eog/eog-9999.ebuild b/media-gfx/eog/eog-9999.ebuild
index 210045c..a9e1e05 100644
--- a/media-gfx/eog/eog-9999.ebuild
+++ b/media-gfx/eog/eog-9999.ebuild
@@ -1,9 +1,10 @@
-# 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/media-gfx/eog/eog-2.32.1.ebuild,v 1.1 2010/11/28 23:00:08 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
@@ -60,8 +61,3 @@ pkg_setup() {
 		--disable-schemas-compile"
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
 }
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "la files removal failed"
-}

diff --git a/media-libs/libcanberra/libcanberra-0.26-r2.ebuild b/media-libs/libcanberra/libcanberra-0.26-r2.ebuild
index 6c709c8..0b4ebd9 100644
--- a/media-libs/libcanberra/libcanberra-0.26-r2.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.26-r2.ebuild
@@ -57,6 +57,7 @@ src_configure() {
 		--with-html-dir=/usr/share/doc/${PF}/html
 }
 
+# TODO: check which la files are really needed
 src_install() {
 	# Disable parallel installation until bug #253862 is solved
 	emake -j1 DESTDIR="${ED}" install || die

diff --git a/media-libs/libgnome-media-profiles/libgnome-media-profiles-2.91.2.ebuild b/media-libs/libgnome-media-profiles/libgnome-media-profiles-2.91.2.ebuild
index 9183d39..ffa51c4 100644
--- a/media-libs/libgnome-media-profiles/libgnome-media-profiles-2.91.2.ebuild
+++ b/media-libs/libgnome-media-profiles/libgnome-media-profiles-2.91.2.ebuild
@@ -3,6 +3,8 @@
 # $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.25.ebuild,v 1.1 2010/06/18 10:11:15 pacho Exp $
 
 EAPI="3"
+GNOME2_LA_PUNT="yes"
+
 inherit gnome2
 
 DESCRIPTION="GNOME Media Profiles library"

diff --git a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild b/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
index ea99b9c..141c806 100644
--- a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
@@ -3,6 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.2 2010/07/06 15:46:43 ssuominen Exp $
 
 EAPI="2"
+GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.5"
 
 inherit eutils gnome2 python multilib virtualx
@@ -175,13 +176,6 @@ src_test() {
 	Xemake check || die "test failed"
 }
 
-src_install() {
-	gnome2_src_install
-
-	find "${D}/usr/$(get_libdir)/rhythmbox/plugins" -name "*.la" -delete \
-		|| die "failed to remove *.la files"
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if use python; then

diff --git a/media-sound/rhythmbox/rhythmbox-9999.ebuild b/media-sound/rhythmbox/rhythmbox-9999.ebuild
index ea99b9c..141c806 100644
--- a/media-sound/rhythmbox/rhythmbox-9999.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-9999.ebuild
@@ -3,6 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.2 2010/07/06 15:46:43 ssuominen Exp $
 
 EAPI="2"
+GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.5"
 
 inherit eutils gnome2 python multilib virtualx
@@ -175,13 +176,6 @@ src_test() {
 	Xemake check || die "test failed"
 }
 
-src_install() {
-	gnome2_src_install
-
-	find "${D}/usr/$(get_libdir)/rhythmbox/plugins" -name "*.la" -delete \
-		|| die "failed to remove *.la files"
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if use python; then

diff --git a/media-video/totem/totem-2.91.5.ebuild b/media-video/totem/totem-2.91.5.ebuild
index cf26bbc..e03cb6e 100644
--- a/media-video/totem/totem-2.91.5.ebuild
+++ b/media-video/totem/totem-2.91.5.ebuild
@@ -3,6 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.30.0-r1.ebuild,v 1.1 2010/06/13 20:36:55 pacho Exp $
 
 EAPI="2"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
 WANT_AUTOMAKE="1.11"
 PYTHON_DEPEND="python? 2:2.4"
 PYTHON_USE_WITH="threads"
@@ -150,13 +151,6 @@ src_prepare() {
 	ln -s $(type -P true) py-compile
 }
 
-src_install() {
-	gnome2_src_install
-	# Installed for plugins, but they're dlopen()-ed
-	# firefox, totem as well as nautilus
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if use python; then

diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 22af246..e03cb6e 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -3,6 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.30.0-r1.ebuild,v 1.1 2010/06/13 20:36:55 pacho Exp $
 
 EAPI="2"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
 WANT_AUTOMAKE="1.11"
 PYTHON_DEPEND="python? 2:2.4"
 PYTHON_USE_WITH="threads"
@@ -118,6 +119,7 @@ pkg_setup() {
 		$(use_enable python)
 		$(use_enable python introspection)
 		$(use_enable vala)
+		VALAC=$(type -P valac-0.12)
 		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
 
 	local plugins="brasero-disc-recorder,chapters,gromit,media-player-keys,ontop,properties,sidebar-test,skipto,screenshot,thumbnail"
@@ -149,13 +151,6 @@ src_prepare() {
 	ln -s $(type -P true) py-compile
 }
 
-src_install() {
-	gnome2_src_install
-	# Installed for plugins, but they're dlopen()-ed
-	# firefox, totem as well as nautilus
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if use python; then

diff --git a/net-libs/gtk-vnc/gtk-vnc-0.4.2-r300.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.4.2-r300.ebuild
index 6f1d8ae..5ebc63e 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.4.2-r300.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.4.2-r300.ebuild
@@ -65,4 +65,7 @@ src_install() {
 	MAKEOPTS="${MAKEOPTS} -j1" \
 		base_src_install
 	dodoc AUTHORS ChangeLog NEWS README || die
+
+	# Remove .la files
+	find "${D}" -name '*.la' -exec rm -f '{}' + || die
 }

diff --git a/net-libs/libepc/libepc-0.3.11.ebuild b/net-libs/libepc/libepc-0.3.11.ebuild
index fff45ed..2967f67 100644
--- a/net-libs/libepc/libepc-0.3.11.ebuild
+++ b/net-libs/libepc/libepc-0.3.11.ebuild
@@ -3,6 +3,7 @@
 # $Header: $
 
 EAPI="2"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.3.11-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.3.11-r200.ebuild
index 5693b0c..58ff81a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.3.11-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.3.11-r200.ebuild
@@ -113,4 +113,7 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "Install failed"
 	dodoc Source/WebKit/gtk/{NEWS,ChangeLog} || die "dodoc failed"
+
+	# Remove .la files
+	find "${D}" -name '*.la' -exec rm -f '{}' + || die
 }

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.3.11.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.3.11.ebuild
index d15a68d..d655d6a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.3.11.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.3.11.ebuild
@@ -113,4 +113,7 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "Install failed"
 	dodoc Source/WebKit/gtk/{NEWS,ChangeLog} || die "dodoc failed"
+
+	# Remove .la files
+	find "${D}" -name '*.la' -exec rm -f '{}' + || die
 }

diff --git a/net-misc/vinagre/vinagre-9999.ebuild b/net-misc/vinagre/vinagre-9999.ebuild
index 499f343..138d259 100644
--- a/net-misc/vinagre/vinagre-9999.ebuild
+++ b/net-misc/vinagre/vinagre-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="2"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
@@ -63,8 +64,6 @@ pkg_setup() {
 src_install() {
 	gnome2_src_install
 
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-
 	# Remove it's own installation of DOCS that go to $PN instead of $P and aren't ecompressed
 	rm -rf "${D}"/usr/share/doc/vinagre
 }

diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.91.5.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.91.5.ebuild
index 76b4540..f033347 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.91.5.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.91.5.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit eutils gnome2 multilib
 
@@ -69,12 +70,6 @@ pkg_setup() {
 
 src_install() {
 	gnome2_src_install
-	find "${ED}"/usr/$(get_libdir)/${PN}/plugins -name "*.la" -delete \
-		|| die "la file removal failed (1)"
-	#if use nautilus; then
-	#	find "${ED}"/usr/$(get_libdir)/nautilus-sendto/plugins -name "*.la" -delete \
-	#		|| die "la file removal failed (1)"
-	#fi
 
 	insinto /$(get_libdir)/udev/rules.d
 	doins "${FILESDIR}"/80-rfkill.rules || die "udev rules installation failed"

diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild
index 76b4540..f033347 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit eutils gnome2 multilib
 
@@ -69,12 +70,6 @@ pkg_setup() {
 
 src_install() {
 	gnome2_src_install
-	find "${ED}"/usr/$(get_libdir)/${PN}/plugins -name "*.la" -delete \
-		|| die "la file removal failed (1)"
-	#if use nautilus; then
-	#	find "${ED}"/usr/$(get_libdir)/nautilus-sendto/plugins -name "*.la" -delete \
-	#		|| die "la file removal failed (1)"
-	#fi
 
 	insinto /$(get_libdir)/udev/rules.d
 	doins "${FILESDIR}"/80-rfkill.rules || die "udev rules installation failed"

diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.91.6.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.91.6.ebuild
index 5e736c3..1c43488 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.91.6.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.91.6.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2
 
@@ -12,8 +13,13 @@ HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="avahi doc fat gnome-keyring nautilus remote-access"
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+fi
 
 CDEPEND="
 	>=dev-libs/glib-2.22:2
@@ -63,8 +69,3 @@ src_prepare() {
 	intltoolize --force --copy --automake || die
 	eautoreconf
 }
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}

diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.91.6.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
similarity index 84%
copy from sys-apps/gnome-disk-utility/gnome-disk-utility-2.91.6.ebuild
copy to sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
index 5e736c3..52b9523 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.91.6.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2
 
@@ -12,8 +13,13 @@ HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="avahi doc fat gnome-keyring nautilus remote-access"
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+fi
 
 CDEPEND="
 	>=dev-libs/glib-2.22:2
@@ -46,7 +52,7 @@ DEPEND="${CDEPEND}
 
 	doc? ( >=dev-util/gtk-doc-1.3 )"
 
-pkg_setup() {
+src_prepare() {
 	G2CONF="${G2CONF}
 		--disable-static
 		$(use_enable avahi avahi-ui)
@@ -54,17 +60,14 @@ pkg_setup() {
 		$(use_enable remote-access)
 		$(use_enable gnome-keyring)"
 	DOCS="AUTHORS NEWS README TODO"
-}
 
-src_prepare() {
 	# Keep avahi optional, upstream bug #631986
 	epatch "${FILESDIR}/${PN}-2.91.6-optional-avahi.patch"
 
-	intltoolize --force --copy --automake || die
-	eautoreconf
-}
+	if [[ ${PV} != 9999 ]]; then
+		intltoolize --force --copy --automake || die
+		eautoreconf
+	fi
 
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
+	gnome2_src_prepare
 }

diff --git a/x11-libs/gtksourceview/gtksourceview-2.91.4.ebuild b/x11-libs/gtksourceview/gtksourceview-2.91.4.ebuild
index 6426cd0..92d2335 100644
--- a/x11-libs/gtksourceview/gtksourceview-2.91.4.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-2.91.4.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="2"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2 virtualx
 

diff --git a/x11-libs/gtksourceview/gtksourceview-9999.ebuild b/x11-libs/gtksourceview/gtksourceview-9999.ebuild
index e399423..c625fdc 100644
--- a/x11-libs/gtksourceview/gtksourceview-9999.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="2"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2 virtualx
 

diff --git a/x11-libs/mx/mx-1.1.4.ebuild b/x11-libs/mx/mx-1.1.4.ebuild
index 9b21abe..83238d7 100644
--- a/x11-libs/mx/mx-1.1.4.ebuild
+++ b/x11-libs/mx/mx-1.1.4.ebuild
@@ -3,6 +3,7 @@
 # $Header: $
 
 EAPI="3"
+CLUTTER_LA_PUNT="yes"
 
 inherit clutter
 

diff --git a/x11-libs/vte/vte-0.27.5.ebuild b/x11-libs/vte/vte-0.27.5.ebuild
index ed73900..ca5975d 100644
--- a/x11-libs/vte/vte-0.27.5.ebuild
+++ b/x11-libs/vte/vte-0.27.5.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 #PYTHON_DEPEND="python? 2:2.4"
 
 inherit autotools eutils gnome2 #python

diff --git a/x11-libs/vte/vte-9999.ebuild b/x11-libs/vte/vte-9999.ebuild
index ed73900..ca5975d 100644
--- a/x11-libs/vte/vte-9999.ebuild
+++ b/x11-libs/vte/vte-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 #PYTHON_DEPEND="python? 2:2.4"
 
 inherit autotools eutils gnome2 #python

diff --git a/x11-themes/gtk-engines-clearlooks/gtk-engines-clearlooks-2.91.5.ebuild b/x11-themes/gtk-engines-clearlooks/gtk-engines-clearlooks-2.91.5.ebuild
index eb23cdc..9944b85 100644
--- a/x11-themes/gtk-engines-clearlooks/gtk-engines-clearlooks-2.91.5.ebuild
+++ b/x11-themes/gtk-engines-clearlooks/gtk-engines-clearlooks-2.91.5.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 MY_PN="gtk-theme-engine-clearlooks"
 
 inherit gnome2
@@ -32,9 +33,3 @@ G2CONF="${G2CONF}
 --disable-animation
 --disable-paranoia
 --disable-deprecated"
-
-src_install() {
-	gnome2_src_install
-
-	find "${ED}" -name "*.la" -delete || die "la file removal failed"
-}

diff --git a/x11-themes/gtk-engines/gtk-engines-2.91.1.ebuild b/x11-themes/gtk-engines/gtk-engines-2.91.1.ebuild
index 70978ab..b7a3019 100644
--- a/x11-themes/gtk-engines/gtk-engines-2.91.1.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.91.1.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="2"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
@@ -25,9 +26,3 @@ DOCS="AUTHORS ChangeLog NEWS README"
 pkg_setup() {
 	G2CONF="${G2CONF} --enable-animation $(use_enable accessibility hc)"
 }
-
-src_install() {
-	gnome2_src_install
-
-	find "${D}" -name "*.la" -delete
-}

diff --git a/x11-wm/mutter/mutter-2.91.6.ebuild b/x11-wm/mutter/mutter-2.91.6.ebuild
index fa2d3c6..bd2113b 100644
--- a/x11-wm/mutter/mutter-2.91.6.ebuild
+++ b/x11-wm/mutter/mutter-2.91.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="2"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools gnome2
 

diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild
index fa2d3c6..bd2113b 100644
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ b/x11-wm/mutter/mutter-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="2"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools gnome2
 



^ permalink raw reply related	[flat|nested] only message in thread
only message in thread, other threads:[~2011-02-07 18:55 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-07 18:55 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, app-misc/the-board/, x11-libs/mx/, Nirbheek Chauhan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox