diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-30 21:33:31 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-30 21:33:31 +0100 |
commit | 2f8db31405fac68eea6f7257d58529243815033b (patch) | |
tree | 54259cc8988a98a10586fc0496b1f3501cd1e2a1 /media-gfx/splashutils | |
parent | a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (diff) |
gentoo resync : 30.04.2018
Diffstat (limited to 'media-gfx/splashutils')
-rw-r--r-- | media-gfx/splashutils/Manifest | 3 | ||||
-rw-r--r-- | media-gfx/splashutils/splashutils-1.5.4.4-r7.ebuild | 239 | ||||
-rw-r--r-- | media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild | 3 |
3 files changed, 2 insertions, 243 deletions
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest index 5ea5e01489b7..e7d058791789 100644 --- a/media-gfx/splashutils/Manifest +++ b/media-gfx/splashutils/Manifest @@ -12,6 +12,5 @@ DIST miscsplashutils-0.1.8.tar.bz2 91997 BLAKE2B f0b47b51b7270ce8ba57fd989f289a9 DIST splashutils-gentoo-1.0.17.tar.bz2 15814 BLAKE2B 8c6e2fea3825e5821ab2a20d0f95dc7050438544b9cdc31dc972e3792050dc7d1687842bfda69f93a721103ced5c7168391f53c0f18906a7def2df4a6fb6127c SHA512 75f1fbfdf165f571b0bf09235235827f370e1b940f1717c4faf5b223caba0b80f853a910ba492c776512aecfafa6e74fd964239bbc6cf412620143d5ffc74167 DIST splashutils-lite-1.5.4.4.tar.bz2 441340 BLAKE2B a2b348fe675a45d54b25ab60b20f5d4f92e673f5639b674027d0e78496c06948026670e2073c9257a3a0134a18752cc1381b2ba2be2d89d66b711cc7ad68ee2b SHA512 1a78216a1de1fdccff514494d7301640e447c65466e1fe02428e5114485507f67fe4394094880d927d074a8ab2d9c786ba03f9fb0371eb7ab6ef4e3b01aa4613 DIST zlib-1.2.3.tar.bz2 425209 BLAKE2B e4226371cbb4219d5f287bbb48a7bf6f8195b9b8de05c168238f39d82f53727f9a2090ceaac45032c6bbece9f839882cf0cd59c783d38be285eae0c02a30b895 SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2 -EBUILD splashutils-1.5.4.4-r7.ebuild 6878 BLAKE2B 6f73a0e3a49677b336b16188f45b7d6592e08d446ef9d2de2969b7aeea8367695b1b0fe0d3b919f903a5753d60fa0cf9cea020e11614d700b422dd5321cf3610 SHA512 1b1e328e9b9b06b53d5e676c8dd79d339095194345f94fd135297bccde2afa5044c2a8c16b4ebdef523dce52b8a9075dceabdecc70765312b8baf959c9dd7713 -EBUILD splashutils-1.5.4.4-r8.ebuild 6970 BLAKE2B faa78f97cf0401763e0170397be44df60aca4e00d03d93b67c5075bdcea41d87ae241e5dd032727d96f753a8fc2aba23129c090ab0b19afff845eda65d4f93b1 SHA512 cb4a35904fce48ed971fda59a1a38c64d27684291f6383935dce56532a2b2be0bda5d690e537903f96683293512947b43d21e678fbd9a10f127b27308310eb37 +EBUILD splashutils-1.5.4.4-r8.ebuild 6936 BLAKE2B 41539451da24db7372912edbb76de036a17f2367edbd1997b199c00104dcb8a356dc49898895c02901cf0c3c504fc36ca5a7c6fc03e3fa03e5892a2be0cfc984 SHA512 3bd655e53a90383d5d92c8d3714b555bc5ffcdd0a379ac0066350b8d90d485cd4d1391be21c9894aa30524d657ff74733ef4d2213ddd6b6a56ca8c77d5e8fbd2 MISC metadata.xml 338 BLAKE2B b1acfec719af910d8c2be2d5224c15c240b2f85ee046e4eb8ebcdd17cfe40c6699d35cf6b2bc68fc73d0bc8ed03643cacd7431409161cfad6a32e551c6ad70ba SHA512 589b371956889ba3388b3c734b51b36605ca0c5e9ba2b1507126cfd805bdc9cd02756c1d8d8b9f10cbffbacecc9e6bd41afc9e8ff505d27612c4d1158fc7cb72 diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r7.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r7.ebuild deleted file mode 100644 index 06730c581400..000000000000 --- a/media-gfx/splashutils/splashutils-1.5.4.4-r7.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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="https://sourceforge.net/projects/fbsplash.berlios/" -SRC_URI=" - mirror://sourceforge/fbsplash.berlios/${PN}-lite-${PV}.tar.bz2 - mirror://sourceforge/fbsplash.berlios/${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 - sys-apps/openrc" - -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" - # Bug #557126 - epatch "${FILESDIR}/${P}-no-la.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 - export PKG_CONFIG="pkg-config --static" - 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 " https://wiki.gentoo.org/wiki/Udev" - 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 -} diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild index 8b09df6c5e92..824b27602945 100644 --- a/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild +++ b/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild @@ -33,10 +33,9 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" RDEPEND=" - elibc_musl? ( sys-libs/queue ) gpm? ( sys-libs/gpm[static-libs(+)] ) truetype? ( >=media-libs/freetype-2[static-libs] |