7 files changed, 11 insertions, 145 deletions
diff --git a/sys-boot/yaboot-static/ChangeLog b/sys-boot/yaboot-static/ChangeLog
index 3cf740a59b3f..f0887cb03782 100644
--- a/sys-boot/yaboot-static/ChangeLog
+++ b/sys-boot/yaboot-static/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/yaboot-static
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/ChangeLog,v 1.18 2008/05/13 03:23:11 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/ChangeLog,v 1.19 2008/05/13 23:41:15 josejx Exp $
+
+  13 May 2008; Joseph Jezak <josejx@gentoo.org>
+  -files/ofpath_device-tree_check.patch, -yaboot-static-1.3.12.ebuild,
+  -yaboot-static-1.3.13.ebuild, -yaboot-static-1.3.13-r1.ebuild,
+  -yaboot-static-1.3.14_pre1.ebuild, yaboot-static-1.3.14.ebuild:
+  Removed old versions, marked 1.3.14 stable.
 
   13 May 2008; Joseph Jezak <josejx@gentoo.org> yaboot-static-1.3.14.ebuild:
   Added mac-fdisk as a dependency for bug #220431.
diff --git a/sys-boot/yaboot-static/files/ofpath_device-tree_check.patch b/sys-boot/yaboot-static/files/ofpath_device-tree_check.patch
deleted file mode 100644
index e3f02cf4cc46..000000000000
--- a/sys-boot/yaboot-static/files/ofpath_device-tree_check.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- usr.orig/sbin/ofpath	2005-10-08 15:59:15.000000000 -0700
-+++ usr/sbin/ofpath	2005-10-08 16:21:35.000000000 -0700
-@@ -473,14 +473,6 @@
- {
-     case "$DEVNODE" in
- 	sd*)
--	    if ls -l /proc/device-tree | grep -q ^lr ; then
--		true
--	    else
--		echo 1>&2 "$PRG: /proc/device-tree is broken.  Do not use BootX to boot, use yaboot."
--		echo 1>&2 "$PRG: The yaboot HOWTO can be found here: http://www.alaska.net/~erbenson/doc"
--		return 1
--	    fi
--
- 	    ## use common scsiinfo function to get info we need.
- 	    scsiinfo || return 1
- 
-@@ -715,13 +707,6 @@
- {
-     case "$DEVNODE" in
- 	sd*)
--	    if ls -l /proc/device-tree | grep -q ^lr ; then
--		true
--	    else
--		echo 1>&2 "$PRG: /proc/device-tree is broken."
--		return 1
--	    fi
--
- 	    ## use common scsiinfo function to get info we need.
- 	    scsiinfo || return 1
- 
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.12.ebuild b/sys-boot/yaboot-static/yaboot-static-1.3.12.ebuild
deleted file mode 100644
index 46f8a5276454..000000000000
--- a/sys-boot/yaboot-static/yaboot-static-1.3.12.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/yaboot-static-1.3.12.ebuild,v 1.7 2007/07/15 02:25:03 mr_bones_ Exp $
-
-DESCRIPTION="Static yaboot ppc boot loader for machines with open firmware"
-
-HOMEPAGE="http://penguinppc.org/projects/yaboot/"
-SRC_URI="mirror://gentoo/yaboot-static-${PVR}.tbz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc64"
-IUSE=""
-DEPEND="!sys-boot/yaboot
-		sys-apps/powerpc-utils
-		sys-fs/hfsutils
-		sys-fs/hfsplusutils"
-PROVIDE="virtual/bootloader"
-
-src_install() {
-	# don't blow away the user's old conf file
-	mv ${WORKDIR}/etc/yaboot.conf ${WORKDIR}/etc/yaboot.conf.unconfigured
-	cp -pPR ${WORKDIR}/* ${D}/
-	}
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.13-r1.ebuild b/sys-boot/yaboot-static/yaboot-static-1.3.13-r1.ebuild
deleted file mode 100644
index a62c1bb2c4b4..000000000000
--- a/sys-boot/yaboot-static/yaboot-static-1.3.13-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/yaboot-static-1.3.13-r1.ebuild,v 1.2 2007/07/15 02:25:03 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="Static yaboot ppc boot loader for machines with open firmware"
-
-HOMEPAGE="http://penguinppc.org/projects/yaboot/"
-SRC_URI="mirror://gentoo/yaboot-static-${PV}.tbz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc64"
-IUSE="ibm"
-DEPEND="!sys-boot/yaboot
-		sys-apps/powerpc-utils"
-RDEPEND="!ibm? ( sys-fs/hfsutils )
-		!ibm? ( sys-fs/hfsplusutils )"
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/ofpath_device-tree_check.patch
-}
-
-src_install() {
-	# don't blow away the user's old conf file
-	mv ${WORKDIR}/etc/yaboot.conf ${WORKDIR}/etc/yaboot.conf.unconfigured
-	cp -pPR ${WORKDIR}/* ${D}/
-}
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.13.ebuild b/sys-boot/yaboot-static/yaboot-static-1.3.13.ebuild
deleted file mode 100644
index 1a3c7889c7ec..000000000000
--- a/sys-boot/yaboot-static/yaboot-static-1.3.13.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/yaboot-static-1.3.13.ebuild,v 1.5 2007/07/15 02:25:03 mr_bones_ Exp $
-
-DESCRIPTION="Static yaboot ppc boot loader for machines with open firmware"
-
-HOMEPAGE="http://penguinppc.org/projects/yaboot/"
-SRC_URI="mirror://gentoo/yaboot-static-${PVR}.tbz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc64"
-IUSE="ibm"
-DEPEND="!sys-boot/yaboot
-		sys-apps/powerpc-utils"
-RDEPEND="!ibm? ( sys-fs/hfsutils )
-		!ibm? ( sys-fs/hfsplusutils )"
-PROVIDE="virtual/bootloader"
-
-src_install() {
-	# don't blow away the user's old conf file
-	mv ${WORKDIR}/etc/yaboot.conf ${WORKDIR}/etc/yaboot.conf.unconfigured
-	cp -pPR ${WORKDIR}/* ${D}/
-	}
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.14.ebuild b/sys-boot/yaboot-static/yaboot-static-1.3.14.ebuild
index 0e9d05c48694..ee0ed79dcfbe 100644
--- a/sys-boot/yaboot-static/yaboot-static-1.3.14.ebuild
+++ b/sys-boot/yaboot-static/yaboot-static-1.3.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/yaboot-static-1.3.14.ebuild,v 1.2 2008/05/13 03:23:12 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/yaboot-static-1.3.14.ebuild,v 1.3 2008/05/13 23:41:15 josejx Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://penguinppc.org/projects/yaboot/"
 SRC_URI="mirror://gentoo/yaboot-static-${PV}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~ppc64"
+KEYWORDS="-* ppc64"
 IUSE="ibm"
 DEPEND="!sys-boot/yaboot
 		sys-apps/powerpc-utils"
@@ -19,12 +19,8 @@ RDEPEND="!ibm? ( sys-fs/hfsutils
 				 sys-fs/mac-fdisk )"
 PROVIDE="virtual/bootloader"
 
-src_unpack() {
-	unpack ${A}
-}
-
 src_install() {
 	# don't blow away the user's old conf file
-	mv ${WORKDIR}/etc/yaboot.conf ${WORKDIR}/etc/yaboot.conf.unconfigured
-	cp -pPR ${WORKDIR}/* ${D}/
+	mv "${WORKDIR}/etc/yaboot.conf" "${WORKDIR}/etc/yaboot.conf.unconfigured"
+	cp -pPR "${WORKDIR}/*" "${D}/"
 }
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.14_pre1.ebuild b/sys-boot/yaboot-static/yaboot-static-1.3.14_pre1.ebuild
deleted file mode 100644
index 91af442842d0..000000000000
--- a/sys-boot/yaboot-static/yaboot-static-1.3.14_pre1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/yaboot-static-1.3.14_pre1.ebuild,v 1.4 2008/01/04 01:10:17 ranger Exp $
-
-inherit eutils
-
-DESCRIPTION="Static yaboot ppc boot loader for machines with open firmware"
-
-HOMEPAGE="http://penguinppc.org/projects/yaboot/"
-SRC_URI="mirror://gentoo/yaboot-static-${PV}.tbz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc64"
-IUSE="ibm"
-DEPEND="!sys-boot/yaboot
-		sys-apps/powerpc-utils"
-RDEPEND="!ibm? ( sys-fs/hfsutils )
-		!ibm? ( sys-fs/hfsplusutils )"
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_install() {
-	# don't blow away the user's old conf file
-	mv ${WORKDIR}/etc/yaboot.conf ${WORKDIR}/etc/yaboot.conf.unconfigured
-	cp -pPR ${WORKDIR}/* ${D}/
-}