projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f827271)
Fix support for multilib systems.
authorMichael Januszewski <spock@gentoo.org>
Tue, 17 Apr 2007 11:06:45 +0000 (11:06 +0000)
committerMichael Januszewski <spock@gentoo.org>
Tue, 17 Apr 2007 11:06:45 +0000 (11:06 +0000)
Package-Manager: portage-2.1.2.3

media-gfx/splashutils/ChangeLog patch | blob | history
media-gfx/splashutils/Manifest patch | blob | history
media-gfx/splashutils/files/splashutils-1.4.1-multilib.patch [new file with mode: 0644] patch | blob
media-gfx/splashutils/splashutils-1.4.1.ebuild patch | blob | history

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 1fe163e3ca8a8ba017154ca741c95d96030b0023..437a1bd6a6a13c71adeaaf6a109850120f438475 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.84 2007/04/12 04:22:37 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.85 2007/04/17 11:06:45 spock Exp $
+
+  17 Apr 2007; Michał Januszewski <spock@gentoo.org>
+  +files/splashutils-1.4.1-multilib.patch, splashutils-1.4.1.ebuild:
+  Fix support for multilib systems.
 
 *splashutils-1.4.1 (12 Apr 2007)
 
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 433bc17d36797d5a784d171de0ee1523c006fcab..5b6aed1d9b85ff14bfb52363f1b4f6af12c2b402 100644 (file)
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -33,6 +33,10 @@ AUX splashutils-1.4-remove-debug-msgs.patch 306 RMD160 d67734b3af1d40a35cf97d483
 MD5 45d1f52ef05fc96a981db3cb0e0d0e21 files/splashutils-1.4-remove-debug-msgs.patch 306
 RMD160 d67734b3af1d40a35cf97d48305e5561985fe74b files/splashutils-1.4-remove-debug-msgs.patch 306
 SHA256 69e1e3d9006f266feefe0c2e4e565d800223f8a2eca1cc51aa61d43bbf8e4e8f files/splashutils-1.4-remove-debug-msgs.patch 306
+AUX splashutils-1.4.1-multilib.patch 1892 RMD160 14678774877802baffcc8ec5ffce56611fa08bf5 SHA1 1f5cc77dd84f711381a7be0306b86616bd821105 SHA256 6678b201888cf21ea4b86252332aba6b482abfc3e21856d1f038599eadfce560
+MD5 9e0d21e4c3b1e96ee23e1b61be037c46 files/splashutils-1.4.1-multilib.patch 1892
+RMD160 14678774877802baffcc8ec5ffce56611fa08bf5 files/splashutils-1.4.1-multilib.patch 1892
+SHA256 6678b201888cf21ea4b86252332aba6b482abfc3e21856d1f038599eadfce560 files/splashutils-1.4.1-multilib.patch 1892
 AUX splashutils-depscan.patch 2197 RMD160 044f771f4d971abc177a1da9563cba76bc101d71 SHA1 6e8406a714b71446089b4337f329c9eeeff0465e SHA256 ea06dec56d412a30abe7da31ab3485ab9748cf58740aa1f08b128b0b5e1e6df9
 MD5 d78ee27cab85b59044d8ef3e7e5be4af files/splashutils-depscan.patch 2197
 RMD160 044f771f4d971abc177a1da9563cba76bc101d71 files/splashutils-depscan.patch 2197
