Added -r16 which removes livecd themes due to new bootsplash-themes-livecd ebuilds.

4 files changed, 241 insertions, 7 deletions

diff --git a/media-gfx/bootsplash/ChangeLog b/media-gfx/bootsplash/ChangeLog
index 230417d3d694..94f46ef2ca28 100644
--- a/media-gfx/bootsplash/ChangeLog
+++ b/media-gfx/bootsplash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/bootsplash 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/ChangeLog,v 1.39 2004/04/25 22:34:05 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/ChangeLog,v 1.40 2004/05/19 20:24:02 wolf31o2 Exp $
+
+*bootsplash-0.6-r16 (19 May 2004)
+
+  19 May 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +bootsplash-0.6-r16.ebuild:
+  Added -r16 which removes livecd themes due to new bootsplash-themes-livecd
+  ebuilds.
 
   26 Apr 2004; Martin Holzer <mholzer@gentoo.org> bootsplash-0.6-r10.ebuild,
   bootsplash-0.6-r13.ebuild, bootsplash-0.6-r14.ebuild,
diff --git a/media-gfx/bootsplash/Manifest b/media-gfx/bootsplash/Manifest
index 0726aa4d81ed..c4d09762922b 100644
--- a/media-gfx/bootsplash/Manifest
+++ b/media-gfx/bootsplash/Manifest
@@ -1,12 +1,14 @@
-MD5 735549a7b5a1f2f93febea613d8b2dd3 bootsplash-0.6-r10.ebuild 5622
-MD5 889ac93924b74e2a9661f5d5cb0188f9 bootsplash-0.6-r8.ebuild 5188
 MD5 056f68d68f6a438cbd7bcc1a59b30004 bootsplash-0.6-r14.ebuild 6401
-MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
-MD5 772479757f4d076162ccae0267dc304d bootsplash-0.6-r15.ebuild 6773
+MD5 889ac93924b74e2a9661f5d5cb0188f9 bootsplash-0.6-r8.ebuild 5188
+MD5 7e36ad7e3f408477dd7d3d56fb122830 bootsplash-0.6-r16.ebuild 6680
 MD5 33d70b8a984accf25a24501dfc3c018e bootsplash-0.6-r13.ebuild 6401
-MD5 62e0e294c6099aea8be996633d243abf ChangeLog 7916
+MD5 772479757f4d076162ccae0267dc304d bootsplash-0.6-r15.ebuild 6773
+MD5 735549a7b5a1f2f93febea613d8b2dd3 bootsplash-0.6-r10.ebuild 5622
+MD5 9dfddbf21de3b2607171c199119366a0 ChangeLog 8125
+MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 MD5 6a993c12a7aad0735a4783e1f7c2c968 files/digest-bootsplash-0.6-r8 70
-MD5 76ccf0b26a417828b751dacf918ec867 files/digest-bootsplash-0.6-r13 71
 MD5 415eead25ab7491fad79afd276c53124 files/digest-bootsplash-0.6-r10 71
+MD5 76ccf0b26a417828b751dacf918ec867 files/digest-bootsplash-0.6-r13 71
 MD5 eced1f4f52f6c503e51583475b899d31 files/digest-bootsplash-0.6-r14 71
 MD5 ea86420ce78486c9a0c6b4a0b0a83bd8 files/digest-bootsplash-0.6-r15 71
