Use correct path to klibc headers on multilib systems.

Package-Manager: portage-2.1.1_pre4-r3

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 08cb373e8a9cf5a508611c7c81b51e915424ac88..0caacf151a6a0e16dd65c203dab3acff0fda3cae 100644 (file)
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.61 2006/07/15 21:47:53 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.62 2006/08/05 18:12:32 herbs Exp $
+
+  05 Aug 2006; Herbie Hopkins <herbs@gentoo.org> splashutils-1.3-r1.ebuild:
+  Use correct path to klibc headers on multilib systems.
 
   15 Jul 2006; Michał Januszewski <spock@gentoo.org>
   +files/splashutils-1.3-pthreads.patch, splashutils-1.3-r1.ebuild:

diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index a342f5a01a81653c925b9a30b85d527edac19360..81759436addc25c39cbdfbca42e829bb6d1b3684 100644 (file)
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -43,14 +43,14 @@ EBUILD splashutils-1.1.9.8-r1.ebuild 6450 RMD160 ee8219564a3b039de20831eb52cb44d
 MD5 e79713db9ac0cc2a97fcabab4fe83275 splashutils-1.1.9.8-r1.ebuild 6450
 RMD160 ee8219564a3b039de20831eb52cb44d70fd8df87 splashutils-1.1.9.8-r1.ebuild 6450
 SHA256 05085409393be9b3561dfa05fcbac6fea86bb2aaf1c82b0b11b31ba9ab8a590b splashutils-1.1.9.8-r1.ebuild 6450
-EBUILD splashutils-1.3-r1.ebuild 6299 RMD160 c40e24d1a45a9685ec7d1e86bf617c5f624021fb SHA1 6129b99b6b6f45c62ef489a8c8a264b366af3dc8 SHA256 bbbd1727410eb50bd6e94211dc0d9e62383e282a6aaa10db686a3c145a64b8a7
-MD5 624c3cd07b0410f785600f9caff2e17a splashutils-1.3-r1.ebuild 6299
-RMD160 c40e24d1a45a9685ec7d1e86bf617c5f624021fb splashutils-1.3-r1.ebuild 6299
-SHA256 bbbd1727410eb50bd6e94211dc0d9e62383e282a6aaa10db686a3c145a64b8a7 splashutils-1.3-r1.ebuild 6299
-MISC ChangeLog 13117 RMD160 c3c5ef1b119811c160560e44a20f0432f0968f62 SHA1 1fe7f48484aed7300c463104893ccca83d1863e3 SHA256 a798b82b3795949ee30227410edc8ea1e6883b095cb744d6426f98bab28f066c
-MD5 7248eda7261ac2930024803692b89b05 ChangeLog 13117
-RMD160 c3c5ef1b119811c160560e44a20f0432f0968f62 ChangeLog 13117
-SHA256 a798b82b3795949ee30227410edc8ea1e6883b095cb744d6426f98bab28f066c ChangeLog 13117
+EBUILD splashutils-1.3-r1.ebuild 6431 RMD160 e5620426f5de102e33783e7ce5c6c2fd644866c0 SHA1 6aec9f3b9ca98518bf7a7dd5e86d39ef7119acad SHA256 2f4e18c940ab901db9651a09b720bf0de839f4d9dd988f8ec3a9b9b692d53580
+MD5 c555d3074cf41827dd5acd4ab5c1f92c splashutils-1.3-r1.ebuild 6431
+RMD160 e5620426f5de102e33783e7ce5c6c2fd644866c0 splashutils-1.3-r1.ebuild 6431
+SHA256 2f4e18c940ab901db9651a09b720bf0de839f4d9dd988f8ec3a9b9b692d53580 splashutils-1.3-r1.ebuild 6431
+MISC ChangeLog 13251 RMD160 a46bba25bb778c459cf5986da751ebfd84c78a2e SHA1 9e2ced6769c141c32205ac52eab2e3fb497ddf1a SHA256 d450d319c7120ebf72aa827c6af58e35f73f56e68ed909f51b1d27eed7485104
+MD5 c07ae391e23edb837cd2bc46c8b3942a ChangeLog 13251
+RMD160 a46bba25bb778c459cf5986da751ebfd84c78a2e ChangeLog 13251
+SHA256 d450d319c7120ebf72aa827c6af58e35f73f56e68ed909f51b1d27eed7485104 ChangeLog 13251
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -65,9 +65,9 @@ MD5 3d46e312960dacdf85b03d8ea2972d0c files/digest-splashutils-1.3-r1 1756
 RMD160 26cc3086c981639c6d77c4c2a6aaa1add6db6d82 files/digest-splashutils-1.3-r1 1756
 SHA256 70ddd8f011a31dd68111a95d08c6ec04e4f0f2ed8aed0c0c566d28e13c5e2ec7 files/digest-splashutils-1.3-r1 1756
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEuWKbchej4aZK9/cRAuu2AJ90QWHd6hIcK2E4IdEIxRlYcdt63QCdHkmb
-JMHXRqjqNhaAiQ4lTUSGWYc=
-=tJoV
+iD8DBQFE1N+a2G5bA0cA/ScRAp3qAJ9yyhOd17ONrGLwumdA/yABjPyYeQCgmiAt
+VEFemP0H2mMRx/HoRc0YerI=
+=kRm0
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/splashutils/splashutils-1.3-r1.ebuild b/media-gfx/splashutils/splashutils-1.3-r1.ebuild
index e9fcba42c85b928e703502f69ab6063da77ff079..a9626d6717389e0a23cf025211e915e2e415c43f 100644 (file)
--- a/media-gfx/splashutils/splashutils-1.3-r1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3-r1.ebuild,v 1.3 2006/07/15 21:47:53 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3-r1.ebuild,v 1.4 2006/08/05 18:12:32 herbs Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -68,7 +68,7 @@ src_unpack() {
        epatch ${FILESDIR}/splashutils-1.3-pthreads.patch
 
        # Check whether the kernel tree has been patched with fbsplash.
-       if [[ ! -e ${ROOT}/usr/lib/klibc/include/linux/console_splash.h ]]; then
+       if [[ ! -e ${ROOT}/usr/$(get_libdir)/klibc/include/linux/console_splash.h ]]; then
                ewarn "The kernel tree against which dev-libs/klibc was built was not patched"
                ewarn "with a compatible version of fbsplash. Splashutils will be compiled"
                ewarn "without fbsplash support (ie. verbose mode will not work)."
@@ -88,11 +88,14 @@ src_unpack() {
        if ! use truetype ; then
                sed -i -e 's/fbtruetype kbd/kbd/' ${SM}/Makefile
        fi
+
+       # Fix path to klibc headers on multilib systems
+       sed -i -e "s:/lib/klibc:/$(get_libdir)/klibc:" ${S}/Makefile
 }
 
 src_compile() {
        local myconf=""
-       if [[ ! -e ${ROOT}/usr/lib/klibc/include/linux/console_splash.h ]]; then
+       if [[ ! -e ${ROOT}/usr/$(get_libdir)/klibc/include/linux/console_splash.h ]]; then
                myconf="--without-fbsplash"
        else
                myconf="--with-fbsplash"