summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2008-02-25 23:16:01 +0000
committerMichael Januszewski <spock@gentoo.org>2008-02-25 23:16:01 +0000
commita0a6e5825ec83878cca2256a2672f4e4eb81c6a7 (patch)
treef5f9f1cd35005a6ba442c141cce84d54df6fb090 /media-gfx
parentFix FLAC playback after security fix. (diff)
downloadgentoo-2-a0a6e5825ec83878cca2256a2672f4e4eb81c6a7.tar.gz
gentoo-2-a0a6e5825ec83878cca2256a2672f4e4eb81c6a7.tar.bz2
gentoo-2-a0a6e5825ec83878cca2256a2672f4e4eb81c6a7.zip
Remove old ebuilds.
(Portage version: 2.1.4.4)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/splashutils/ChangeLog10
-rw-r--r--media-gfx/splashutils/files/splashutils-1.4.2-getcfg.patch13
-rw-r--r--media-gfx/splashutils/files/splashutils-1.4.2-misc-strip.patch25
-rw-r--r--media-gfx/splashutils/files/splashutils-1.4.2-rcabort.patch41
-rw-r--r--media-gfx/splashutils/splashutils-1.4.2.1.ebuild205
-rw-r--r--media-gfx/splashutils/splashutils-1.4.2.ebuild213
-rw-r--r--media-gfx/splashutils/splashutils-1.5.3.2.ebuild199
-rw-r--r--media-gfx/splashutils/splashutils-1.5.3.3.ebuild198
8 files changed, 9 insertions, 895 deletions
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index c7e3efc4719b..de2961117464 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for media-gfx/splashutils
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.130 2008/02/25 23:03:56 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.131 2008/02/25 23:16:00 spock Exp $
+
+ 25 Feb 2008; Michał Januszewski <spock@gentoo.org>
+ -files/splashutils-1.4.2-getcfg.patch,
+ -files/splashutils-1.4.2-misc-strip.patch,
+ -files/splashutils-1.4.2-rcabort.patch, -splashutils-1.4.2.ebuild,
+ -splashutils-1.4.2.1.ebuild, -splashutils-1.5.3.2.ebuild,
+ -splashutils-1.5.3.3.ebuild:
+ Remove old ebuilds.
*splashutils-1.5.4 (25 Feb 2008)
diff --git a/media-gfx/splashutils/files/splashutils-1.4.2-getcfg.patch b/media-gfx/splashutils/files/splashutils-1.4.2-getcfg.patch
deleted file mode 100644
index b4b43b85a6d8..000000000000
--- a/media-gfx/splashutils/files/splashutils-1.4.2-getcfg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/core/kernel.c b/core/kernel.c
-index d6d96cd..c9a39fe 100644
---- a/core/kernel.c
-+++ b/core/kernel.c
-@@ -254,6 +254,8 @@ int main(int argc, char **argv)
- if (parse_cfg(config_file))
- goto out;
-
-+ fd_splash = open_fbsplash(false);
-+
- if (!strcmp(argv[2],"getpic")) {
- err = cfg_check_sanity('v');
- if (!err) {
diff --git a/media-gfx/splashutils/files/splashutils-1.4.2-misc-strip.patch b/media-gfx/splashutils/files/splashutils-1.4.2-misc-strip.patch
deleted file mode 100644
index 8cdb0bd403bb..000000000000
--- a/media-gfx/splashutils/files/splashutils-1.4.2-misc-strip.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/misc/Makefile b/misc/Makefile
-index 7749b4a..bcb6ee7 100644
---- a/misc/Makefile
-+++ b/misc/Makefile
-@@ -1,15 +1,16 @@
- SUBDIRS = fbtruetype kbd
- LIB ?= lib
-+STRIP = strip
-
- all: fbres usleep
-
--fbres:
-+fbres:
- $(CC) $(CFLAGS) $@.c -o $@
-- strip $@
-+ $(STRIP) $@
-
--usleep:
-+usleep:
- $(CC) $(CFLAGS) $@.c -o $@
-- strip $@
-+ $(STRIP) $@
-
- %:
- @set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
diff --git a/media-gfx/splashutils/files/splashutils-1.4.2-rcabort.patch b/media-gfx/splashutils/files/splashutils-1.4.2-rcabort.patch
deleted file mode 100644
index 419737d7ed26..000000000000
--- a/media-gfx/splashutils/files/splashutils-1.4.2-rcabort.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/gentoo/splash.c b/gentoo/splash.c
-index f4e2221..945f3aa 100644
---- a/gentoo/splash.c
-+++ b/gentoo/splash.c
-@@ -561,7 +561,13 @@ static int splash_stop(const char *runlevel)
- if (splash_is_silent())
- splash_set_verbose();
-
-- return splash_cache_cleanup(save);
-+ /* If we don't get a runlevel argument, then we're being executed
-+ * because of a rc-abort event and we don't save any data. */
-+ if (runlevel == NULL) {
-+ return splash_cache_cleanup(NULL);
-+ } else {
-+ return splash_cache_cleanup(save);
-+ }
- }
-
- int _splash_hook (rc_hook_t hook, const char *name)
-@@ -579,7 +585,7 @@ int _splash_hook (rc_hook_t hook, const char *name)
- /* We generally do nothing if we're in sysinit. Except if the
- * autoconfig service is present, when we get a list of services
- * that will be started by it and mark them as coldplugged. */
-- if (!strcmp(name, RC_LEVEL_SYSINIT)) {
-+ if (name && !strcmp(name, RC_LEVEL_SYSINIT)) {
- if (hook == rc_hook_runlevel_start_out) {
- FILE *fp;
- char **list = NULL;
-@@ -793,6 +799,12 @@ do_start:
- config = NULL;
- break;
-
-+ case rc_hook_abort:
-+ i = splash_stop(name);
-+ splash_lib_cleanup();
-+ config = NULL;
-+ break;
-+
- default:
- break;
- }
diff --git a/media-gfx/splashutils/splashutils-1.4.2.1.ebuild b/media-gfx/splashutils/splashutils-1.4.2.1.ebuild
deleted file mode 100644
index d3dfd00c083c..000000000000
--- a/media-gfx/splashutils/splashutils-1.4.2.1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# 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.2.1.ebuild,v 1.3 2007/08/06 11:13:14 spock Exp $
-
-inherit eutils multilib toolchain-funcs
-
-MISCSPLASH="miscsplashutils-0.1.7"
-GENTOOSPLASH="splashutils-gentoo-1.0.3"
-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="~amd64 ~ppc ~x86"
-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/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 --missing true 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
-
- sed -i -e "s#/lib/splash#/$(get_libdir)/splash#" ${S}/scripts/{splash_manager,splash_geninitramfs}
-}
-
-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) STRIP=true || die "failed to build miscsplashutils"
-
- cd ${S}
- ./configure \
- --with-fifo="/$(get_libdir)/splash/cache/.splash" \
- $(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) || die "failed to build splashutils"
-
- if has_version ">=sys-apps/baselayout-1.13.99"; then
- cd ${SG}
- emake LIB=$(get_libdir) || die "failed to build the splash plugin"
- fi
-}
-
-src_install() {
- local LIB=$(get_libdir)
-
- cd ${SM}
- make DESTDIR=${D} LIB=${LIB} install || die
-
- export ZLIBSRC LPNGSRC JPEGSRC FT2SRC
- cd ${S}
- make DESTDIR=${D} LIB=${LIB} install || die
-
- echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
- doenvd 99splash
-
- newinitd ${SG}/init-splash splash
- newconfd ${SG}/splash.conf splash
-
- insinto /usr/share/${PN}
- doins ${SG}/initrd.splash
-
- insinto /etc/splash
- doins ${SM}/fbtruetype/luxisri.ttf
-
- dodoc docs/* README AUTHORS
-
- if has_version ">=sys-apps/baselayout-1.13.99"; then
- cd ${SG}
- 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
-
- 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
-}
-
-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"
- ewarn ""
- fi
-
- if has_version '<media-gfx/splashutils-1.0' ; then
- ewarn "Since you are upgrading from a pre-1.0 version, please make sure that you"
- ewarn "rebuild your initrds. You can use the splash_geninitramfs script to do that."
- ewarn ""
- fi
-
- if ! test -f /proc/cmdline ||
- ! egrep -q '(console|CONSOLE)=(tty1|/dev/tty1)' /proc/cmdline ; then
- ewarn "It is required that you add 'console=tty1' to your kernel"
- ewarn "command line parameters."
- ewarn ""
- 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.4.2.ebuild b/media-gfx/splashutils/splashutils-1.4.2.ebuild
deleted file mode 100644
index 480bd6aea97a..000000000000
--- a/media-gfx/splashutils/splashutils-1.4.2.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# 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.2.ebuild,v 1.9 2007/08/06 11:13:14 spock Exp $
-
-inherit eutils multilib toolchain-funcs
-
-MISCSPLASH="miscsplashutils-0.1.6"
-GENTOOSPLASH="splashutils-gentoo-1.0.2"
-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="amd64 ppc x86"
-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/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 ${SM}
- epatch ${FILESDIR}/${P}-misc-strip.patch
-
- cd ${SG}
- epatch ${FILESDIR}/${P}-rcabort.patch
-
- cd ${S}
- ln -sf ${S} ${WORKDIR}/core
- epatch ${FILESDIR}/${P}-getcfg.patch
-
- # 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 --missing true 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
-
- sed -i -e "s#/lib/splash#/$(get_libdir)/splash#" ${S}/scripts/{splash_manager,splash_geninitramfs}
-}
-
-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) STRIP=true || die "failed to build miscsplashutils"
-
- cd ${S}
- ./configure \
- --with-fifo="/$(get_libdir)/splash/cache/.splash" \
- $(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 LIB=$(get_libdir) || die "failed to build the splash plugin"
- fi
-}
-
-src_install() {
- local LIB=$(get_libdir)
-
- cd ${SM}
- make DESTDIR=${D} LIB=${LIB} install || die
-
- export ZLIBSRC LPNGSRC JPEGSRC FT2SRC
- cd ${S}
- make DESTDIR=${D} LIB=${LIB} install || die
-
- echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
- doenvd 99splash
-
- newinitd ${SG}/init-splash splash
- newconfd ${SG}/splash.conf splash
-
- insinto /usr/share/${PN}
- doins ${SG}/initrd.splash
-
- insinto /etc/splash
- doins ${SM}/fbtruetype/luxisri.ttf
-
- dodoc docs/* README AUTHORS
-
- if has_version ">=sys-apps/baselayout-1.13.99"; then
- cd ${SG}
- 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
-
- 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
-}
-
-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"
- ewarn ""
- fi
-
- if has_version '<media-gfx/splashutils-1.0' ; then
- ewarn "Since you are upgrading from a pre-1.0 version, please make sure that you"
- ewarn "rebuild your initrds. You can use the splash_geninitramfs script to do that."
- ewarn ""
- fi
-
- if ! test -f /proc/cmdline ||
- ! egrep -q '(console|CONSOLE)=(tty1|/dev/tty1)' /proc/cmdline ; then
- ewarn "It is required that you add 'console=tty1' to your kernel"
- ewarn "command line parameters."
- ewarn ""
- 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.3.2.ebuild b/media-gfx/splashutils/splashutils-1.5.3.2.ebuild
deleted file mode 100644
index 1ab68798be4f..000000000000
--- a/media-gfx/splashutils/splashutils-1.5.3.2.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# 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.5.3.2.ebuild,v 1.2 2007/12/23 12:22:05 spock Exp $
-
-inherit eutils multilib toolchain-funcs
-
-MISCSPLASH="miscsplashutils-0.1.8"
-GENTOOSPLASH="splashutils-gentoo-1.0.10"
-V_JPEG="6b"
-V_PNG="1.2.18"
-V_ZLIB="1.2.3"
-V_FT="2.3.5"
-
-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 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="~amd64 ~ppc ~x86"
-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/fbgrab"
-DEPEND="${RDEPEND}
- >=dev-libs/klibc-1.5
- dev-util/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_unpack() {
- unpack ${A}
-
- [ ! -d "${S}/libs" ] && mkdir "${S}/libs"
- 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"
-
- 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.in"
- fi
-
- if ! use truetype ; then
- sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile"
- fi
-}
-
-src_compile() {
- cd "${SM}"
- emake LIB=$(get_libdir) STRIP=true || die "failed to build miscsplashutils"
-
- cd "${S}"
- econf \
- $(use_with png) \
- $(use_with mng) \
- $(use_with gpm) \
- $(use_with truetype ttf) \
- $(use_with truetype ttf-kernel) \
- $(use_enable fbcondecor) \
- --with-freetype2-src=${FT2SRC} \
- --with-jpeg-src=${JPEGSRC} \
- --with-lpng-src=${LPNGSRC} \
- --with-zlib-src=${ZLIBSRC} || die "failed to configure splashutils"
-
- emake -j1 || die "failed to build splashutils"
-
- if has_version ">=sys-apps/baselayout-1.13.99"; then
- cd "${SG}"
- emake LIB=$(get_libdir) || die "failed to build the splash plugin"
- fi
-}
-
-src_install() {
- local LIB=$(get_libdir)
-
- cd "${SM}"
- make DESTDIR="${D}" LIB=${LIB} install || die
-
- cd "${S}"
- make DESTDIR="${D}" install || die
-
- 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
-
- if has_version ">=sys-apps/baselayout-1.13.99"; then
- cd "${SG}"
- 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
-
- 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
-}
-
-pkg_postinst() {
- if has_version sys-fs/devfsd || ! has_version sys-fs/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 has_version '<media-gfx/splashutils-1.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 has_version '<media-gfx/splashutils-1.5.3' && ! 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|CONSOLE)=(tty1|/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
-
- elog "Please note that the 'fbsplash' kernel patch has now been renamed to"
- elog "'fbcondecor'. Accordingly, the old 'splash' initscript is now called"
- elog "'fbcondecor'. Make sure you update your system. See:"
- elog " http://dev.gentoo.org/~spock/projects/fbcondecor/#history"
- elog "for further info about the name changes."
- elog ""
- elog "Also note that splash_util has now been split into splash_util, fbsplashd"
- elog "and fbcondecor_ctl."
-}
diff --git a/media-gfx/splashutils/splashutils-1.5.3.3.ebuild b/media-gfx/splashutils/splashutils-1.5.3.3.ebuild
deleted file mode 100644
index 49dca5c9588a..000000000000
--- a/media-gfx/splashutils/splashutils-1.5.3.3.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.3.3.ebuild,v 1.2 2008/01/15 15:50:00 spock Exp $
-
-inherit eutils multilib toolchain-funcs
-
-MISCSPLASH="miscsplashutils-0.1.8"
-GENTOOSPLASH="splashutils-gentoo-1.0.11"
-V_JPEG="6b"
-V_PNG="1.2.18"
-V_ZLIB="1.2.3"
-V_FT="2.3.5"
-
-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 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="~amd64 ~ppc ~x86"
-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/fbgrab"
-DEPEND="${RDEPEND}
- >=dev-libs/klibc-1.5
- dev-util/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_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}/src" "${WORKDIR}/core"
-
- 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.in"
- fi
-
- if ! use truetype ; then
- sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile"
- fi
-}
-
-src_compile() {
- cd "${SM}"
- emake LIB=$(get_libdir) STRIP=true || die "failed to build miscsplashutils"
-
- cd "${S}"
- econf \
- $(use_with png) \
- $(use_with mng) \
- $(use_with gpm) \
- $(use_with truetype ttf) \
- $(use_with truetype ttf-kernel) \
- $(use_enable fbcondecor) \
- --with-freetype2-src=${FT2SRC} \
- --with-jpeg-src=${JPEGSRC} \
- --with-lpng-src=${LPNGSRC} \
- --with-zlib-src=${ZLIBSRC} || die "failed to configure splashutils"
-
- emake -j1 || die "failed to build splashutils"
-
- if has_version ">=sys-apps/baselayout-1.13.99"; then
- cd "${SG}"
- emake LIB=$(get_libdir) || die "failed to build the splash plugin"
- fi
-}
-
-src_install() {
- local LIB=$(get_libdir)
-
- cd "${SM}"
- make DESTDIR="${D}" LIB=${LIB} install || die
-
- cd "${S}"
- make DESTDIR="${D}" install || die
-
- 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
-
- if has_version ">=sys-apps/baselayout-1.13.99"; then
- cd "${SG}"
- make DESTDIR="${D}" LIB=${LIB} install || die "failed to install the splash plugin"
- else
- cp "${SG}"/splash-functions-bl1.sh "${D}"/sbin/
- fi
-
- 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
-}
-
-pkg_postinst() {
- if has_version sys-fs/devfsd || ! has_version sys-fs/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 has_version '<media-gfx/splashutils-1.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 has_version '<media-gfx/splashutils-1.5.3' && ! 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|CONSOLE)=(tty1|/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
-
- elog "Please note that the 'fbsplash' kernel patch has now been renamed to"
- elog "'fbcondecor'. Accordingly, the old 'splash' initscript is now called"
- elog "'fbcondecor'. Make sure you update your system. See:"
- elog " http://dev.gentoo.org/~spock/projects/fbcondecor/#history"
- elog "for further info about the name changes."
- elog ""
- elog "Also note that splash_util has now been split into splash_util, fbsplashd"
- elog "and fbcondecor_ctl."
-}