Added fix for bug #247659, cleaned up ebuild.

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

4 files changed, 43 insertions, 18 deletions

diff --git a/sys-boot/quik/ChangeLog b/sys-boot/quik/ChangeLog
index 7e7ef5e2c1cc..7fafef0936dc 100644
--- a/sys-boot/quik/ChangeLog
+++ b/sys-boot/quik/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/quik
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/quik/ChangeLog,v 1.12 2008/05/11 16:42:47 drac Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/quik/ChangeLog,v 1.13 2010/02/10 03:23:37 josejx Exp $
+
+  10 Feb 2010; Joseph Jezak <josejx@gentoo.org> quik-2.1.6.ebuild,
+  files/headers.patch:
+  Added fix for bug #247659, cleaned up ebuild.
 
   11 May 2008; Samuli Suominen <drac@gentoo.org> quik-2.1.6.ebuild:
   Move rpm2targz to DEPEND wrt #220213.
diff --git a/sys-boot/quik/Manifest b/sys-boot/quik/Manifest
index 33d3118b7214..4df6d4f6c365 100644
--- a/sys-boot/quik/Manifest
+++ b/sys-boot/quik/Manifest
@@ -1,6 +1,16 @@
-AUX headers.patch 731 RMD160 705be57266abcf66d191fdd1af266fa63c510561 SHA1 894de01227289601f52a977edd11facdc0ec87a1 SHA256 be06e0127f88fdf474cb79050f68416e1cf5c0ab60526b245717b109574fee52
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX headers.patch 991 RMD160 1608ecda3b5daf032de0d08f31b801f8f6a8c4ef SHA1 4ce94be4084efa4b1b3c3de6a7a50af5dfce6863 SHA256 3ef7f4ef85e8f210a82e4bb96e94e5c61b59cef119ca1cec7656746d3a83e2f6
 AUX md-fix.diff 392 RMD160 929b8c6e9cdbd7d3d6d2dc8aea81d5200ef260c6 SHA1 e020f604cedcc7f8e55a7fb191a6206096821cd3 SHA256 6529d6b01a17e5a2a0cea17358c3c8376e1ef4be6d3943bcb0e39d42715a264f
 DIST quik-2.1-6.ydl4.src.rpm 91961 RMD160 9f9c44fb7afc806de9700d75797bd19bb59a050f SHA1 0b6088469b93fb2a67a238b2c38f61ee5d166e87 SHA256 a4c8c95fa97ef0e01e7ca981442c8dc8761f79c9bc4c683bfde03378a8ee9db2
-EBUILD quik-2.1.6.ebuild 1060 RMD160 9a51884c65706e6b86e7d38254d48b21145844d6 SHA1 13b4b27ea787bd8287617cce96a2b3e08552d1fe SHA256 f2032e884ba0a80163f6214c74520c25e3099d3b0755d02fbb7f47224daeb8c9
-MISC ChangeLog 3412 RMD160 7c02cdd2aa4f6671dd85850f71d9ed340cc82327 SHA1 01620e057df3a78432311174389bb7a98dcf1a3f SHA256 951b645ce019728cc7509bdc9ad349a14d66f7d8997959d618b5f0b1efa9b3f1
+EBUILD quik-2.1.6.ebuild 1089 RMD160 0cbe4a47d303d4f355f0cc37e7d505a2216e53c2 SHA1 98032822ddb12604796d018f5f03990032c20a47 SHA256 00ddc3ff4d84b26bf20809fa16cebd9336d3bbaba862bfee09b2449824ed3663
+MISC ChangeLog 3553 RMD160 302d5024c3a8d1e4ba6ec30ff5a88d5e8e1fcde3 SHA1 66fea3aab4b3768b328cf2b528c2ff8473ede612 SHA256 b3d0983947df8961dc1dd941b3862d9c1fca691c265e69bb196d98ced18a5952
 MISC metadata.xml 156 RMD160 a57e9e3e71bd04aa138850dc8cce8dbe9e1cd5a2 SHA1 30b3e2b32ee2b52b68ad1d77f04f2c75980bf7d4 SHA256 d57f79be439079b5c78578b17eb3ee7d20883353b1c40a716d3f1ab06af34851
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktyJpsACgkQcsIHjyDViGQMOQCcCLr0FFfnofFd3ffFg5hwJVDp
+Wn0An3bN/Jq1N4lFzhDaYXDXWFkFC29f
+=tjFp
+-----END PGP SIGNATURE-----
diff --git a/sys-boot/quik/files/headers.patch b/sys-boot/quik/files/headers.patch
index 1778b18f1b0f..eccfba698e17 100644
--- a/sys-boot/quik/files/headers.patch
+++ b/sys-boot/quik/files/headers.patch
@@ -20,3 +20,14 @@
  char *strcpy(char * dest,const char *src);
  char *strncpy(char * dest,const char *src,size_t count);
  char *strchr(const char * s, int c);
+--- second/misc.c.bak	2010-02-09 22:18:47.000000000 -0500
++++ second/misc.c	2010-02-09 22:18:52.000000000 -0500
+@@ -11,7 +11,7 @@
+  */
+ #include <linux/kernel.h>
+ 
+-#include <asm/page.h>
++// #include <asm/page.h>
+ 
+ #include <sys/types.h>
+ #include "setjmp.h"
diff --git a/sys-boot/quik/quik-2.1.6.ebuild b/sys-boot/quik/quik-2.1.6.ebuild
index 265d4b4155b5..2e46daa78866 100644
--- a/sys-boot/quik/quik-2.1.6.ebuild
+++ b/sys-boot/quik/quik-2.1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 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/quik/quik-2.1.6.ebuild,v 1.4 2008/05/11 16:42:47 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/quik/quik-2.1.6.ebuild,v 1.5 2010/02/10 03:23:37 josejx Exp $
 
 inherit toolchain-funcs mount-boot eutils
 
@@ -23,24 +23,24 @@ 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
-	epatch ${FILESDIR}/headers.patch
+	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" || die
+
+	cd "${WORKDIR}/quik-2.1"
+	epatch "${WORKDIR}/quik_2.1-6.diff.gz"
+	epatch "${FILESDIR}/md-fix.diff"
+	epatch "${FILESDIR}/headers.patch"
 }
 
 src_compile() {
-	cd ${WORKDIR}/quik-2.1
+	cd "${WORKDIR}/quik-2.1"
 	emake || die
 }
 
 src_install() {
-	cd ${WORKDIR}/quik-2.1
+	cd "${WORKDIR}/quik-2.1"
 	DESTDIR=${D} make install
 	prepman /usr
 }