From: Sergey Popov Date: Sun, 1 Feb 2015 09:11:16 +0000 (+0000) Subject: Revision bump: correct freetype 2.5 patch, wrt bug #506124. Add support for user... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=30885429c510a6a089af58c6e10994958ce1076f;p=gentoo.git Revision bump: correct freetype 2.5 patch, wrt bug #506124. Add support for user patches, add include for queue.h kernel header explicitly, prune unnecessary libtool files Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x1F357D42 --- diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog index de68cce26cda..a2951b82902b 100644 --- a/media-gfx/splashutils/ChangeLog +++ b/media-gfx/splashutils/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-gfx/splashutils # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.226 2015/02/01 08:55:01 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.227 2015/02/01 09:11:15 pinkbyte Exp $ + +*splashutils-1.5.4.4-r5 (01 Feb 2015) + + 01 Feb 2015; Sergey Popov + +splashutils-1.5.4.4-r5.ebuild, files/splashutils-1.5.4.4-ft25.patch, + +files/splashutils-1.5.4.4-sys-queue.patch: + Revision bump: correct freetype 2.5 patch, wrt bug #506124. Add support for + user patches, add include for queue.h kernel header explicitly, prune + unnecessary libtool files 01 Feb 2015; Sergey Popov -splashutils-1.5.4.4-r2.ebuild, -splashutils-1.5.4.4-r3.ebuild, diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest index e5e998953350..184487220786 100644 --- a/media-gfx/splashutils/Manifest +++ b/media-gfx/splashutils/Manifest @@ -3,10 +3,11 @@ Hash: SHA256 AUX splashutils-1.5.4.4-bzip2.patch 1539 SHA256 9596a410eb5fcadab850ac8f1d54c14d60287333a204212cfcdb1dc2dfa608ac SHA512 c42a967361b4ebe9673eb41cb3d8d120edf95708892422bed0b2a46ea501d852c6c43b9405c90b69469a9b0eb07a5159e1547d168ef04b0de8a6c7bae0651317 WHIRLPOOL 4f28bec7ffac7caa4b5fc8e931ae579bf8041b8fcf6c6b571dc9c59a329285d6a6c5943313bedfc3144a3f0848eecbe0784a27bdaf395715c57909bd5e90447c AUX splashutils-1.5.4.4-freetype-bz2.patch 515 SHA256 06a9f6d9d9206d09115abf3d8c86692908530f11168a51d99dd43a465e7092c0 SHA512 880cc0703de76c3c145680f1e85e461473df3dd41817757878bd18dc4c0d10484d1f93f995e6818ddcf3309e6b9febc1447ce7880006df8e08626bac5aae2e5c WHIRLPOOL 50c58afaacfd2594c1bc402c07680d742809e2af694b98acb3656f7dbc50cc85a537bec4b362c443f9dbe1054307c397cdba9613392ef6c508760d2487095265 -AUX splashutils-1.5.4.4-ft25.patch 411 SHA256 868e50d46aeb4c6440ba48c6eab8f4ec41274381539791ac589c36892e08fa16 SHA512 e28e6dfbee21b73ef6fb60dcdd498fc2b4cdf7830b2d3c47f0b337cd58d2c204c294b72235e2df2ba0475ee6ce2a21431b492daa755b4a6c0c5959d44eb1b759 WHIRLPOOL 7ce671d977a219adb4ffdfa137588b5a3b595bb0546ca8fb6db73b4968ded25ae153da663a42cb4dbb6b44784a987dd70df80e101761bff4ff178da10dd280a0 +AUX splashutils-1.5.4.4-ft25.patch 1221 SHA256 6468265cffb4595703a83c01f5b54d7d3d389f93b395636010564db49c4e843b SHA512 5a6d80ed51c7c57ff9ab5930bdbb50d8c594076c0a8a5e72d2d1014f32d2413a2c5b366a777da2cd4292d4e8246caa05c69892930a7a17719e989edd7b749051 WHIRLPOOL 8415e49f13fd80a6beebc14d0cbb4f3a209a104f123695b34e5f746f442085f43f287b85caffb6a3ba0f0e6ce905986a62f19610b8a7c4fa356e23cbbc5434c2 AUX splashutils-1.5.4.4-gentoo-typo-fix.patch 567 SHA256 92ee0727bfd9fe6f9565d09546ea63079467f67c2d57385713a62d0b617bb1bf SHA512 f5d5fd222b5dea9906e5a7541ad2ab1ff161061c6bb5e013929767d3f6aa9fe245092e201b8d42a086938be3320b77384301c22bc307cf7872daac33184127f2 WHIRLPOOL f971453383c1abf28c912a49c426c7da92ba6d44580981e89bedd4ef7df9940236e53842bd31ecb85c44c2ff31230569a33e7233498269aefc8caeacb84b9caa AUX splashutils-1.5.4.4-multi-keyboard.patch 10158 SHA256 95a0de0a666c29c7d80fe653659191770d359f62d1edac00dc3ad97ac14d6dac SHA512 71056d599f4465ef424444d717ce1597295e0228f548c69cb36ef617075af430b1ac50f5be27bca65a50ed9e7d0169ceb256dbc66cf4b635fd9f8310d32baeae WHIRLPOOL ce782d0a6a21350fd9b00792f0eb247907b3bcf900c0e5aa8f6304d4d3c05ee59f1b036d623f25262484bd8d48ddd95a5ef086644d369c6190570be8db432112 AUX splashutils-1.5.4.4-r3-bzip2.patch 1808 SHA256 9622dc7721e0c36538e8a1321ff59e224231578675831909d1c68f3eb9f46434 SHA512 8c1ea0bef43c4c829615db010a958ffa7c4ab8c84786a39e702be677745e47004ee59bdb1d7c80bfc637ff7c0f9a129f225e024251492b45aec7c42e1bd73da0 WHIRLPOOL 2522dcc049d68269764c9254f8884d62aa16d08fe5fa917b7c89db46617c1694c73c79f3af30c361cdd22b4d68c07b0b52c70c3243c15b263c6b5cdb6e2ef457 +AUX splashutils-1.5.4.4-sys-queue.patch 233 SHA256 a3425703473d21050a142d901ee1d6114967ce91da4a2540fa6d262de191bea0 SHA512 27181754bffb312360cc5834587a6cb68154cdac3a771956f3d4165db0cd079e884a7af5ee1910003882ad7b8835f8947ba9fc7dcc14800635206ac8bd7ada76 WHIRLPOOL 3b04bc2cae8e89489204bbdd58ba87e654e54dd0c5c56afb3fb6ee7a20feaac8188176a116ec70390ede4e5faf22b25945de4a2d524b39eee821ac749d1e5ed6 DIST freetype-2.3.12.tar.bz2 1453034 SHA256 3b96438f016a62b676c1d2089c00ca777f710d19f6aefa66ccf068d360db3e92 SHA512 becb0f138ee13181513d3f03b943f0a474e492cab151992fa78d0c84127819dc91ec6d2bd1528af7e111ab150b3a29104f2f7ab79650cebc35ce4d966b19f34b WHIRLPOOL 1a7363b8e1cc1b4597077e6cdf7e978b80cc76e1428124312d139ee81fe5247eed5ec0243352b721c28a25a179bceb901700d0766c1a5110b19f8fe53c303a89 DIST jpegsrc.v8a.tar.gz 962018 SHA256 bf86a5eaafa79b5d60feb27bee08df2db4c9ca2fb40d453e7a2080f7663a713b SHA512 4020e82e16b99189b1a50bad18b09616775559740b94a988692aa33f9302d4b5abe3ccaa30895b49e6950fb3d9a830deeb7df750d128ec5c7e1844583db4524d WHIRLPOOL 46e0c98f30c8d975b85b8e86b69e9c5c64632f579502b1b3c54902706d7e08b86582a85b49a0d3bfffd03cd90946fbd20171324504a5ff521eb89e6ce11d568b DIST libpng-1.4.3.tar.bz2 658335 SHA256 2b022f39f4788505ad62a4b1f4a33286228d544719680da40f3626393ecde4a2 SHA512 aaa137ebc2312805d58caf19702d24a34ee81593d4250c4e807ce66ba7edb829926919cd0a2b0e5975421451c8eb6674798c06dbaf745175b16c9d3c92b63f61 WHIRLPOOL d383e01e6080166816991650183b47d15938aa269c0a85e234846b9c5a7ec04a1ba7620779b4ddae639ca64440772ce8dd1b3a596f6eb32124c4d6c55592fb0a @@ -16,16 +17,17 @@ DIST splashutils-lite-1.5.4.4.tar.bz2 441340 SHA256 bc0e22293d4550281d2289672da3 DIST zlib-1.2.3.tar.bz2 425209 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2 WHIRLPOOL e874b123296f5d77daf60617501b30f4beebccb64b3910c2539f75f6c194a2cf4885dc7a3904bf790e1651120ec33b55c48e95970dd6bfd6c4d0a2ea48d7d0f4 EBUILD splashutils-1.5.4.4-r1.ebuild 7509 SHA256 b5e3bfc1e41388f4e2ff7fd324ec40689341eedc6780fa7dcd800698d98c9e2c SHA512 02a623a4ad53d52001be282f32b14a65f38e5ff9e0d0867f8c564b54415015677a70155c12f445fecfb27883dbe7d56078ecd3dacb840d18dd92704b7fbf0c65 WHIRLPOOL 0205614273c9bbda6aa4371af5a889a758bc99e7ebbd6b55638ceb8a5d72538dfdcbf41d55e18f597627bc8e595d7096eeb9c17cb6d2bcf81897e155b5b23de8 EBUILD splashutils-1.5.4.4-r4.ebuild 6761 SHA256 d94ea2fa25ddc18ef168d2493f4df3f24ee656cc9610b1e2a08cc3926d95d67f SHA512 55db1569016b74d9bfd8228feee8a1de6109bfad5c0574e8a2685a23580e9c67298f552cbf43dc43a1c5c397059a73d70e9d203b0398764d02f43f183215f9b0 WHIRLPOOL 971e920825be2c39fe38064e177d234b4b719ad79b567973aa4c8440c03a0e6724e29ef6b7b63f7e2119b75663bee13be4ffa80b1c88179391041689041e9e49 -MISC ChangeLog 40730 SHA256 c22eefd700a1c8ab10f3dcc4428b6e55ef5da1c3859ec6c7359726f85e0a0d30 SHA512 0eb550033efddfea51f4c98a9ed3b074191659deeb108f79f2c396eed5097fb7c38c38d27918addf2fe79249a64014cd012dc660b50c65bb80cef2eaa309c74b WHIRLPOOL 4932d02ee9f485f62429245f490271da729c7b0667d3d45514c8e2768e7ae04f5556c6e89d756fd505a24dbb42a4b1b6de3d2ddd9caa1ffccf82e0b3ade783e3 +EBUILD splashutils-1.5.4.4-r5.ebuild 6857 SHA256 bdfd53cf79071b965197fabde4f6c64446822e3f945b569a4b1d47161bbd87fc SHA512 caf75d017969dce729840786104f3e20485851b5b9dda7bea84270e5549c8a56814f94fec252511ad1d7a13291550931b7b1e63c47dfda3bcb83ccfede59fe38 WHIRLPOOL 344328f18d404b9065693450827a9360a7284d6ca4c9a6fade80b365cd1a36fbdc112c66698f3ee835bad6793a4a011576f67e2b33add30734d69b94e59d3c99 +MISC ChangeLog 41116 SHA256 cce7fc98182a241d770515a1df31c67215d60aa4b50a6b9f4a679e972a7ca89b SHA512 f50ff69512175d09d7e60a29fb1dcd8a91f311d417b17ec243e0f76886ce7d4f892fb2e51313350d1a0392c6c6ee7c60bebe09420f8e7984c1774cb8a1d8fbcc WHIRLPOOL 351b7eeecea571b82374655b01f0599716acb4102bcd08f2daefd6bea0f70b2b94272449b1ed98f5a8a6c84440b686f9e32d942a93272b0c8e8722514eebecd4 MISC metadata.xml 324 SHA256 51a25c570502116aa46bfe2bdfbb99be8a81290879563848978a9ee301a3dfa5 SHA512 4fccbcc1c6372560a0139262caf1f305cf658be6761e9703a0033da08af0d8a3dc310e1ceec52761b173fce2d6a94971fbde69ee0a419a7f00457f08691b233e WHIRLPOOL 60b68573116b7ef2a1a4fd87ab47172b56617c7d713ba44e9cdfce23283bf45ddf94ce0d4dd7d9d8ca7ab0c3af164557ec8f16ae872269b1b04b92d3a6e4781d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUzenrAAoJECo/aRed9267+UMH+gIwsbfR6fzV2pnYGH0bZIQc -BiETbcdycie6GY8UZ1oG9m/xSF7VQpHqIg6Icr0BRvMaeuQCihRkLp9X3tgigLPt -7EMFMqhFUCZSSATGzXMc9aYuel1brLGOfHPZBMTnuedlnp9IZWJXb4G1vS16Vjk8 -qNaEEt7eZfQgq/Jr01HYbDNL0wmD50E6qAmipvBap4fj0ieXqAr81pLSW73Y28Un -5sVLNni8sChX4e8N02D1MR9oSv7/a7oc7a90Eur0NYdtB0m5ctY98AgPBAlR6qkf -LQTWBpZxWD4oA43eiPJrfEZ1Ce9gVaYTyx6y7ad4HTk+xTYgk4XaZmelHepDnzE= -=5Kd3 +iQEcBAEBCAAGBQJUze20AAoJECo/aRed9267c1oIAM2o71qs8EKlK7IhfNq4IsxY +nw6fzVtgNrlYQ+xWgKe97i9JPPHt0n+2bZLcaGsDkDd9DFtYP6ZPCx+fPKtfxEzV +wWcfS9p9uHpA7ZNcI1IYxLZYIq/srEcGDXs7HqvG+Dh3Ho5aLjf3GIKHkCwxAbSe +7A6Gy5ybK8b6Y+mXYIseEJm2rC6WJ+JhTxNEZlyHpsacuttiQJAAtA3IcnIFgpQA +X4jqXjChQTQnhVJJGGy9nvNIlzqbRVJf1O6oc5PltQqYmQaYW0ETXvmOgYJNQ2hQ +udnyH7Ks3htSxsdubVNP5I2i7yg5biz1BTwzcECR274M5SwX0xkPZsY+mmocD9M= +=fARS -----END PGP SIGNATURE----- diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-ft25.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-ft25.patch index b8a2cf4e103b..b5194d5499a8 100644 --- a/media-gfx/splashutils/files/splashutils-1.5.4.4-ft25.patch +++ b/media-gfx/splashutils/files/splashutils-1.5.4.4-ft25.patch @@ -1,5 +1,6 @@ Gentoo-bug: https://bugs.gentoo.org/506124 Signed-off-by: Lars Wendler (Polynomial-C) +Modified-by: Sergey Popov (Pinkbyte) --- miscsplashutils-0.1.8/fbtruetype/ttf.c +++ miscsplashutils-0.1.8/fbtruetype/ttf.c @@ -13,8 +13,8 @@ @@ -13,3 +14,29 @@ Signed-off-by: Lars Wendler (Polynomial-C) #include "ttf.h" +--- splashutils-1.5.4.4/src/ttf.c 2015-02-01 11:35:04.330595381 +0300 ++++ splashutils-1.5.4.4/src/ttf.c 2015-02-01 11:35:24.287596342 +0300 +@@ -25,8 +25,8 @@ + #include + + #include +-#include +-#include ++#include FT_OUTLINE_H ++#include FT_TRUETYPE_IDS_H + + #include "common.h" + #include "render.h" +--- splashutils-1.5.4.4/src/ttf.h 2015-02-01 11:38:33.852605470 +0300 ++++ splashutils-1.5.4.4/src/ttf.h 2015-02-01 11:38:52.504606368 +0300 +@@ -1,8 +1,8 @@ + #ifndef _TTF_H + #define _TTF_H + #include +-#include +-#include ++#include FT_OUTLINE_H ++#include FT_TRUETYPE_IDS_H + + #define CACHED_METRICS 0x10 + #define CACHED_BITMAP 0x01 diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-sys-queue.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-sys-queue.patch new file mode 100644 index 000000000000..8ede7322c0d1 --- /dev/null +++ b/media-gfx/splashutils/files/splashutils-1.5.4.4-sys-queue.patch @@ -0,0 +1,8 @@ +--- splash.c 2011-06-13 04:45:59.000000000 +0700 ++++ splash.c 2014-11-14 20:04:43.000000000 +0700 +@@ -21,4 +21,5 @@ + #include + #include ++#include + #include + #include diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r5.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r5.ebuild new file mode 100644 index 000000000000..885c40a3af40 --- /dev/null +++ b/media-gfx/splashutils/splashutils-1.5.4.4-r5.ebuild @@ -0,0 +1,236 @@ +# Copyright 1999-2015 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.4-r5.ebuild,v 1.1 2015/02/01 09:11:15 pinkbyte Exp $ + +EAPI=5 +inherit autotools eutils multilib toolchain-funcs + +MISCSPLASH="miscsplashutils-0.1.8" +GENTOOSPLASH="splashutils-gentoo-1.0.17" +V_JPEG="8a" +V_PNG="1.4.3" +V_ZLIB="1.2.3" +V_FT="2.3.12" + +ZLIBSRC="libs/zlib-${V_ZLIB}" +LPNGSRC="libs/libpng-${V_PNG}" +JPEGSRC="libs/jpeg-${V_JPEG}" +FT2SRC="libs/freetype-${V_FT}" + +RESTRICT="test" +IUSE="hardened +png +truetype gpm fbcondecor" + +DESCRIPTION="Framebuffer splash utilities" +HOMEPAGE="http://fbsplash.berlios.de" +SRC_URI=" + mirror://berlios/fbsplash/${PN}-lite-${PV}.tar.bz2 + mirror://berlios/fbsplash/${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="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND=" + gpm? ( sys-libs/gpm[static-libs(+)] ) + truetype? ( + >=media-libs/freetype-2[static-libs] + app-arch/bzip2[static-libs(+)] + sys-libs/zlib[static-libs(+)] + ) + png? ( + >=media-libs/libpng-1.4.3[static-libs] + sys-libs/zlib[static-libs(+)] + ) + virtual/jpeg:0[static-libs] + app-arch/cpio + media-gfx/fbgrab + !sys-apps/lcdsplash" + +DEPEND="${RDEPEND} + >=dev-libs/klibc-1.5 + virtual/pkgconfig +" + +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_prepare() { + 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 "${SG}" + epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch" + epatch "${FILESDIR}/splashutils-1.5.4.4-sys-queue.patch" + + if use truetype ; then + cd "${SM}" + epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch" + cd "${WORKDIR}" + epatch "${FILESDIR}/splashutils-1.5.4.4-ft25.patch" + fi + + cd "${S}" + ln -sf "${S}/src" "${WORKDIR}/core" + + epatch "${FILESDIR}/${P}-bzip2.patch" + epatch "${FILESDIR}/${P}-multi-keyboard.patch" + + if ! tc-is-cross-compiler && \ + has_version "sys-devel/gcc:$(gcc-version)[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.in" + fi + + if ! use truetype ; then + sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile" + fi + + # Latest version of klibc defined its own version of ferror, so there is + # not need for the hack in klibc_compat.h + if has_version ">=dev-libs/klibc-1.5.20"; then + echo > "libs/klibc_compat.h" + fi + + rm -f m4/* + epatch_user + eautoreconf +} + +src_configure() { + tc-export CC + cd "${SM}" + emake CC="${CC}" LIB=$(get_libdir) STRIP=true + + cd "${S}" + econf \ + $(use_with png) \ + --without-mng \ + $(use_with gpm) \ + $(use_with truetype ttf) \ + $(use_with truetype ttf-kernel) \ + $(use_enable fbcondecor) \ + --docdir=/usr/share/doc/${PF} \ + --with-freetype2-src=${FT2SRC} \ + --with-jpeg-src=${JPEGSRC} \ + --with-lpng-src=${LPNGSRC} \ + --with-zlib-src=${ZLIBSRC} \ + --with-essential-libdir=/$(get_libdir) +} + +src_compile() { + emake CC="${CC}" STRIP="true" + + cd "${SG}" + emake LIB=$(get_libdir) +} + +src_install() { + local LIB=$(get_libdir) + + cd "${SM}" + emake DESTDIR="${D}" LIB=${LIB} install + + cd "${S}" + emake DESTDIR="${D}" STRIP="true" install + + mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/ + gen_usr_ldscript libfbsplash.so + + echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash + doenvd 99splash + + if use fbcondecor ; then + newinitd "${SG}"/init-fbcondecor fbcondecor + newconfd "${SG}"/fbcondecor.conf fbcondecor + fi + newconfd "${SG}"/splash.conf splash + + insinto /usr/share/${PN} + doins "${SG}"/initrd.splash + + insinto /etc/splash + doins "${SM}"/fbtruetype/luxisri.ttf + + cd "${SG}" + make DESTDIR="${D}" LIB=${LIB} install + prune_libtool_files + + sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh + keepdir /${LIB}/splash/{tmp,cache,bin,sys} + dosym /${LIB}/splash/bin/fbres /sbin/fbres +} + +pkg_preinst() { + has_version "<${CATEGORY}/${PN}-1.0" + previous_less_than_1_0=$? + + has_version "<${CATEGORY}/${PN}-1.5.3" + previous_less_than_1_5_3=$? +} + +pkg_postinst() { + if has_version sys-fs/devfsd || ! has_version virtual/udev ; then + elog "This package has been designed with udev in mind. Other solutions, such as" + elog "devfs or a static /dev tree might work, but are generally discouraged and" + elog "not supported. If you decide to switch to udev, you might want to have a" + elog "look at 'The Gentoo udev Guide', which can be found at" + elog " http://www.gentoo.org/doc/en/udev-guide.xml" + elog "" + fi + + if [[ $previous_less_than_1_0 = 0 ]] ; then + elog "Since you are upgrading from a pre-1.0 version, please make sure that you" + elog "rebuild your initrds. You can use the splash_geninitramfs script to do that." + elog "" + fi + + if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then + elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch" + elog "is optional and dependent on the the 'fbcondecor' USE flag. If you wish" + elog "to use fbcondecor, run:" + elog " echo \"media-gfx/splashutils fbcondecor\" >> /etc/portage/package.use" + elog "and re-emerge splashutils." + fi + + if ! test -f /proc/cmdline || + ! egrep -q '(console=tty1|CONSOLE=/dev/tty1)' /proc/cmdline ; then + elog "It is required that you add 'console=tty1' to your kernel" + elog "command line parameters." + elog "" + elog "After these modifications, the relevant part of the kernel command" + elog "line might look like:" + elog " splash=silent,fadein,theme:emergence console=tty1" + elog "" + fi + + if ! has_version 'media-gfx/splash-themes-livecd' && + ! has_version 'media-gfx/splash-themes-gentoo'; then + elog "The sample Gentoo themes (emergence, gentoo) have been removed from the" + elog "core splashutils package. To get some themes you might want to emerge:" + elog " media-gfx/splash-themes-livecd" + elog " media-gfx/splash-themes-gentoo" + fi +}