Fixed build failure reported in bug 384131 wrt Robin Johnson.

Package-Manager: portage-2.1.10.27/cvs/Linux x86_64

4 files changed, 26 insertions, 21 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 669fb9f1849d..a4bb04115e08 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.195 2011/09/04 14:13:19 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.196 2011/10/18 12:59:32 pva Exp $
+
+  18 Oct 2011; Peter Volkov <pva@gentoo.org> splashutils-1.5.4.4.ebuild,
+  files/splashutils-1.5.4.4-freetype-bz2.patch:
+  Fixed build failure reported in bug 384131 wrt Robin Johnson.
 
   04 Sep 2011; Michał Januszewski <spock@gentoo.org>
   splashutils-1.5.4.3-r3.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 41b0acf0592a..1bb541733a2e 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -13,7 +13,7 @@ AUX splashutils-1.5.4.3-openrc-umount-fix.patch 1152 RMD160 a5acc1c648ca41d1aabe
 AUX splashutils-1.5.4.3-splash-functions.patch 680 RMD160 dfdb1754557d9590a060cb6103e154a5c1468605 SHA1 ba9d72fdb884e5966785bd5b9bde43a9806e454d SHA256 2ff9a645513187264af92b16e4ed10bf97edc1cc46b800ed8ae7b4027d407554
 AUX splashutils-1.5.4.3-splash_geninitramfs.patch 606 RMD160 cf5b1cb43bb39acf40b761bba700a742930e91b9 SHA1 c5844ce733f3da949f12ab0cd6dc5786dba5c7e4 SHA256 9fe2d8c232a58089e902af3aebeba569669310fc1219da5d2c8775d4e10929ca
 AUX splashutils-1.5.4.3-splash_util.patch 1335 RMD160 e7249f00c803ce04fcc3e6e6d202e63f9262953e SHA1 5721b7e2945a051fefff1205f60ed1180ed14594 SHA256 25b64a8bcb49f660a18dbd30bbd0e368675cf6cde122378a94521966d5b3f928
-AUX splashutils-1.5.4.4-freetype-bz2.patch 431 RMD160 e309de41e8e9d4d84859c6722dd7d7654abcf56e SHA1 a5b6089540b013b1557c99c20a355c9be7003e48 SHA256 8a908b8d40b54ea2141592b7b20c14c06ac955b23bf6da6e7de2b869c9a8f741
+AUX splashutils-1.5.4.4-freetype-bz2.patch 515 RMD160 ed9273dd243c139f71a524d8ca969b068c8978b4 SHA1 7249f38145ac0da68d90d61a4ce711226dd67b27 SHA256 06a9f6d9d9206d09115abf3d8c86692908530f11168a51d99dd43a465e7092c0
 AUX splashutils-1.5.4.4-gentoo-typo-fix.patch 567 RMD160 76f7b0d7caf56c260439a5a7655e6435259df422 SHA1 f53bce95c24e6c9d2cc8c59e0d7b37043e294fcd SHA256 92ee0727bfd9fe6f9565d09546ea63079467f67c2d57385713a62d0b617bb1bf
 AUX splashutils-openrc-0.4-fix.patch 2750 RMD160 b9e7694c7e2d2083e62f321f232be9054696f06b SHA1 1d3c6c7418a0ada751dec57dff075af709f0b383 SHA256 9da0e841d23b07b262b4f49e25986dce24f73f554f25bc4219024414ccdd9846
 AUX splashutils-openrc-0.4.3-runlevel-fix.patch 3472 RMD160 2e45065be3e8f670034df92a83e6c8ee9f8fb237 SHA1 a4d7bae4844070697091f84bd4a7602b8eabab26 SHA256 9e122dc031acee6996375170ae8954a0ea78cc99ba9265ab2e4ba540da25cb94
@@ -27,15 +27,13 @@ DIST splashutils-lite-1.5.4.3.tar.bz2 426935 RMD160 e15b1c52d8c9c2886951fa7a674a
 DIST splashutils-lite-1.5.4.4.tar.bz2 441340 RMD160 f67a93aa38bcbda7131c8570533aa021d43bb77f SHA1 46c5aa6e25d7623f46ca2158c10c5ba5d0774744 SHA256 bc0e22293d4550281d2289672da3acb42594c18a75b9d00ba75526e05162ec6b
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
 EBUILD splashutils-1.5.4.3-r3.ebuild 8337 RMD160 9975c1064654abc08bfeb1301622d58a8f797182 SHA1 56a86aa4bad40175ca071e3936f4e997e3e6871c SHA256 21852637c1b2e12687a9bc83c183fa6c2c80aaa3c67b2511815958b52a2f5634
