summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2009-04-02 17:58:39 +0000
committerJeroen Roovers <jer@gentoo.org>2009-04-02 17:58:39 +0000
commit8005ee630a63ad355184d58087f9e2378e29fd68 (patch)
tree9d09562bab350c62cd5cc61b5b604f9596eb6aea
parentStable on sparc, bug #264121 (diff)
downloadgentoo-2-8005ee630a63ad355184d58087f9e2378e29fd68.tar.gz
gentoo-2-8005ee630a63ad355184d58087f9e2378e29fd68.tar.bz2
gentoo-2-8005ee630a63ad355184d58087f9e2378e29fd68.zip
Remove unneeded patch.
(Portage version: 2.2_rc28/cvs/Linux i686)
-rw-r--r--sys-boot/unetbootin/ChangeLog6
-rw-r--r--sys-boot/unetbootin/files/unetbootin-gentoo.patch17
2 files changed, 5 insertions, 18 deletions
diff --git a/sys-boot/unetbootin/ChangeLog b/sys-boot/unetbootin/ChangeLog
index dd795854a309..0ff28761514c 100644
--- a/sys-boot/unetbootin/ChangeLog
+++ b/sys-boot/unetbootin/ChangeLog
@@ -1,6 +1,10 @@
# 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.7 2009/04/01 23:08:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/ChangeLog,v 1.8 2009/04/02 17:58:39 jer Exp $
+
+ 02 Apr 2009; Jeroen Roovers <jer@gentoo.org>
+ -files/unetbootin-gentoo.patch:
+ Remove unneeded patch.
01 Apr 2009; Jeroen Roovers <jer@gentoo.org> -unetbootin-304-r1.ebuild,
-unetbootin-307.ebuild, -unetbootin-310.ebuild:
diff --git a/sys-boot/unetbootin/files/unetbootin-gentoo.patch b/sys-boot/unetbootin/files/unetbootin-gentoo.patch
deleted file mode 100644
index ce9425668566..000000000000
--- a/sys-boot/unetbootin/files/unetbootin-gentoo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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