Fix libtool usage for configure stage, bug #213789.

Fix bug #197899 by raising gtk-doc to 1.8 (as per upstream svn).
Package-Manager: portage-2.1.5_rc5

4 files changed, 45 insertions, 11 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index f339d8679d75..33b57e37862c 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.377 2008/04/10 01:28:03 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.378 2008/04/28 21:12:50 eva Exp $
+
+  28 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gtk+-2.12.9-libtool-2.patch, gtk+-2.12.9-r2.ebuild:
+  Fix libtool usage for configure stage, bug #213789. Fix bug #197899 by
+  raising gtk-doc to 1.8 (as per upstream svn).
 
 *gtk+-2.12.9-r2 (10 Apr 2008)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 0ffba28fa6ca..06a54a722c9e 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -14,6 +14,7 @@ AUX gtk+-2.12.1-cupsutils.patch 663 RMD160 2947c516f9697fe3c83be03ef2a613910f30f
 AUX gtk+-2.12.1-firefox-print-preview.patch 888 RMD160 6fedfd6e63e61ec7f7301d2d881d3e69a44176dd SHA1 5eb4779ee1a8cbfb672a2b19f15dc20b96bcda84 SHA256 eadd5a4c4084ecd39317f3eb39e7d4e35aa7d26a8b7010bdd6aeb94c69f362aa
 AUX gtk+-2.12.9-filechooser-fix-icon-size.patch 1265 RMD160 688d9448a2f7ed70dec30e727c6841079ece130a SHA1 cbe2069f9e849bda3676264fd71296c09b383f30 SHA256 3435b45e4958b4311a9b8066906728affc68e296f201814b53d9458677eeb2c9
 AUX gtk+-2.12.9-gtk-filesystem-backend-tilde-fix.patch 1116 RMD160 f63ef76bc8f35f3a6a7b60662a9b6f4637e2a585 SHA1 ed53a93ac825a0690d67d00ed1e68c9401dcabaf SHA256 ef631e5fd1d289d545e8efd4c2b557fa2f1de685a0130f93101afea6b0668ca1
+AUX gtk+-2.12.9-libtool-2.patch 920 RMD160 3ef1dfe66e89af4fe9b51d662e6cc3f7fdaa6e3d SHA1 2e788ff62ed2bffc7c3f5e7900466a3fa0f95b3b SHA256 0f9c8c0700d22c55dff1e943651a20165dc3de510e00169e6f03c7e57063abfb
 AUX gtk+-2.12.9-print-backend-64bit.patch 572 RMD160 986d089399597ee506e405e36b46e4adaf2bde74 SHA1 e240e7e04359defee0a4748805ac71d77415978c SHA256 32f977a50bd578089e3b67a3c49042cda7867f7da9f262d10bf0b9c20eb1d8bd
 AUX gtk+-2.12.9-treeview-search-window-type.patch 841 RMD160 610af248058e785f9456918415c2e16a92c63e51 SHA1 079db29dcc7bf1aec49822d4098597b7ee6f022f SHA256 f381550baf1348f2731e6d09f4a3399c61c538fae96a2a470136f32d32e88eb1
 AUX gtk+-2.8.0-multilib.patch 2456 RMD160 ba94fb0b16f9002dec8e92700ff3f7931f600548 SHA1 e65e843c6f1beecee7a0e1f7ec3292596c2a65a4 SHA256 595bddaa3e50a54f47dbcf30381e11bce0baa1ccd683ac1ba30ca0221b78a4fd
@@ -32,14 +33,14 @@ EBUILD gtk+-2.12.1-r2.ebuild 4676 RMD160 75f0979550c70a425e12673e34949c05f801b5e
 EBUILD gtk+-2.12.5-r1.ebuild 4605 RMD160 729c078b760bb67df03961e2692aa53264af39c1 SHA1 eba6b89060044067b103e92ef7468e5158e70d76 SHA256 a3693132b29c8749f04a897d16607e617dc8922a8d7a5424e6a320ad86d30348
 EBUILD gtk+-2.12.8.ebuild 4571 RMD160 5ee8c3872801e50cf1dc99282e74253946422c47 SHA1 2fcdb81933fd6bab2fb7b10ede0ac7fed5d553a6 SHA256 80ea9abd64a29eafcc09e4b248214f2ad0f7aebee627ab053258a911ca2f82e6
 EBUILD gtk+-2.12.9-r1.ebuild 4615 RMD160 98b7930a6ade2ad915a7101f6750922926a43c08 SHA1 e790f140baa04576a518574d076e3527cc30bca7 SHA256 1c703580dcb5620fdffd811bad7366c3484865cc570a8e319220f05f4b7b2326