@@ -67,18 +71,18 @@ 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.1.ebuild 6699 RMD160 a38dda8fe096f700213d319c77f002f1ccfff4ad SHA1 0448026c87e9d84e6e61ffaa2662b85d00c96220 SHA256 56ce3aaeabc2757187503233e2cc20b9ce689d9602b66bfcba5334396536d037
-MD5 9df7eeb63c8890915e09055705b9a644 splashutils-1.4.1.ebuild 6699
-RMD160 a38dda8fe096f700213d319c77f002f1ccfff4ad splashutils-1.4.1.ebuild 6699
-SHA256 56ce3aaeabc2757187503233e2cc20b9ce689d9602b66bfcba5334396536d037 splashutils-1.4.1.ebuild 6699
+EBUILD splashutils-1.4.1.ebuild 6795 RMD160 510aa4c8fc9a1359fdc777e0dbae36fdb36985d6 SHA1 cec57b3c247fa48c96d86816a388b76148957c0b SHA256 8a19b78c8a17e624c7c87c9cd7885cdf748564117bc18ed3671e587b1072b7fb
+MD5 1cdd7502e9618998481a52de4d804f82 splashutils-1.4.1.ebuild 6795
+RMD160 510aa4c8fc9a1359fdc777e0dbae36fdb36985d6 splashutils-1.4.1.ebuild 6795
+SHA256 8a19b78c8a17e624c7c87c9cd7885cdf748564117bc18ed3671e587b1072b7fb splashutils-1.4.1.ebuild 6795
 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 17156 RMD160 c0fe68387c3309435d33b2ae2980a353bb7d4822 SHA1 657b05a1f9ded356b207e2e68f1602952b987360 SHA256 75e60b0dc7b30fa07d40338e5b43514749fed1410149b9b72baad72531b980ea
