Send 1.11 to the bitbucket; Promote 1.13 to stable, and recruit 1.16 as the new unstable.

(Portage version: 2.0.51.19)

6 files changed, 65 insertions, 19 deletions

diff --git a/sys-boot/colo/ChangeLog b/sys-boot/colo/ChangeLog
index 79d81e828a5b..4dabb3ad3187 100644
--- a/sys-boot/colo/ChangeLog
+++ b/sys-boot/colo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/colo
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/ChangeLog,v 1.11 2004/09/18 13:21:07 kumba Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/ChangeLog,v 1.12 2005/03/21 03:00:33 kumba Exp $
+
+*colo-1.16 (20 Mar 2005)
+
+  20 Mar 2005; Joshua Kinard <kumba@gentoo.org> -colo-1.11.ebuild,
+  colo-1.13.ebuild, +colo-1.16.ebuild:
+  Send 1.11 to the bitbucket; Promote 1.13 to stable, and recruit 1.16 as the
+  new unstable.
 
   18 Sep 2004; Joshua Kinard <kumba@gentoo.org> colo-1.13.ebuild:
   Typo fix.
diff --git a/sys-boot/colo/Manifest b/sys-boot/colo/Manifest
index 7721371ec770..b6f9ee77eb37 100644
--- a/sys-boot/colo/Manifest
+++ b/sys-boot/colo/Manifest
@@ -1,9 +1,9 @@
-MD5 d619cc6965d7d44f20a12029373a2299 ChangeLog 1969
+MD5 3e00e09ba758c22833be95db5871981f ChangeLog 2196
+MD5 4eaf7fcca950459099b21ce13c7c43f6 colo-1.16.ebuild 4457
+MD5 13b62b8fe22e9e6864282a2e89492912 colo-1.13.ebuild 3754
 MD5 821bbe104fd36eab5f08495277bc5adb metadata.xml 364
-MD5 3042a931765662eae20162251690496e colo-1.11.ebuild 3144
-MD5 ee5295b0f0c0bafbf07b2345a6c1d3b4 colo-1.13.ebuild 3755
-MD5 3a2004f193ec415c0087691d913c92db files/digest-colo-1.13 61
+MD5 90a0baf918f815c9b6d3daafcc77c960 files/digest-colo-1.16 61
 MD5 bcfba587298a2f1a3dd4c186dbc1ce0d files/colo-linker-overlap-fix.patch 1489
-MD5 c5c9112560e049209e3cf4226a5b7ddc files/digest-colo-1.11 61
 MD5 887b7cc9e154a546edceffc8ecedc9fd files/default.colo 840
+MD5 3a2004f193ec415c0087691d913c92db files/digest-colo-1.13 61
 MD5 216fc6b6d9c407532a57bf484d8fe7d3 files/menu-linux.colo 286
diff --git a/sys-boot/colo/colo-1.13.ebuild b/sys-boot/colo/colo-1.13.ebuild
index 274ca43f849f..99b132795468 100644
--- a/sys-boot/colo/colo-1.13.ebuild
+++ b/sys-boot/colo/colo-1.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/colo-1.13.ebuild,v 1.2 2004/09/18 13:21:07 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/colo-1.13.ebuild,v 1.3 2005/03/21 03:00:33 kumba Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.colonel-panic.org/cobalt-mips/"
 SRC_URI="http://www.colonel-panic.org/cobalt-mips/colo/colo-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~mips"
+KEYWORDS="-* mips"
 IUSE=""
 DEPEND=""
 RESTRICT="nostrip"
diff --git a/sys-boot/colo/colo-1.11.ebuild b/sys-boot/colo/colo-1.16.ebuild
index 5758874dbdee..3ba6acba89de 100644
--- a/sys-boot/colo/colo-1.11.ebuild
+++ b/sys-boot/colo/colo-1.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/colo-1.11.ebuild,v 1.2 2004/09/03 06:19:03 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/colo-1.16.ebuild,v 1.1 2005/03/21 03:00:33 kumba Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.colonel-panic.org/cobalt-mips/"
 SRC_URI="http://www.colonel-panic.org/cobalt-mips/colo/colo-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* mips"
+KEYWORDS="-* ~mips"
 IUSE=""
 DEPEND=""
 RESTRICT="nostrip"