-EBUILD splashutils-1.5.4.4.ebuild 7574 RMD160 9f4e61527f9c98b38625112176f82002f74bf479 SHA1 6edcd5d2efbee469cba2ff9d6f82366d74d6fe6b SHA256 7a5e56b9a0c56481f35387c8326c3241aca6fb1f8ba2f016ac65f20c29732c7d
-MISC ChangeLog 35014 RMD160 e3237fa3d5fec849f2997f12b807ef6d9042f21d SHA1 cfca05821fad7583b8bcbdb96a79d4f76f800344 SHA256 9146880af5ad655e0c9320729fb31544ea31cfcb5922d82c12ed8028ef325958
+EBUILD splashutils-1.5.4.4.ebuild 7568 RMD160 7b27abe58cf2d34eed6709d40dda83df07812b4a SHA1 d7f9d45c3a34df7fd0c17e3caa83448f8844229d SHA256 4dfa2706686592f65ea57410aa3801631ddf4af7e32f1a78bbc725d361c5bffc
+MISC ChangeLog 35198 RMD160 8d91b7a93520e11481b0443dfb1fde838fdb0d5e SHA1 d114fea44f7211935c9f9bd94a6dab3a0a4e1098 SHA256 2672f7af9ba1ef098a8f87cec41d6ad8883c6ef3640908eca06b3552fbf80175
 MISC metadata.xml 290 RMD160 69b03f30fde18ee40c22f890a59849d355b0fb18 SHA1 d5a1fe4bde5716b91950bb8b3e5ca0e13b457bb7 SHA256 8cafd30cdb9d1d0db9dbf9780adaec8c687052bc8759d4b61c637c24d6e0bee7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59ovUACgkQfXuS5UK5QB2LmgP+PNFyyhGBqSJP+4xZuA6NDXen
-7P+rUofLSlfyl6TbmprntvqvJ33+v5WXvs5XecJnvd2ebeFKk981wt41HFkOEpRM
-dAC2GcvdWeHoJHg78dulxXt9NJiXl6T4DagZ7EYKFB2aeAvcO+7TtK/1tjZAJRjS
-MU/Fc7AXHdcm8/kNP8s=
-=ykAY
+iF4EAREIAAYFAk6dd8oACgkQGrk+8vGYmwf0bwEAmRrCBhIitWPLrcO94a53vE7Z
+59L0MbPdxjNtvpzrOQ0A+wfyM7jX4oX8jTIb4KhpeBDU+5vjeucQ16ptdMUiKsNA
+=Ls5A
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch
index 50a81a3d2c0d..3438fd523b2a 100644
--- a/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch
+++ b/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch
@@ -1,11 +1,15 @@
---- fbtruetype/Makefile.old	2011-07-12 16:57:03.110616657 +0300
-+++ fbtruetype/Makefile	2011-07-12 16:48:31.656254788 +0300
-@@ -23,7 +23,7 @@
+=== modified file 'fbtruetype/Makefile'
+--- fbtruetype/Makefile	2011-10-01 14:10:17 +0000
++++ fbtruetype/Makefile	2011-10-01 14:15:02 +0000
+@@ -23,8 +23,8 @@
  OBJECTS  = fbtruetype.o messages.o console.o ttf.o luxisri.o
  
  LDFLAGS  += -L$(LIBDIR)
 -LIBSS    = $(LIBDIR)/libfreetype.a $(LIBDIR)/libz.a -lm
-+LIBSS    = $(LIBDIR)/libfreetype.a $(LIBDIR)/libz.a $(LIBDIR)/libbz2.a -lm
- LIBSD    = -lfreetype -lm
+-LIBSD    = -lfreetype -lm
++LIBSS    = $(shell pkg-config freetype2 --libs --static) -lm
++LIBSD    = $(shell pkg-config freetype2 --libs) -lm
  
  CFLAGS   += -I/usr/include/freetype2
+ COMPILE  = $(CC) $(CFLAGS)
+
diff --git a/media-gfx/splashutils/splashutils-1.5.4.4.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4.ebuild
index 979277c7c160..d9ed44655c0a 100644
--- a/media-gfx/splashutils/splashutils-1.5.4.4.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.4 2011/08/28 17:48:30 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.5 2011/10/18 12:59:32 pva Exp $
 
 EAPI="2"
 
@@ -36,7 +36,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 RDEPEND="gpm? ( sys-libs/gpm )
 	truetype? ( >=media-libs/freetype-2[static-libs]
-		|| ( <app-arch/bzip2-1.0.6-r3 app-arch/bzip2[static-libs] ) )
+		|| ( <app-arch/bzip2-1.0.6-r3 app-arch/bzip2[static-libs] )
+		|| ( <sys-libs/zlib-1.2.5.1-r2 sys-libs/zlib[static-libs] ) )
 	png? ( >=media-libs/libpng-1.4.3[static-libs] )
 	mng? (
 		media-libs/lcms:0[static-libs]
@@ -75,10 +76,8 @@ src_prepare() {
 	epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch"
 
 	if use truetype ; then
-		if [[ "`freetype-config --ftversion`" > "2.4.4" ]]; then
-			cd "${SM}"
-			epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch"
-		fi
+		cd "${SM}"
+		epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch"
 	fi
 
 	cd "${S}"