Fix bug #285595, automagic python support which caused compilation fail when pygtk was not installed

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 39 insertions, 15 deletions

diff --git a/dev-libs/libgweather/ChangeLog b/dev-libs/libgweather/ChangeLog
index e423935ccb43..3aa55a6f54f7 100644
--- a/dev-libs/libgweather/ChangeLog
+++ b/dev-libs/libgweather/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libgweather
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/ChangeLog,v 1.38 2009/07/25 03:19:11 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/ChangeLog,v 1.39 2009/09/19 19:04:45 mrpouet Exp $
+
+  19 Sep 2009; Romain Perier <mrpouet@gentoo.org>
+  libgweather-2.26.2.1.ebuild,
+  +files/libgweather-2.26.2.1-automagic-python.patch:
+  Fix bug #285595, automagic python support which caused compilation fail
+  when pygtk was not installed.
 
   25 Jul 2009; Joseph Jezak <josejx@gentoo.org> libgweather-2.26.1.ebuild,
   libgweather-2.26.2.1.ebuild:
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 90fea2465f9b..2eca71f3399f 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX libgweather-2.26.2.1-automagic-python.patch 838 RMD160 a7b99bd433e51ec7c7ddb5b7fe13beb83caa980f SHA1 ed1ebad4b965b1da8f6095f72b3634822881eb43 SHA256 d6e1462c5a7d57908bb378dcec65ed8ec1bba8ac19883d67801a696b73157597
 DIST libgweather-2.24.3.tar.bz2 7094107 RMD160 4875b5f150d6c99d958de37e5eca16e0c19ca8e4 SHA1 6a8134d4d2170ea7879dc8f1e847148b3e81edc8 SHA256 fff7f1fa447156951ce6f01ed88f52b891c1ca6c65ff215f56a501e8aa917fcb
 DIST libgweather-2.26.1.tar.bz2 6540960 RMD160 ccf9f86c14a1598ea93821e95393589218995f11 SHA1 9bc67204fe3c52873cb4166b0b2154b4c58468d7 SHA256 accde7dfe0ec866fd4a071469bca24725ecad516e7a8f004d55d0e5b38711842
 DIST libgweather-2.26.2.1.tar.bz2 6367411 RMD160 0639ebe78f9d7f99bc6299e94b013565654ef476 SHA1 f6d6ee5bb9eb7b81e9a413cd75e4ac86d1bc4421 SHA256 70cf977060a5e71ade98346070856f09fbf33f6d88f4d49632d7ae0f6b314834
 EBUILD libgweather-2.24.3.ebuild 930 RMD160 e20db16bec90de2b1f74e66cae0e4121256bcc02 SHA1 fc818c8e606ab97757a86f58f0f74a9162c8f903 SHA256 35496e0bdc3f22df3ae0f7997b37701a0e2410886c43c8c0b62117b55f8bd4c7
 EBUILD libgweather-2.26.1.ebuild 1028 RMD160 49bb94bc7c28fb7ad74cd497d01f975397e37a65 SHA1 f171c55f5ebab04c1e3907a8887a81f213cb3a6d SHA256 a7a9a9b730aa68df6cfae9f2ddb1376f68b7c2623f774e7c65037414e92ff007
-EBUILD libgweather-2.26.2.1.ebuild 1618 RMD160 a7165234c74e9adf624a3753e5a0e2f6d7d30f36 SHA1 627f029e3eac9a2bdcced87861f0e3104171a26a SHA256 3c683b08c8ed636db9fbf1cb3e528439ecfdd6d3d6b30dcc907aad75e1eea6dd
-MISC ChangeLog 5364 RMD160 ab8b7073179fc75703fbd5c97eff3d21b7eddafb SHA1 0753d7d006ad50659887b75a3e113cac916353cb SHA256 87a0f89fd003c3a333c06d18c1b3fe7633c5c22299172eaf3543837b1e8df1f0
+EBUILD libgweather-2.26.2.1.ebuild 1722 RMD160 a11072230d0a45393cd2b30edf281408485013ee SHA1 c8670cf82675166a5c44accb0e41f7519b58bb6b SHA256 b98f38ef64974526f8032dadcafafc3c994b82a8808fb5ee4270a9a49478c8bb
+MISC ChangeLog 5607 RMD160 40c774751f101694135c95d29c0ea8e518f61193 SHA1 83da5b95c92e6a36c8d1e790aa76adc509dbfabc SHA256 af2ec05fea34accf5563cf6f28c74f20b008ee9e946b09ac773d7f971b3cb572
 MISC metadata.xml 206 RMD160 61d950942f566dfc272d4f115fa2fb390fbbe301 SHA1 3f059bf106cd99ac3eb9aab89e0708f5fa86ddf9 SHA256 91b15066df76a399233847c54c04eca1d95ab2b73fdef41207dfeb17dbb38193
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpqefoACgkQcsIHjyDViGTY5QCfY1Qo6BKE3BbjIGSDd3kyMJAg
-LZ0AoI3vO9n76IXSjagcMdp/Fpvvrobp
-=g7Z7
------END PGP SIGNATURE-----
diff --git a/dev-libs/libgweather/files/libgweather-2.26.2.1-automagic-python.patch b/dev-libs/libgweather/files/libgweather-2.26.2.1-automagic-python.patch
new file mode 100644
index 000000000000..77f2f94eb5cf
--- /dev/null
+++ b/dev-libs/libgweather/files/libgweather-2.26.2.1-automagic-python.patch
@@ -0,0 +1,24 @@
+From 03626e45436b0b9c345e0c07e4f488375639877a Mon Sep 17 00:00:00 2001
+From: Romain Perier <mrpouet@gentoo.org>
+Date: Sat, 19 Sep 2009 20:54:32 +0200
+Subject: [PATCH] Fix automagic python support when --disable-python is given on the command line
+
+---
+ configure.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index f363571..743fe9d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -215,7 +215,7 @@ dnl ***************************************************************************
+ AC_ARG_ENABLE(python,
+         [AC_HELP_STRING([--enable-python],
+                         [Build libgweather python bindings])],
+-        [enable_python=yes],
++        [enable_python=$enableval],
+         [enable_python=no])
+ if test "$enable_python" = "yes"; then
+    AM_PATH_PYTHON()
+-- 
+1.6.5.rc1
diff --git a/dev-libs/libgweather/libgweather-2.26.2.1.ebuild b/dev-libs/libgweather/libgweather-2.26.2.1.ebuild
index 6df195d94805..5303d4d7437d 100644
--- a/dev-libs/libgweather/libgweather-2.26.2.1.ebuild
+++ b/dev-libs/libgweather/libgweather-2.26.2.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-2.26.2.1.ebuild,v 1.4 2009/07/25 03:19:11 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-2.26.2.1.ebuild,v 1.5 2009/09/19 19:04:45 mrpouet Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
 
-inherit autotools gnome2
+inherit autotools gnome2 eutils
 
 DESCRIPTION="Library to access weather information from online services"
 HOMEPAGE="http://www.gnome.org/"
@@ -52,6 +52,9 @@ src_prepare() {
 			-i gtk-doc.make || die "sed 2 failed"
 	fi
 
+	# Fix automagic python support, bug #285595
+	epatch "${FILESDIR}/${P}-automagic-python.patch"
+
 	# Make it libtool-1 compatible, bug #278516
 	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"