Fixed compilation with libtool-2.2, bug #213831, thank Alessandro Guido for report.

Package-Manager: portage-2.1.4.4

4 files changed, 87 insertions, 4 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index 6b463f68da68..8732e2be4ec6 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.109 2008/03/30 23:04:48 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.110 2008/05/04 13:27:41 pva Exp $
+
+  04 May 2008; Peter Volkov <pva@gentoo.org>
+  +files/fontconfig-2.5.0-libtool-2.2.patch, fontconfig-2.5.0-r1.ebuild:
+  Fixed compilation with libtool-2.2, bug #213831, thank Alessandro Guido
+  for report.
 
   30 Mar 2008; <ricmm@gentoo.org> fontconfig-2.4.2.ebuild:
   Drop to ~mips due to unstable deps
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 7c3249155653..93123efa74c8 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,7 +1,8 @@
 AUX fontconfig-2.3.2-docbook.patch 506 RMD160 c205d99ecc19866da8d0ac4ef7172dcef98a6299 SHA1 1054f38cef09c93baf34f08253345ca2ae638e4a SHA256 c6480dcf19fec22126a9205fa3d9b317e5a97613f86218cf1926a2a07848afd5
+AUX fontconfig-2.5.0-libtool-2.2.patch 2589 RMD160 36a07e0161c6b2a970de19a090db4f750a519bea SHA1 e0267a4f29c670425861211cf960745021c22b6d SHA256 fce47ca38e8cff70ef7be40493b02b99ff2387a6e141a0e322ec8bfedee5b1a9
 DIST fontconfig-2.4.2.tar.gz 1278340 RMD160 c953020a5193500080c9eceef47b76e61c41b188 SHA1 cd5e30625680a0435563b586275156eaf8d0d34a SHA256 63a3d6413182817b91eea327b58c243f1865acfc40bef61fc52d2b0431341363
 DIST fontconfig-2.5.0.tar.gz 1385058 RMD160 2c61ba3adc49aa5dd4eb081e13a849cc1d62d9da SHA1 9ffad5f5eb2c5dd277bfed1cafc6e62aa0172842 SHA256 34c6badb4cb7eb496779d30616903de400fa244838ea39c2a7f63eaa5fdf0efe
 EBUILD fontconfig-2.4.2.ebuild 2414 RMD160 4c7488d70c9e4380ae73525e7f15a122de85f2b5 SHA1 479f03bcf14b76e10e67950a5925991f00494388 SHA256 e0274d8c6fb723b4f0bc39e2e6596c4b61b8c6d15f0a79ab160d4945c0ac3ee0
-EBUILD fontconfig-2.5.0-r1.ebuild 2427 RMD160 dcf564d42878542ce2dd587157a998c6675ab2b8 SHA1 3e745da0a0ee55b5761e5baf930f30ff97220cc2 SHA256 d659f63da5245047b93a5a616b88286412a6da1f55a2a35fdad3dc6514043d67
-MISC ChangeLog 16077 RMD160 d0aa0f35c7399618c44d45c178f43c92ad8ae40b SHA1 a817ec3da8f8ff69c201bf345ab361b14612d6b6 SHA256 d4088af8b5671c3b12ac84c8a89c1b46b0d0c3e494358a5e760953d7d3354ac3
+EBUILD fontconfig-2.5.0-r1.ebuild 2505 RMD160 e65b8588e50e6f56ddaebbe9e75f0600e18e98a9 SHA1 55f256b214f5d2bef1d78ef61a747d61b6f77266 SHA256 2b6ecdb834a51f4ef21dd265127e82eb60474edc1dc83dceec4f1c987b64c5b5
+MISC ChangeLog 16282 RMD160 55cbe749f59bed92fa53bfe130e063cf122720b4 SHA1 8f4534e728c1798a49b8a5301eb8af746bb32d99 SHA256 854bff6d953590e618ddc99e94a68938cc2710df2f87a8050a2faa8fcb98002a
 MISC metadata.xml 419 RMD160 898b8233ab233060d8137dadf28c291b83a65500 SHA1 ee62c352812f8765122e5a65b7df5f8794c6c485 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db