+MD5 e07733044709e48e34df036d69dc9f3a files/digest-bootsplash-0.6-r16 71
diff --git a/media-gfx/bootsplash/bootsplash-0.6-r16.ebuild b/media-gfx/bootsplash/bootsplash-0.6-r16.ebuild
new file mode 100644
index 000000000000..a2a3503b8772
--- /dev/null
+++ b/media-gfx/bootsplash/bootsplash-0.6-r16.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/bootsplash-0.6-r16.ebuild,v 1.1 2004/05/19 20:24:02 wolf31o2 Exp $
+
+IUSE=""
+S=${WORKDIR}/${PF}
+DESCRIPTION="Graphical backgrounds for frame buffer consoles"
+HOMEPAGE="http://www.bootsplash.org/ http://linux.tkdack.com/"
+SRC_URI="mirror://gentoo/${PF}.tar.bz2
+	http://dev.gentoo.org/~wolf31o2/${PF}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND=">=media-libs/freetype-2
+	media-libs/libmng"
+
+src_compile() {
+	# compile utils
+	# the util builds but the rc scripts have not been modified
+	# animated boot up require patches to the baselayout package
+	cd ${S}/utils
+
+	emake -C fbmngplay || die
+	emake -C fbtruetype || die
+	emake -C splashutils || die
+
+	cd ${S}
+}
+
+src_install() {
+	# Splash utilities
+	exeinto /sbin
+	doexe utils/fbmngplay/fbmngplay{,.static}
+	doexe utils/fbtruetype/fbtruetype{,.static}
+	doexe misc/bootsplash_resize
+	newexe utils/splashutils/splash splash.bin
+	doexe misc/splash
+	doexe utils/splashutils/{fbresolution,getkey,progress}
+
+	exeinto /usr/lib/${PN}
+	doexe misc/bootsplash_resizer.pl
+
+	dodir /etc/${PN}
+	cp -pR themes/* ${D}/etc/${PN}
+
+	# link default config for boot images if not already set
+	if [ ! -e ${ROOT}/etc/bootsplash/default ]; then
+		dosym ./gentoo /etc/bootsplash/default
+	fi
+
+	exeinto /etc/init.d
+	doexe misc/bootsplash
+
+	insinto /etc/conf.d
+	newins misc/bootsplash.conf bootsplash
+
+	insinto /usr/share/${PN}
+	doins kernel/*.bz2 misc/grub.conf.sample
+
+	sed -i "s:${PN}:${PF}:g" misc/bootsplash_patch
+	into /
+	dosbin misc/bootsplash_patch
+	fperms 0754 /sbin/bootsplash_patch
+}
+
+pkg_postinst() {
+	# has to be done here so that the initrd images are created properly
+	if [ "${ROOT}" = "/" ]
+	then
+		for THEME in `ls /etc/bootsplash`
+		do
+			if [ -d /etc/bootsplash/${THEME} ] && [ "${THEME}" != "default" ]
+			then
+				for SIZE in 800x600 1024x768 1280x1024 1600x1200
+				do
+					/sbin/splash -s -f \
+						/etc/bootsplash/${THEME}/config/bootsplash-${SIZE}.cfg \
+						> /usr/share/${PN}/initrd-${THEME}-${SIZE}
+				done
+			fi
+		done
+	fi
+
+	# rename bootsplash config file to fit with the standard
+	if [ -f ${ROOT}/etc/conf.d/bootsplash.conf ]
+	then
+		mv -f ${ROOT}/etc/conf.d/bootsplash.conf ${ROOT}/etc/conf.d/bootsplash
+	fi
+
+	echo ""
+	einfo "Execute \`bootsplash_patch\` to have your kernel sources in"
+	einfo "/usr/src/linux patched with the Framebuffer Bootsplash patches."
+	einfo
+	einfo "You can also use:"
+	einfo "    bootsplash_patch /path/to/your/custom/kernel/"
+	einfo "to patch your custom kernel sources."
+	echo ""
+	ewarn "If you have already patched the kernel then you only need to copy"
+	ewarn "an initrd from /usr/share/${PN} to /boot"
+	echo ""
+	einfo "Run:"
+	einfo "    rc-update add bootsplash default"
+	einfo "to change the console images after startup"
+	echo ""
+	einfo "Please note that in case /sbin is a separate partition"
+	einfo "you'll need to use the statically linked versions of Bootplash"
+	einfo 'utilities (fbmngplay.static, fbtruetype.static) during boot-time.'
+	echo ""
+	einfo "If you would like to have a better quality background picture"
+	einfo "from the Gentoo theme and you don't care about a few more kilobytes"
+	einfo "of used memory, try the gentoo-highquality theme which you can"
+	einfo "download from:"
+	einfo "http://dev.gentoo.org/~spock/stuff/bootsplash/gentoo-highquality.tar.bz2"
+	echo ""
+	einfo "After the download is complete, unpack the files to /etc/bootsplash/"
+	echo ""
+	einfo "If you want to automatically generate configs for a new resolution"
+	einfo "you can use the \`bootsplash_resize\` script. More info:"
+	einfo "    bootsplash_resize -h"
+	echo ""
+}
+
+pkg_config() {
+
+	if [ "${LINUX}" == "" ]; then
+		LINUX='/usr/src/linux'
+	fi
+
+	eval `sed -n -e 's/^\([A-Z]*\) = \([0-9]*\)$/\1=\2/p' -e 's/^\([A-Z]*\) = \(-[-a-z0-9]*\)$/\1=\2/p' ${LINUX}/Makefile`
+
+	if [ -z "$VERSION" -o -z "$PATCHLEVEL" -o -z "$SUBLEVEL" ]
+	then
+		die "Unable to determine kernel version in ${LINUX}"
+	fi
+
+	KB="${VERSION}.${PATCHLEVEL}"
+	KV_MINOR="${SUBLEVEL}"
+
+	ewarn
+	ewarn "Patching the kernel (branch: ${KB}) in ${LINUX} ..."
+	ewarn
+
+	cd ${ROOT}/${LINUX}
+
+	if [ "${KB}" == "2.4" ]; then
+
+		if [ -f drivers/video/fbcon-splash.c ]; then
+			eerror
+			eerror "It appears your kernel has already been patched."
+			eerror
+			exit 1
+		fi
+
+		if [ ${KV_MINOR} -ge 25 ]; then
+			bzip2 -dc ${ROOT}/usr/share/${PN}/${PN}-3.0.7-2.4.25.patch.bz2 \
+					| patch -p1 || die
+		elif [ ${KV_MINOR} -ge 22 ]; then
+			bzip2 -dc ${ROOT}/usr/share/${PN}/${PN}-3.0.7-2.4.22-vanilla.diff.bz2 \
+					| patch -p1 || die
+		else
+			bzip2 -dc ${ROOT}/usr/share/${PN}/${PN}-3.0.7-2.4.20-vanilla.diff.bz2 \
+					| patch -p1 || die
+		fi
+
+	elif [ "${KB}" == "2.6" ]; then
+
+		if [ -d drivers/video/bootsplash ]; then
+			eerror
+			eerror "It appears your kernel has already been patched."
+			eerror
+			exit 1
+		fi
+
+		if [ ${KV_MINOR} -ge 6 ]; then
+			bzip2 -dc ${ROOT}/usr/share/${PN}/${PN}-3.1.4-2.6.6-rc2.patch.bz2 \
+					| patch -p1 || die
+		elif [ ${KV_MINOR} -ge 5 ]; then
+			bzip2 -dc ${ROOT}/usr/share/${PN}/${PN}-3.1.4-2.6.5.patch.bz2 \
+					| patch -p1 || die
+		elif [ ${KV_MINOR} -ge 3 ]; then
+			bzip2 -dc ${ROOT}/usr/share/${PN}/${PN}-3.1.4-2.6.3.diff.bz2 \
+					| patch -p1 || die
+		else
+			bzip2 -dc ${ROOT}/usr/share/${PN}/${PN}-3.1.3-2.6.0-test9.diff.bz2 \
+					| patch -p1 || die
+		fi
+	else
+		die "Sorry, this kernel branch is not supported."
+	fi
+
+	ewarn
+	ewarn " ... complete."
+	einfo
+	einfo "Your kernel has been patched, rebuild with the following options"
+	einfo "enabled (do not build them as modules!):"
+	einfo "		Block Devices ->"
+	einfo "			[*] RAM disk support"
+	einfo "			[*] Loopback device support"
+	einfo "			[*] Initial RAM disk (initrd) support"
+	einfo
+	einfo "		Console Drivers ->"
+	einfo "			[*] Video mode selection support"
+	einfo "			Frame-buffer support ->"
+	einfo "				[*] Support for frame buffer devices"
+	einfo "				[*] VESA VGA graphics console"
+	einfo "				[*] Use splash screen instead of boot logo"
+	einfo
+	einfo "Copy an initrd from /usr/share/${PN} to /boot"
+	einfo
+	einfo "Look at \"/usr/share/${PN}/grub.conf.sample\" for an example"
+	einfo "grub.conf file with the appropriate changes to enable the"
+	einfo "framebuffer boot screens"
+	einfo
+	einfo "Ensure you make the appropriate changes to your grub.conf"
+	echo ""
+	ewarn "Note that bootsplash will not work with kernels which have CONFIG_REGPARM"
+	ewarn "(Processor type and features -> Use register arguments) option enabled."
+	ewarn "You will also need framebuffer console support compiled into the kernel"
+	ewarn "(and not as a module)."
+	echo ""
+
+}
diff --git a/media-gfx/bootsplash/files/digest-bootsplash-0.6-r16 b/media-gfx/bootsplash/files/digest-bootsplash-0.6-r16
new file mode 100644
index 000000000000..9ae670b91a2f
--- /dev/null
+++ b/media-gfx/bootsplash/files/digest-bootsplash-0.6-r16
@@ -0,0 +1 @@
+MD5 989e656ea19533a4ffb05078d930d032 bootsplash-0.6-r16.tar.bz2 437953