From: Michael Januszewski Date: Thu, 5 Apr 2007 22:14:00 +0000 (+0000) Subject: Version bump. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=901e7f091eb9c841ae9491124f0d80c983625987;p=gentoo.git Version bump. Package-Manager: portage-2.1.2.3 --- diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog index 6c7d2c4ed2fd..c4b664c266d2 100644 --- a/media-gfx/splashutils/ChangeLog +++ b/media-gfx/splashutils/ChangeLog @@ -1,6 +1,12 @@ # 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.78 2007/03/21 20:00:33 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.79 2007/04/05 22:14:00 spock Exp $ + +*splashutils-1.4 (05 Apr 2007) + + 05 Apr 2007; Michał Januszewski + +splashutils-1.4.ebuild: + Version bump. 21 Mar 2007; Michał Januszewski files/splashutils-gentoo-0.5.4-old-baselayout.patch: diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest index 42ed21cd2381..2bf8532b2cec 100644 --- a/media-gfx/splashutils/Manifest +++ b/media-gfx/splashutils/Manifest @@ -60,10 +60,12 @@ DIST splashutils-gentoo-0.1.14.tar.bz2 7750 RMD160 680efa24119dcf699f37a9f295e3f 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-gentoo-0.5.4.tar.bz2 6631 RMD160 dde17340439121f6d2da021c2f8ac84d35411645 SHA1 9e24af43ac491ea8c1f715d447950a455c031f70 SHA256 401cbc912d26be430b827203d6a94c2bab5aa0b6eead2010c0397f52643e6f74 +DIST splashutils-gentoo-1.0.0.tar.bz2 14182 RMD160 f1043e019e4c1106d34de895db03c917243c9d5d SHA1 4d51c0fe60275f743d12e98a9bfaa63d2b6f4445 SHA256 4276a5f69669c819855221fab46acae464804d9fc0a9e4d0a88eac7ccd4deb7d 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 DIST splashutils-lite-1.3.1.tar.bz2 61506 RMD160 14f47119523c5eca24482429c37d393e32562c3c SHA1 5a98b452009a0366ac006a1fcd1662855a181af7 SHA256 45ab13d25ff941e9920ec2f941bc450794b869658fdcee13d72595708d569e39 DIST splashutils-lite-1.3.tar.bz2 61079 RMD160 4d5296ed0b2a7a7783cfe5f9f25b53fa56307bc7 SHA1 22349164fc0512a698ae2f387bfd7845d3f8063e SHA256 4f94e91ee81acea4d6ef8d481b32cf15cd7987030e048e0e249eec995ef8a5d0 +DIST splashutils-lite-1.4.tar.bz2 66484 RMD160 a4348f47a64f3e04121c4589e45f4122fd3da08d SHA1 61be0d4df3b7727d16721ee0937d9b291c3a2413 SHA256 dac6706df0415c05a799540ac38ab9b6bb20980e66414f271820d3af4a4ed3e3 DIST zlib-1.2.1.tar.bz2 284152 RMD160 aca88eb02d90b91c732f351e1b7efd4ce409ee25 SHA1 13bd164df955911c25342adfad805c1cad5e398e SHA256 9ea4bd04487e05254d05cebde539b3855af2899658e2da84487e86f7f400e0e1 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca EBUILD splashutils-1.1.9.10-r1.ebuild 6864 RMD160 123a3c1b3789a5d90d461811e3589a356c5c81b9 SHA1 10d82a4d88d2bbd7683a700009769a30a6a8cbf3 SHA256 4be9e32911aa265931a061ebb0767e26fcb0ee752464140f2e7797f712820784 @@ -86,10 +88,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 -MISC ChangeLog 16142 RMD160 ed18e81ca05d0e3cdee38da1c5fb3d442fc6b230 SHA1 85e98c5cc1e15d3cc5a33e420bfe6affe4251a59 SHA256 e47c82d878b823cd986c73932047f8979b8b3e304cbd335536e73c16980cc6d0 -MD5 6a4e146281e48de75e668f6d6103acea ChangeLog 16142 -RMD160 ed18e81ca05d0e3cdee38da1c5fb3d442fc6b230 ChangeLog 16142 -SHA256 e47c82d878b823cd986c73932047f8979b8b3e304cbd335536e73c16980cc6d0 ChangeLog 16142 +EBUILD splashutils-1.4.ebuild 6478 RMD160 511f81e2000d8c152d2eb536132c1c95953c0aed SHA1 2d2afd97d679f6d51a213497d7154825ee2d2739 SHA256 0837621c680f9d4fae9ed50042639ac84ffa3f5748a0c3806e3f246227d44338 +MD5 b0655977713ec9e3b3a4e77f234b7b86 splashutils-1.4.ebuild 6478 +RMD160 511f81e2000d8c152d2eb536132c1c95953c0aed splashutils-1.4.ebuild 6478 +SHA256 0837621c680f9d4fae9ed50042639ac84ffa3f5748a0c3806e3f246227d44338 splashutils-1.4.ebuild 6478 +MISC ChangeLog 16272 RMD160 ad0306df4c883489bf30d0c82a9dce6f8490ffcc SHA1 27e843c32df021e1e1fdfd39c77c02a964fcbdb6 SHA256 734881f33a4ea84ee1d668c924cf9ba44314b9c103ef573fa1227b160aa2445b +MD5 75a617525f57b6f97abd0bea2ff83131 ChangeLog 16272 +RMD160 ad0306df4c883489bf30d0c82a9dce6f8490ffcc ChangeLog 16272 +SHA256 734881f33a4ea84ee1d668c924cf9ba44314b9c103ef573fa1227b160aa2445b ChangeLog 16272 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220 @@ -109,10 +115,13 @@ SHA256 033b154e5cba7f58d9cce3d213a3b1f229e3750c78526e26cd04d9a5fac383a4 files/di MD5 ce69ea1709bd9f722cf0823d82ca3230 files/digest-splashutils-1.3.1 1762 RMD160 cee3d8129e8200b93554c4da621a325c5d834bf2 files/digest-splashutils-1.3.1 1762 SHA256 20dc274189e8c25ee3bf459573da4a263e9ada3eedbe816283c53c28f200e0c7 files/digest-splashutils-1.3.1 1762 +MD5 ae034fdfc74b5b9a1f772c06a3c67fa2 files/digest-splashutils-1.4 1759 +RMD160 3963e0d9000b2df0e940317899820cdd8f0b4232 files/digest-splashutils-1.4 1759 +SHA256 08f814d0b8340fbda15e2cbfeac683314c4c0e8376776da2f98c495b8613c7f3 files/digest-splashutils-1.4 1759 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGAY7qchej4aZK9/cRAsPtAJ9wmLLztwHaSmebEZkELYrzN+pnJACfVWUj -FXLjo4hMtmNJXbLMmIgtW/0= -=ppI0 +iD8DBQFGFXS9chej4aZK9/cRAp5RAJ9Nfpr0TaPbE1wEG3f05ZISntrSbwCfSQDW +YRNX3Smen66zt+3mUuBvAe0= +=KSru -----END PGP SIGNATURE----- diff --git a/media-gfx/splashutils/files/digest-splashutils-1.4 b/media-gfx/splashutils/files/digest-splashutils-1.4 new file mode 100644 index 000000000000..75bdd5204a47 --- /dev/null +++ b/media-gfx/splashutils/files/digest-splashutils-1.4 @@ -0,0 +1,21 @@ +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 20fc3ed2407edc8cd97623bf7f1c5c7b miscsplashutils-0.1.5.tar.bz2 91898 +RMD160 1930081408fd6bad6f60db883127f22ff727f83e miscsplashutils-0.1.5.tar.bz2 91898 +SHA256 906163c75d487a00ba7d6b287e20e4ce195febcd4fdb8592d53827c2f8a28142 miscsplashutils-0.1.5.tar.bz2 91898 +MD5 81fe3137dfc232588444eefed1556db1 splashutils-gentoo-1.0.0.tar.bz2 14182 +RMD160 f1043e019e4c1106d34de895db03c917243c9d5d splashutils-gentoo-1.0.0.tar.bz2 14182 +SHA256 4276a5f69669c819855221fab46acae464804d9fc0a9e4d0a88eac7ccd4deb7d splashutils-gentoo-1.0.0.tar.bz2 14182 +MD5 79fec4b24ce52bc0055dfda2c0def2b9 splashutils-lite-1.4.tar.bz2 66484 +RMD160 a4348f47a64f3e04121c4589e45f4122fd3da08d splashutils-lite-1.4.tar.bz2 66484 +SHA256 dac6706df0415c05a799540ac38ab9b6bb20980e66414f271820d3af4a4ed3e3 splashutils-lite-1.4.tar.bz2 66484 +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/splashutils-1.4.ebuild b/media-gfx/splashutils/splashutils-1.4.ebuild new file mode 100644 index 000000000000..d37854343ee3 --- /dev/null +++ b/media-gfx/splashutils/splashutils-1.4.ebuild @@ -0,0 +1,206 @@ +# 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.1 2007/04/05 22:14:00 spock Exp $ + +inherit eutils multilib toolchain-funcs + +MISCSPLASH="miscsplashutils-0.1.5" +GENTOOSPLASH="splashutils-gentoo-1.0.0" +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 gpm" + +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 ) + mng? ( media-libs/lcms media-libs/libmng ) + >=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.4.13" + +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} + ln -sf ${S} ${WORKDIR}/core + + # Check whether the kernel tree has been patched with fbsplash. + if [[ ! -e /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 has_version sys-libs/glibc && ! built_with_use sys-libs/glibc nptl ; then + eerror "Your sys-libs/glibc has been built with support for linuxthreads only." + eerror "This package requires nptl to work correctly. Please recompile glibc" + eerror "with the 'nptl' USE flag enabled." + die "nptl not available" + 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 +} + +src_compile() { + local myconf="" + if [[ ! -e /usr/$(get_libdir)/klibc/include/linux/console_splash.h ]]; then + myconf="--without-fbsplash" + else + myconf="--with-fbsplash" + fi + + if has_version ">=sys-apps/baselayout-1.13.99"; then + myconf="${myconf} --with-gentoo" + fi + + cd ${SM} + emake LIB=$(get_libdir) || die "failed to build miscsplashutils" + + cd ${S} + ./configure \ + $(use_with png) \ + $(use_with mng) \ + $(use_with gpm) \ + $(use_with truetype ttf) \ + $(use_with truetype ttfkern) \ + ${myconf} || die "failed to configure splashutils" + + export ZLIBSRC LPNGSRC JPEGSRC FT2SRC + emake -j1 LIB=$(get_libdir) CFLAGS="${CFLAGS}" \ + || die "failed to build splashutils" + + if has_version ">=sys-apps/baselayout-1.13.99"; then + cd ${SG} + emake || die "failed to build the splash plugin" + fi +} + +src_install() { + cd ${SM} + make DESTDIR=${D} install || die + + export ZLIBSRC LPNGSRC JPEGSRC FT2SRC + cd ${S} + make DESTDIR=${D} install || die + + 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 /etc/conf.d + newins ${SG}/splash.conf splash + + insinto /etc/splash + doins ${SM}/fbtruetype/luxisri.ttf + + dodoc docs/* README AUTHORS + + if has_version ">=sys-apps/baselayout-1.13.99"; then + LIB=$(get_libdir) + cd ${SG} + make DESTDIR=${D} install || die "failed to install the splash plugin" + else + LIB=lib + cp ${SG}/splash-functions-bl1.sh ${D}/sbin/splash-functions.sh + fi + + keepdir /${LIB}/splash/{tmp,cache,bin} + dosym /${LIB}/splash/bin/fbres /sbin/fbres +} + +pkg_postinst() { + 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 '