Fix bug #380281.

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

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index fe8090c13e445357658e06ed89693b16d3047b39..2224c4b5a53eff5dc931ec37e692e5b450f7d4ad 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.193 2011/07/23 22:36:21 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.194 2011/08/28 17:48:30 spock Exp $
+
+  28 Aug 2011; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.5.4.4.ebuild:
+  Fix bug #380281.
 
   23 Jul 2011; Michał Januszewski <spock@gentoo.org>
   splashutils-1.5.4.4.ebuild, +files/splashutils-1.5.4.4-freetype-bz2.patch:

diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index b67cfca7950b26add8fa1b6f1f051cbf96defa8e..e96bd59709905f4ca3cfbc6f4ed7819c749ef7cb 100644 (file)
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -27,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 7512 RMD160 adab187a8f1e45c3452ba8706398b585764d2fe0 SHA1 84023b9722384e77fab92f3daa604622b0e005fa SHA256 4ef8f0a821a5d1f9ac121b212c5d8d5839cc380189bc330971f024fa1ef66392
-MISC ChangeLog 34803 RMD160 b2d000bbbbb187e29105089775ec2a92c0bdf341 SHA1 e0a6068286990d8f284091882f2751254b8306ac SHA256 f094200327b7a8d1a797152f591173a30c7435e1110767f297648e854f8595b1
+EBUILD splashutils-1.5.4.4.ebuild 7574 RMD160 9f4e61527f9c98b38625112176f82002f74bf479 SHA1 6edcd5d2efbee469cba2ff9d6f82366d74d6fe6b SHA256 7a5e56b9a0c56481f35387c8326c3241aca6fb1f8ba2f016ac65f20c29732c7d
+MISC ChangeLog 34907 RMD160 3677d41324a62597e280d5fdb0b04059f67f1047 SHA1 0d8aaca4e8adfb7bae54bf77c279d66489b22aa9 SHA256 489492a71e10b698864ec0f16834f4cba452a23e1a751b540298b22daf82341f
 MISC metadata.xml 311 RMD160 77b41213be37a5c0c7d5822d480ae11acc1af542 SHA1 34dbe221785f338326999be3fdabc0a29df8cf31 SHA256 d548d0cef598c99abeeba18f5308fe482651ebea18746195d86e53ba334f3392
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4rTQIACgkQchej4aZK9/eKeACeMmRZwfyhP76kwv/PI8bTztbC
-VwgAn2XooIa8ut0nZeUSw65+nD/vjRo+
-=s2VZ
+iEYEARECAAYFAk5af3gACgkQchej4aZK9/dsNwCfRF7F5hxEQu6Ydeibr8tF3Pwb
+tNAAn36OOWcTdg0voxmTPIWcOLI4Z2UK
+=dITB
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/splashutils/splashutils-1.5.4.4.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4.ebuild
index 0dae206dbd24d309cf939f737a5d226007e924ed..979277c7c16058ec20b0b0aebafdfc86e2969de0 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.3 2011/07/23 22:36:21 spock Exp $
+# $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 $
 
 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[static-libs] )
+       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]