@@ -30,9 +30,11 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	# patch Docs
-	cd ${S}
-	epatch ${FILESDIR}/colo-linker-overlap-fix.patch
+	# cp the bootscripts to WORKDIR
+	cp ${FILESDIR}/menu-linux.colo ${WORKDIR}
+
+	# sed the primary boot script and stick the current colo version in there
+	sed "s:@COLOVER@:${PV}:g" ${FILESDIR}/default.colo > ${WORKDIR}/default.colo
 }
 
 src_compile() {
@@ -63,6 +65,20 @@ src_compile() {
 	cd ${S}/tools/md5rom
 	make clean || die
 	make || die
+
+	# lcdtools
+	echo -e ""
+	einfo ">>> Building lcdtools ..."
+	cd ${S}/tools/lcdtools
+	make clean || die
+	make || die
+
+	# elf2rfx
+	echo -e ""
+	einfo ">>> Building elf2rfx ..."
+	cd ${S}/tools/elf2rfx
+	make clean || die
+	make || die
 }
 
 src_install() {
@@ -71,7 +87,6 @@ src_install() {
 	dodir /usr/lib/colo
 	cp binaries/colo-chain.elf ${D}/usr/lib/colo
 	cp binaries/colo-rom-image.bin ${D}/usr/lib/colo
-	cp ${FILESDIR}/default.boot.example ${D}/usr/lib/colo/default.colo.example
 
 	# docs
 	dodoc CHANGES COPYING INSTALL README README.{restore,shell} TODO
@@ -87,6 +102,20 @@ src_install() {
 	# md5rom
 	dosbin tools/md5rom/md5rom
 	doman tools/md5rom/md5rom.8
+
+	# lcdtools
+	for tool in paneld putlcd e2fsck-lcd; do
+		dosbin tools/lcdtools/${tool}/${tool}
+		doman tools/lcdtools/${tool}/${tool}.8
+	done
+	dolib.a tools/lcdtools/liblcd/liblcd.a
+
+	# elf2rfx
+	dosbin tools/elf2rfx/elf2rfx
+
+	# bootscripts
+	dodir /usr/lib/colo/scripts
+	cp ${WORKDIR}/default.colo ${WORKDIR}/menu-linux.colo ${D}/usr/lib/colo/scripts
 }
 
 pkg_postinst() {
@@ -94,12 +123,22 @@ pkg_postinst() {
 	einfo "Install locations:"
 	einfo "   Binaries:\t/usr/lib/${PN}"
 	einfo "   Docs:\t/usr/share/doc/${PF}"
-	einfo "   Tools:\t/usr/bin/{flash-tool,colo-perm,md5rom}"
+	einfo "   Tools:\t/usr/sbin/{flash-tool,colo-perm,md5rom,"
+	einfo "         \tputlcd,paneld,e2fsck-lcd,elf2rfx}"
 	einfo "   Scripts:\t/usr/lib/${PN}/scripts"
 	echo -e ""
 	einfo "Please read the docs to fully understand the behavior of this bootloader, and"
 	einfo "edit the boot scripts to suit your needs."
 	echo -e ""
+	ewarn "Please note that the 'menu' command, introduced in colo-1.12 has been replaced"
+	ewarn "by the 'select' command.  Have a look at the menu.colo example in the example"
+	ewarn "scripts directory for hints on updating your boot scripts if necessary."
+	echo -e ""
+	ewarn "Users installing ${PN} for the first time need to be aware that newer"
+	ewarn "versions of ${PN} disable the serial port by default.  If the serial port"
+	ewarn "is needed, select it from the boot menu.  Users using the example boot"
+	ewarn "scripts provided will have the serial port automatically enabled."
+	echo -e ""
 	echo -e ""
 	ewarn "Note: It is HIGHLY recommended that you use the chain"
 	ewarn "bootloader (colo-chain.elf) first before attempting to"
diff --git a/sys-boot/colo/files/digest-colo-1.11 b/sys-boot/colo/files/digest-colo-1.11
deleted file mode 100644
index d76c315f5219..000000000000
--- a/sys-boot/colo/files/digest-colo-1.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0528bbc5d64d1fa1851fb71ac2dc4146 colo-1.11.tar.gz 216716
diff --git a/sys-boot/colo/files/digest-colo-1.16 b/sys-boot/colo/files/digest-colo-1.16
new file mode 100644
index 000000000000..9bdd764a236b
--- /dev/null
+++ b/sys-boot/colo/files/digest-colo-1.16
@@ -0,0 +1 @@
+MD5 7e00fb1a68e185c03152dc161cecb8d4 colo-1.16.tar.gz 242604