Version bump.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

5 files changed, 70 insertions, 4 deletions

diff --git a/sys-boot/unetbootin/ChangeLog b/sys-boot/unetbootin/ChangeLog
index cb4d94cb5198..58a240055cea 100644
--- a/sys-boot/unetbootin/ChangeLog
+++ b/sys-boot/unetbootin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.5 2009/02/06 06:09:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/ChangeLog,v 1.6 2009/03/11 17:59:05 jer Exp $
+
+*unetbootin-319 (11 Mar 2009)
+
+  11 Mar 2009; Jeroen Roovers <jer@gentoo.org>
+  +files/unetbootin-312-gentoo.patch, unetbootin-312.ebuild,
+  +unetbootin-319.ebuild:
+  Version bump.
 
 *unetbootin-312 (06 Feb 2009)
 
diff --git a/sys-boot/unetbootin/Manifest b/sys-boot/unetbootin/Manifest
index 5469528f9237..ca76790d5abc 100644
--- a/sys-boot/unetbootin/Manifest
+++ b/sys-boot/unetbootin/Manifest
@@ -1,11 +1,14 @@
+AUX unetbootin-312-gentoo.patch 491 RMD160 b49ce464e6a57566e05fd19e0e5da361f76dcc81 SHA1 336bf1c3127b4aace1bccb5a692de00dbac7aa16 SHA256 0bad42443e4736551afde3bbe9d7b3b8e76985c3158edafa8ed01b2a391e542d
 AUX unetbootin-gentoo.patch 947 RMD160 b4d3400d91a3e02c8a865186202209b1e17562dc SHA1 f68bac377065624bc72df83a174bf6d771139edb SHA256 c85427f93790146f1a3f25090786e7c154467e6be07cab01c4404cef586df1fc
 DIST unetbootin-source-304.tar.gz 139665 RMD160 ff4ff040d920d7ca9262596a623500555a8a42e3 SHA1 5428b21eace1d79b76541f169f37d61681e86c4b SHA256 1f52cf2e7f6e57a7dcf9e9a061b1d87150d37520948586526d400f11806c66a5
 DIST unetbootin-source-307.tar.gz 141417 RMD160 2ed53d6e2768c2f2b531228305826ae2742594c0 SHA1 6acd80f63b2354b942460fe351fbc6500419bbce SHA256 723d6d2b61db4a6038b7e7d5f8382936d641c267720c6954f5efff5ea0d481d3
 DIST unetbootin-source-310.tar.gz 141070 RMD160 e265ac334a05fe2fcddaac397b8a1c2d7fee1933 SHA1 62edc091603fdccfdd1b1c1a718b4b4ec585b710 SHA256 dd993b546beb412118af349d74ee725ce3866a0216a27dbadf8e5a60628dce11
 DIST unetbootin-source-312.tar.gz 141104 RMD160 9158a3c55e11004f1a0b5e2db8b751193c041b58 SHA1 9ba85dc488d05b525984d927bff089f543a42841 SHA256 fc2bfe692f36978675bb7dbaf03d572278d25012dbdc0360eecc32ac25aa80b3
+DIST unetbootin-source-319.tar.gz 159273 RMD160 aeb1f02d89fcb9b7b95c23d5600721e3b666374b SHA1 7b807df4bf37b36f29688298540e9a78d3c2a330 SHA256 916d3446627329ba22771eab56f9da7d620bd92549d23dda803797208e3d8133
 EBUILD unetbootin-304-r1.ebuild 830 RMD160 2fe1c2d10518c4639a912dd44ff418e7aa15e91f SHA1 0bd10920806ab67411b248a9ee8d43ab050efa92 SHA256 bafa73f80d25f11a892d7aec39caa8cdf45cc6d817c46003f17d38d9caafffc7
 EBUILD unetbootin-307.ebuild 827 RMD160 2903ecf16ab90311256d8af0e40298e927216b58 SHA1 8171d9c261a747be02ae9129a140e85457c63f1d SHA256 2b098878244b9fcd59e4b13b4bca7cf4853594a97641a9614914835f37440a18
 EBUILD unetbootin-310.ebuild 817 RMD160 83becc972a34bea90d5b57cb20566ff36d670fe9 SHA1 99f9b54b407604e52034854f86f978dfabf8c812 SHA256 32bf10cc3b6cca39c4e089d8c1fe847dfbf1b026b0db22285b81e3be6c7333e5