diff --git a/media-libs/fontconfig/files/fontconfig-2.5.0-libtool-2.2.patch b/media-libs/fontconfig/files/fontconfig-2.5.0-libtool-2.2.patch
new file mode 100644
index 000000000000..0da2b300680b
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.5.0-libtool-2.2.patch
@@ -0,0 +1,76 @@
+From: Keith Packard <keithp@keithp.com>
+Date: Sun, 4 May 2008 03:23:37 +0000 (-0700)
+Subject: Deal with libtool 2.2 which doesn't let us use LT_ variables. (bug 15692)
+X-Git-Tag: 2.5.92
+X-Git-Url: http://gitweb.freedesktop.org/?p=fontconfig;a=commitdiff;h=19d124dc4f9a68e1c9ddce58bf79a5e11d2ccbfd
+
+Deal with libtool 2.2 which doesn't let us use LT_ variables. (bug 15692)
+
+Libtool-2.2 introduces new restrictions. So now it does not allow LT_*
+variables as it includes marcros:
+
+m4_pattern_forbid([^_?LT_[A-Z_]+$])
+
+Rename the LT_ variables to LIBT_ to work around this restriction.
+---
+
+--- a/configure.in
++++ b/configure.in
+@@ -41,17 +41,17 @@ dnl libtool versioning
+ dnl bump revision when fixing bugs
+ dnl bump current and age, reset revision to zero when adding APIs
+ dnl bump current, leave age, reset revision to zero when changing/removing APIS
+-LT_CURRENT=4
+-LT_REVISION=0
+-AC_SUBST(LT_CURRENT)
+-AC_SUBST(LT_REVISION)
+-LT_AGE=3
++LIBT_CURRENT=4
++LIBT_REVISION=0
++AC_SUBST(LIBT_CURRENT)
++AC_SUBST(LIBT_REVISION)
++LIBT_AGE=3
+ 
+-LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
+-AC_SUBST(LT_VERSION_INFO)
++LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE"
++AC_SUBST(LIBT_VERSION_INFO)
+ 
+-LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
+-AC_SUBST(LT_CURRENT_MINUS_AGE)
++LIBT_CURRENT_MINUS_AGE=`expr $LIBT_CURRENT - $LIBT_AGE`
++AC_SUBST(LIBT_CURRENT_MINUS_AGE)
+ 
+ dnl ==========================================================================
+ 
+--- a/fontconfig-zip.in
++++ b/fontconfig-zip.in
+@@ -10,7 +10,7 @@ DEVZIP=/tmp/fontconfig-dev-@VERSION@.zip
+ cd @prefix@
+ rm -f $ZIP
+ zip $ZIP -@ <<EOF
+-bin/libfontconfig-@LT_CURRENT_MINUS_AGE@.dll
++bin/libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll
+ etc/fonts/fonts.conf
+ EOF
+ 
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -112,7 +112,7 @@ libfontconfig_la_SOURCES = \
+ lib_LTLIBRARIES = libfontconfig.la
+ 
+ libfontconfig_la_LDFLAGS =			\
+-	-version-info @LT_VERSION_INFO@ -no-undefined $(export_symbols)
++	-version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols)
+ 
+ libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS)
+ 
+@@ -148,6 +148,6 @@ fontconfig.def: $(PUBLIC_FILES) $(PUBLIC
+ 	(cat $(PUBLIC_FILES) $(PUBLIC_FT_FILES) || echo 'FcERROR ()' ) | \
+  	grep '^Fc[^ ]* *(' | sed -e 's/ *(.*$$//' -e 's/^/	/' | \
+ 	sort; \
+-	echo LIBRARY libfontconfig-@LT_CURRENT_MINUS_AGE@.dll; \
+-	echo VERSION @LT_CURRENT@.@LT_REVISION@) >$@
++	echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \
++	echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@
+ 	@ ! grep -q FcERROR $@ || ($(RM) $@; false)
diff --git a/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild
index e8e5de5d10df..c6cb77ac79c3 100644
--- a/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.5.0-r1.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/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild,v 1.9 2008/01/16 15:40:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild,v 1.10 2008/05/04 13:27:41 pva Exp $
 
 inherit eutils libtool autotools
 
@@ -27,6 +27,7 @@ src_unpack() {
 	cd "${S}"
 	# add docbook switch so we can disable it
 	epatch "${FILESDIR}"/${PN}-2.3.2-docbook.patch
+	epatch "${FILESDIR}"/${P}-libtool-2.2.patch #213831 Fix libtool-2.2 brekage
 
 	eautoreconf
 	epunt_cxx #74077