Added latest version and removed old versions.

(Portage version: 2.0.51.22-r1)

15 files changed, 70 insertions, 282 deletions

diff --git a/sys-boot/quik/ChangeLog b/sys-boot/quik/ChangeLog
index 6e0ca78d5fa9..d9a1134822fc 100644
--- a/sys-boot/quik/ChangeLog
+++ b/sys-boot/quik/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-boot/quik
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/quik/ChangeLog,v 1.8 2005/05/22 05:33:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/quik/ChangeLog,v 1.9 2005/05/26 15:15:26 josejx Exp $
+
+*quik-2.1.6 (26 May 2005)
+
+  26 May 2005; Joseph Jezak <josejx@gentoo.org>
+  -files/quik-2.0.1.0-fclose-bug.patch, -files/quik-2.0.1.0-gcc-321.patch,
+  +files/md-fix.diff, -quik-2.0.1.0-r1.ebuild, -quik-2.0.1.0-r2.ebuild,
+  -quik-2.0.1.0-r3.ebuild, -quik-2.0.1k.ebuild, +quik-2.1.6.ebuild:
+  Added latest version and removed old versions.
 
   22 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
   quik-2.0.1.0-r1.ebuild, quik-2.0.1.0-r2.ebuild, quik-2.0.1.0-r3.ebuild,
diff --git a/sys-boot/quik/Manifest b/sys-boot/quik/Manifest
index fa5bee3a0db1..de34effbf262 100644
--- a/sys-boot/quik/Manifest
+++ b/sys-boot/quik/Manifest
@@ -1,12 +1,5 @@
-MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
-MD5 eba00512ddde0d5dae061b07affb22e9 quik-2.0.1k.ebuild 1155
 MD5 b044f63e2280f18f6bc24ef2396be72a ChangeLog 2728
