Revision bump to add a modified Debian patch to add netboot support

(Portage version: 2.1.7.17/cvs/Linux ia64)

4 files changed, 27 insertions, 138 deletions

diff --git a/sys-boot/aboot/ChangeLog b/sys-boot/aboot/ChangeLog
index 47abc998101c..bafb52b17cc0 100644
--- a/sys-boot/aboot/ChangeLog
+++ b/sys-boot/aboot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/aboot
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/ChangeLog,v 1.14 2009/09/23 20:29:43 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/ChangeLog,v 1.15 2010/04/04 13:50:52 armin76 Exp $
+
+*aboot-1.0_pre20040408-r3 (04 Apr 2010)
+
+  04 Apr 2010; Raúl Porcel <armin76@gentoo.org> -aboot-0.9-r1.ebuild,
+  -aboot-1.0_pre20040408.ebuild, -aboot-1.0_pre20040408-r1.ebuild,
+  +aboot-1.0_pre20040408-r3.ebuild:
+  Revision bump to add a modified Debian patch to add netboot support
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> aboot-0.9-r1.ebuild,
   aboot-1.0_pre20040408.ebuild:
diff --git a/sys-boot/aboot/aboot-0.9-r1.ebuild b/sys-boot/aboot/aboot-0.9-r1.ebuild
deleted file mode 100644
index 3d88cf67ae22..000000000000
--- a/sys-boot/aboot/aboot-0.9-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/aboot-0.9-r1.ebuild,v 1.7 2009/09/23 20:29:43 patrick Exp $
-
-DESCRIPTION="Alpha Linux boot loader for SRM"
-HOMEPAGE="http://aboot.sourceforge.net/"
-SRC_URI="http://aboot.sourceforge.net/tarballs/aboot-0.9bpre.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* alpha"
-IUSE=""
-
-DEPEND=""
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/aboot-0.9bpre ${WORKDIR}/${P}
-	cd ${S}
-	sed -i "s:/usr/man:/usr/share/man:" Makefile || die
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodir /boot /sbin /usr/share/man/man5
-	make \
-		root=${D} \
-		bindir=${D}/sbin \
-		bootdir=${D}/boot \
-		mandir=${D}/usr/share/man \
-		install
-
-	dodoc ChangeLog INSTALL README TODO aboot.conf
-
-	insinto /etc
-	newins ${FILESDIR}/aboot.conf aboot.conf.example
-}
-
-pkg_postinst() {
-	einfo "To make aboot install a new bootloader on your harddisk follow"
-	einfo "these steps:"
-	einfo ""
-	einfo " - edit the file /etc/aboot.conf"
-	einfo " - cd /boot"
-	einfo " - swriteboot -c2 /dev/sda bootlx"
-	einfo " This will install a new bootsector on /dev/sda and aboot will"
-	einfo " use the second partition on this device to lookup kernel and "
-	einfo " initrd (as described in the aboot.conf file)"
-	einfo ""
-	einfo "IMPORTANT :"
-	einfo ""
-	einfo "The partition table of your boot device has to contain "
-	einfo "a BSD-DISKLABEL and the first 12 megabytes of your boot device"
-	einfo "must not be part of a partition as aboot will write its bootloader"
-	einfo "in there and not as with most x86 bootloaders into the "
-	einfo "master boot sector. If your partition table does not reflect this"
-	einfo "you are going to destroy your installation !"
-	einfo "Also note that aboot currently only supports ext2/3 partitions"
-	einfo "to boot from."
-}
diff --git a/sys-boot/aboot/aboot-1.0_pre20040408-r1.ebuild b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild
index af2bd556d08f..953df06342fa 100644
--- a/sys-boot/aboot/aboot-1.0_pre20040408-r1.ebuild
+++ b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/aboot-1.0_pre20040408-r1.ebuild,v 1.1 2007/07/15 07:07:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild,v 1.1 2010/04/04 13:50:52 armin76 Exp $
 
 inherit eutils
 
@@ -9,7 +9,9 @@ KERN_VER="2.6.22"
 DESCRIPTION="Alpha Linux boot loader for SRM"
 HOMEPAGE="http://aboot.sourceforge.net/"
 SRC_URI="http://aboot.sourceforge.net/tarballs/${P}.tar.bz2
