Fixing some livecd issues and updating 2004.2 to use proper fonts.

8 files changed, 80 insertions, 44 deletions

diff --git a/media-gfx/bootsplash-themes-livecd/ChangeLog b/media-gfx/bootsplash-themes-livecd/ChangeLog
index 01439fb93f38..b0ff0eeb3b72 100644
--- a/media-gfx/bootsplash-themes-livecd/ChangeLog
+++ b/media-gfx/bootsplash-themes-livecd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/bootsplash-themes-livecd
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash-themes-livecd/ChangeLog,v 1.3 2004/05/26 12:20:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash-themes-livecd/ChangeLog,v 1.4 2004/06/03 22:40:04 wolf31o2 Exp $
+
+*bootsplash-themes-livecd-2004.2-r1 (03 Jun 2004)
+
+  03 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  bootsplash-themes-livecd-2004.0.ebuild,
+  bootsplash-themes-livecd-2004.1.ebuild,
+  +bootsplash-themes-livecd-2004.2-r1.ebuild,
+  bootsplash-themes-livecd-2004.2.ebuild:
+  Fixing some livecd issues and updating 2004.2 to use proper fonts.
 
 *bootsplash-themes-livecd-2004.2 (26 May 2004)
 
diff --git a/media-gfx/bootsplash-themes-livecd/Manifest b/media-gfx/bootsplash-themes-livecd/Manifest
index 3ed15898ea34..cd8d1399e008 100644
--- a/media-gfx/bootsplash-themes-livecd/Manifest
+++ b/media-gfx/bootsplash-themes-livecd/Manifest
@@ -1,8 +1,10 @@
-MD5 2807e8f2ad0b6f5acde493c7ec66d33d bootsplash-themes-livecd-2004.1.ebuild 938
-MD5 f3aca399d10c6caf8c35d9d606c2fff0 bootsplash-themes-livecd-2004.0.ebuild 938
-MD5 72a84f4359d598f8efed29ff0208cbb6 ChangeLog 809
+MD5 cb2d7777588f69713519917560de9592 bootsplash-themes-livecd-2004.2-r1.ebuild 859
+MD5 8ff56a3ebb94d24f4de3b6ce95bcc261 bootsplash-themes-livecd-2004.1.ebuild 856
+MD5 27f58f7ebc09a5988dd6ea84b15ab957 bootsplash-themes-livecd-2004.0.ebuild 856
+MD5 c2c002897bfb92e3b41f43301f08ae4c ChangeLog 1156
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
-MD5 57b1ca9a1f0643e95708b5ce8a385642 bootsplash-themes-livecd-2004.2.ebuild 919
+MD5 28cfa06e0b1362c1560d9be394d23dc9 bootsplash-themes-livecd-2004.2.ebuild 856
 MD5 ba9d58e94814ef84fb557e5da1a9179e files/digest-bootsplash-themes-livecd-2004.0 84
 MD5 0a71da624fab2230f950a40364d96500 files/digest-bootsplash-themes-livecd-2004.1 84
-MD5 7b81032d3c979e6bee331563ba8846e0 files/digest-bootsplash-themes-livecd-2004.2 84
+MD5 f598bd29b45d0de237019c32b85afa62 files/digest-bootsplash-themes-livecd-2004.2 84
+MD5 72d29a2e64867ea7f68d6347c71626d2 files/digest-bootsplash-themes-livecd-2004.2-r1 87
diff --git a/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.0.ebuild b/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.0.ebuild
index 97f0676d5ca3..df11c00e1203 100644
--- a/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.0.ebuild
+++ b/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.0.ebuild
@@ -1,28 +1,27 @@
 # 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-themes-livecd/bootsplash-themes-livecd-2004.0.ebuild,v 1.2 2004/05/20 21:17:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.0.ebuild,v 1.3 2004/06/03 22:40:04 wolf31o2 Exp $
 
 IUSE="livecd"
