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

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

commit:     3e071a1f7359e833776e8386e15d93359d93e429
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 17:48:19 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 18:07:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3e071a1f

dev-libs/libgweather: 3.5.92 → 3.6.1

---
 ...ther-3.5.92.ebuild => libgweather-3.6.1.ebuild} |   23 +++++++++++++------
 dev-libs/libgweather/libgweather-9999.ebuild       |   23 +++++++++++++------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/dev-libs/libgweather/libgweather-3.5.92.ebuild b/dev-libs/libgweather/libgweather-3.6.1.ebuild
similarity index 80%
rename from dev-libs/libgweather/libgweather-3.5.92.ebuild
rename to dev-libs/libgweather/libgweather-3.6.1.ebuild
index d739a4a..1af5ed3 100644
--- a/dev-libs/libgweather/libgweather-3.5.92.ebuild
+++ b/dev-libs/libgweather/libgweather-3.6.1.ebuild
@@ -16,8 +16,9 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="+introspection doc"
+IUSE="+introspection"
 if [[ ${PV} = 9999 ]]; then
+	IUSE="${IUSE} doc"
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
@@ -31,21 +32,29 @@ COMMON_DEPEND=">=x11-libs/gtk+-2.90.0:3[introspection?]
 	>=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/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.11
+"
+
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		doc? ( >=dev-util/gtk-doc-1.9 )"
+fi
 
-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-static
 		$(use_enable introspection)"
+	gnome2_src_configure
 }

diff --git a/dev-libs/libgweather/libgweather-9999.ebuild b/dev-libs/libgweather/libgweather-9999.ebuild
index d739a4a..1af5ed3 100644
--- a/dev-libs/libgweather/libgweather-9999.ebuild
+++ b/dev-libs/libgweather/libgweather-9999.ebuild
@@ -16,8 +16,9 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="+introspection doc"
+IUSE="+introspection"
 if [[ ${PV} = 9999 ]]; then
+	IUSE="${IUSE} doc"
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
@@ -31,21 +32,29 @@ COMMON_DEPEND=">=x11-libs/gtk+-2.90.0:3[introspection?]
 	>=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/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.11
+"
+
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		doc? ( >=dev-util/gtk-doc-1.9 )"
+fi
 
-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-static
 		$(use_enable introspection)"
+	gnome2_src_configure
 }