-EBUILD gtk+-2.12.9-r2.ebuild 5378 RMD160 ef1f9f1f0c1b0602f7b67ad29b56f612d716abb8 SHA1 67e304bb2e40b600cacda10567119e8599b4fa51 SHA256 86710a0a119bcb4dd882004733b6707f01b2020d4c4f949b7b2b9e82b2bccbac
+EBUILD gtk+-2.12.9-r2.ebuild 5460 RMD160 447bf240e364b8c13f416c3077085121ad08b197 SHA1 7f78383ebfe96f2d749047be5d301d7b1696897d SHA256 75bcee3ea31ad46806520cb0f6468680899558af6c741000a67def2d937ce791
 EBUILD gtk+-2.12.9.ebuild 4602 RMD160 db67856a08175fb0fc3bd068a916b0cdf20344eb SHA1 a9be62b0fc40037560c8a377fb0feb606735963f SHA256 db691d15aef069d0bcf34f49729e530d10a6b549ed7b2805ec1f57ddd7f5ad52
-MISC ChangeLog 53651 RMD160 8215f8ebf1cc4c78f92fdd3d9436b3c01f328f76 SHA1 9d7c03f68acc8067d76ed10d15c642738185ce94 SHA256 6b1b2cc6f8e2134e16bf414b8ce228ac339d9a408ed55c2eac69cf6baeb40a42
+MISC ChangeLog 53887 RMD160 eca1daf62b6632217012eed9e2b832c1852ac98a SHA1 2f7145de5393f9e0c091e297c1a863f6b3c90015 SHA256 e419273fbadb78041fa57d394498e420b9e4abb3b0eb6e28546b432cf89be6f6
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFIAo6Pj9hvisErhMIRAr+iAJ9NrYC9WhcRSNwcM7HTxShjU8eDGACgsF2L
-8zjIxY7sqN1Z0mqrP31SyW8=
-=Y+yV
+iEYEARECAAYFAkgWWf8ACgkQ1fmVwcYIWAYljgCfW17LwNeqLPvM48GuDqmgLiix
+q+sAn2Wt1EEWZYw680hPqYKwEQr2bLxu
+=+9df
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/gtk+-2.12.9-libtool-2.patch b/x11-libs/gtk+/files/gtk+-2.12.9-libtool-2.patch
new file mode 100644
index 000000000000..b4570cafb10d
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.12.9-libtool-2.patch
@@ -0,0 +1,25 @@
+#############
+# Taken from 
+# http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg135168.html
+#############
+
+--- gtk+-2.12.9/configure.in.orig	2008-03-12 05:17:28.000000000 +0100
++++ gtk+-2.12.9/configure.in	2008-04-22 14:48:55.434333756 +0200
+@@ -166,6 +166,8 @@
+ 
+ AC_LIBTOOL_WIN32_DLL
+ AM_PROG_LIBTOOL
++dnl when using libtool 2.x create libtool early, because it's used in configure
++m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+ 
+ # Make sure we use 64-bit versions of various file stuff.
+ AC_SYS_LARGEFILE
+@@ -377,7 +379,7 @@
+ case $enable_explicit_deps in
+   auto)
+     export SED
+-    deplibs_check_method=`(./libtool --config; echo 'eval echo $deplibs_check_method') | sh`
++    deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
+     if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
+       enable_explicit_deps=yes  
+     else
diff --git a/x11-libs/gtk+/gtk+-2.12.9-r2.ebuild b/x11-libs/gtk+/gtk+-2.12.9-r2.ebuild
index 7088c30db3bd..eef076662309 100644
--- a/x11-libs/gtk+/gtk+-2.12.9-r2.ebuild
+++ b/x11-libs/gtk+/gtk+-2.12.9-r2.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/x11-libs/gtk+/gtk+-2.12.9-r2.ebuild,v 1.1 2008/04/10 01:28:03 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.12.9-r2.ebuild,v 1.2 2008/04/28 21:12:50 eva Exp $
 
 WANT_AUTOMAKE="1.7"
 
@@ -43,8 +43,9 @@ DEPEND="${RDEPEND}
 	x11-proto/inputproto
 	x11-proto/damageproto
 	xinerama? ( x11-proto/xineramaproto )
+	>=dev-util/gtk-doc-am-1.8
 	doc? (
-			>=dev-util/gtk-doc-1.6
+			>=dev-util/gtk-doc-1.8
 			~app-text/docbook-xml-dtd-4.1.2
 		 )"
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
@@ -95,10 +96,12 @@ src_unpack() {
 
 	use ppc64 && append-flags -mminimal-toc
 
+	# Fix libtool usage for configure stage, bug #213789
+	epatch "${FILESDIR}/${P}-libtool-2.patch"
+
 	# remember, eautoreconf applies elibtoolize.
 	# if you remove this, you should manually run elibtoolize
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="." eautoreconf
+	eautoreconf
 
 	epunt_cxx
 }