Punt silly pygobject:2 dependency. Drop old.

(Portage version: 2.2.0_alpha145/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

4 files changed, 16 insertions, 278 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index d8106c25105d..6fcc0504b41f 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -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:
diff --git a/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild
deleted file mode 100644
index 02aabafc24ad..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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-2.32.1.1.ebuild,v 1.21 2012/05/10 09:45:02 tetromino Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils gnome2 python autotools
-
-DESCRIPTION="Applets for the GNOME Desktop and Panel"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="gnome gstreamer ipv6 networkmanager policykit"
-
-# TODO: configure says python stuff is optional
-# null applet still needs bonobo support for gnome-panel
-RDEPEND=">=x11-libs/gtk+-2.20:2
-	>=dev-libs/glib-2.22:2
-	>=gnome-base/gconf-2.8:2
-	>=gnome-base/gnome-panel-2.31.2[bonobo]
-	>=x11-libs/libxklavier-4.0
-	>=x11-libs/libwnck-2.9.3:1
-	>=gnome-base/gnome-desktop-2.11.1:2
-	>=x11-libs/libnotify-0.3.2
-	>=sys-apps/dbus-1.1.2
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/libxml2-2.5.0:2
-	>=x11-themes/gnome-icon-theme-2.15.91
-	>=dev-libs/libgweather-2.22.1:2
-	<dev-libs/libgweather-2.91:2
-	x11-libs/libX11
-
-	gnome?	(
-		gnome-base/gnome-settings-daemon
-		gnome-base/libgnome
-
-		>=gnome-extra/gucharmap-2.23:0
-		>=gnome-base/libgtop-2.11.92:2
-
-		>=dev-python/pygobject-2.6:2
-		>=dev-python/pygtk-2.6:2
-		>=dev-python/gconf-python-2.10:2
-		>=dev-python/gnome-applets-python-2.10 )
-	gstreamer?	(
-		>=media-libs/gstreamer-0.10.2:0.10
-		>=media-libs/gst-plugins-base-0.10.14:0.10
-		|| (
-			>=media-plugins/gst-plugins-alsa-0.10.14:0.10
-			>=media-plugins/gst-plugins-oss-0.10.14:0.10 ) )
-	networkmanager? ( >=net-misc/networkmanager-0.7.0 )
-	policykit? ( >=sys-auth/polkit-0.92 )"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.1.4
-	>=app-text/gnome-doc-utils-0.3.2
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-	dev-libs/libxslt
-	~app-text/docbook-xml-dtd-4.3
-	gnome-base/gnome-common"
-# gnome-base/gnome-common for eautoreconf
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--without-hal
-		--disable-battstat
-		--disable-scrollkeeper
-		--disable-schemas-install
-		$(use_enable gstreamer mixer-applet)
-		$(use_enable ipv6)
-		$(use_enable networkmanager)
-		$(use_enable policykit polkit)"
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-libnotify-0.7.patch \
-		"${FILESDIR}"/${P}-underlinking.patch
-
-	# gweather: fix NetworkManager support to compile, see upstream bug 636217 and bug 358043
-	epatch "${FILESDIR}"/${P}-dbus-fix.patch
-
-	# disable pyc compiling
-	echo '#!/bin/sh' > py-compile
-
-	# Invest applet tests need gconf/proxy/...
-	sed 's/^TESTS.*/TESTS=/g' -i invest-applet/invest/Makefile.am \
-		invest-applet/invest/Makefile.in || die "disabling invest tests failed"
-
-	python_convert_shebangs -r 2 .
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check || die "emake check failed"
-}
-
-src_install() {
-	gnome2_src_install
-
-	local APPLETS="accessx-status charpick cpufreq drivemount geyes
-			 gkb-new gswitchit gweather invest-applet mini-commander
-			 mixer modemlights multiload null_applet stickynotes trashapplet"
-
-	# modemlights is out because it needs system-tools-backends-1
-
-	for applet in ${APPLETS} ; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO ; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	# check for new python modules on bumps
-	python_mod_optimize invest
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup invest
-}
diff --git a/gnome-base/gnome-applets/gnome-applets-3.2.1.ebuild b/gnome-base/gnome-applets/gnome-applets-3.2.1.ebuild
deleted file mode 100644
index 406b40891f4b..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-3.2.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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.2.1.ebuild,v 1.4 2012/05/05 05:38:07 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="no" # bug 340725, no other la files
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="Applets for the GNOME Desktop and Panel"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-IUSE="gnome ipv6 networkmanager policykit"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-# null applet still needs bonobo support for gnome-panel?
-#
-# Latest gnome-panel needed due to commit 45a4988a6
-# atk, cairo, pango used in multiple applets
-RDEPEND=">=x11-libs/gtk+-3.0.0:3
-	dev-libs/atk
-	>=dev-libs/glib-2.22:2
-	>=gnome-base/gconf-2.8:2
-	>=gnome-base/gnome-panel-2.91.91
-	x11-libs/cairo
-	>=x11-libs/libxklavier-4.0
-	>=x11-libs/libwnck-2.91.0:3
-	>=x11-libs/libnotify-0.7
-	x11-libs/pango
-	>=sys-apps/dbus-1.1.2
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/libxml2-2.5.0
-	>=x11-themes/gnome-icon-theme-2.15.91
-	>=dev-libs/libgweather-2.91.0
-	x11-libs/libX11
-
-	gnome?	(
-		gnome-base/gnome-settings-daemon
-
-		>=gnome-extra/gucharmap-2.33.0:2.90
-		>=gnome-base/libgtop-2.11.92
-
-		>=dev-python/pygobject-2.26:2[introspection]
-		gnome-base/gconf[introspection]
-		gnome-base/gnome-panel[introspection]
-		x11-libs/gdk-pixbuf[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
-	networkmanager? ( >=net-misc/networkmanager-0.7.0 )
-	policykit? ( >=sys-auth/polkit-0.92 )"
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.1.4
-	>=app-text/gnome-doc-utils-0.3.2
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-	dev-libs/libxslt
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xml-dtd:4.3"
-
-pkg_setup() {
-	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
-	# GNOME 3 has a hard-dependency on pulseaudio, so gstmixer applet is useless
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--without-hal
-		--disable-battstat
-		--disable-mixer-applet
-		$(use_enable ipv6)
-		$(use_enable networkmanager)
-		$(use_enable policykit polkit)"
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	echo '#!/bin/sh' > py-compile
-
-	# Invest applet tests need gconf/proxy/...
-	# Note: for now, invest tests are commented out by upstream
-	#sed 's/^TESTS.*/TESTS=/g' -i invest-applet/invest/Makefile.am \
-	#	invest-applet/invest/Makefile.in || die "disabling invest tests failed"
-
-	python_convert_shebangs -r 2 .
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	local APPLETS="accessx-status charpick cpufreq drivemount geyes
-			 gkb-new gweather invest-applet mini-commander
-			 multiload null_applet stickynotes trashapplet"
-
-	# mixer is out because gnome3 uses pulseaudio
-	# modemlights is out because it needs system-tools-backends-1
-	# battstat is disabled because we don't want HAL anywhere
-
-	for applet in ${APPLETS} ; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO ; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	# check for new python modules on bumps
-	python_mod_optimize invest
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup invest
-}
diff --git a/gnome-base/gnome-applets/gnome-applets-3.4.1.ebuild b/gnome-base/gnome-applets/gnome-applets-3.4.1.ebuild
index 63175bcc785e..3fccc3ff6daf 100644
--- a/gnome-base/gnome-applets/gnome-applets-3.4.1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-3.4.1.ebuild
@@ -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 @@ RDEPEND=">=x11-libs/gtk+-3.0.0:3
 		>=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 @@ DEPEND="${RDEPEND}
 	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 @@ pkg_setup() {
 		$(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