diff options
author | Michael Januszewski <spock@gentoo.org> | 2007-07-07 18:30:25 +0000 |
---|---|---|
committer | Michael Januszewski <spock@gentoo.org> | 2007-07-07 18:30:25 +0000 |
commit | 1ec56e476e656d03fc0376624db632cfeec2e0a2 (patch) | |
tree | 3cee2c24c1ed4b4b979e193c18f549d4a4565b43 /media-gfx | |
parent | pymp moved to media-video. (diff) | |
download | gentoo-2-1ec56e476e656d03fc0376624db632cfeec2e0a2.tar.gz gentoo-2-1ec56e476e656d03fc0376624db632cfeec2e0a2.tar.bz2 gentoo-2-1ec56e476e656d03fc0376624db632cfeec2e0a2.zip |
Remove old ebuilds.
(Portage version: 2.1.3_rc6)
Diffstat (limited to 'media-gfx')
15 files changed, 14 insertions, 1055 deletions
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog index acdd8c527daa..acf5a2cc28a4 100644 --- a/media-gfx/splashutils/ChangeLog +++ b/media-gfx/splashutils/ChangeLog @@ -1,6 +1,19 @@ # 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.97 2007/07/07 18:18:45 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.98 2007/07/07 18:30:25 spock Exp $ + + 07 Jul 2007; Michał Januszewski <spock@gentoo.org> + -files/splashutils-gentoo-0.1.14-stat.patch, + -files/splashutils-gentoo-0.5.4-old-baselayout.patch, + -files/splashutils-1.1.9.10-2.6.18-vt-fix.patch, + -files/splashutils-1.1.9.10-makefile.patch, + -files/splashutils-1.1.9.10-ppc-2.6.14.patch, + -files/splashutils-1.1.9.10-types_h.patch, + -files/splashutils-1.3.1-boot_message-fix.patch, + -files/splashutils-1.3.1-boot_msg.patch, + -files/splashutils-1.3.1-cachedir.patch, -files/splashutils-depscan.patch, + -splashutils-1.1.9.10-r1.ebuild, -splashutils-1.3.1.ebuild: + Remove old ebuilds. *splashutils-1.4.3 (07 Jul 2007) diff --git a/media-gfx/splashutils/files/digest-splashutils-1.1.9.10-r1 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.10-r1 deleted file mode 100644 index 32c19a6065f5..000000000000 --- a/media-gfx/splashutils/files/digest-splashutils-1.1.9.10-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 f8e92992682bbaf8e6eb2316ac708bc0 miscsplashutils-0.1.3.tar.bz2 91825 -RMD160 47516ec50225ef18fd42e36d58e90e57bfc0dbac miscsplashutils-0.1.3.tar.bz2 91825 -SHA256 16fcb4d199e071a822d744bbd9238609a2175d512fc1c019018c05501cb23bdb miscsplashutils-0.1.3.tar.bz2 91825 -MD5 89c00eb118a549348bd3a97ee7087ecc splashutils-gentoo-0.1.14.tar.bz2 7750 -RMD160 680efa24119dcf699f37a9f295e3f81faebbdc18 splashutils-gentoo-0.1.14.tar.bz2 7750 -SHA256 2515416c98bcf8e4e0d217cafc74b507295cb03d915d78b224683577159ae9dc splashutils-gentoo-0.1.14.tar.bz2 7750 -MD5 3603b1d5124bf7a143f201dd828c95d7 splashutils-lite-1.1.9.10.tar.bz2 55094 -RMD160 274cfc9a79b69091b0feba8f6d64e3eb965dfb9a splashutils-lite-1.1.9.10.tar.bz2 55094 -SHA256 de38e284103ed569360caf5d555d784309afea7625bad7acd689399d26c3955c splashutils-lite-1.1.9.10.tar.bz2 55094 -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/digest-splashutils-1.3.1 b/media-gfx/splashutils/files/digest-splashutils-1.3.1 deleted file mode 100644 index d3b423bd951e..000000000000 --- a/media-gfx/splashutils/files/digest-splashutils-1.3.1 +++ /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 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 f29193cf6492f2b2700a7359fbab767b splashutils-gentoo-0.5.4.tar.bz2 6631 -RMD160 dde17340439121f6d2da021c2f8ac84d35411645 splashutils-gentoo-0.5.4.tar.bz2 6631 -SHA256 401cbc912d26be430b827203d6a94c2bab5aa0b6eead2010c0397f52643e6f74 splashutils-gentoo-0.5.4.tar.bz2 6631 -MD5 08f338d01cb18c11b5a465ef98df84ea splashutils-lite-1.3.1.tar.bz2 61506 -RMD160 14f47119523c5eca24482429c37d393e32562c3c splashutils-lite-1.3.1.tar.bz2 61506 -SHA256 45ab13d25ff941e9920ec2f941bc450794b869658fdcee13d72595708d569e39 splashutils-lite-1.3.1.tar.bz2 61506 -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.1.9.10-2.6.18-vt-fix.patch b/media-gfx/splashutils/files/splashutils-1.1.9.10-2.6.18-vt-fix.patch deleted file mode 100644 index a202190cb4e4..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.1.9.10-2.6.18-vt-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naurp splashutils-1.1.9.10-orig/kernel.c splashutils-1.1.9.10/kernel.c ---- splashutils-1.1.9.10-orig/kernel.c 2006-09-27 16:49:17.000000000 +0200 -+++ splashutils-1.1.9.10/kernel.c 2006-09-27 16:49:57.000000000 +0200 -@@ -23,6 +23,7 @@ - #include <linux/kd.h> - #include <linux/tty.h> - #include <linux/tiocl.h> -+#include <linux/vt.h> - - #include "splash.h" - diff --git a/media-gfx/splashutils/files/splashutils-1.1.9.10-makefile.patch b/media-gfx/splashutils/files/splashutils-1.1.9.10-makefile.patch deleted file mode 100644 index 0663a8d3f88f..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.1.9.10-makefile.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff -Naurp splashutils-1.1.9.10-orig/Makefile splashutils-1.1.9.10/Makefile ---- splashutils-1.1.9.10-orig/Makefile 2006-04-16 21:50:51.000000000 +0200 -+++ splashutils-1.1.9.10/Makefile 2006-04-16 21:51:01.000000000 +0200 -@@ -101,8 +101,8 @@ endif - - KOUT = kernel - dotg = \e[32;01m*\e[0m --info = if [ "${QUIET}" == "true" ] ; then printf " %-7s %s\n" $(1) $(2); fi --install_script = $(call info,INSTALL,$(1)) ; $(INSTALL_PROG) -D scripts/$(1) $(DESTDIR)$(usrbindir)/$(1) ; \ -+infmsg = if [ "${QUIET}" == "true" ] ; then printf " %-7s %s\n" $(1) $(2) ; fi -+install_script = $(call infmsg,INSTALL,$(1)) ; $(INSTALL_PROG) -D scripts/$(1) $(DESTDIR)$(usrbindir)/$(1) ; \ - sed -e 's/%PKG_VERSION%/$(PKG_VERSION)/g' -i $(DESTDIR)$(usrbindir)/$(1) - - SP_HELPER = splash_helper -@@ -119,7 +119,7 @@ all: splash_kern splash_user - splash_user: $(SP_UTIL) - - $(SP_UTIL): $(OBJS) -- @$(call info,LD,$@) -+ @$(call infmsg,LD,$@) - $(Q)$(CC) $+ $(LDLIBS) -o $@ - $(Q)$(CC) $+ $(LDLIBS) -static -o $@.static - -@@ -136,69 +136,69 @@ kdir: - zlib: config.h - @cd $(ZLIBSRC) ; \ - if [ ! -e ./Makefile ]; then \ -- $(call info,CONF,zlib) ; \ -+ $(call infmsg,CONF,zlib) ; \ - CC=$(KLCC) CFLAGS="$(K_CFLAGS)" \ - ./configure > $(OUTPUT); \ - sed -i 's#^CFLAGS=\(.*\)#CFLAGS=\1 $(K_CFLAGS)#' Makefile ; \ - fi ; \ -- if ! make -q CC=$(KLCC) libz.a; then $(call info,MAKE,zlib) ; fi ; \ -+ if ! make -q CC=$(KLCC) libz.a; then $(call infmsg,MAKE,zlib) ; fi ; \ - make CC=$(KLCC) libz.a > $(OUTPUT) - - libpng: zlib config.h - @cd $(LPNGSRC) ; \ - if [ ! -e ./Makefile ]; then \ -- $(call info,CONF,libpng) ; \ -+ $(call infmsg,CONF,libpng) ; \ - cp scripts/makefile.linux Makefile > $(OUTPUT); \ - sed -i -e '/^CFLAGS/ { N ; s#^CFLAGS=.*#CFLAGS=$(K_CFLAGS) $(PNGDEFS)# ; P ; D }' \ - -e 's#^ZLIBINC=.*#ZLIBINC=$(ZLIBSRC)#' \ - -e 's#^ZLIBLIB=.*#ZLIBLIB=$(ZLIBSRC)#' Makefile ; \ - fi ; \ -- if ! make -q CC=$(KLCC) libpng.a; then $(call info,MAKE,libpng) ; fi ; \ -+ if ! make -q CC=$(KLCC) libpng.a; then $(call infmsg,MAKE,libpng) ; fi ; \ - make CC=$(KLCC) libpng.a > $(OUTPUT) - - jpeglib: - @cd $(JPEGSRC) ; \ - if [ ! -e ./Makefile ]; then \ -- $(call info,CONF,libjpeg) ; \ -+ $(call infmsg,CONF,libjpeg) ; \ - CC=$(KLCC) CFLAGS="$(K_CFLAGS)" \ - ./configure > $(OUTPUT) ; \ - echo "#define NO_GETENV 1" >> jconfig.h ; \ - sed -i "s#CFLAGS=.*#CFLAGS=$(K_CFLAGS)#" Makefile ; \ - sed -i "s:#define JMESSAGE.*::" jerror.c ; \ - fi ; \ -- if ! make -q CC=$(KLCC) libjpeg.a; then $(call info,MAKE,libjpeg) ; fi ; \ -+ if ! make -q CC=$(KLCC) libjpeg.a; then $(call infmsg,MAKE,libjpeg) ; fi ; \ - make CC=$(KLCC) libjpeg.a > $(OUTPUT) - - ft2: config.h - @cd $(FT2SRC) ; \ - if [ ! -e ./config.mk ]; then \ -- $(call info,CONF,freetype2) ; \ -+ $(call infmsg,CONF,freetype2) ; \ - CC=$(KLCC) CPPFLAGS="-I$(ROOT)/$(ZLIBSRC)" \ - CFLAGS="$(K_CFLAGS) -include $(ROOT)/klibc_compat.h" \ - ./configure --disable-shared > $(OUTPUT) ; \ - fi ; \ -- if ! make -q CFLAGS="$(K_CFLAGS)" library; then $(call info,MAKE,freetype2) ; fi ; \ -+ if ! make -q CFLAGS="$(K_CFLAGS)" library; then $(call infmsg,MAKE,freetype2) ; fi ; \ - make CFLAGS="-c $(K_CFLAGS)" library > $(OUTPUT) - - splash_kern: linux jpeglib kdir $(K_DEPS) $(SP_HELPER) config.h $(K_LDLIBS) - - $(SP_HELPER): $(K_OBJS) -- @$(call info,LD,$@) -+ @$(call infmsg,LD,$@) - $(Q)$(KLCC) $(K_LDFLAGS) -o $@ $+ $(K_LDLIBS) - $(Q)$(STRIP) $@ - - $(KOUT)/%.o: %.c config.h splash.h -- @$(call info,CC,$@) -+ @$(call infmsg,CC,$@) - $(Q)$(KLCC) $(K_CFLAGS) -I/usr/include -c -o $@ $< - - %.o: %.c config.h splash.h -- @$(call info,CC,$@) -+ @$(call infmsg,CC,$@) - $(Q)$(CC) $(CFLAGS) $(INCLUDES) -DPKG_VERSION=\"$(PKG_VERSION)\" -c -o $@ $< - - clean: clean_jpg clean_png clean_zlib clean_ft2 clean_splash - - clean_splash: -- @$(call info,CLEAN,splash) -+ @$(call infmsg,CLEAN,splash) - $(Q)rm -f *.o - $(Q)rm -f kernel/*.o - $(Q)rm -f splash_helper splash_util splash_util.static -@@ -207,7 +207,7 @@ clean_splash: - clean_jpg: - @cd $(JPEGSRC) ; \ - if [ -e Makefile ]; then \ -- $(call info,CLEAN,libjpeg) ; \ -+ $(call infmsg,CLEAN,libjpeg) ; \ - make clean > $(OUTPUT) ; \ - rm -f Makefile ; \ - fi -@@ -215,7 +215,7 @@ clean_jpg: - clean_png: - @cd $(LPNGSRC) ; \ - if [ -e Makefile ]; then \ -- $(call info,CLEAN,libpng) ; \ -+ $(call infmsg,CLEAN,libpng) ; \ - make clean > $(OUTPUT) ; \ - rm -f Makefile ; \ - fi -@@ -223,7 +223,7 @@ clean_png: - clean_zlib: - @cd $(ZLIBSRC) ; \ - if [ -e Makefile ]; then \ -- $(call info,CLEAN,zlib) ; \ -+ $(call infmsg,CLEAN,zlib) ; \ - make clean > $(OUTPUT) ; \ - rm -f Makefile ; \ - fi -@@ -231,17 +231,17 @@ clean_zlib: - clean_ft2: - @cd $(FT2SRC) ; \ - if [ -e ./config.mk ]; then \ -- $(call info,CLEAN,freetype2) ; \ -+ $(call infmsg,CLEAN,freetype2) ; \ - make clean > $(OUTPUT) ; \ - rm -f config.mk ; \ - fi - - install: all -- @$(call info,INSTALL,$(SP_HELPER)) -+ @$(call infmsg,INSTALL,$(SP_HELPER)) - $(Q)$(INSTALL_PROG) -D $(SP_HELPER) $(DESTDIR)$(sbindir)/$(SP_HELPER) -- @$(call info,INSTALL,$(SP_UTIL)) -+ @$(call infmsg,INSTALL,$(SP_UTIL)) - $(Q)$(INSTALL_PROG) -D $(SP_UTIL) $(DESTDIR)$(sbindir)/$(SP_UTIL) -- @$(call info,INSTALL,$(SP_UTIL).static) -+ @$(call infmsg,INSTALL,$(SP_UTIL).static) - $(Q)$(INSTALL_PROG) -D $(SP_UTIL).static $(DESTDIR)$(sbindir)/$(SP_UTIL).static - @$(call install_script,$(SP_GIRAM)) - @$(call install_script,$(SP_CONV)) -@@ -249,18 +249,18 @@ install: all - @$(call install_script,$(SP_MNGR)) - - uninstall: -- @$(call info,UNINSTALL,$(SP_HELPER)) -+ @$(call infmsg,UNINSTALL,$(SP_HELPER)) - $(Q)rm -f $(sbindir)/$(SP_HELPER) -- @$(call info,UNINSTALL,$(SP_UTIL)) -+ @$(call infmsg,UNINSTALL,$(SP_UTIL)) - $(Q)rm -f $(sbindir)/$(SP_UTIL) -- @$(call info,UNINSTALL,$(SP_UTIL).static) -+ @$(call infmsg,UNINSTALL,$(SP_UTIL).static) - $(Q)rm -f $(sbindir)/$(SP_UTIL).static -- @$(call info,UNINSTALL,$(SP_GIRAM)) -+ @$(call infmsg,UNINSTALL,$(SP_GIRAM)) - $(Q)rm -f $(usrbindir)/$(SP_GIRAM) -- @$(call info,UNINSTALL,$(SP_CONV)) -+ @$(call infmsg,UNINSTALL,$(SP_CONV)) - $(Q)rm -f $(usrbindir)/$(SP_CONV) -- @$(call info,UNINSTALL,$(SP_RESIZE)) -+ @$(call infmsg,UNINSTALL,$(SP_RESIZE)) - $(Q)rm -f $(usrbindir)/$(SP_RESIZE) -- @$(call info,UNINSTALL,$(SP_MNGR)) -+ @$(call infmsg,UNINSTALL,$(SP_MNGR)) - $(Q)rm -f $(usrbindir)/$(SP_MNGR) - diff --git a/media-gfx/splashutils/files/splashutils-1.1.9.10-ppc-2.6.14.patch b/media-gfx/splashutils/files/splashutils-1.1.9.10-ppc-2.6.14.patch deleted file mode 100644 index d1647e11a430..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.1.9.10-ppc-2.6.14.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: splashutils-1.1.9.10/Makefile -=================================================================== ---- splashutils-1.1.9.10.orig/Makefile -+++ splashutils-1.1.9.10/Makefile -@@ -48,7 +48,7 @@ ROOT = $(shell pwd) - - # flags for the kernel utils - K_CFLAGS = -w -ffunction-sections -fdata-sections $(MISCINCS) \ -- -I$(ROOT)/$(ZLIBSRC) -I$(ROOT)/$(FT2SRC)/include -I$(ROOT)/linux/include -I$(ROOT)/linux/include2 \ -+ -I$(ROOT)/$(ZLIBSRC) -I$(ROOT)/$(FT2SRC)/include -I$(ROOT)/linux/include -I$(ROOT)/linux/include2 -I$(ROOT)/linux/arch/$(ARCH)/include \ - -DWITH_ERRLIST -DTARGET_KERNEL -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER - - PNGDEFS = -DPNG_NO_WRITE_TIME -DPNG_NO_FLOATING_POINT_SUPPORTED -DPNG_NO_WRITE_SUPPORTED -DPNG_NO_READ_iTXt \ diff --git a/media-gfx/splashutils/files/splashutils-1.1.9.10-types_h.patch b/media-gfx/splashutils/files/splashutils-1.1.9.10-types_h.patch deleted file mode 100644 index 84ab9c8e9aeb..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.1.9.10-types_h.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naurp splashutils-1.1.9.10-orig/render.c splashutils-1.1.9.10/render.c ---- splashutils-1.1.9.10-orig/render.c 2007-02-10 15:05:53.000000000 +0100 -+++ splashutils-1.1.9.10/render.c 2007-02-10 15:06:36.000000000 +0100 -@@ -17,9 +17,9 @@ - #undef __KERNEL__ - #endif - --#include <linux/fb.h> - #include <stdio.h> - #include <stdlib.h> -+#include <linux/fb.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <unistd.h> diff --git a/media-gfx/splashutils/files/splashutils-1.3.1-boot_message-fix.patch b/media-gfx/splashutils/files/splashutils-1.3.1-boot_message-fix.patch deleted file mode 100644 index 3cb4ae8c9cb9..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.3.1-boot_message-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/core/splash.c b/core/splash.c -index 3792ed9..459f5a7 100644 ---- a/core/splash.c -+++ b/core/splash.c -@@ -122,9 +122,10 @@ int main(int argc, char **argv) - arg_vc = -1; - - verbose_img.cmap.red = silent_img.cmap.red = NULL; -- boot_message = getenv("BOOT_MSG"); - - #ifdef CONFIG_TTF -+ boot_message = getenv("BOOT_MSG"); -+ - if (TTF_Init() < 0) { - fprintf(stderr, "Couldn't initialize TTF.\n"); - return -1; diff --git a/media-gfx/splashutils/files/splashutils-1.3.1-boot_msg.patch b/media-gfx/splashutils/files/splashutils-1.3.1-boot_msg.patch deleted file mode 100644 index 2235a63978e1..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.3.1-boot_msg.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/gentoo/splash-functions.sh b/gentoo/splash-functions.sh -index 9601116..38216f1 100644 ---- a/gentoo/splash-functions.sh -+++ b/gentoo/splash-functions.sh -@@ -260,11 +260,10 @@ splash_start() { - [[ ${SPLASH_KDMODE} == "GRAPHICS" ]] && options="--kdgraphics" - - # Start the splash daemon -- ${spl_util} -d --theme=${SPLASH_THEME} --pidfile=${spl_pidfile} ${options} -+ BOOT_MSG="$(splash_get_boot_message)" ${spl_util} -d --theme=${SPLASH_THEME} --pidfile=${spl_pidfile} ${options} - - # Set the silent TTY and boot message - splash_comm_send "set tty silent ${SPLASH_TTY}" -- splash_comm_send "set message $(splash_get_boot_message)" - - if [[ ${SPLASH_MODE_REQ} == "silent" ]] ; then - splash_comm_send "set mode silent" diff --git a/media-gfx/splashutils/files/splashutils-1.3.1-cachedir.patch b/media-gfx/splashutils/files/splashutils-1.3.1-cachedir.patch deleted file mode 100644 index 5bca5df48c24..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.3.1-cachedir.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/gentoo/splash-functions.sh b/gentoo/splash-functions.sh -index 38216f1..c7c805e 100644 ---- a/gentoo/splash-functions.sh -+++ b/gentoo/splash-functions.sh -@@ -523,7 +523,13 @@ splash_cache_cleanup() { - # writable, update it to avoid stale mtab entries (bug #121827). - local mntopt="" - [[ -w /etc/mtab ]] || mntopt="-n" -- umount ${mntopt} -l "${spl_tmpdir}" 2>/dev/null -+ mount ${mntopt} --move "${spl_cachedir}" "${spl_tmpdir}" 2>/dev/null -+ -+ # Don't try to copy anything if the cachedir is not writable. -+ [[ -w "${spl_cachedir}" ]] || return; -+ -+ cp -a "${spl_tmpdir}"/profile "${spl_cachedir}" 2>/dev/null -+ umount -l "${spl_tmpdir}" 2>/dev/null - } - - ########################################################################### diff --git a/media-gfx/splashutils/files/splashutils-depscan.patch b/media-gfx/splashutils/files/splashutils-depscan.patch deleted file mode 100644 index 49e81f5e4c82..000000000000 --- a/media-gfx/splashutils/files/splashutils-depscan.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- splash 2005-07-08 20:14:29.000000000 +0100 -+++ splash 2005-07-08 20:14:29.000000000 +0100 -@@ -15,9 +15,9 @@ - [[ -z ${SPLASH_SHUTDOWN_MESSAGE} ]] && SPLASH_SHUTDOWN_MESSAGE="Shutting down the system (\$progress%)... Press F2 for verbose mode" - [[ -z ${SPLASH_REBOOT_MESSAGE} ]] && SPLASH_REBOOT_MESSAGE="Rebooting the system (\$progress%)... Press F2 for verbose mode" - --[[ RC_GOT_FUNCTIONS != "yes" ]] && . /sbin/functions.sh --[[ -f /etc/conf.d/splash ]] && . /etc/conf.d/splash --[[ -f /etc/conf.d/rc ]] && . /etc/conf.d/rc -+[[ ${RC_GOT_FUNCTIONS} != "yes" ]] && source /sbin/functions.sh -+[[ -f $(add_suffix /etc/conf.d/splash) ]] \ -+ && source "$(add_suffix /etc/conf.d/splash)" - [[ ${RUNLEVEL} == "6" || ${RUNLEVEL} == "0" ]] && SHUTDOWN="yes" - - SPLUTIL="/sbin/splash_util.static" ---- splash-functions.sh 2005-07-18 13:48:05.000000000 +0100 -+++ splash-functions.sh 2005-07-18 13:48:05.000000000 +0100 -@@ -26,23 +26,6 @@ - spl_fifo="${spl_cachedir}/.splash" - spl_pidfile="${spl_cachedir}/daemon.pid" - --# This is a little tricky. We need depscan.sh to create an updated cache for --# us, and we need it in our place ($spl_cachedir), and not in $svcdir, since the --# latter might not be writable at this moment. In order to get what we need, --# we trick depscan.sh into thinking $svcdir is $spl_cachedir. --# --# Here is how it works: --# - $svcdir is defined in /sbin/functions.sh --# - /sbin/splash-functions.sh is sourced from /sbin/function.sh, after $svcdir --# is defined --# - /sbin/functions.sh is sourced from /sbin/depscan.sh --# --# $spl_cache_depscan is used to prevent breaking things when /sbin/depscan.sh --# is not run by us. --if [[ "$0" == "/sbin/depscan.sh" && "${spl_cache_depscan}" == "yes" ]]; then -- svcdir="${spl_cachedir}" --fi -- - # This is the main function that handles all events. - # Accepted parameters: - # svc_start <name> -@@ -203,7 +193,7 @@ - h=$(stat -c '%y' ${spl_cachedir}/deptree 2>/dev/null) - - # Point depscan.sh to our cachedir -- spl_cache_depscan="yes" /sbin/depscan.sh -u -+ spl_cache_depscan="yes" /sbin/depscan.sh --svcdir "${spl_cachedir}" - - if [[ "$1" == "start" ]]; then - # Check whether the list of services that will be started during boot diff --git a/media-gfx/splashutils/files/splashutils-gentoo-0.1.14-stat.patch b/media-gfx/splashutils/files/splashutils-gentoo-0.1.14-stat.patch deleted file mode 100644 index 6e8ef66a1426..000000000000 --- a/media-gfx/splashutils/files/splashutils-gentoo-0.1.14-stat.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naurp splashutils-gentoo-0.1.14-orig/splash-functions.sh splashutils-gentoo-0.1.14/splash-functions.sh ---- splashutils-gentoo-0.1.14-orig/splash-functions.sh 2007-04-09 12:45:01.000000000 +0200 -+++ splashutils-gentoo-0.1.14/splash-functions.sh 2007-04-09 12:46:32.000000000 +0200 -@@ -207,7 +207,7 @@ splash_cache_prep() { - - mount -n --move "${spl_tmpdir}" "${spl_cachedir}" - -- h=$(stat -c '%y' ${spl_cachedir}/deptree 2>/dev/null) -+ h=$(ls -ld --full-time ${spl_cachedir}/deptree | cut -f6,7,8 -d' ' 2>/dev/null) - - # Point depscan.sh to our cachedir - spl_cache_depscan="yes" /sbin/depscan.sh -u -@@ -226,8 +226,8 @@ splash_cache_prep() { - local lastlev timestamp - { read lastlev; read timestamp; } < ${spl_cachedir}/levels - if [[ "${lastlev}" != "${BOOTLEVEL}/${DEFAULTLEVEL}" || \ -- "${timestamp}" != "$(stat -c '%y' /etc/runlevels/${BOOTLEVEL})/$(stat -c '%y' /etc/runlevels/${DEFAULTLEVEL})" || \ -- "$(stat -c '%y' ${spl_cachedir}/deptree)" != "${h}" ]]; then -+ "${timestamp}" != "$(ls -ld --full-time /etc/runlevels/${BOOTLEVEL} | cut -f6,7,8 -d' ')/$(ls -ld --full-time /etc/runlevels/${DEFAULTLEVEL} | cut -f6,7,8 -d' ')" || \ -+ "$(ls -ld --full-time ${spl_cachedir}/deptree | cut -f6,7,8 -d' ')" != "${h}" ]]; then - echo $(splash_svclist_update "start") > ${spl_cachedir}/svcs_start - fi - fi diff --git a/media-gfx/splashutils/files/splashutils-gentoo-0.5.4-old-baselayout.patch b/media-gfx/splashutils/files/splashutils-gentoo-0.5.4-old-baselayout.patch deleted file mode 100644 index 252dab890c15..000000000000 --- a/media-gfx/splashutils/files/splashutils-gentoo-0.5.4-old-baselayout.patch +++ /dev/null @@ -1,218 +0,0 @@ -diff -Naurp splashutils-gentoo-0.5.4-orig/splash-functions.sh splashutils-gentoo-0.5.4/splash-functions.sh ---- splashutils-gentoo-0.5.4-orig/splash-functions.sh 2007-03-21 20:51:46.000000000 +0100 -+++ splashutils-gentoo-0.5.4/splash-functions.sh 2007-03-21 20:53:37.000000000 +0100 -@@ -489,10 +489,39 @@ splash_cache_prep() { - return "${retval}" - fi - -+ # Copy the dependency cache and services lists to our new cache dir. -+ # With some luck, we won't have to update it. -+ cp -a ${svcdir}/{depcache,deptree} "${spl_tmpdir}" 2>/dev/null -+ cp -a ${spl_cachedir}/{svcs_start,svcs_stop,levels} "${spl_tmpdir}" 2>/dev/null -+ -+ # Now that the data from the old cache is copied, move tmpdir to cachedir. - mount -n --move "${spl_tmpdir}" "${spl_cachedir}" - -+ h=$(ls -ld --full-time ${spl_cachedir}/deptree | cut -f6,7,8 -d' ' 2>/dev/null) -+ -+ # Point depscan.sh to our cachedir -+ /sbin/depscan.sh --svcdir "${spl_cachedir}" -+ - if [[ "$1" == "start" ]]; then -- echo $(splash_svclist_update "start") > ${spl_cachedir}/svcs_start -+ # Check whether the list of services that will be started during boot -+ # needs updating. This is generally the case if: -+ # - one of the caches doesn't exist -+ # - our deptree was out of date -+ # - we're booting with a different boot/default level than the last time -+ # - one of the runlevel dirs has been modified since the last boot -+ if [[ ! -e ${spl_cachedir}/levels || \ -+ ! -e ${spl_cachedir}/svcs_start ]]; then -+ echo $(splash_svclist_update "start") > ${spl_cachedir}/svcs_start -+ else -+ local lastlev timestamp -+ { read lastlev; read timestamp; } < ${spl_cachedir}/levels -+ if [[ "${lastlev}" != "${BOOTLEVEL}/${DEFAULTLEVEL}" || \ -+ "${timestamp}" != "$(ls -ld --full-time /etc/runlevels/${BOOTLEVEL} | cut -f6,7,8 -d' ')/$(ls -ld --full-time /etc/runlevels/${DEFAULTLEVEL} | cut -f6,7,8 -d' ')" || \ -+ "$(ls -ld --full-time ${spl_cachedir}/deptree | cut -f6,7,8 -d' ')" != "${h}" ]]; then -+ echo $(splash_svclist_update "start") > ${spl_cachedir}/svcs_start -+ fi -+ fi -+ - echo -n > ${spl_cachedir}/profile - fi - -@@ -524,7 +553,17 @@ splash_cache_cleanup() { - # writable, update it to avoid stale mtab entries (bug #121827). - local mntopt="" - [[ -w /etc/mtab ]] || mntopt="-n" -- umount ${mntopt} -l "${spl_tmpdir}" 2>/dev/null -+ mount ${mntopt} --move "${spl_cachedir}" "${spl_tmpdir}" 2>/dev/null -+ -+ # Don't try to copy anything if the cachedir is not writable. -+ [[ -w "${spl_cachedir}" ]] || return; -+ -+ cp -a "${spl_tmpdir}"/{envcache,depcache,deptree,svcs_start,svcs_stop,profile} "${spl_cachedir}" 2>/dev/null -+ echo "${BOOTLEVEL}/${DEFAULTLEVEL}" > "${spl_cachedir}/levels" -+ echo "$(stat -c '%y' /etc/runlevels/${BOOTLEVEL})/$(stat -c '%y' /etc/runlevels/${DEFAULTLEVEL})" \ -+ >> "${spl_cachedir}/levels" -+ -+ umount -l "${spl_tmpdir}" 2>/dev/null - } - - ########################################################################### -@@ -557,32 +596,133 @@ splash_svclist_get() { - } - - splash_svclist_update() { -- local svcs= order= x= dlvl="${SOFTLEVEL}" -+ ( -+ # Source our own deptree and required functions -+ source ${spl_cachedir}/deptree -+ [[ ${RC_GOT_SERVICES} != "yes" ]] && source "${svclib}/sh/rc-services.sh" -+ -+ svcs_started=" " -+ svcs_order="" -+ -+ # We're sure our depcache is up-to-date, no need to waste -+ # time checking mtimes. -+ check_mtime() { -+ return 0 -+ } -+ -+ is_net_up() { -+ local netcount=0 -+ -+ case "${RC_NET_STRICT_CHECKING}" in -+ lo) -+ netcount="$(echo ${svcs_started} | tr ' ' '\n' | \ -+ egrep -c "\/net\..*$")" -+ ;; -+ *) -+ netcount="$(echo ${svcs_started} | tr ' ' '\n' | \ -+ grep -v 'net\.lo' | egrep -c "\/net\..*$")" -+ ;; -+ esac -+ -+ # Only worry about net.* services if this is the last one running, -+ # or if RC_NET_STRICT_CHECKING is set ... -+ if [[ ${netcount} -lt 1 || ${RC_NET_STRICT_CHECKING} == "yes" ]]; then -+ return 1 -+ fi -+ -+ return 0 -+ } - -- for x in $(dolisting /etc/runlevels/${BOOTLEVEL}) \ -- $(dolisting ${svcdir}/coldplugged) ; do -- svcs="${svcs} ${x##*/}" -- if [[ ${x##*/} == "autoconfig" ]] ; then -- svcs="${svcs} $(. /etc/init.d/autoconfig; list_services)" -+ service_started() { -+ if [[ -z "${svcs_started/* ${1} */}" ]]; then -+ return 0 -+ else -+ return 1 - fi -- done -- order=$(rc-depend -ineed -iuse -iafter ${svcs}) -+ } -+ -+ # This simulates the service startup and has to mimic the behaviour of -+ # svc_start() from /sbin/runscript.sh and start_service() from rc-functions.sh -+ # as closely as possible. -+ start_service() { -+ local svc="$1" - -- # We call rc-depend twice so we get the ordering exactly right -- svcs= -- if [[ ${SOFTLEVEL} == "${BOOTLEVEL}" ]] ; then -- dlvl="${DEFAULTLEVEL}" -- fi -- for x in $(dolisting /etc/runlevels/"${dlvl}") ; do -- svcs="${svcs} ${x##*/}" -- if [[ ${x##*/} == "autoconfig" ]] ; then -- svcs="${svcs} $(. /etc/init.d/autoconfig; list_services)" -+ if service_started ${svc}; then -+ return - fi -- done -- order="${order} $(SOFTLEVEL="$dlvl" rc-depend -ineed -iuse -iafter ${svcs})" - -- # Only list each service once -- uniqify ${order} -+ # Prevent recursion.. -+ svcs_started="${svcs_started}$1 " -+ -+ if is_fake_service "${svc}" "${mylevel}"; then -+ svcs_order="${svcs_order} ${svc}" -+ return -+ fi -+ -+ svcs_startup="$(ineed "${svc}") \ -+ $(valid_iuse "${svc}") \ -+ $(valid_iafter "${svc}")" -+ -+ for x in ${svcs_startup} ; do -+ if [[ ${x} == "net" ]] && [[ ${svc%%.*} != "net" || ${svc##*.} == ${svc} ]] && ! is_net_up ; then -+ local netservices="$(dolisting "/etc/runlevels/${BOOTLEVEL}/net.*") \ -+ $(dolisting "/etc/runlevels/${mylevel}/net.*")" -+ -+ for y in ${netservices} ; do -+ mynetservice="${y##*/}" -+ if ! service_started ${mynetservice} ; then -+ start_service "${mynetservice}" -+ fi -+ done -+ else -+ if ! service_started ${x} ; then -+ start_service "${x}" -+ fi -+ fi -+ done -+ -+ svcs_order="${svcs_order} ${svc}" -+ return -+ } -+ -+ # This function should return a list of services that will be started -+ # from /etc/init.d/autoconfig. In order to do that, we source -+ # /etc/init.d/autoconfig and use its list_services() function. -+ autoconfig_svcs() { -+ [[ -r /etc/init.d/autoconfig ]] || return -+ . /etc/init.d/autoconfig -+ echo "$(list_services)" -+ } -+ -+ as="$(autoconfig_svcs)" -+ [[ -n "${SOFTLEVEL}" ]] && ss="$(dolisting "/etc/runlevels/${SOFTLEVEL}/") " -+ sb="$(dolisting "/etc/runlevels/${BOOTLEVEL}/") " -+ sd="$(dolisting "/etc/runlevels/${DEFAULTLEVEL}/") " -+ -+ # If autoconfig is one of the services that will be started, -+ # insert an updated list of services into our list. -+ if [[ -z "${ss/*\/autoconfig */}" ]]; then -+ ss="${ss/\/autoconfig /\/autoconfig $as }" -+ fi -+ -+ if [[ -z "${sb/*\/autoconfig */}" ]]; then -+ sb="${sb/\/autoconfig /\/autoconfig $as }" -+ fi -+ -+ if [[ -z "${sd/*\/autoconfig */}" ]]; then -+ sd="${sd/\/autoconfig /\/autoconfig $as }" -+ fi -+ -+ mylevel="${BOOTLEVEL}" -+ for i in ${CRITICAL_SERVICES} ${sb}; do -+ start_service "${i##*/}" -+ done -+ mylevel="${DEFAULTLEVEL}" -+ for i in ${LOGGER_SERVICE} ${sd} ${ss}; do -+ start_service "${i##*/}" -+ done -+ echo "${svcs_order}" -+ ) - } - - ########################################################################### diff --git a/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild b/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild deleted file mode 100644 index c36b6d3b482e..000000000000 --- a/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild +++ /dev/null @@ -1,230 +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.1.9.10-r1.ebuild,v 1.11 2007/04/30 22:45:13 genone Exp $ - -inherit eutils multilib linux-mod - -MISCSPLASH="miscsplashutils-0.1.3" -GENTOOSPLASH="splashutils-gentoo-0.1.14" -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 kdgraphics" - -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 ) - >=media-libs/jpeg-6b - >=sys-apps/baselayout-1.9.4-r5 - app-arch/cpio - !media-gfx/bootsplash - media-gfx/fbgrab" -DEPEND="${RDEPEND} - virtual/linux-sources - >=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 -} - -spl_conf() { - sed -i -re "s/#.* $2([^_].*|$)//g" ${S}/config.h - - if [[ "$1" == "yes" ]]; then - echo "#define $2 1" >> ${S}/config.h - else - echo "#undef $2" >> ${S}/config.h - fi -} - -spl_conf_use() { - if use $1; then - spl_conf yes $2 - else - spl_conf no $2 - fi -} - -pkg_setup() { - check_kernel_built -} - -src_unpack() { - unpack ${A} - ln -s ${KV_DIR} ${S}/linux - - # Ensure that we call depscan with --svcdir - cd "${WORKDIR}/${GENTOOSPLASH}" - epatch "${FILESDIR}/splashutils-depscan.patch" - epatch ${FILESDIR}/splashutils-gentoo-0.1.14-stat.patch - - 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}/${P}-ppc-2.6.14.patch - epatch ${FILESDIR}/${P}-makefile.patch - epatch ${FILESDIR}/${P}-2.6.18-vt-fix.patch - epatch ${FILESDIR}/${P}-types_h.patch - - # Check whether the kernel tree has been patched with fbsplash. - if [[ ! -e ${KV_DIR}/include/linux/console_splash.h ]]; then - ewarn "Your kernel in ${KV_DIR} has not been patched with a compatible version" - ewarn "of fbsplash. You can download the latest patch from http://dev.gentoo.org/~spock/" - ewarn "" - ewarn "Splashutils will be compiled without fbsplash support. Verbose mode will not" - ewarn "be supported." - spl_conf no CONFIG_FBSPLASH - else - spl_conf yes CONFIG_FBSPLASH - 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 - - mkdir ${S}/kernel - - # 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 - - epunt_cxx -} - -src_compile() { - spl_conf_use png CONFIG_PNG - spl_conf_use truetype CONFIG_TTF - spl_conf_use truetype CONFIG_TTF_KERNEL - spl_conf_use kdgraphics CONFIG_SILENT_KD_GRAPHICS - sed -i -e "s/^CFLAGS[ \t]*=.*/CFLAGS = ${CFLAGS}/" Makefile - - cd ${SM} - emake LIB=$(get_libdir) || die "failed to build miscsplashutils" - cd ${S} - 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 /sbin - doexe ${SG}/splash - - newinitd ${SG}/init-splash splash - newconfd ${SG}/splash.conf splash - - insinto /usr/share/${PN} - doins ${SG}/initrd.splash - - insinto /sbin - doins ${SG}/splash-functions.sh - - 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" - ewarn "" - 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" - 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 - einfo "The sample Gentoo themes (emergence, gentoo) have been removed from the" - einfo "core splashutils package. To get some themes you might want to emerge:" - einfo " media-gfx/splash-themes-livecd" - einfo " media-gfx/splash-themes-gentoo" - fi -} diff --git a/media-gfx/splashutils/splashutils-1.3.1.ebuild b/media-gfx/splashutils/splashutils-1.3.1.ebuild deleted file mode 100644 index fcb1299ecc66..000000000000 --- a/media-gfx/splashutils/splashutils-1.3.1.ebuild +++ /dev/null @@ -1,221 +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.3.1.ebuild,v 1.6 2007/04/30 22:45:13 genone Exp $ - -inherit eutils multilib toolchain-funcs - -MISCSPLASH="miscsplashutils-0.1.5" -GENTOOSPLASH="splashutils-gentoo-0.5.4" -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 ) - 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 ${SG} - - if has_version '>=sys-apps/baselayout-1.13.0_alpha12' ; then - epatch ${FILESDIR}/${P}-cachedir.patch - else - epatch ${FILESDIR}/${GENTOOSPLASH}-old-baselayout.patch - fi - - epatch ${FILESDIR}/${P}-boot_msg.patch - - cd ${S} - epatch ${FILESDIR}/${P}-boot_message-fix.patch - - # Make sure the static version of splash_util is linked against the nptl - # libraries and not the linuxthreads ones. - sed -i -e 's#$(LDLIBS) -static#$(LDLIBS) -L/usr/lib/nptl -static#' Makefile - - # 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 - - # 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 /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 - - newinitd ${SG}/init-splash splash - newconfd ${SG}/splash.conf splash - - insinto /usr/share/${PN} - doins ${SG}/initrd.splash - - insinto /sbin - doins ${SG}/splash-functions.sh - - 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" - ewarn "" - 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" - 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 -} |