Fix the ebuild to handle multilib properly.

Package-Manager: portage-2.1.2.3

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 009d6bfb6be85309b72a3b19f0d4dd69c3194cd8..0ed7975381c60f63e6bf3f29dc958d1fb84a8993 100644 (file)
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.82 2007/04/09 11:17:49 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.83 2007/04/11 11:50:14 spock Exp $
+
+  11 Apr 2007; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.4.ebuild:
+  Fix the ebuild to handle multilib properly.
 
   09 Apr 2007; Michał Januszewski <spock@gentoo.org>
   -files/splashutils-1.3-initrd-chvt.patch,

diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 47896a9dbbf51d0e1727ba7e8a4e8cdab7659ef2..4348312f32fc6b2c1cf748673769b526d5df4827 100644 (file)
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -65,14 +65,14 @@ EBUILD splashutils-1.3.1.ebuild 7143 RMD160 c08055b999d7ebfa1cfd8cf52cbe58e75012
 MD5 2a52e2d99fbe524cfce0230cb85ff605 splashutils-1.3.1.ebuild 7143
 RMD160 c08055b999d7ebfa1cfd8cf52cbe58e750126798 splashutils-1.3.1.ebuild 7143
 SHA256 25745d5dad1162bf4ff55229c478c9ce83515b5dc2448204c92bc294d2c92a3e splashutils-1.3.1.ebuild 7143
-EBUILD splashutils-1.4.ebuild 6539 RMD160 c20df54bddc39e5b3136312617c681bd0949dd2b SHA1 21f60b1d19d5ec16444a430d10f674374a11c08e SHA256 a081bc05df5d4980be28537afd1acbd3f04c96552b49d441153a654a3de29337
-MD5 0d0ecd3ad699f122420bb8abc7213b13 splashutils-1.4.ebuild 6539
-RMD160 c20df54bddc39e5b3136312617c681bd0949dd2b splashutils-1.4.ebuild 6539
-SHA256 a081bc05df5d4980be28537afd1acbd3f04c96552b49d441153a654a3de29337 splashutils-1.4.ebuild 6539
-MISC ChangeLog 16895 RMD160 1eb52abeeeaff099e6e04d0729f6148548cd432f SHA1 0086c63f4ec2568340ed671d08a950c147a36bf7 SHA256 9a43886e3e73977322fdee8441e848fc4f31bc32a9b29f20b8ad3dc6c0472992
-MD5 c0d0f41fa737fd68b6686b3dfec2796e ChangeLog 16895
-RMD160 1eb52abeeeaff099e6e04d0729f6148548cd432f ChangeLog 16895
-SHA256 9a43886e3e73977322fdee8441e848fc4f31bc32a9b29f20b8ad3dc6c0472992 ChangeLog 16895
+EBUILD splashutils-1.4.ebuild 6651 RMD160 58348f76118f783accda8caca78171a7ec879a2f SHA1 d86aa8ad86dec657dfd36990ee30b196d5807a6d SHA256 0ba9f3cd956391e67eb8e259561b7915da066128c1d7e24da8d1dd75f7f847f1
+MD5 784bdd6c520dc33245ecbdead41e26e4 splashutils-1.4.ebuild 6651
+RMD160 58348f76118f783accda8caca78171a7ec879a2f splashutils-1.4.ebuild 6651
+SHA256 0ba9f3cd956391e67eb8e259561b7915da066128c1d7e24da8d1dd75f7f847f1 splashutils-1.4.ebuild 6651
+MISC ChangeLog 17022 RMD160 75bfcb2c1c2c4050c811ee58f52edef6eca342de SHA1 78120e1bf726627e246a080ec6117a5936b84796 SHA256 e6f96844497bf200689dc4a12d958ae4ac5ceced8ec0318b938526f5cbefa738
+MD5 a7f43990694761baa46221f5c09edbda ChangeLog 17022
+RMD160 75bfcb2c1c2c4050c811ee58f52edef6eca342de ChangeLog 17022
+SHA256 e6f96844497bf200689dc4a12d958ae4ac5ceced8ec0318b938526f5cbefa738 ChangeLog 17022
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -89,7 +89,7 @@ SHA256 08f814d0b8340fbda15e2cbfeac683314c4c0e8376776da2f98c495b8613c7f3 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGGiDZchej4aZK9/cRApTsAJ9I8MLPCrQUaeRZ819GnnKhIUZ4LQCeKgs9
-vaABmV/Y9nNm1ys/CZRjZ0U=
-=+s5I
+iD8DBQFGHMttchej4aZK9/cRAsMQAJ9akph4S/SuA9ZmFcuHRDasYmlNewCfZkEl
+FsEbiykO1mkzOgTVSZ5GAjM=
+=UyTt
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/splashutils/splashutils-1.4.ebuild b/media-gfx/splashutils/splashutils-1.4.ebuild
index 767a7a14ff1bce0dc0f26adac3c9a3933cecc34f..f2b8ab66ab48206b32a7a0dfa9a9729397b9d9d1 100644 (file)
--- a/media-gfx/splashutils/splashutils-1.4.ebuild
+++ b/media-gfx/splashutils/splashutils-1.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.4.ebuild,v 1.2 2007/04/06 09:02:01 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.4.ebuild,v 1.3 2007/04/11 11:50:14 spock Exp $
 
-inherit eutils multilib toolchain-funcs
+inherit eutils multilib flag-o-matic toolchain-funcs
 
 MISCSPLASH="miscsplashutils-0.1.5"
 GENTOOSPLASH="splashutils-gentoo-1.0.0"
@@ -116,6 +116,7 @@ src_compile() {
 
        cd ${S}
        ./configure \
+               --with-fifo=$(get_libdir)/splash/cache/.splash \
                $(use_with png) \
                $(use_with mng) \
                $(use_with gpm) \
@@ -129,6 +130,7 @@ src_compile() {
 
        if has_version ">=sys-apps/baselayout-1.13.99"; then
                cd ${SG}
+               append-flags "-DLIBDIR=\\\"$(get_libdir)\\\""
                emake || die "failed to build the splash plugin"
        fi
 }