-MD5 b53e5b697ec3d8423681bd0e0a3480a2 quik-2.0.1.0-r2.ebuild 1904
-MD5 4ba913eee047af52a2a9ff57b2c6600f quik-2.0.1.0-r3.ebuild 2081
-MD5 0f261b370d342d53165d4bb4e7cb574d quik-2.0.1.0-r1.ebuild 1770
-MD5 8a63d4b2ce3cd4ebfc702aedef92c190 files/digest-quik-2.0.1.0-r2 127
-MD5 490acba710c1c30fda817d7e8dd9eab3 files/quik-2.0.1.0-fclose-bug.patch 221
-MD5 8a63d4b2ce3cd4ebfc702aedef92c190 files/digest-quik-2.0.1.0-r1 127
-MD5 d82779b77dcea6480025a86ce1a622d7 files/quik-2.0.1.0-gcc-321.patch 493
-MD5 8a63d4b2ce3cd4ebfc702aedef92c190 files/digest-quik-2.0.1.0-r3 127
-MD5 3325de32d341278b3ebab8702e03fdfd files/digest-quik-2.0.1k 63
+MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
+MD5 ed0ff7cb9842b168d47be363cfe69352 quik-2.1.6.ebuild 902
+MD5 f22b33927a0b8b237a90feef820f3a33 files/digest-quik-2.1.6 67
+MD5 caf3f0cb5b2e65531f3e22aeeb6c7ffe files/md-fix.diff 392
diff --git a/sys-boot/quik/files/digest-quik-2.0.1.0-r1 b/sys-boot/quik/files/digest-quik-2.0.1.0-r1
deleted file mode 100644
index 1aa7f3e72997..000000000000
--- a/sys-boot/quik/files/digest-quik-2.0.1.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d546fd92dfa16255e062fa8505a5b8d4 quik_2.0e.orig.tar.gz 39440
-MD5 71828c98994bf3a3f7d08bc0672e33e5 quik_2.0e-1.diff.gz 7694
diff --git a/sys-boot/quik/files/digest-quik-2.0.1.0-r2 b/sys-boot/quik/files/digest-quik-2.0.1.0-r2
deleted file mode 100644
index 1aa7f3e72997..000000000000
--- a/sys-boot/quik/files/digest-quik-2.0.1.0-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d546fd92dfa16255e062fa8505a5b8d4 quik_2.0e.orig.tar.gz 39440
-MD5 71828c98994bf3a3f7d08bc0672e33e5 quik_2.0e-1.diff.gz 7694
diff --git a/sys-boot/quik/files/digest-quik-2.0.1.0-r3 b/sys-boot/quik/files/digest-quik-2.0.1.0-r3
deleted file mode 100644
index 1aa7f3e72997..000000000000
--- a/sys-boot/quik/files/digest-quik-2.0.1.0-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d546fd92dfa16255e062fa8505a5b8d4 quik_2.0e.orig.tar.gz 39440
-MD5 71828c98994bf3a3f7d08bc0672e33e5 quik_2.0e-1.diff.gz 7694
diff --git a/sys-boot/quik/files/digest-quik-2.0.1k b/sys-boot/quik/files/digest-quik-2.0.1k
deleted file mode 100644
index e28b63e10ca8..000000000000
--- a/sys-boot/quik/files/digest-quik-2.0.1k
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e2b8243ab018c4a39544583e69c6d75f quik-2.0-1k.src.rpm 50796
diff --git a/sys-boot/quik/files/digest-quik-2.1.6 b/sys-boot/quik/files/digest-quik-2.1.6
new file mode 100644
index 000000000000..d8075868b873
--- /dev/null
+++ b/sys-boot/quik/files/digest-quik-2.1.6
@@ -0,0 +1 @@
+MD5 1697de06d32979b02d23f7159e6056fd quik-2.1-6.ydl4.src.rpm 91961
diff --git a/sys-boot/quik/files/md-fix.diff b/sys-boot/quik/files/md-fix.diff
new file mode 100644
index 000000000000..2319397d93f1
--- /dev/null
+++ b/sys-boot/quik/files/md-fix.diff
@@ -0,0 +1,11 @@
+--- include/quik_md.h.bak	2005-05-27 00:42:36.000000000 +1000
++++ include/quik_md.h	2005-05-27 00:42:43.000000000 +1000
+@@ -88,8 +88,6 @@
+ #define BOOTDEV(dev,i) ((dev)->devs[(i)]->bootdev)
+ #define SPART(dev,i) ((dev)->devs[(i)]->spart)
+ 
+-dev_info_t * new_dev_info (unsigned char);
+-void free_dev_info (dev_info_t *);
+ int md_get_version (int);
+ mdev_info_t * md_get_info (const char *);
+ 
diff --git a/sys-boot/quik/files/quik-2.0.1.0-fclose-bug.patch b/sys-boot/quik/files/quik-2.0.1.0-fclose-bug.patch
deleted file mode 100644
index 9d43025cf89c..000000000000
--- a/sys-boot/quik/files/quik-2.0.1.0-fclose-bug.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- quik/quik.c.orig	2003-02-04 23:40:21.000000000 -0600
-+++ quik/quik.c	2003-02-04 23:40:39.000000000 -0600
-@@ -454,6 +454,7 @@
- 			    exit(0);
- 		    }
- 	    }
-+            fclose(f);
-     }
- 
-     config_file = NULL;
diff --git a/sys-boot/quik/files/quik-2.0.1.0-gcc-321.patch b/sys-boot/quik/files/quik-2.0.1.0-gcc-321.patch
deleted file mode 100644
index f569a94cff6a..000000000000
--- a/sys-boot/quik/files/quik-2.0.1.0-gcc-321.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- second/file.c.orig	2003-01-28 08:13:59.000000000 -0600
-+++ second/file.c	2003-01-28 08:14:09.000000000 -0600
-@@ -23,7 +23,6 @@
- #include <sys/types.h>
- #include <errno.h>
- #include "quik.h"
--typedef int FILE;
- #include <linux/ext2_fs.h>
- #include <ext2fs/ext2fs.h>
- #include <setjmp.h>
-@@ -167,11 +166,6 @@
-     return 1;
- }
- 
--int sprintf (char *buf, char *fmt,...)
--{
--    strcpy (buf, fmt);
--}
--
- void com_err (const char *a, long i, const char *fmt,...)
- {
-     printf ((char *) fmt);
diff --git a/sys-boot/quik/quik-2.0.1.0-r1.ebuild b/sys-boot/quik/quik-2.0.1.0-r1.ebuild
deleted file mode 100644
index 555d01aefb23..000000000000
--- a/sys-boot/quik/quik-2.0.1.0-r1.ebuild
+++ /dev/null
@@ -1,58 +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/quik/quik-2.0.1.0-r1.ebuild,v 1.8 2005/05/22 05:33:41 mr_bones_ Exp $
-
-inherit toolchain-funcs mount-boot
-
-S="${WORKDIR}/quik-2.0"
-HOMEPAGE=""
-DESCRIPTION="OldWorld PowerMac Bootloader"
-HOMEPAGE="http://www.xs4all.nl/~eddieb/linuxppc/"
-MY_P="quik_2.0e.orig.tar.gz"
-DEB_P="quik_2.0e-1.diff"
-DEB_URI="ftp://ftp.debian.org/debian/pool/main/q/quik"
-SRC_URI="${DEB_URI}/${MY_P} ${DEB_URI}/${DEB_P}.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="ppc -x86 -amd64 -alpha -hppa -mips -sparc"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${MY_P} || die
-	zcat ${DISTDIR}/${DEB_P}.gz | patch -p1 -d ${S}|| die
-	[ -z "${CC}" ] && CC=$(tc-getCC)
-	if [ "`${CC} -dumpversion | cut -d. -f1,2`" != "2.95" ] ; then
-		cd ${S}/second
-		cp Makefile Makefile.orig
-		sed -e s:'$(LD) $(LDFLAGS) -Bstatic -o second $(OBJS) -lext2fs':'$(LD) $(LDFLAGS) -Bstatic -o second $(OBJS) -lext2fs -lc -lgcc -L/usr/lib/gcc-lib/powerpc-unknown-linux-gnu/3.2/': Makefile.orig > Makefile
-
-	fi
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	#i'll have a look at this later
-	install -d -m 755 ${D}/sbin || die
-	install -d -m 755 ${D}/etc || die
-	install -d -m 755 ${D}/boot || die
-	install -d -m 755 ${D}/usr/share/man/man5 || die
-	install -d -m 755 ${D}/usr/share/man/man8 || die
-	install -s -m 755 quik/quik ${D}/sbin || DIE
-	install -m 644 man/quik.conf.5 \
-			${D}/usr/share/man/man5 || DIE
-	install -m 644 man/quik.8 man/bootstrap.8 \
-			${D}/usr/share/man/man8 || DIE
-
-	install -m 444 first/first.b second/second.b \
-					second/second ${D}/boot || die
-	install -m 644 etc/quik.conf ${D}/etc || die
-}
diff --git a/sys-boot/quik/quik-2.0.1.0-r2.ebuild b/sys-boot/quik/quik-2.0.1.0-r2.ebuild
deleted file mode 100644
index 6464bf9a4d52..000000000000
--- a/sys-boot/quik/quik-2.0.1.0-r2.ebuild
+++ /dev/null
@@ -1,61 +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/quik/quik-2.0.1.0-r2.ebuild,v 1.8 2005/05/22 05:33:41 mr_bones_ Exp $
-
-inherit toolchain-funcs mount-boot
-
-S="${WORKDIR}/quik-2.0"
-HOMEPAGE=""
-DESCRIPTION="OldWorld PowerMac Bootloader"
-HOMEPAGE="http://www.xs4all.nl/~eddieb/linuxppc/"
-MY_P="quik_2.0e.orig.tar.gz"
-DEB_P="quik_2.0e-1.diff"
-DEB_URI="ftp://ftp.debian.org/debian/pool/main/q/quik"
-SRC_URI="${DEB_URI}/${MY_P} ${DEB_URI}/${DEB_P}.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~ppc -x86 -amd64 -alpha -hppa -mips -sparc"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${MY_P} || die
-	zcat ${DISTDIR}/${DEB_P}.gz | patch -p1 -d ${S}|| die
-	[ -z "${CC}" ] && CC=$(tc-getCC)
-	GCC_VERSION="`${CC} -dumpversion | cut -d. -f1,2,3`"
-	einfo "GCC_VERSION: ${GCC_VERSION}"
-	if [ "${GCC_VERSION}" != "2.95" ] ; then
-		cd ${S}/second
-		patch -p1 < ${FILESDIR}/quik-2.0.1.0-gcc-321.patch
-		cp Makefile Makefile.orig
-		sed -e s:'$(LD) $(LDFLAGS) -Bstatic -o second $(OBJS) -lext2fs':'$(LD) $(LDFLAGS) -Bstatic -o second $(OBJS) -lext2fs -lc -lgcc -L/usr/lib/gcc-lib/powerpc-unknown-linux-gnu/'${GCC_VERSION}/: Makefile.orig > Makefile
-
-	fi
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	#i'll have a look at this later
-	install -d -m 755 ${D}/sbin || die
-	install -d -m 755 ${D}/etc || die
-	install -d -m 755 ${D}/boot || die
-	install -d -m 755 ${D}/usr/share/man/man5 || die
-	install -d -m 755 ${D}/usr/share/man/man8 || die
-	install -s -m 755 quik/quik ${D}/sbin || DIE
-	install -m 644 man/quik.conf.5 \
-			${D}/usr/share/man/man5 || DIE
-	install -m 644 man/quik.8 man/bootstrap.8 \
-			${D}/usr/share/man/man8 || DIE
-
-	install -m 444 first/first.b second/second.b \
-					second/second ${D}/boot || die
-	install -m 644 etc/quik.conf ${D}/etc || die
-}
diff --git a/sys-boot/quik/quik-2.0.1.0-r3.ebuild b/sys-boot/quik/quik-2.0.1.0-r3.ebuild
deleted file mode 100644
index 2a100937dd49..000000000000
--- a/sys-boot/quik/quik-2.0.1.0-r3.ebuild
+++ /dev/null
@@ -1,65 +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/quik/quik-2.0.1.0-r3.ebuild,v 1.8 2005/05/22 05:33:41 mr_bones_ Exp $
-
-inherit toolchain-funcs mount-boot
-
-S="${WORKDIR}/quik-2.0"
-HOMEPAGE=""
-DESCRIPTION="OldWorld PowerMac Bootloader"
-HOMEPAGE="http://www.xs4all.nl/~eddieb/linuxppc/"
-MY_P="quik_2.0e.orig.tar.gz"
-DEB_P="quik_2.0e-1.diff"
-DEB_URI="ftp://ftp.debian.org/debian/pool/main/q/quik"
-SRC_URI="${DEB_URI}/${MY_P} ${DEB_URI}/${DEB_P}.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~ppc -x86 -amd64 -alpha -hppa -mips -sparc"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${MY_P} || die
-	zcat ${DISTDIR}/${DEB_P}.gz | patch -p1 -d ${S}|| die
-	[ -z "${CC}" ] && CC=$(tc-getCC)
-	GCC_VERSION="`${CC} -dumpversion | cut -d. -f1,2,3`"
-	einfo "GCC_VERSION: ${GCC_VERSION}"
-	cd ${S}/quik
-	# this patch fixes bug #14817
-	einfo "Fixing missing fclose()"
-	patch -p1 < ${FILESDIR}/quik-2.0.1.0-fclose-bug.patch || die "patch failed"
-	if [ "${GCC_VERSION}" != "2.95" ] ; then
-		cd ${S}/second
-		patch -p1 < ${FILESDIR}/quik-2.0.1.0-gcc-321.patch || die "patch failed"
-		cp Makefile Makefile.orig
-		sed -e s:'$(LD) $(LDFLAGS) -Bstatic -o second $(OBJS) -lext2fs':'$(LD) $(LDFLAGS) -Bstatic -o second $(OBJS) -lext2fs -lc -lgcc -L/usr/lib/gcc-lib/powerpc-unknown-linux-gnu/'${GCC_VERSION}/: Makefile.orig > Makefile
-
-	fi
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	#i'll have a look at this later
-	install -d -m 755 ${D}/sbin || die
-	install -d -m 755 ${D}/etc || die
-	install -d -m 755 ${D}/boot || die
-	install -d -m 755 ${D}/usr/share/man/man5 || die
-	install -d -m 755 ${D}/usr/share/man/man8 || die
-	install -s -m 755 quik/quik ${D}/sbin || DIE
-	install -m 644 man/quik.conf.5 \
-			${D}/usr/share/man/man5 || DIE
-	install -m 644 man/quik.8 man/bootstrap.8 \
-			${D}/usr/share/man/man8 || DIE
-
-	install -m 444 first/first.b second/second.b \
-					second/second ${D}/boot || die
-	install -m 644 etc/quik.conf ${D}/etc || die
-}
diff --git a/sys-boot/quik/quik-2.0.1k.ebuild b/sys-boot/quik/quik-2.0.1k.ebuild
deleted file mode 100644
index cfbe80ff3eda..000000000000
--- a/sys-boot/quik/quik-2.0.1k.ebuild
+++ /dev/null
@@ -1,47 +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/quik/quik-2.0.1k.ebuild,v 1.8 2005/05/22 05:33:41 mr_bones_ Exp $
-
-inherit toolchain-funcs mount-boot eutils
-
-S="${WORKDIR}/"
-MY_PV=${PV%.*}-${PV#*.*.}
-
-DESCRIPTION="OldWorld PowerMac Bootloader"
-HOMEPAGE="http://www.xs4all.nl/~eddieb/linuxppc/"
-SRC_URI="http://www.xs4all.nl/~eddieb/linuxppc/YDL3/quik-${MY_PV}.src.rpm"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~ppc -x86 -amd64 -alpha -hppa -mips -sparc"
-IUSE=""
-
-DEPEND="virtual/libc
-	app-arch/rpm2targz"
-
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	cd ${WORKDIR}
-	rpm2targz ${DISTDIR}/quik-${MY_PV}.src.rpm
-	tar -xzf ${WORKDIR}/quik-${MY_PV}.src.tar.gz || die
-	tar -xzf ${WORKDIR}/quik-2.0.tar.gz
-
-	cd ${WORKDIR}/quik-2.0
-	epatch ${WORKDIR}/quik_2.0e-0.1.diff
-	epatch ${WORKDIR}/quik-glibc2.2.patch
-	epatch ${WORKDIR}/quik-noargs.patch
-	epatch ${WORKDIR}/quik-j-k-diff.patch
-	epatch ${WORKDIR}/quik-k-dac.patch
-}
-
-src_compile() {
-	cd ${WORKDIR}/quik-2.0
-	emake || die
-}
-
-src_install() {
-	cd ${WORKDIR}/quik-2.0
-	DESTDIR=${D} make install
-	prepman /usr
-}
diff --git a/sys-boot/quik/quik-2.1.6.ebuild b/sys-boot/quik/quik-2.1.6.ebuild
new file mode 100644
index 000000000000..fb586f2ac475
--- /dev/null
+++ b/sys-boot/quik/quik-2.1.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/quik/quik-2.1.6.ebuild,v 1.1 2005/05/26 15:15:26 josejx Exp $
+
+inherit toolchain-funcs mount-boot eutils
+
+MY_PV=${PV%.*}-${PV#*.*.}
+
+HOMEPAGE="http://penguinppc.org/bootloaders/quik/"
+DESCRIPTION="OldWorld PowerMac Bootloader"
+SRC_URI="http://www.shiner.info/files/Yellow%20Dog%20Linux%204/quik/quik-${MY_PV}.ydl4.src.rpm"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-* ~ppc"
+IUSE=""
+
+DEPEND="virtual/libc
+	app-arch/rpm2targz"
+
+PROVIDE="virtual/bootloader"
+
+S="${WORKDIR}/"
+
+src_unpack() {
+	cd ${WORKDIR}
+	rpm2targz ${DISTDIR}/quik-${MY_PV}.ydl4.src.rpm
+	tar -xzf ${WORKDIR}/quik-${MY_PV}.ydl4.src.tar.gz || die
+	tar -xzf ${WORKDIR}/quik_2.1.orig.tar.gz
+
+	cd ${WORKDIR}/quik-2.1
+	epatch ${WORKDIR}/quik_2.1-6.diff.gz
+	epatch ${FILESDIR}/md-fix.diff
+}
+
+src_compile() {
+	cd ${WORKDIR}/quik-2.1
+	emake || die
+}
+
+src_install() {
+	cd ${WORKDIR}/quik-2.1
+	DESTDIR=${D} make install
+	prepman /usr
+}