Marked ~amd64 thanks to Markos Chandras and Xavier Neys (bug #254316). Apply syslinux patch thanks to Xavier Neys (bug #254419).

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.25-gentoo-r7-JeR i686

4 files changed, 38 insertions, 5 deletions

diff --git a/sys-boot/unetbootin/ChangeLog b/sys-boot/unetbootin/ChangeLog
index 5078d398ea92..6aae7ad04a9a 100644
--- a/sys-boot/unetbootin/ChangeLog
+++ b/sys-boot/unetbootin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-boot/unetbootin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/ChangeLog,v 1.1 2009/01/08 18:12:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/ChangeLog,v 1.2 2009/01/11 16:01:08 jer Exp $
+
+*unetbootin-304-r1 (11 Jan 2009)
+
+  11 Jan 2009; Jeroen Roovers <jer@gentoo.org>
+  +files/unetbootin-304-syslinux-gentoo.patch, -unetbootin-304.ebuild,
+  +unetbootin-304-r1.ebuild:
+  Marked ~amd64 thanks to Markos Chandras and Xavier Neys (bug #254316).
+  Apply syslinux patch thanks to Xavier Neys (bug #254419).
 
 *unetbootin-304 (08 Jan 2009)
 
diff --git a/sys-boot/unetbootin/Manifest b/sys-boot/unetbootin/Manifest
index bc2ba2f8b6a4..45f539b42e5f 100644
--- a/sys-boot/unetbootin/Manifest
+++ b/sys-boot/unetbootin/Manifest
@@ -1,4 +1,5 @@
+AUX unetbootin-304-syslinux-gentoo.patch 947 RMD160 b4d3400d91a3e02c8a865186202209b1e17562dc SHA1 f68bac377065624bc72df83a174bf6d771139edb SHA256 c85427f93790146f1a3f25090786e7c154467e6be07cab01c4404cef586df1fc
 DIST unetbootin-source-304.tar.gz 139665 RMD160 ff4ff040d920d7ca9262596a623500555a8a42e3 SHA1 5428b21eace1d79b76541f169f37d61681e86c4b SHA256 1f52cf2e7f6e57a7dcf9e9a061b1d87150d37520948586526d400f11806c66a5
-EBUILD unetbootin-304.ebuild 732 RMD160 dac07190101be1cb3533f10b28b3297f4b61e0f2 SHA1 df811e4ce59c26d4c307c88bbecd3f07b64ccd09 SHA256 5c31a176219263768e90e4f664bc10c52a1744b96274c008eea0f4a7c19d8ef1
-MISC ChangeLog 360 RMD160 c3f3885594f9fbc24ee399cea58e3355860d4c88 SHA1 3ddbeca51918fdf796752ac4e9d833fa101481b6 SHA256 b92e8532ea5eeab6ac4c03083a693ac99662ec355500e1f704639b1e4fcfdbf2
+EBUILD unetbootin-304-r1.ebuild 838 RMD160 96859b29cf87e895aa0cfcfd79667401be5205a1 SHA1 d7dfd93e7bb431f5b3da832e5d4954bf7eefb93f SHA256 05c66429e53c164bb42ed761f46f7d809c5b181c4ca42102feda1d94439c0730
+MISC ChangeLog 675 RMD160 5004712a6a02cc94738fefb6bada876de917b465 SHA1 572b7e791ffb171209cef1e8a82c8a0fe9192821 SHA256 94297283800713a57f27afba4e03ff74259d2d467cef8889fd524437cf0d528a
 MISC metadata.xml 247 RMD160 ce510949efadc662a8bdf3f163ab8da65425031b SHA1 9e77d3a27a86999fbe9fd9c8098a6f487512cd89 SHA256 219ac51d48f3a246086b75c336a1be44caafec3dd2c86ba61a44caa6374778df
diff --git a/sys-boot/unetbootin/files/unetbootin-304-syslinux-gentoo.patch b/sys-boot/unetbootin/files/unetbootin-304-syslinux-gentoo.patch
new file mode 100644
index 000000000000..ce9425668566
--- /dev/null
+++ b/sys-boot/unetbootin/files/unetbootin-304-syslinux-gentoo.patch
@@ -0,0 +1,17 @@
+--- unetbootin.cpp.orig	2009-01-10 14:30:50.000000000 +0100
++++ unetbootin.cpp	2009-01-10 14:39:43.000000000 +0100
+@@ -2219,11 +2219,11 @@
+ 	QFile srcF(QString(":/%1").arg(srcfName));
+ 	#ifdef NOSTATIC
+ 	if (srcfName == "memdisk")
+-		srcF.setFileName("/usr/lib/syslinux/memdisk");
++		srcF.setFileName(QFile::exists("/usr/share/syslinux/memdisk") ? "/usr/share/syslinux/memdisk" : "/usr/lib/syslinux/memdisk");
+ 	else if (srcfName == "vesamenu.c32")
+-		srcF.setFileName("/usr/lib/syslinux/vesamenu.c32");
++		srcF.setFileName(QFile::exists("/usr/share/syslinux/vesamenu.c32") ? "/usr/share/syslinux/vesamenu.c32" : "/usr/lib/syslinux/vesamenu.c32");
+ 	else if (srcfName == "mbr.bin")
+-		srcF.setFileName("/usr/lib/syslinux/mbr.bin");
++		srcF.setFileName(QFile::exists("/usr/share/syslinux/mbr.bin") ? "/usr/share/syslinux/mbr.bin" : "/usr/lib/syslinux/mbr.bin");
+ 	else if (srcfName == "ubnsylnx")
+ 		srcF.setFileName("/usr/bin/syslinux");
+ //	else
diff --git a/sys-boot/unetbootin/unetbootin-304.ebuild b/sys-boot/unetbootin/unetbootin-304-r1.ebuild
index df0f2e1f0b0d..1728f9ef0b34 100644
--- a/sys-boot/unetbootin/unetbootin-304.ebuild
+++ b/sys-boot/unetbootin/unetbootin-304-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/unetbootin-304.ebuild,v 1.1 2009/01/08 18:12:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/unetbootin-304-r1.ebuild,v 1.1 2009/01/11 16:01:08 jer Exp $
+
+inherit eutils
 
 DESCRIPTION="Universal Netboot Installer creates Live USB systems for various OS
 distributions."
@@ -9,7 +11,7 @@ SRC_URI="mirror://sourceforge/unetbootin/${PN}-source-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 S="${WORKDIR}"
@@ -20,6 +22,11 @@ RDEPEND="${DEPEND}
 		 sys-boot/syslinux
 		 app-arch/p7zip"
 
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-syslinux-gentoo.patch
+}
+
 src_compile() {
 	./INSTALL || die "compile failed!"
 }