-	mirror://gentoo/gentoo-headers-base-${KERN_VER}.tar.bz2"
+	mirror://gentoo/gentoo-headers-base-${KERN_VER}.tar.bz2
+	mirror://gentoo/${PN}_gentoo.diff.bz2
+	http://dev.gentoo.org/~armin76/dist/${PN}_gentoo.diff.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,13 +30,19 @@ src_unpack() {
 	ln -s asm-alpha asm || die
 	touch linux/config.h || die
 	cd "${S}"
-	sed -i '1i#define bool int' cons.c
-	sed -i "s:/usr/man:/usr/share/man:" Makefile || die
 	epatch "${FILESDIR}/aboot-gcc-3.4.patch"
+	epatch "${FILESDIR}/aboot-pt_note.patch"
+	# Modified patch from Debian to add netboot support
+	epatch "${WORKDIR}"/aboot_gentoo.diff
+}
+
+src_compile() {
+	# too many problems with parallel building
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
-	dodir /boot /sbin /usr/share/man/man5
+	dodir /boot /sbin /usr/share/man/man{1,5,8}
 	make \
 		root="${D}" \
 		bindir="${D}"/sbin \
@@ -42,10 +50,14 @@ src_install() {
 		mandir="${D}"/usr/share/man \
 		install
 
+	insinto /boot
+	doins net_aboot.nh
+	dobin netabootwrap
 	dodoc ChangeLog INSTALL README TODO aboot.conf
 
 	insinto /etc
 	newins "${FILESDIR}"/aboot.conf aboot.conf.example
+
 }
 
 pkg_postinst() {
diff --git a/sys-boot/aboot/aboot-1.0_pre20040408.ebuild b/sys-boot/aboot/aboot-1.0_pre20040408.ebuild
deleted file mode 100644
index babf9d7b7029..000000000000
--- a/sys-boot/aboot/aboot-1.0_pre20040408.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/aboot-1.0_pre20040408.ebuild,v 1.7 2009/09/23 20:29:43 patrick Exp $
-
-inherit eutils
-
-DESCRIPTION="Alpha Linux boot loader for SRM"
-HOMEPAGE="http://aboot.sourceforge.net/"
-SRC_URI="http://aboot.sourceforge.net/tarballs/aboot-1.0_pre20040408.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* alpha"
-IUSE=""
-
-DEPEND=""
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i "s:/usr/man:/usr/share/man:" Makefile || die
-	epatch "${FILESDIR}/aboot-gcc-3.4.patch"
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodir /boot /sbin /usr/share/man/man5
-	make \
-		root=${D} \
-		bindir=${D}/sbin \
-		bootdir=${D}/boot \
-		mandir=${D}/usr/share/man \
-		install
-
-	dodoc ChangeLog INSTALL README TODO aboot.conf
-
-	insinto /etc
-	newins ${FILESDIR}/aboot.conf aboot.conf.example
-}
-
-pkg_postinst() {
-	einfo "To make aboot install a new bootloader on your harddisk follow"
-	einfo "these steps:"
-	einfo ""
-	einfo " - edit the file /etc/aboot.conf"
-	einfo " - cd /boot"
-	einfo " - swriteboot -c2 /dev/sda bootlx"
-	einfo " This will install a new bootsector on /dev/sda and aboot will"
-	einfo " use the second partition on this device to lookup kernel and "
-	einfo " initrd (as described in the aboot.conf file)"
-	einfo ""
-	einfo "IMPORTANT :"
-	einfo ""
-	einfo "The partition table of your boot device has to contain "
-	einfo "a BSD-DISKLABEL and the first 12 megabytes of your boot device"
-	einfo "must not be part of a partition as aboot will write its bootloader"
-	einfo "in there and not as with most x86 bootloaders into the "
-	einfo "master boot sector. If your partition table does not reflect this"
-	einfo "you are going to destroy your installation !"
-	einfo "Also note that aboot currently only supports ext2/3 partitions"
-	einfo "to boot from."
-}