-EBUILD unetbootin-312.ebuild 817 RMD160 03de01c4ba3e9252f6b6535fc65ff9d5168dc438 SHA1 318299b515b73c4d87f825c7854a8f8cb4642692 SHA256 063e081d425b2bcb9fba2dae80d838b343f9dc84eee23b78e984f75f13e1c800
-MISC ChangeLog 1218 RMD160 76cadd408ac26b2fc89d6f60acabd0a96bf8b0da SHA1 5c76d77050336764ad18646a10cbe1397b2d433f SHA256 a15fec530316bd03681affdc8ab8e68691929eb160c654e2f9f72aa73679dfc1
+EBUILD unetbootin-312.ebuild 888 RMD160 8af936d1b20681bdf496216cd5c2d03c26bee44b SHA1 332c4732c5726fcf97a629f9d11a368da4099bb1 SHA256 b32e31d3888d22eea7112d5422db2c5f136f95674abbebfdc536acd15ac2b89d
+EBUILD unetbootin-319.ebuild 893 RMD160 3e83d47a172911d1db48fb4bd1f9344a55992712 SHA1 878b25072ca4c249a49f7f97a1172bce084c4dd5 SHA256 ff1c6b14fe0a94500d94cee1d06737241042cdd6a303b0f83762857dd496eac2
+MISC ChangeLog 1400 RMD160 5f0cc5123ec2ca30eae06ae6c73f0522e91b4184 SHA1 fe5b6cc08996c61174a8b6e7d168b04ab2f56a36 SHA256 d448f17a71281efc7ddd874ef2b003a6cb2ab8311dba6b74b07dc3dea2a38cf5
 MISC metadata.xml 247 RMD160 ce510949efadc662a8bdf3f163ab8da65425031b SHA1 9e77d3a27a86999fbe9fd9c8098a6f487512cd89 SHA256 219ac51d48f3a246086b75c336a1be44caafec3dd2c86ba61a44caa6374778df
diff --git a/sys-boot/unetbootin/files/unetbootin-312-gentoo.patch b/sys-boot/unetbootin/files/unetbootin-312-gentoo.patch
new file mode 100644
index 000000000000..737b57ae2b05
--- /dev/null
+++ b/sys-boot/unetbootin/files/unetbootin-312-gentoo.patch
@@ -0,0 +1,11 @@
+--- unetbootin.cpp.orig	2009-02-03 23:02:03.000000000 +0100
++++ unetbootin.cpp	2009-02-14 18:58:44.000000000 +0100
+@@ -2610,7 +2610,7 @@
+ 		QFile usbmbrF(rawtargetDev);
+ 		QFile mbrbinF(":/mbr.bin");
+ 		#ifdef NOSTATIC
+-		mbrbinF.setFileName("/usr/lib/syslinux/mbr.bin");
++		mbrbinF.setFileName(QFile::exists("/usr/share/syslinux/mbr.bin") ? "/usr/share/syslinux/mbr.bin" : "/usr/lib/syslinux/mbr.bin");
+ 		#endif
+ 		usbmbrF.open(QIODevice::WriteOnly);
+ 		mbrbinF.open(QIODevice::ReadOnly);
diff --git a/sys-boot/unetbootin/unetbootin-312.ebuild b/sys-boot/unetbootin/unetbootin-312.ebuild
index 58d143a28166..868facdc7bdf 100644
--- a/sys-boot/unetbootin/unetbootin-312.ebuild
+++ b/sys-boot/unetbootin/unetbootin-312.ebuild
@@ -1,6 +1,6 @@
 # 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-312.ebuild,v 1.1 2009/02/06 06:09:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/unetbootin-312.ebuild,v 1.2 2009/03/11 17:59:05 jer Exp $
 
 inherit qt4
 
@@ -22,6 +22,11 @@ RDEPEND="${DEPEND}
 		 sys-boot/syslinux
 		 app-arch/p7zip"
 
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
 src_compile() {
 	lupdate unetbootin.pro
 	lrelease unetbootin.pro
diff --git a/sys-boot/unetbootin/unetbootin-319.ebuild b/sys-boot/unetbootin/unetbootin-319.ebuild
new file mode 100644
index 000000000000..af4e7f75b361
--- /dev/null
+++ b/sys-boot/unetbootin/unetbootin-319.ebuild
@@ -0,0 +1,40 @@
+# 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-319.ebuild,v 1.1 2009/03/11 17:59:05 jer Exp $
+
+inherit qt4
+
+DESCRIPTION="Universal Netboot Installer creates Live USB systems for various OS
+distributions."
+HOMEPAGE="http://unetbootin.sourceforge.net/"
+SRC_URI="mirror://sourceforge/unetbootin/${PN}-source-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+DEPEND="x11-libs/qt-gui"
+RDEPEND="${DEPEND}
+		 sys-fs/mtools
+		 sys-boot/syslinux
+		 app-arch/p7zip"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${PN}-312-gentoo.patch
+}
+
+src_compile() {
+	lupdate unetbootin.pro
+	lrelease unetbootin.pro
+	eqmake4 unetbootin.pro
+	emake || die "make failed"
+}
+
+src_install() {
+	dodoc README.TXT
+	dobin unetbootin || die "dobin failed"
+}