From: Michael Januszewski Date: Sat, 13 Jan 2007 22:54:30 +0000 (+0000) Subject: Add a fix for bug #161129. Remove an old ebuild. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7aabaa2c648e5892fa777a0b5ad64e67001648c1;p=gentoo.git Add a fix for bug #161129. Remove an old ebuild. Package-Manager: portage-2.1.2_rc4-r9 --- diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest index cb5187c955ad..a378de3492d8 100644 --- a/media-gfx/splashutils/Manifest +++ b/media-gfx/splashutils/Manifest @@ -13,14 +13,6 @@ AUX splashutils-1.1.9.10-ppc-2.6.14.patch 749 RMD160 0642a987ff97cc18294840c37a2 MD5 6b70ab6899c37465a35de0f0a89c6365 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749 RMD160 0642a987ff97cc18294840c37a2f88aa4f252450 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749 SHA256 3995fd9d153a80f709882cbafc9c2330061eb0c8b6187b136ce79e956617f000 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749 -AUX splashutils-1.3-fdset.patch 373 RMD160 120858f4ba1f70d9c94214204b12ba973336a9e3 SHA1 34cdbb332468a900f2204d31f2ef6e497560601f SHA256 a6c177ef2703b413ef8449182b00dd3619033dfdc3b43901858a675f91f55fa0 -MD5 440a1a6ed07852e0f4ddae55fb566ca1 files/splashutils-1.3-fdset.patch 373 -RMD160 120858f4ba1f70d9c94214204b12ba973336a9e3 files/splashutils-1.3-fdset.patch 373 -SHA256 a6c177ef2703b413ef8449182b00dd3619033dfdc3b43901858a675f91f55fa0 files/splashutils-1.3-fdset.patch 373 -AUX splashutils-1.3-pthreads.patch 1375 RMD160 3bbbccb8c42910428b319ab28655ef3a8a1a81bd SHA1 5dac07fcd6f010eb308a026b6fa4274643403fc1 SHA256 db76a9c9c9c3bfe06cfd3e7532b1aaa7bb702b1eef387b8395bf03bca9f8ff3a -MD5 e88a1248bcf97dd10b7598a69b31ee1c files/splashutils-1.3-pthreads.patch 1375 -RMD160 3bbbccb8c42910428b319ab28655ef3a8a1a81bd files/splashutils-1.3-pthreads.patch 1375 -SHA256 db76a9c9c9c3bfe06cfd3e7532b1aaa7bb702b1eef387b8395bf03bca9f8ff3a files/splashutils-1.3-pthreads.patch 1375 AUX splashutils-1.3-r2-fbsplash.patch 412 RMD160 99458341f19af11f0c7782d46dbbde68c37dc802 SHA1 0b0603a7f471af2c9e6ebd478d50982c3bf39046 SHA256 ed4e3498daf3d6505e11c9b0b05b89aea2727dfa720f7573a25e4fd37c98b419 MD5 b20b7397cc53750256712a2732601843 files/splashutils-1.3-r2-fbsplash.patch 412 RMD160 99458341f19af11f0c7782d46dbbde68c37dc802 files/splashutils-1.3-r2-fbsplash.patch 412 @@ -38,12 +30,10 @@ DIST jpegsrc.v6b.tar.gz 613261 RMD160 18892206014fbb8cae2a44e281f4ed53feaf7882 S DIST klibc-1.0.8.tar.bz2 446138 RMD160 006511b5178fc32cebd801ee399cc792b545418c SHA1 74d51df90912e5997adb17e7169222d358dbc837 SHA256 3d39bb503e2fc0ac9782edd235e06015bd4f14fe8bd4318042b208f3a9ce529a DIST libpng-1.2.8.tar.bz2 384970 RMD160 7de7456faaa4e4361b6b7ed74c87f0702f9cc88c SHA1 b6d73493eea4095166118b298efecb54a8e3d2f5 SHA256 9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b DIST miscsplashutils-0.1.3.tar.bz2 91825 RMD160 47516ec50225ef18fd42e36d58e90e57bfc0dbac SHA1 844da6370e2a15da842bed109cc2574318bc25a0 SHA256 16fcb4d199e071a822d744bbd9238609a2175d512fc1c019018c05501cb23bdb -DIST miscsplashutils-0.1.4.tar.bz2 93298 RMD160 4916038efc966219cc7780c6d53a4f937e4c9c83 SHA1 f074fc989cf13d2a7297d4b4218133099097a49d SHA256 51a39795eadd8bf5f0dcd75bf8f041cda71a02cabe399831a5b739efe024843f DIST miscsplashutils-0.1.5.tar.bz2 91898 RMD160 1930081408fd6bad6f60db883127f22ff727f83e SHA1 ac35d4a09c3d84f0fd704c0296c1ee13172036a0 SHA256 906163c75d487a00ba7d6b287e20e4ce195febcd4fdb8592d53827c2f8a28142 DIST splashutils-gentoo-0.1.12.tar.bz2 7563 RMD160 5c8518b24bc1bbfaea9bf81f1b71eb7745eb8684 SHA1 8fd8f770d359c0d094f4b3e2cb535f35a37d2b5d SHA256 9118fb36f2352bf65ba69d4b9eebe916b25be028c0b7b1878d5d23cb675cd3e3 DIST splashutils-gentoo-0.1.14.tar.bz2 7750 RMD160 680efa24119dcf699f37a9f295e3f81faebbdc18 SHA1 55285679ca778c82a5e8363526901689dc7b6cba SHA256 2515416c98bcf8e4e0d217cafc74b507295cb03d915d78b224683577159ae9dc -DIST splashutils-gentoo-0.5.1.tar.bz2 7514 RMD160 5a5c9692269784b96379a3bf8abf0e7408a1ec14 SHA1 d7da87bb4fd8b45e2ddfab75d04d75b8a48290b7 SHA256 956251cb3c2ed387e97dec49cc16de780baed15c7dd73085f82cca3acec9333e -DIST splashutils-gentoo-0.5.2.tar.bz2 7529 RMD160 a82c2a73ca51f5980be507038f96c30a9485da7a SHA1 30995e01cc547ee3dc5291562ab155f073847f67 SHA256 a3399dcae60b201d14da9a2c9806d845a3066e8dc93220eaabe193e12585e2c3 +DIST splashutils-gentoo-0.5.2.1.tar.bz2 7522 RMD160 5e0b94448dafd156e60bf92225945e2e508036a1 SHA1 51be358941801e8874d479f4671ae2b2b558e841 SHA256 06cbe08b0b10a95d4eb3829294934bebffe2db63291bd4ec11a62c5ffe813560 DIST splashutils-gentoo-0.5.3.tar.bz2 6796 RMD160 19952bd63cf6a4e512d3c604e4e015e79d0c2187 SHA1 5097d92cc9b8047072d46f99b898ba1678b6f494 SHA256 f784704b11c8d6e884a652cc0084117ccb4e28392ba3acfabd060fc7358aa100 DIST splashutils-lite-1.1.9.10.tar.bz2 55094 RMD160 274cfc9a79b69091b0feba8f6d64e3eb965dfb9a SHA1 c4bc383f40bd4f3cf45bd251fa133b59c6bd1d49 SHA256 de38e284103ed569360caf5d555d784309afea7625bad7acd689399d26c3955c DIST splashutils-lite-1.1.9.8.tar.bz2 55013 RMD160 377396b94562f4cde5e298170f762bb6518545ef SHA1 7d90c9b56d4d54083d21b618811eb225d456df0c SHA256 4f7ce63a2ec11884b4d624c334a93ddd5806f8b0acd5f80fc1e9edf369384f54 @@ -58,14 +48,10 @@ 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 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 -EBUILD splashutils-1.3-r2.ebuild 6985 RMD160 3478daeae7cadfb0270159e301ac0b59977f2948 SHA1 ea89435cd86fbc5ed8fdb0739bd049ca0ce48870 SHA256 78706bdd83e7bc0a562a394b5a84d81831b6b7542f35868416ac04b558c80f15 -MD5 d91de9d33486316103f638ed86f97e56 splashutils-1.3-r2.ebuild 6985 -RMD160 3478daeae7cadfb0270159e301ac0b59977f2948 splashutils-1.3-r2.ebuild 6985 -SHA256 78706bdd83e7bc0a562a394b5a84d81831b6b7542f35868416ac04b558c80f15 splashutils-1.3-r2.ebuild 6985 +EBUILD splashutils-1.3-r2.ebuild 6987 RMD160 aa8562712252620bacbb71044e3866d0ca2636f6 SHA1 1fd4a10b82e52983361a21357621a05aff2e033e SHA256 d16c69bc5dbb8eed0ba61ae08376e65a365527aad6854919786be88810742779 +MD5 75f58b5a0dcc874defc4d5e05a3c4cf2 splashutils-1.3-r2.ebuild 6987 +RMD160 aa8562712252620bacbb71044e3866d0ca2636f6 splashutils-1.3-r2.ebuild 6987 +SHA256 d16c69bc5dbb8eed0ba61ae08376e65a365527aad6854919786be88810742779 splashutils-1.3-r2.ebuild 6987 EBUILD splashutils-1.3-r3.ebuild 7102 RMD160 c6a3fe82db8744a9bd89321e7ac15c580f4b4173 SHA1 d39d5680fe4ec6ced103baff87995718b78c841b SHA256 c5e72370a054e726d9821afe712da4652520d528a28c5be7f5b84772b3a012ba MD5 683f7b989112132389cd4860a104652c splashutils-1.3-r3.ebuild 7102 RMD160 c6a3fe82db8744a9bd89321e7ac15c580f4b4173 splashutils-1.3-r3.ebuild 7102 @@ -84,19 +70,16 @@ SHA256 ae313288aa756133eb20f3c3f738003bcdf7176636cabd47918916dae8fbd036 files/di MD5 f94a2c7d921f0fb8a93e7870384730a7 files/digest-splashutils-1.1.9.8-r1 2009 RMD160 98e1467215be8e850a1164aa7d86833e67680991 files/digest-splashutils-1.1.9.8-r1 2009 SHA256 791d499355b791860bab3f2fc5b30e3a946536395d503bfa7bc4af4ddf2b19f7 files/digest-splashutils-1.1.9.8-r1 2009 -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 -MD5 4ca85a62e94c210cf461eb6ba2172e72 files/digest-splashutils-1.3-r2 1756 -RMD160 dd947b2bba697a47bb0f235139ea884809b74a1d files/digest-splashutils-1.3-r2 1756 -SHA256 11721d4526a8e9b47e1c29ec0d99ee2862e7543b1b0968aeba30e331acf70e2a files/digest-splashutils-1.3-r2 1756 +MD5 b2894b2b478d2da6f55408b858b89069 files/digest-splashutils-1.3-r2 1762 +RMD160 53fdbe93b2cf7a24e4350968e4680dc264ff0a56 files/digest-splashutils-1.3-r2 1762 +SHA256 f218ccab115663b1c0b49b96fca381490895de58baf92f6d7c8d176b1ea59109 files/digest-splashutils-1.3-r2 1762 MD5 4d847b245ed019bdbc5e49db00f16411 files/digest-splashutils-1.3-r3 1756 RMD160 6cf154f3a835edc1b7c14afbc1880a1debeebd98 files/digest-splashutils-1.3-r3 1756 SHA256 033b154e5cba7f58d9cce3d213a3b1f229e3750c78526e26cd04d9a5fac383a4 files/digest-splashutils-1.3-r3 1756 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFadCrchej4aZK9/cRAoa6AJ45rl1HnTqXYFtCFtLcnnEqy5t1dwCfbVHb -OscDFgG1YCseq8xvgKeEWmU= -=D7wN +iD8DBQFFqWMbchej4aZK9/cRAnj1AJ9OJ6PUmYDnZV7krg0NAtfxhvK0FQCdH7nd +K9+xdba2KkV3PmRchgF9744= +=RCb9 -----END PGP SIGNATURE----- diff --git a/media-gfx/splashutils/files/digest-splashutils-1.3-r1 b/media-gfx/splashutils/files/digest-splashutils-1.3-r1 deleted file mode 100644 index 6152d6dd1f96..000000000000 --- a/media-gfx/splashutils/files/digest-splashutils-1.3-r1 +++ /dev/null @@ -1,21 +0,0 @@ -MD5 ec1b903e4be5f073caa72458ea58c29c freetype-2.1.9.tar.bz2 992394 -RMD160 1dd8fb6fda8b159ef0d2ebedeca99a67ed65dc72 freetype-2.1.9.tar.bz2 992394 -SHA256 4dabc3b38405f5c5f03b8f14d8902a9d506713182baf2baec9dea509515d4b6f freetype-2.1.9.tar.bz2 992394 -MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261 -RMD160 18892206014fbb8cae2a44e281f4ed53feaf7882 jpegsrc.v6b.tar.gz 613261 -SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d jpegsrc.v6b.tar.gz 613261 -MD5 00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2 384970 -RMD160 7de7456faaa4e4361b6b7ed74c87f0702f9cc88c libpng-1.2.8.tar.bz2 384970 -SHA256 9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b libpng-1.2.8.tar.bz2 384970 -MD5 bece4af3463d38a0e0c9f8fd5d6e2c03 miscsplashutils-0.1.4.tar.bz2 93298 -RMD160 4916038efc966219cc7780c6d53a4f937e4c9c83 miscsplashutils-0.1.4.tar.bz2 93298 -SHA256 51a39795eadd8bf5f0dcd75bf8f041cda71a02cabe399831a5b739efe024843f miscsplashutils-0.1.4.tar.bz2 93298 -MD5 bd121b76f3d2f189e389c7a818296752 splashutils-gentoo-0.5.1.tar.bz2 7514 -RMD160 5a5c9692269784b96379a3bf8abf0e7408a1ec14 splashutils-gentoo-0.5.1.tar.bz2 7514 -SHA256 956251cb3c2ed387e97dec49cc16de780baed15c7dd73085f82cca3acec9333e splashutils-gentoo-0.5.1.tar.bz2 7514 -MD5 4ccfe3fcfba17e44c19df6d8b6a4a2e6 splashutils-lite-1.3.tar.bz2 61079 -RMD160 4d5296ed0b2a7a7783cfe5f9f25b53fa56307bc7 splashutils-lite-1.3.tar.bz2 61079 -SHA256 4f94e91ee81acea4d6ef8d481b32cf15cd7987030e048e0e249eec995ef8a5d0 splashutils-lite-1.3.tar.bz2 61079 -MD5 dee233bf288ee795ac96a98cc2e369b6 zlib-1.2.3.tar.bz2 425209 -RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 zlib-1.2.3.tar.bz2 425209 -SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca zlib-1.2.3.tar.bz2 425209 diff --git a/media-gfx/splashutils/files/splashutils-1.3-fdset.patch b/media-gfx/splashutils/files/splashutils-1.3-fdset.patch deleted file mode 100644 index 38d636521f63..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.3-fdset.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/core/render.c b/core/render.c -index 290ea97..47319a8 100644 ---- a/core/render.c -+++ b/core/render.c -@@ -9,8 +9,15 @@ - * - */ - -+/* -+ * HACK WARNING: -+ * This is necessary to get FD_SET and FD_ZERO on platforms other than x86. -+ */ -+ - #ifdef TARGET_KERNEL -+#define __KERNEL__ - #include -+#undef __KERNEL__ - #endif - - #include diff --git a/media-gfx/splashutils/files/splashutils-1.3-pthreads.patch b/media-gfx/splashutils/files/splashutils-1.3-pthreads.patch deleted file mode 100644 index 340b81a9357b..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.3-pthreads.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/core/daemon.c b/core/daemon.c -index 5f3f7db..0cf2e23 100644 ---- a/core/daemon.c -+++ b/core/daemon.c -@@ -98,9 +98,10 @@ void *thf_anim(void *unused) - anim *a = NULL, *ca; - item *i; - mng_anim *mng; -- int delay = 10000; -+ int delay = 10000, oldstate; - - /* Render the first frame of all animations on the screen. */ -+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate); - pthread_mutex_lock(&mtx_paint); - for (i = anims.head; i != NULL; i = i->next) { - ca = i->p; -@@ -113,9 +114,10 @@ void *thf_anim(void *unused) - anim_render_frame(ca); - } - pthread_mutex_unlock(&mtx_paint); -+ pthread_setcancelstate(oldstate, NULL); - - while(1) { -- -+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate); - pthread_mutex_lock(&mtx_paint); - /* Find the shortest delay. */ - for (i = anims.head; i != NULL; i = i->next) { -@@ -133,9 +135,11 @@ void *thf_anim(void *unused) - } - } - pthread_mutex_unlock(&mtx_paint); -+ pthread_setcancelstate(oldstate, NULL); - - usleep(delay * 1000); - -+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate); - pthread_mutex_lock(&mtx_paint); - /* Don't paint anything if we aren't in silent mode. */ - if (ctty != CTTY_SILENT) -@@ -161,6 +165,7 @@ void *thf_anim(void *unused) - } - - next: pthread_mutex_unlock(&mtx_paint); -+ pthread_setcancelstate(oldstate, NULL); - - a = NULL; - delay = 10000; diff --git a/media-gfx/splashutils/splashutils-1.3-r1.ebuild b/media-gfx/splashutils/splashutils-1.3-r1.ebuild deleted file mode 100644 index a9626d671738..000000000000 --- a/media-gfx/splashutils/splashutils-1.3-r1.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# 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.4 2006/08/05 18:12:32 herbs Exp $ - -inherit eutils multilib toolchain-funcs - -MISCSPLASH="miscsplashutils-0.1.4" -GENTOOSPLASH="splashutils-gentoo-0.5.1" -V_JPEG="6b" -V_PNG="1.2.8" -V_ZLIB="1.2.3" -V_FT="2.1.9" - -ZLIBSRC="libs/zlib-${V_ZLIB}" -LPNGSRC="libs/libpng-${V_PNG}" -JPEGSRC="libs/jpeg-${V_JPEG}" -FT2SRC="libs/freetype-${V_FT}" - -IUSE="hardened png truetype mng" - -DESCRIPTION="Framebuffer splash utilities." -HOMEPAGE="http://dev.gentoo.org/~spock/projects/gensplash/" -SRC_URI="mirror://gentoo/${PN}-lite-${PV}.tar.bz2 - mirror://gentoo/${GENTOOSPLASH}.tar.bz2 - mirror://gentoo/${MISCSPLASH}.tar.bz2 - mirror://sourceforge/libpng/libpng-${V_PNG}.tar.bz2 - ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${V_JPEG}.tar.gz - mirror://sourceforge/freetype/freetype-${V_FT}.tar.bz2 - http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64 ~ppc" -RDEPEND="truetype? ( >=media-libs/freetype-2 ) - png? ( >=media-libs/libpng-1.2.7 ) - >=media-libs/jpeg-6b - >=sys-apps/baselayout-1.9.4-r5 - app-arch/cpio - !media-gfx/bootsplash - media-gfx/fbgrab" -DEPEND="${RDEPEND} - >=dev-libs/klibc-1.0.14-r1" - -S="${WORKDIR}/${P/_/-}" -SG="${WORKDIR}/${GENTOOSPLASH}" -SM="${WORKDIR}/${MISCSPLASH}" - -pkg_setup() { - if use hardened; then - ewarn "Due to problems with klibc, it is currently impossible to compile splashutils" - ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with" - ewarn "-fno-stack-protector. Hardened GCC features will not be used while building" - ewarn "the splash kernel helper." - fi -} - -src_unpack() { - unpack ${A} - - mv ${WORKDIR}/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} ${S}/libs - # We need to delete the Makefile and let it be rebuilt when splashutils - # is being configured. Either that, or we end up with a segfaulting kernel - # helper. - rm ${S}/libs/zlib-${V_ZLIB}/Makefile - cd ${S} - - epatch ${FILESDIR}/splashutils-1.3-fdset.patch - epatch ${FILESDIR}/splashutils-1.3-pthreads.patch - - # Check whether the kernel tree has been patched with fbsplash. - 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)." - fi - - if built_with_use sys-devel/gcc vanilla ; then - ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile" - ewarn "splashutils, you're on your own, as this configuration is not supported." - else - # This should make splashutils compile on systems with hardened GCC. - sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i ${S}/Makefile - fi - - # Use tty16 as the default silent tty. - sed -i -e 's/#define TTY_SILENT.*/#define TTY_SILENT 16/' ${S}/splash.h - - 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/$(get_libdir)/klibc/include/linux/console_splash.h ]]; then - myconf="--without-fbsplash" - else - myconf="--with-fbsplash" - fi - - sed -i -e "s/^CFLAGS[ \t]*=.*/CFLAGS = ${CFLAGS}/" Makefile - cd ${SM} - emake LIB=$(get_libdir) || die "failed to build miscsplashutils" - cd ${S} - - ./configure \ - $(use_with png) \ - $(use_with mng) \ - $(use_with truetype ttf) \ - $(use_with truetype ttfkern) \ - ${myconf} || die "failed to configure splashutils" - - export ZLIBSRC LPNGSRC JPEGSRC FT2SRC - emake -j1 LIB=$(get_libdir) ARCH=$(tc-arch-kernel) || die "failed to build splashutils" -} - -src_install() { - cd ${SM} - make DESTDIR=${D} install || die - - export ZLIBSRC LPNGSRC JPEGSRC FT2SRC - cd ${S} - make DESTDIR=${D} install || die - - keepdir /lib/splash/{tmp,cache,bin} - dosym /lib/splash/bin/fbres /sbin/fbres - - dodir /etc/env.d - echo 'CONFIG_PROTECT_MASK="/etc/splash"' > ${D}/etc/env.d/99splash - - exeinto /etc/init.d - newexe ${SG}/init-splash splash - - insinto /usr/share/${PN} - doins ${SG}/initrd.splash - - insinto /sbin - doins ${SG}/splash-functions.sh - - insinto /etc/conf.d - newins ${SG}/splash.conf splash - - insinto /etc/splash - doins ${SM}/fbtruetype/luxisri.ttf - - dodoc docs/* README AUTHORS -} - -pkg_postinst() { - ebegin "Checking whether /dev/tty1 is in place" - mount --bind / ${T} - - if [[ ! -c ${T}/dev/tty1 ]]; then - eend 1 - ewarn "It appears that the /dev/tty1 character device doesn't exist on" - ewarn "the root filesystem. This will prevent the silent mode from working" - ewarn "properly. You can fix the problem by doing:" - ewarn " mount --bind / /lib/splash/tmp" - ewarn " mknod /lib/splash/tmp/dev/tty1 c 4 1" - ewarn " umount /lib/splash/tmp" - echo "" - else - eend 0 - fi - umount ${T} - - if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then - ewarn "This package has been designed with udev in mind. Other solutions, such as" - ewarn "devfs or a static /dev tree might work, but are generally discouraged and" - ewarn "not supported. If you decide to switch to udev, you might want to have a" - ewarn "look at 'The Gentoo udev Guide', which can be found at" - ewarn " http://www.gentoo.org/doc/en/udev-guide.xml" - echo "" - fi - - if has_version '