Fix bug #381189.

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

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 2224c4b5a53eff5dc931ec37e692e5b450f7d4ad..669fb9f1849db4c636d179baca31f0c01aec67b9 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.194 2011/08/28 17:48:30 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.195 2011/09/04 14:13:19 spock Exp $
+
+  04 Sep 2011; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.5.4.3-r3.ebuild:
+  Fix bug #381189.
 
   28 Aug 2011; Michał Januszewski <spock@gentoo.org>
   splashutils-1.5.4.4.ebuild:

diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index e96bd59709905f4ca3cfbc6f4ed7819c749ef7cb..4aee1a90f3d5867a752288e23aea12c707ddfdd2 100644 (file)
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -26,14 +26,14 @@ DIST splashutils-gentoo-1.0.17.tar.bz2 15814 RMD160 283baea7b24cd5cc41c63da9fd8f
 DIST splashutils-lite-1.5.4.3.tar.bz2 426935 RMD160 e15b1c52d8c9c2886951fa7a674a9fc1707a0316 SHA1 943ffaae0b96305809ffb52f417a0fca2651a742 SHA256 3f21bd57ac67bd7426caa3ff5791d3609567db3bcd4319da29867ec42cadb362
 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.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 34907 RMD160 3677d41324a62597e280d5fdb0b04059f67f1047 SHA1 0d8aaca4e8adfb7bae54bf77c279d66489b22aa9 SHA256 489492a71e10b698864ec0f16834f4cba452a23e1a751b540298b22daf82341f
+MISC ChangeLog 35014 RMD160 e3237fa3d5fec849f2997f12b807ef6d9042f21d SHA1 cfca05821fad7583b8bcbdb96a79d4f76f800344 SHA256 9146880af5ad655e0c9320729fb31544ea31cfcb5922d82c12ed8028ef325958
 MISC metadata.xml 311 RMD160 77b41213be37a5c0c7d5822d480ae11acc1af542 SHA1 34dbe221785f338326999be3fdabc0a29df8cf31 SHA256 d548d0cef598c99abeeba18f5308fe482651ebea18746195d86e53ba334f3392
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5af3gACgkQchej4aZK9/dsNwCfRF7F5hxEQu6Ydeibr8tF3Pwb
-tNAAn36OOWcTdg0voxmTPIWcOLI4Z2UK
-=dITB
+iEYEARECAAYFAk5jh40ACgkQchej4aZK9/fnPACfSX0ONye6hJ7VywrQ9cAode2i
+kygAnRAHFWbqOdMDJlGUydyKK4Zq30Ak
+=N8rd
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild b/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild
index 6c858cd21ffff6dcd05f413af345398e9c39fba7..5cd962b128eee9b2dcc9001d534b6aa106ac5daf 100644 (file)
--- a/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4.3-r3.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.3-r3.ebuild,v 1.16 2011/06/08 13:25:52 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild,v 1.17 2011/09/04 14:13:19 spock Exp $
 
 EAPI="2"
 
@@ -35,7 +35,8 @@ 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]
+               || ( <app-arch/bzip2-1.0.6-r3 app-arch/bzip2[static-libs] ) )
        png? ( >=media-libs/libpng-1.4.3[static-libs] )
        mng? (
                media-libs/lcms:0[static-libs]