[gentoo-commits] proj/gnome:master commit in: dev-libs/libgweather/

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     e1658fddaeff8bce5b32cb2776e22adc8f23b4a4
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 05:11:25 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 05:11:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e1658fdd

dev-libs/libgweather: don't slot, fix automagic introspection

* slotmove done in portage

---
 .../libgweather/libgweather-2.30.3-r200.ebuild     |   68 --------------------
 dev-libs/libgweather/libgweather-2.91.6.ebuild     |    8 +-
 dev-libs/libgweather/libgweather-9999.ebuild       |    8 +-
 3 files changed, 8 insertions(+), 76 deletions(-)

diff --git a/dev-libs/libgweather/libgweather-2.30.3-r200.ebuild b/dev-libs/libgweather/libgweather-2.30.3-r200.ebuild
deleted file mode 100644
index 1cbe889..0000000
--- a/dev-libs/libgweather/libgweather-2.30.3-r200.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# 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"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="python? 2"
-
-inherit autotools gnome2 python
-
-DESCRIPTION="Library to access weather information from online services"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="python doc"
-
-# libsoup-gnome is to be used because libsoup[gnome] might not
-# get libsoup-gnome installed by the time ${P} is built
-RDEPEND=">=x11-libs/gtk+-2.11:2
-	>=dev-libs/glib-2.13
-	>=gnome-base/gconf-2.8
-	>=net-libs/libsoup-gnome-2.25.1:2.4
-	>=dev-libs/libxml2-2.6.0
-	>=sys-libs/timezone-data-2010k
-	python? (
-		>=dev-python/pygobject-2
-		>=dev-python/pygtk-2 )
-	!<gnome-base/gnome-applets-2.22.0"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.3
-	>=dev-util/pkgconfig-0.19
-	>=dev-util/gtk-doc-am-1.9
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-PDEPEND="dev-libs/libgweather:3"
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-locations-compression
-		--disable-all-translations-in-one-xml
-		--disable-static
-		$(use_enable python)"
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix building -python, Gnome bug #596660.
-	epatch "${FILESDIR}/${PN}-2.30.0-fix-automagic-python-support.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Don't install these here, libgweather:2 also provides them
-	# IMPORTANT: Don't let the files diverge
-	rm -rf "${D}"/usr/share/icons || die "Removing icons failed"
-	rm -rf "${D}"/usr/share/libgweather || die "Removing locations failed"
-	rm -rf "${D}"/etc/gconf/schemas/gweather.schemas || die "Removing schemas failed"
-
-	python_clean_installation_image
-}

diff --git a/dev-libs/libgweather/libgweather-2.91.6.ebuild b/dev-libs/libgweather/libgweather-2.91.6.ebuild
index 2f991f9..0302cdb 100644
--- a/dev-libs/libgweather/libgweather-2.91.6.ebuild
+++ b/dev-libs/libgweather/libgweather-2.91.6.ebuild
@@ -1,4 +1,4 @@
-# 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/dev-libs/libgweather/libgweather-2.30.3.ebuild,v 1.3 2010/11/14 23:05:07 eva Exp $
 
@@ -12,7 +12,7 @@ DESCRIPTION="Library to access weather information from online services"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
-SLOT="3"
+SLOT="2"
 IUSE="+introspection doc"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
@@ -32,7 +32,6 @@ RDEPEND=">=x11-libs/gtk+-2.90.0:3[introspection?]
 
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 
-	!<dev-libs/libgweather-2.30.3-r200
 	!<gnome-base/gnome-applets-2.22.0"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40.3
@@ -47,4 +46,5 @@ G2CONF="${G2CONF}
 	--enable-locations-compression
 	--disable-maintainer-mode
 	--disable-all-translations-in-one-xml
-	--disable-static"
+	--disable-static
+	$(use_enable introspection)"

diff --git a/dev-libs/libgweather/libgweather-9999.ebuild b/dev-libs/libgweather/libgweather-9999.ebuild
index 2f991f9..0302cdb 100644
--- a/dev-libs/libgweather/libgweather-9999.ebuild
+++ b/dev-libs/libgweather/libgweather-9999.ebuild
@@ -1,4 +1,4 @@
-# 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/dev-libs/libgweather/libgweather-2.30.3.ebuild,v 1.3 2010/11/14 23:05:07 eva Exp $
 
@@ -12,7 +12,7 @@ DESCRIPTION="Library to access weather information from online services"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
-SLOT="3"
+SLOT="2"
 IUSE="+introspection doc"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
@@ -32,7 +32,6 @@ RDEPEND=">=x11-libs/gtk+-2.90.0:3[introspection?]
 
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 
-	!<dev-libs/libgweather-2.30.3-r200
 	!<gnome-base/gnome-applets-2.22.0"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40.3
@@ -47,4 +46,5 @@ G2CONF="${G2CONF}
 	--enable-locations-compression
 	--disable-maintainer-mode
 	--disable-all-translations-in-one-xml
-	--disable-static"
+	--disable-static
+	$(use_enable introspection)"