Fix build issue in stable, bug #384131.

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

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index a4bb04115e08eb819e990e0e0194658e797f4a5d..26ce25062e6b9bd93cece5344cc86a9a2af0f500 100644 (file)
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,9 @@
 # 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.196 2011/10/18 12:59:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.197 2011/10/19 03:09:22 pva Exp $
+
+  19 Oct 2011; Peter Volkov <pva@gentoo.org> splashutils-1.5.4.3-r3.ebuild:
+  Fix build issue in stable, bug #384131.
 
   18 Oct 2011; Peter Volkov <pva@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 1bb541733a2ee6e47fe50696fce0ad5cab9e6150..b186dccb92cc1505fa165c6dbcb497774e8c2323 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 8337 RMD160 9975c1064654abc08bfeb1301622d58a8f797182 SHA1 56a86aa4bad40175ca071e3936f4e997e3e6871c SHA256 21852637c1b2e12687a9bc83c183fa6c2c80aaa3c67b2511815958b52a2f5634
+EBUILD splashutils-1.5.4.3-r3.ebuild 8406 RMD160 c203206191e1855f33f6dabdbfdf015a229741dc SHA1 f1b1206bc8fc4d210df9a269ed67fb0fafbd506a SHA256 0becb5d79a54570f78d516cbf3621a754e8da8af9bd141b253272a34d0db2772
 EBUILD splashutils-1.5.4.4.ebuild 7568 RMD160 7b27abe58cf2d34eed6709d40dda83df07812b4a SHA1 d7f9d45c3a34df7fd0c17e3caa83448f8844229d SHA256 4dfa2706686592f65ea57410aa3801631ddf4af7e32f1a78bbc725d361c5bffc
-MISC ChangeLog 35198 RMD160 8d91b7a93520e11481b0443dfb1fde838fdb0d5e SHA1 d114fea44f7211935c9f9bd94a6dab3a0a4e1098 SHA256 2672f7af9ba1ef098a8f87cec41d6ad8883c6ef3640908eca06b3552fbf80175
+MISC ChangeLog 35317 RMD160 7a269669286060950f3a3e5cdba8de81c44e76a4 SHA1 77c1f24957afea857560f2850a3ec1e929b7ef8b SHA256 f940b700e391993ee6639ea758013f267d11b968a09f2896d2a92d5e17583ed2
 MISC metadata.xml 290 RMD160 69b03f30fde18ee40c22f890a59849d355b0fb18 SHA1 d5a1fe4bde5716b91950bb8b3e5ca0e13b457bb7 SHA256 8cafd30cdb9d1d0db9dbf9780adaec8c687052bc8759d4b61c637c24d6e0bee7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6dd8oACgkQGrk+8vGYmwf0bwEAmRrCBhIitWPLrcO94a53vE7Z
-59L0MbPdxjNtvpzrOQ0A+wfyM7jX4oX8jTIb4KhpeBDU+5vjeucQ16ptdMUiKsNA
-=Ls5A
+iF4EAREIAAYFAk6ePvcACgkQGrk+8vGYmwfL5wEA93h+DBXnUZxYBk0hAdFl5JXq
+HK2HRGVNSvXrZKQgIZcA/icftFlGTFYX/tEjfilX14leRL3rpwIsIfQjsYDYZ1Qy
+=noL5
 -----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 5cd962b128eee9b2dcc9001d534b6aa106ac5daf..a1811a3122f45b1b17692466a60f602320995d93 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.17 2011/09/04 14:13:19 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild,v 1.18 2011/10/19 03:09:22 pva Exp $
 
 EAPI="2"
 
@@ -107,6 +107,8 @@ src_prepare() {
        epatch "${FILESDIR}"/splashutils-1.5.4.3-nondefault-runlevel.patch
        epatch "${FILESDIR}"/splashutils-1.5.4.3-openrc-effects.patch
        epatch "${FILESDIR}"/initrd.splash-cmp-str-instead-of-int.patch
+       cd ${SM}
+       epatch "${FILESDIR}"/splashutils-1.5.4.4-freetype-bz2.patch
        cd "${S}"
 
        # Latest version of klibc defined its own version of ferror, so there is