Version bump for gnome-3.6. Update homepage and license. Drop useless doc USE flag, switch to global introspection flag. Drop old.

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

5 files changed, 52 insertions, 46 deletions

diff --git a/dev-libs/libgweather/ChangeLog b/dev-libs/libgweather/ChangeLog
index 122c4dc22078..d9ea347f9b3e 100644
--- a/dev-libs/libgweather/ChangeLog
+++ b/dev-libs/libgweather/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libgweather
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/ChangeLog,v 1.86 2012/08/21 03:54:21 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/ChangeLog,v 1.87 2012/12/19 01:53:47 tetromino Exp $
+
+*libgweather-3.6.2 (19 Dec 2012)
+
+  19 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libgweather-2.30.3.ebuild, -libgweather-3.2.1.ebuild,
+  libgweather-3.4.1.ebuild, +libgweather-3.6.2.ebuild, metadata.xml:
+  Version bump for gnome-3.6. Update homepage and license. Drop useless doc USE
+  flag, switch to global introspection flag. Drop old.
 
   21 Aug 2012; Christoph Junghans <ottxor@gentoo.org> libgweather-3.4.1.ebuild:
   added prefix keywords
diff --git a/dev-libs/libgweather/libgweather-2.30.3.ebuild b/dev-libs/libgweather/libgweather-2.30.3.ebuild
index ece2154d9dce..13be1c4df784 100644
--- a/dev-libs/libgweather/libgweather-2.30.3.ebuild
+++ b/dev-libs/libgweather/libgweather-2.30.3.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2012 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.15 2012/05/21 18:45:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-2.30.3.ebuild,v 1.16 2012/12/19 01:53:47 tetromino Exp $
 
-EAPI="2"
+EAPI="4"
 GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
 PYTHON_DEPEND="python? 2"
 
 inherit autotools eutils gnome2 python
 
 DESCRIPTION="Library to access weather information from online services"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://live.gnome.org/LibGWeather"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="2"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="python doc"
+IUSE="python"
 
 # libsoup-gnome is to be used because libsoup[gnome] might not
 # get libsoup-gnome installed by the time ${P} is built
@@ -32,33 +33,33 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.40.3
 	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.9
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS"
+	>=dev-util/gtk-doc-am-1.9"
 
 pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS"
 	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
+	gnome2_src_prepare
 }
 
 src_install() {
 	gnome2_src_install
-	python_clean_installation_image
+	use python && python_clean_installation_image
 
 	find "${D}" -name '*.la' -exec rm -f {} +
 }
diff --git a/dev-libs/libgweather/libgweather-3.4.1.ebuild b/dev-libs/libgweather/libgweather-3.4.1.ebuild
index c892a0e16be0..3b2f0373c080 100644
--- a/dev-libs/libgweather/libgweather-3.4.1.ebuild
+++ b/dev-libs/libgweather/libgweather-3.4.1.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-3.4.1.ebuild,v 1.2 2012/08/21 03:54:21 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-3.4.1.ebuild,v 1.3 2012/12/19 01:53:47 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
 DESCRIPTION="Library to access weather information from online services"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://live.gnome.org/LibGWeather"
 
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="+introspection doc"
+LICENSE="GPL-2+"
+SLOT="2/3-0" # subslot = 3-(libgweather-3 soname suffix)
+IUSE="+introspection"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 
 # libsoup-gnome is to be used because libsoup[gnome] might not
@@ -27,15 +27,15 @@ COMMON_DEPEND=">=x11-libs/gtk+-2.90.0:3[introspection?]
 
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
 DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.9
 	>=dev-util/intltool-0.40.6
 	sys-devel/gettext
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )"
+"
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gnome-applets-2.22.0"
-# eautoreconf requires >=dev-util/gtk-doc-am-1.11
 
-pkg_setup() {
+src_configure() {
 	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS"
 	# Do not add --disable-all-translations-in-one-xml : it will enable them
 	G2CONF="${G2CONF}
diff --git a/dev-libs/libgweather/libgweather-3.2.1.ebuild b/dev-libs/libgweather/libgweather-3.6.2.ebuild
index f4b295eca016..27158354bb2f 100644
--- a/dev-libs/libgweather/libgweather-3.2.1.ebuild
+++ b/dev-libs/libgweather/libgweather-3.6.2.ebuild
@@ -1,46 +1,47 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-3.2.1.ebuild,v 1.3 2012/05/06 07:26:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-3.6.2.ebuild,v 1.1 2012/12/19 01:53:47 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
 DESCRIPTION="Library to access weather information from online services"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://live.gnome.org/LibGWeather"
 
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="+introspection doc"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+LICENSE="GPL-2+"
+SLOT="2/3-1" # subslot = 3-(libgweather-3 soname suffix)
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 
 # libsoup-gnome is to be used because libsoup[gnome] might not
 # get libsoup-gnome installed by the time ${P} is built
 COMMON_DEPEND=">=x11-libs/gtk+-2.90.0:3[introspection?]
 	>=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
 
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-applets-2.22.0
+"
 DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.6
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.50
 	sys-devel/gettext
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-applets-2.22.0"
-# eautoreconf requires >=dev-util/gtk-doc-am-1.9
+"
 
-pkg_setup() {
+src_configure() {
 	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS"
 	# Do not add --disable-all-translations-in-one-xml : it will enable them
 	G2CONF="${G2CONF}
 		--enable-locations-compression
-		--disable-maintainer-mode
 		--disable-static
 		$(use_enable introspection)"
+	gnome2_src_configure
 }
diff --git a/dev-libs/libgweather/metadata.xml b/dev-libs/libgweather/metadata.xml
index 44825d13c084..dad9001338dc 100644
--- a/dev-libs/libgweather/metadata.xml
+++ b/dev-libs/libgweather/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>
-	<use>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
-	</use>
 </pkgmetadata>