-S=${WORKDIR}/${PF}
+S=${WORKDIR}/livecd-${PV}
 DESCRIPTION="Gentoo ${PV} theme for bootsplash consoles"
 HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="mirror://gentoo/${PF}.tar.bz2
 	http://dev.gentoo.org/~wolf31o2/livecd/${PF}.tar.bz2"
 
-SLOT="0"
+SLOT=${PV}
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 
 DEPEND=">=media-gfx/bootsplash-0.6-r16"
 
 src_install() {
-	cp -r * ${D}/etc/bootsplash/themes/livecd-${PV}
+	dodir /etc/bootsplash/livecd-${PV}
+	cp -r ${S}/* ${D}/etc/bootsplash/livecd-${PV}
 
-	# link default config for boot images if not already set
-	if [ ! -e ${ROOT}/etc/bootsplash/default ]; then
-		use livecd \
-			&& dosym ./livecd-${PV} /etc/bootsplash/default \
-			|| dosym ./gentoo /etc/bootsplash/default
-	fi
-	use livecd && dosed "s:gentoo:livecd-${PV}:" /etc/conf.d/bootsplash
+	# link default config for livecd images if USE=livecd set
+	use livecd \
+		&& cd ${D}/etc/bootsplash \
+		&& rm default \
+		&& dosym ./livecd-${PV} /etc/bootsplash/default
 }
diff --git a/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.1.ebuild b/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.1.ebuild
index aa1dff19e6ec..b4433103a9e8 100644
--- a/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.1.ebuild
+++ b/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.1.ebuild
@@ -1,28 +1,27 @@
 # 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-themes-livecd/bootsplash-themes-livecd-2004.1.ebuild,v 1.2 2004/05/20 21:17:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.1.ebuild,v 1.3 2004/06/03 22:40:04 wolf31o2 Exp $
 
 IUSE="livecd"
-S=${WORKDIR}/${PF}
+S=${WORKDIR}/livecd-${PV}
 DESCRIPTION="Gentoo ${PV} theme for bootsplash consoles"
 HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="mirror://gentoo/${PF}.tar.bz2
 	http://dev.gentoo.org/~wolf31o2/livecd/${PF}.tar.bz2"
 
-SLOT="0"
+SLOT=${PV}
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 
 DEPEND=">=media-gfx/bootsplash-0.6-r16"
 
 src_install() {
-	cp -r * ${D}/etc/bootsplash/themes/livecd-${PV}
+	dodir /etc/bootsplash/livecd-${PV}
+	cp -r ${S}/* ${D}/etc/bootsplash/livecd-${PV}
 
-	# link default config for boot images if not already set
-	if [ ! -e ${ROOT}/etc/bootsplash/default ]; then
-		use livecd \
-			&& dosym ./livecd-${PV} /etc/bootsplash/default \
-			|| dosym ./gentoo /etc/bootsplash/default
-	fi
-	use livecd && dosed "s:gentoo:livecd-${PV}:" /etc/conf.d/bootsplash
+	# link default config for livecd images if USE=livecd set
+	use livecd \
+		&& cd ${D}/etc/bootsplash \
+		&& rm default \
+		&& dosym ./livecd-${PV} /etc/bootsplash/default
 }
diff --git a/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.2-r1.ebuild b/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.2-r1.ebuild
new file mode 100644
index 000000000000..5e5d20e2049a
--- /dev/null
+++ b/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.2-r1.ebuild
@@ -0,0 +1,27 @@
+# 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-themes-livecd/bootsplash-themes-livecd-2004.2-r1.ebuild,v 1.1 2004/06/03 22:40:04 wolf31o2 Exp $
+
+IUSE="livecd"
+S=${WORKDIR}/livecd-${PV}
+DESCRIPTION="Gentoo ${PV} theme for bootsplash consoles"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${PF}.tar.bz2
+	http://dev.gentoo.org/~wolf31o2/livecd/${PF}.tar.bz2"
+
+SLOT=${PV}
+LICENSE="GPL-2"
+KEYWORDS="x86 amd64"
+
+DEPEND=">=media-gfx/bootsplash-0.6-r16"
+
+src_install() {
+	dodir /etc/bootsplash/livecd-${PV}
+	cp -r ${S}/* ${D}/etc/bootsplash/livecd-${PV}
+
+	# link default config for livecd images if USE=livecd set
+	use livecd \
+		&& cd ${D}/etc/bootsplash \
+		&& rm default \
+		&& dosym ./livecd-${PV} /etc/bootsplash/default
+}
diff --git a/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.2.ebuild b/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.2.ebuild
index 9bf8261d7a33..4689e6d75453 100644
--- a/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.2.ebuild
+++ b/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.2.ebuild
@@ -1,28 +1,27 @@
 # 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-themes-livecd/bootsplash-themes-livecd-2004.2.ebuild,v 1.1 2004/05/26 12:20:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.2.ebuild,v 1.2 2004/06/03 22:40:04 wolf31o2 Exp $
 
 IUSE="livecd"
-S=${WORKDIR}/${PF}
+S=${WORKDIR}/livecd-${PV}
 DESCRIPTION="Gentoo ${PV} theme for bootsplash consoles"
 HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="mirror://gentoo/${PF}.tar.bz2
-	http://dev.gentoo.org/~wolf31o2/${PF}.tar.bz2"
+	http://dev.gentoo.org/~wolf31o2/livecd/${PF}.tar.bz2"
 
-SLOT="0"
+SLOT=${PV}
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64"
 
-DEPEND="media-gfx/bootsplash"
+DEPEND=">=media-gfx/bootsplash-0.6-r16"
 
 src_install() {
-	cp -r * ${D}/etc/bootsplash/themes/livecd-${PV}
+	dodir /etc/bootsplash/livecd-${PV}
+	cp -r ${S}/* ${D}/etc/bootsplash/livecd-${PV}
 
-	# link default config for boot images if not already set
-	if [ ! -e ${ROOT}/etc/bootsplash/default ]; then
-		use livecd \
-			&& dosym ./livecd-${PV} /etc/bootsplash/default \
-			|| dosym ./gentoo /etc/bootsplash/default
-	fi
-	use livecd && dosed "s:gentoo:livecd-${PV}:" /etc/conf.d/bootsplash
+	# link default config for livecd images if USE=livecd set
+	use livecd \
+		&& cd ${D}/etc/bootsplash \
+		&& rm default \
+		&& dosym ./livecd-${PV} /etc/bootsplash/default
 }
diff --git a/media-gfx/bootsplash-themes-livecd/files/digest-bootsplash-themes-livecd-2004.2 b/media-gfx/bootsplash-themes-livecd/files/digest-bootsplash-themes-livecd-2004.2
index 46fdd403113c..90a5bc25edb6 100644
--- a/media-gfx/bootsplash-themes-livecd/files/digest-bootsplash-themes-livecd-2004.2
+++ b/media-gfx/bootsplash-themes-livecd/files/digest-bootsplash-themes-livecd-2004.2
@@ -1 +1 @@
-MD5 20c16b6f8a954209ee172e7f10efd9b5 bootsplash-themes-livecd-2004.2.tar.bz2 563549
+MD5 0c29fc887a2d118e9f1b1b154ae8a44a bootsplash-themes-livecd-2004.2.tar.bz2 563452
diff --git a/media-gfx/bootsplash-themes-livecd/files/digest-bootsplash-themes-livecd-2004.2-r1 b/media-gfx/bootsplash-themes-livecd/files/digest-bootsplash-themes-livecd-2004.2-r1
new file mode 100644
index 000000000000..d77e9de25dff
--- /dev/null
+++ b/media-gfx/bootsplash-themes-livecd/files/digest-bootsplash-themes-livecd-2004.2-r1
@@ -0,0 +1 @@
+MD5 e340a654d7fe028457dbd6761181ec0e bootsplash-themes-livecd-2004.2-r1.tar.bz2 409557