app-editors/gedit: Add a patch for python detection with libtool 2.2 (see bug #216110)

Package-Manager: portage-2.1.5_rc9

4 files changed, 23 insertions, 15 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index 109380ca723d..1632d1f19c5d 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.239 2008/04/10 21:29:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.240 2008/05/10 18:27:46 remi Exp $
+
+  10 May 2008; Rémi Cardona <remi@gentoo.org>
+  +files/gedit-2.22.1-fix-libtool-2.2.patch, gedit-2.22.1.ebuild:
+  Add a patch for python detection with libtool 2.2 (see bug #216110)
 
 *gedit-2.22.1 (10 Apr 2008)
 
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 7ca5888752f3..7ddd103db5c5 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gedit-2.16.2-no_python_module_docs.patch 730 RMD160 81afcad6cca9d0be7311fca0da788d93368beef4 SHA1 70f11ceb222c58a85f5ce4d08474dbc70b3abfe5 SHA256 7cff8d687f0def86ccabd6bc584e9a57de23e48e9b8fb7d5f241f60ac7c3b38c
 AUX gedit-2.18.1-fbsd.patch 1001 RMD160 7b3a79b497cc99e19b806f0fa8f194469010a7cd SHA1 abb113abf5d54e8d1abdc48abaa5df3564e86453 SHA256 0016495f6c47a8f720913a4cb7f198f5c9ef22feabd2165d5d69079aad34a800
 AUX gedit-2.20.3-libattr.patch 395 RMD160 36d526fce179fa961ae7d3692024750380333380 SHA1 d933005f9cd7070c62eaa5ce24802d3e4e2eda2f SHA256 61cd9cb84709890029260f6a4d930df5cb7c99ebeaa0492ac7b2f09b97a4cea3
 AUX gedit-2.20.4-parallel-install.patch 382 RMD160 bebad6c652b617484b1d67ef9e9c0811eaccc2fb SHA1 411586d0e348779fe306a3acb72169f96cb02a45 SHA256 aa01ae580a82289f76cc5186673f58ada09cd58d55c3c198abbe18d04d522aa2
+AUX gedit-2.22.1-fix-libtool-2.2.patch 250 RMD160 26f257916aaa2bc99bc54be02f60ee57129825a6 SHA1 a6df9ba1042e8001548c9e89f1e1f3cfbda0df31 SHA256 091fe2c54d41032f5f4857787e1235709349215db44060a3d07545aaacbfb0b9
 DIST gedit-2.20.3.tar.bz2 3812377 RMD160 e3747bbafca099ae5567005b5bd6af3ba2704c3d SHA1 ccbb9bad00101ed465c39da05b0dcaf8ea881120 SHA256 d8159e6a3442a3bcf8dba5aab5b8d4b79faa5f2d14d9df9b43fa0e9186922df0
 DIST gedit-2.20.4.tar.bz2 3809006 RMD160 8f87871f2ab5c9f5747dd990aaa5eaad2f30215a SHA1 82bf5fe2e119018936fca0b89196c9e86c69ee3f SHA256 695b70582734b3ba04e0d76970bf1dd722a22ef027f8a749ec3fb05e40e83121
 DIST gedit-2.22.0.tar.bz2 3883104 RMD160 57ee94075d0b88eba2b933313e81e26eb05115b8 SHA1 a960a32a5b43a25ad3bfd577835b2cf05a7391fc SHA256 ffad28c732e1a9b250d6d3c5b92a252b6ac87741e4d1fd9daba9940fde399e2e
@@ -12,13 +10,6 @@ DIST gedit-2.22.1.tar.bz2 3883851 RMD160 91ddb86b4c1b6cd04839f3b1f603a19ba862e1a
 EBUILD gedit-2.20.3.ebuild 1778 RMD160 31e114c3a8913f53a31d1189fc97d3b8837608aa SHA1 d378bcc2fd5316073c447745e21ba4147ecf2b32 SHA256 f370eec52c41281f312d96e07d1c3cce402dc7384c02e8a4a13e4009fc5c528c
 EBUILD gedit-2.20.4-r1.ebuild 2251 RMD160 6e013bc8e029fe02dd897412e13bc6e75a9137ff SHA1 a08efb32e77f28f0603d9fd5b7309be119ea68f8 SHA256 edeb80dbe814cdd08401968702ee59d1ba99680433819bb1b9343bcba5eda94b
 EBUILD gedit-2.22.0.ebuild 2157 RMD160 91b8a0fb82f4425a3bdbda0355cdddba817c5383 SHA1 14b80964c746d089d1dd1b981b815c828880581a SHA256 44ceb7cf8393217198866bfbcdbc90e05485c79f9628ea28a7ca036d4dd56406
-EBUILD gedit-2.22.1.ebuild 2157 RMD160 30b65e5ab7a6c76b1c0e9e3454c7d7b6fc9a205a SHA1 30cfc494b9c0cd42115b2d3230a6924188267fc5 SHA256 84af3c61583279463971e44bfb3d33a9c8a2032d650e1c31a61a8c3be4c732c0
-MISC ChangeLog 28810 RMD160 29f27969eb26c7fdbdaabb0867bfd0d41297e756 SHA1 374a99f00fa5d2a42a3df02033b8fcf59826fa05 SHA256 f4e0e6447032bf4a5ff2d9d3bd46fd7471b2719ab777910645c1a5bededb0dcc
+EBUILD gedit-2.22.1.ebuild 2263 RMD160 e7d2c6fc92bd16b4220e04532756589626bb1a6d SHA1 8b2aa8dad1882484cb348f1897fde8a236031dae SHA256 5598e110fc2dd0e6adb2198968cb97d7e36eee494524a071f80c4a96c78149b4
+MISC ChangeLog 28995 RMD160 0d1a40785f80e0a61f1576852236362b472a6b82 SHA1 2a190c28ade11447537eef1fd0b610f1b36970b6 SHA256 0baf5cd2f8a50b04e775ffd021d3de80fe58f64be385df46ce4da12e892d81f0
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkf+hqkACgkQ1fmVwcYIWAaczgCdG1tVkO6Ef9S0HvgjDBgXf2dW
-wgYAn3A4dexXpTLg6Je06RHDDnVRNjnq
-=lf3p
------END PGP SIGNATURE-----
diff --git a/app-editors/gedit/files/gedit-2.22.1-fix-libtool-2.2.patch b/app-editors/gedit/files/gedit-2.22.1-fix-libtool-2.2.patch
new file mode 100644
index 000000000000..70d1234add3d
--- /dev/null
+++ b/app-editors/gedit/files/gedit-2.22.1-fix-libtool-2.2.patch
@@ -0,0 +1,10 @@
+--- configure.ac.old	2008-05-10 19:56:22.000000000 +0200
++++ configure.ac	2008-05-10 19:56:57.000000000 +0200
+@@ -31,6 +31,7 @@
+ IT_PROG_INTLTOOL([0.35.0])
+ 
+ AC_PROG_LIBTOOL
++m4_ifdef([LT_OUTPUT],[LT_OUTPUT])
+ 
+ GNOME_DOC_INIT
+ GTK_DOC_CHECK([1.0])
diff --git a/app-editors/gedit/gedit-2.22.1.ebuild b/app-editors/gedit/gedit-2.22.1.ebuild
index 6965a6917d80..50490f920bbd 100644
--- a/app-editors/gedit/gedit-2.22.1.ebuild
+++ b/app-editors/gedit/gedit-2.22.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.22.1.ebuild,v 1.1 2008/04/10 21:29:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.22.1.ebuild,v 1.2 2008/05/10 18:27:46 remi Exp $
 
 inherit gnome2 python eutils autotools
 
@@ -69,11 +69,14 @@ src_unpack() {
 	# Make libattr optional; bug #191989
 	epatch "${FILESDIR}"/${PN}-2.20.3-libattr.patch
 
+	# fixes failing python test due to libtool 2.2, bug #216110
+	epatch "${FILESDIR}/${PN}-2.22.1-fix-libtool-2.2.patch"
+
 	# disable pyc compiling
 	mv "${S}"/py-compile "${S}"/py-compile.orig
 	ln -s $(type -P true) "${S}"/py-compile
 
-	AT_M4DIR="m4" eautoreconf
+	eautoreconf
 }
 
 pkg_postinst() {