[gentoo-commits] gentoo-x86 commit in gnome-base/gnome-applets: ChangeLog gnome-applets-3.4.1.ebuild gnome-applets-3.2.1.ebuild gnome-applets-2.32.1.1.ebuild

[gentoo-commits] gentoo-x86 commit in gnome-base/gnome-applets: ChangeLog gnome-applets-3.4.1.ebuild gnome-applets-3.2.1.ebuild gnome-applets-2.32.1.1.ebuild

[Alexandre Rostovtsev (tetromino)]

tetromino    12/12/10 01:58:41

  Modified:             ChangeLog gnome-applets-3.4.1.ebuild
  Removed:              gnome-applets-3.2.1.ebuild
                        gnome-applets-2.32.1.1.ebuild
  Log:
  Punt silly pygobject:2 dependency. Drop old.
  
  (Portage version: 2.2.0_alpha145/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

Revision  Changes    Path
1.362                gnome-base/gnome-applets/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-applets/ChangeLog?rev=1.362&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-applets/ChangeLog?rev=1.362&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-applets/ChangeLog?r1=1.361&r2=1.362

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- ChangeLog	28 Oct 2012 15:50:24 -0000	1.361
+++ ChangeLog	10 Dec 2012 01:58:41 -0000	1.362
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.361 2012/10/28 15:50:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.362 2012/12/10 01:58:41 tetromino Exp $
+
+  10 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-applets-2.32.1.1.ebuild, -gnome-applets-3.2.1.ebuild,
+  gnome-applets-3.4.1.ebuild:
+  Punt silly pygobject:2 dependency. Drop old.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org>
   gnome-applets-2.32.1.1-r1.ebuild:



1.4                  gnome-base/gnome-applets/gnome-applets-3.4.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-applets/gnome-applets-3.4.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-applets/gnome-applets-3.4.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-applets/gnome-applets-3.4.1.ebuild?r1=1.3&r2=1.4

Index: gnome-applets-3.4.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-3.4.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-applets-3.4.1.ebuild	24 May 2012 15:05:47 -0000	1.3
+++ gnome-applets-3.4.1.ebuild	10 Dec 2012 01:58:41 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-3.4.1.ebuild,v 1.3 2012/05/24 15:05:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-3.4.1.ebuild,v 1.4 2012/12/10 01:58:41 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -44,7 +44,7 @@
 		>=gnome-extra/gucharmap-2.33.0:2.90
 		>=gnome-base/libgtop-2.11.92
 
-		>=dev-python/pygobject-2.26:2[introspection]
+		dev-python/pygobject:3
 		gnome-base/gconf[introspection]
 		gnome-base/gnome-panel[introspection]
 		x11-libs/gdk-pixbuf[introspection]
@@ -62,6 +62,11 @@
 	virtual/pkgconfig"
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 	# We don't want HAL or battstat.
 	# mixer applet uses gstreamer, conflicts with the mixer provided by g-s-d
@@ -76,11 +81,9 @@
 		$(use_enable networkmanager)
 		$(use_enable policykit polkit)"
 
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
+	# Remove silly check for pygobject:2
+	# https://bugzilla.gnome.org/show_bug.cgi?id=660550
+	sed -e 's/pygobject-2.0/pygobject-3.0/' -i configure || die "sed failed"
 	gnome2_src_prepare
 
 	python_clean_py-compile_files