-MD5 ff9f9a14e81c01e6ac23d9b71f114402 ChangeLog 17156
-RMD160 c0fe68387c3309435d33b2ae2980a353bb7d4822 ChangeLog 17156
-SHA256 75e60b0dc7b30fa07d40338e5b43514749fed1410149b9b72baad72531b980ea ChangeLog 17156
+MISC ChangeLog 17316 RMD160 48ccfe4ddb92ade400bdedd7992ceca6df90c946 SHA1 102a24a69abfc25c9b0850e60e11081eeef739f6 SHA256 ad3c3fe56d180f20f3d9a644ae00f5e2e731d8f019b4dcfc412693a2e44e6b3c
+MD5 d23ab26f0dfb6355e757740962e6ca37 ChangeLog 17316
+RMD160 48ccfe4ddb92ade400bdedd7992ceca6df90c946 ChangeLog 17316
+SHA256 ad3c3fe56d180f20f3d9a644ae00f5e2e731d8f019b4dcfc412693a2e44e6b3c ChangeLog 17316
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -98,7 +102,7 @@ SHA256 3bb29d22480ef58fa2008c08841b09b89d235eaa9905b5d068e0f530080c0db5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGHbQcchej4aZK9/cRAnCzAJ9VuRg+xyC1aMu45kRfuF099KOFJgCcDyxR
-0oA9me1RANmA2Jp8DmlKF5A=
-=IO7l
+iD8DBQFGJKpEchej4aZK9/cRAnxfAJ9i7mV2hnUc+HnOPhFDKHAbRs5TmwCeNDnu
+UfMEYvc2r2ru0inVOWpgUXs=
+=j5OU
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/splashutils-1.4.1-multilib.patch b/media-gfx/splashutils/files/splashutils-1.4.1-multilib.patch
new file mode 100644 (file)
index 0000000..171dbc7
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.4.1-multilib.patch
@@ -0,0 +1,63 @@
+diff --git a/miscsplashutils-0.1.5/Makefile b/miscsplashutils-0.1.5/Makefile
+index 24e13fb..7749b4a 100644
+--- a/miscsplashutils-0.1.5/Makefile
++++ b/miscsplashutils-0.1.5/Makefile
+@@ -1,4 +1,5 @@
+ SUBDIRS = fbtruetype kbd
++LIB           ?= lib
+ 
+ all:  fbres usleep
+ 
+@@ -18,7 +19,7 @@ clean:
+       @rm -f *.o fbres usleep
+ 
+ install:
+-      install -D fbres $(DESTDIR)/lib/splash/bin/fbres
+-      install -D usleep $(DESTDIR)/lib/splash/bin/usleep
++      install -D fbres $(DESTDIR)/$(LIB)/splash/bin/fbres
++      install -D usleep $(DESTDIR)/$(LIB)/splash/bin/usleep
+       @set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
+ 
+diff --git a/miscsplashutils-0.1.5/kbd/Makefile b/miscsplashutils-0.1.5/kbd/Makefile
+index c83d34d..fd7f0cb 100644
+--- a/miscsplashutils-0.1.5/kbd/Makefile
++++ b/miscsplashutils-0.1.5/kbd/Makefile
+@@ -1,3 +1,5 @@
++LIB ?= lib
++
+ all: fgconsole
+ 
+ fgconsole: fgconsole.o getfd.o
+@@ -7,5 +9,5 @@ clean:
+       rm -f *.o fgconsole
+ 
+ install:
+-      install -D fgconsole $(DESTDIR)/lib/splash/bin/fgconsole
++      install -D fgconsole $(DESTDIR)/$(LIB)/splash/bin/fgconsole
+ 
+diff --git a/splashutils-gentoo-1.0.1/Makefile b/splashutils-gentoo-1.0.1/Makefile
+index 0bf6b90..e6e77ac 100644
+--- a/splashutils-gentoo-1.0.1/Makefile
++++ b/splashutils-gentoo-1.0.1/Makefile
+@@ -17,7 +17,7 @@ test: test.o
+       $(CC) $(CFLAGS) $(INCLUDES) -DLIBDIR=\"$(LIB)\" -fPIC -c -o $@ $<
+ 
+ install:
+-      install -D splash.so $(DESTDIR)/lib/rcscripts/plugins/splash.so
++      install -D splash.so $(DESTDIR)/$(LIB)/rcscripts/plugins/splash.so
+ 
+ clean:
+       rm -rf *.o *.so
+diff --git a/splashutils-1.4.1/Makefile b/splashutils-1.4.1/Makefile
+index c29a15e..42105c4 100644
+--- a/splashutils-1.4.1/Makefile
++++ b/splashutils-1.4.1/Makefile
+@@ -27,7 +27,7 @@ LIB          ?= lib
+ 
+ prefix     =
+ sbindir    = ${prefix}/sbin
+-libdir     = ${prefix}/lib
++libdir     = ${prefix}/${LIB}
+ usrbindir  = ${prefix}/usr/bin
+ mandir           = ${prefix}/usr/share/man
+ 
diff --git a/media-gfx/splashutils/splashutils-1.4.1.ebuild b/media-gfx/splashutils/splashutils-1.4.1.ebuild
index 859a408d75d1941fbacedf4e2f28b4ab873494e7..52b3da3e12d00dafecb04af3859f1c7d24f742c1 100644 (file)
--- a/media-gfx/splashutils/splashutils-1.4.1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2007/04/12 04:22:37 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.4.1.ebuild,v 1.2 2007/04/17 11:06:45 spock Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -64,6 +64,9 @@ src_unpack() {
        # helper.
        rm ${S}/libs/zlib-${V_ZLIB}/Makefile
 
+       cd ${WORKDIR}
+       epatch ${FILESDIR}/${P}-multilib.patch
+
        cd ${S}
        ln -sf ${S} ${WORKDIR}/core
 
@@ -135,12 +138,14 @@ src_compile() {
 }
 
 src_install() {
+       local LIB=$(get_libdir)
+
        cd ${SM}
-       make DESTDIR=${D} install || die
+       make DESTDIR=${D} LIB=${LIB} install || die
 
        export ZLIBSRC LPNGSRC JPEGSRC FT2SRC
        cd ${S}
-       make DESTDIR=${D} install || die
+       make DESTDIR=${D} LIB=${LIB} install || die
 
        echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
        doenvd 99splash
@@ -161,12 +166,11 @@ src_install() {
 
        if has_version ">=sys-apps/baselayout-1.13.99"; then
                cd ${SG}
-               make DESTDIR=${D} install || die "failed to install the splash plugin"
+               make DESTDIR=${D} LIB=${LIB} install || die "failed to install the splash plugin"
        else
                cp ${SG}/splash-functions-bl1.sh ${D}/sbin/splash-functions.sh
        fi
 
-       LIB=$(get_libdir)
        sed -i -e "s#/lib/splash#/${LIB}/splash#" ${D}/sbin/splash-functions.sh
        keepdir /${LIB}/splash/{tmp,cache,bin}
        dosym /${LIB}/splash/bin/fbres /sbin/fbres
Unnamed repository; edit this file 'description' to name the repository.