Fix bug #374203 (patch by Theofilos Intzoglou).

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

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 6f8874c1b8f51b56baef5fb1d5cee306d683f4fb..fe8090c13e445357658e06ed89693b16d3047b39 100644 (file)
--- 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.192 2011/06/14 21:33:32 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.193 2011/07/23 22:36:21 spock Exp $
+
+  23 Jul 2011; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.5.4.4.ebuild, +files/splashutils-1.5.4.4-freetype-bz2.patch:
+  Fix bug #374203 (patch by Theofilos Intzoglou).
 
   14 Jun 2011; Michał Januszewski <spock@gentoo.org>
   splashutils-1.5.4.4.ebuild, +files/splashutils-1.5.4.4-gentoo-typo-fix.patch:

diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 49a631475ac881e1d05b59c2455bb0f3b563a051..b67cfca7950b26add8fa1b6f1f051cbf96defa8e 100644 (file)
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -13,6 +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-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
@@ -26,13 +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 8267 RMD160 98233f93e40db9b33a54c596e634b8bac2c8cfe0 SHA1 667af4c6d95d8f230f12bb699c48742180d7c9e3 SHA256 ff8ffdd325ac56aaad4a113c396afd1414651dbed863bf4430ac6c57b7e856f8
-EBUILD splashutils-1.5.4.4.ebuild 7329 RMD160 ec7a63bf7a4e15955877eb8ddb2b6b3f483629e5 SHA1 45dea1605dfeba57904662782dc14929437428d0 SHA256 c2ea9fc94e4a589b572d9cf1ae1d99506fcff7725636a8b3d4c8ff2e3bcbd487
-MISC ChangeLog 34621 RMD160 efc5a51cdf95024ea6e2d47caa226f0e739992cf SHA1 e03b8445d5dc1fbaea25c7d3e2280879ae3515a2 SHA256 aba354141c7413ed62cc9027231ced18070d8ddb6427f98778f6594e27548cd8
+EBUILD splashutils-1.5.4.4.ebuild 7512 RMD160 adab187a8f1e45c3452ba8706398b585764d2fe0 SHA1 84023b9722384e77fab92f3daa604622b0e005fa SHA256 4ef8f0a821a5d1f9ac121b212c5d8d5839cc380189bc330971f024fa1ef66392
+MISC ChangeLog 34803 RMD160 b2d000bbbbb187e29105089775ec2a92c0bdf341 SHA1 e0a6068286990d8f284091882f2751254b8306ac SHA256 f094200327b7a8d1a797152f591173a30c7435e1110767f297648e854f8595b1
 MISC metadata.xml 311 RMD160 77b41213be37a5c0c7d5822d480ae11acc1af542 SHA1 34dbe221785f338326999be3fdabc0a29df8cf31 SHA256 d548d0cef598c99abeeba18f5308fe482651ebea18746195d86e53ba334f3392
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3307kACgkQchej4aZK9/cEVQCeJUjI20zNoO8r82VjISWnjlAR
-5NIAn3tu2G4rqq/YXWgEe0bWCdNbYV3t
-=5g45
+iEYEARECAAYFAk4rTQIACgkQchej4aZK9/eKeACeMmRZwfyhP76kwv/PI8bTztbC
+VwgAn2XooIa8ut0nZeUSw65+nD/vjRo+
+=s2VZ
 -----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
new file mode 100644 (file)
index 0000000..50a81a3
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch
@@ -0,0 +1,11 @@
+--- 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 @@
+ 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
+ 
+ CFLAGS   += -I/usr/include/freetype2

diff --git a/media-gfx/splashutils/splashutils-1.5.4.4.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4.ebuild
index 107da13e24645fb3d0269ec4e828870b9eb07591..0dae206dbd24d309cf939f737a5d226007e924ed 100644 (file)
--- 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.2 2011/06/14 21:33:32 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.3 2011/07/23 22:36:21 spock Exp $
 
 EAPI="2"
 
@@ -35,7 +35,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 RDEPEND="gpm? ( sys-libs/gpm )
-       truetype? ( >=media-libs/freetype-2 )
+       truetype? ( >=media-libs/freetype-2[static-libs] )
        png? ( >=media-libs/libpng-1.4.3[static-libs] )
        mng? (
                media-libs/lcms:0[static-libs]
@@ -73,6 +73,13 @@ src_prepare() {
        cd "${SG}"
        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
+       fi
+
        cd "${S}"
        ln -sf "${S}/src" "${WORKDIR}/core"