taking out python gtk check to avoid problems for people building with X (#31589)

Package-Manager: portage-2.0.51.19

4 files changed, 25 insertions, 15 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index 47681d248aef..83d0c0b2287e 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/dia
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.48 2005/04/17 04:26:16 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.49 2005/04/27 18:09:35 liquidx Exp $
+
+  27 Apr 2005; Alastair Tse <liquidx@gentoo.org>
+  +files/0.94-disable_python_gtk_import.patch, dia-0.94-r1.ebuild:
+  taking out python gtk check to avoid problems for people building with X
+  (#31589)
 
   17 Apr 2005; Mark Loeser <halcy0n@gentoo.org> +files/dia-0.94-gcc4.patch,
   dia-0.94-r1.ebuild:
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index c545f17cd211..bffabb59b4f6 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0cc259b8578665b19aa2c569106f9a72 ChangeLog 6230
 MD5 8919b8358acac532bb4c2283e7bdcbb3 dia-0.93.ebuild 1074
 MD5 858a96d79b7c8b479edd95aedcf0c0c6 metadata.xml 589
-MD5 a49cca09d7a8328038cefbbb43a45e3f dia-0.94-r1.ebuild 1280
-MD5 364d452e7bd501c01910f613c066608e files/dia-0.94-help.patch 2766
+MD5 7fd63810f9cf556baf089f0a06abcd61 dia-0.94-r1.ebuild 1443
 MD5 7459df6c8efd61f2c725351d0da979ad files/dia-0.93-fix_py_prefix.patch 499
-MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r1 62
 MD5 1df50dee999cd3aa4746682bfc1d1d72 files/digest-dia-0.93 62
+MD5 364d452e7bd501c01910f613c066608e files/dia-0.94-help.patch 2766
 MD5 5825798492b196ec96d3757e9e1d0de8 files/dia-0.94-no_font_cache.patch 473
+MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r1 62
 MD5 159070f80a109b691f1a945755bf2b7c files/dia-0.94-gcc4.patch 934
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCYeV2CRZPokWLroQRAjb3AJ9Hvm9nP0iK3IZsAD0S3amiekGCnwCgtNfm
-lMRYte7qrI6yCZL0mnfPLck=
-=vpIl
------END PGP SIGNATURE-----
+MD5 275b4e09a76a808202872cae5ac90f7c files/0.94-disable_python_gtk_import.patch 313
diff --git a/app-office/dia/dia-0.94-r1.ebuild b/app-office/dia/dia-0.94-r1.ebuild
index ec0ab1ed5a00..2970344f5669 100644
--- a/app-office/dia/dia-0.94-r1.ebuild
+++ b/app-office/dia/dia-0.94-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.94-r1.ebuild,v 1.6 2005/04/17 04:26:16 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.94-r1.ebuild,v 1.7 2005/04/27 18:09:35 liquidx Exp $
 
 inherit eutils gnome2
 
@@ -37,6 +37,10 @@ DOCS="AUTHORS ChangeLog KNOWN_BUGS NEWS README RELEASE-PROCESS THANKS TODO"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	# Disable python -c 'import gtk' during compile to prevent using
+	# X being involved (#31589)
+	epatch ${FILESDIR}/${PV}-disable_python_gtk_import.patch
+	autoconf
 
 	# Disable buggy font cache. See bug #81227.
 	epatch ${FILESDIR}/${P}-no_font_cache.patch
diff --git a/app-office/dia/files/0.94-disable_python_gtk_import.patch b/app-office/dia/files/0.94-disable_python_gtk_import.patch
new file mode 100644
index 000000000000..ec93f258bfc3
--- /dev/null
+++ b/app-office/dia/files/0.94-disable_python_gtk_import.patch
@@ -0,0 +1,10 @@
+--- configure.in~	2004-08-17 16:03:26.000000000 +0100
++++ configure.in	2005-04-27 18:35:43.231299642 +0100
+@@ -401,7 +401,6 @@
+ 
+ if test "x$with_python" != xno; then
+   AM_PATH_PYTHON(1.5.2)
+-  AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(could not find pygtk module)])
+   AM_CHECK_PYTHON_HEADERS
+   AM_CHECK_PYTHON_LIB
+