[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     076d4beb76e46e1648c98cbf5bda3a4569f2cc18
Author:     Sobhan Mohammadpour <sobhanmohammadpour1 <AT> yahoo <DOT> fr>
AuthorDate: Sun Oct 28 16:27:24 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 17:28:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=076d4beb

gnome-base/gnome-shell: 3.6.0 → 3.6.1

[GD] Drop sed, it is handled by eclass.

Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org>

---
 ...shell-3.6.0.ebuild => gnome-shell-3.6.1.ebuild} |   14 +++++---------
 gnome-base/gnome-shell/gnome-shell-9999.ebuild     |   14 +++++---------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/gnome-base/gnome-shell/gnome-shell-3.6.0.ebuild b/gnome-base/gnome-shell/gnome-shell-3.6.1.ebuild
similarity index 96%
rename from gnome-base/gnome-shell/gnome-shell-3.6.0.ebuild
rename to gnome-base/gnome-shell/gnome-shell-3.6.1.ebuild
index 60c1640..a8612d2 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.6.0.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.6.1.ebuild
@@ -116,6 +116,11 @@ DEPEND="${COMMON_DEPEND}
 # https://bugs.gentoo.org/show_bug.cgi?id=360413
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
 	DOCS="AUTHORS NEWS README"
 	# Don't error out on warnings
 	G2CONF="${G2CONF}
@@ -126,11 +131,7 @@ pkg_setup() {
 		$(use_enable networkmanager)
 		$(use_with systemd)
 		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-	python_set_active_version 2
-	python_pkg_setup
-}
 
-src_prepare() {
 	# Fix automagic gnome-bluetooth dep, bug #398145
 	epatch "${FILESDIR}/${PN}-3.5.x-bluetooth-flag.patch"
 
@@ -139,11 +140,6 @@ src_prepare() {
 
 	[[ ${PV} != 9999 ]] && eautoreconf
 	gnome2_src_prepare
-
-	# Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765
-	# Note: sed Makefile.in because it is generated from several Makefile.ams
-	sed -e 's/-DG_DISABLE_DEPRECATED//g' \
-		-i src/Makefile.in browser-plugin/Makefile.in || die "sed failed"
 }
 
 src_install() {

diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 60c1640..a8612d2 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -116,6 +116,11 @@ DEPEND="${COMMON_DEPEND}
 # https://bugs.gentoo.org/show_bug.cgi?id=360413
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
 	DOCS="AUTHORS NEWS README"
 	# Don't error out on warnings
 	G2CONF="${G2CONF}
@@ -126,11 +131,7 @@ pkg_setup() {
 		$(use_enable networkmanager)
 		$(use_with systemd)
 		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-	python_set_active_version 2
-	python_pkg_setup
-}
 
-src_prepare() {
 	# Fix automagic gnome-bluetooth dep, bug #398145
 	epatch "${FILESDIR}/${PN}-3.5.x-bluetooth-flag.patch"
 
@@ -139,11 +140,6 @@ src_prepare() {
 
 	[[ ${PV} != 9999 ]] && eautoreconf
 	gnome2_src_prepare
-
-	# Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765
-	# Note: sed Makefile.in because it is generated from several Makefile.ams
-	sed -e 's/-DG_DISABLE_DEPRECATED//g' \
-		-i src/Makefile.in browser-plugin/Makefile.in || die "sed failed"
 }
 
 src_install() {