Version bump. Fix desktop file issues.

Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64

4 files changed, 126 insertions, 9 deletions

diff --git a/sys-boot/unetbootin/ChangeLog b/sys-boot/unetbootin/ChangeLog
index 53a01e9ca3e9..2a4352bc5195 100644
--- a/sys-boot/unetbootin/ChangeLog
+++ b/sys-boot/unetbootin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/unetbootin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/ChangeLog,v 1.86 2012/08/16 08:07:05 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/ChangeLog,v 1.87 2012/08/27 10:06:48 jer Exp $
+
+*unetbootin-581 (27 Aug 2012)
+
+  27 Aug 2012; Jeroen Roovers <jer@gentoo.org> +unetbootin-581.ebuild,
+  +files/unetbootin-581-desktop.patch:
+  Version bump. Fix desktop file issues.
 
   16 Aug 2012; Johannes Huber <johu@gentoo.org> unetbootin-578.ebuild:
   Stable for x86, wrt bug #431592
diff --git a/sys-boot/unetbootin/Manifest b/sys-boot/unetbootin/Manifest
index 771dd2203a88..55542897bf0d 100644
--- a/sys-boot/unetbootin/Manifest
+++ b/sys-boot/unetbootin/Manifest
@@ -1,22 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX unetbootin-581-desktop.patch 707 SHA256 f0baf1835aa8ae51d0c81a2a1a9bc9a6e77ee2f7b443931f525d9fff1bd56124 SHA512 036f887c7fb4209cd08710be88ef25671e8c1e481e3d82bc78cc1e3b1480224573cbbbf8c290846373937863400ee108b72521c1d6a9a883e01209c1da33cae2 WHIRLPOOL be30f248621adb6432c08821fbeb31d5605313a93ccfc397517e8a11c232c931a04affe2ed82aad6d8172a724ed8784465b99e0fdeb8b828b89a210511085070
 DIST unetbootin-source-575.tar.gz 731600 SHA256 a098a8683ee724a6dcc82027418d5bef15d1d88d81cafc7b98aa46f5d4b176ba SHA512 2547cc8a896ebbe4ade400d504917e497d173dd9db3cd720b124ae8d838118313cb6ee2b8341162db0fd6d0f0e5d44abc9fb497aa91bc91249e72607461666d1 WHIRLPOOL 519de9cc0c801c4b40416bd99d90bf87811da3b7ecd735ca2159e0d2d448d160761be4e9eabd05146f6cb9499a10c7664eeff76fa8d954cf9bd3374792a55abb
 DIST unetbootin-source-577.tar.gz 731696 SHA256 38307af98b3c2f912227d96c1cd2f6c5f1d69fdc844bff9acce66860ab1a383c SHA512 480de81d8901b4599684155df300942fb33c628305cd9555603836376a9f80d5042f9cc2000ba206c1581d55503b1c8426c8538ff03848e7c7d10c0209e2d34c WHIRLPOOL 74375e817bd2d71f2b021ac359507948da75a7b342971d7d9b84283a6fc41efceb23c638ae2668ecc8db83cbff4a8a1ffed575e56b78e2ce98d6e6f6c27dfd19
 DIST unetbootin-source-578.tar.gz 731923 SHA256 f21f6114c4acc76522123696c270e7a24f82a4c8bcdf691c95f0826599bd614c SHA512 c079f94ce28f897c25f20e2ad5230fc2f796211222309109556acf0c60fbdaa97ecf706af14ef269b602d55878e9ea8b168a74c571de73620066a73f4352f097 WHIRLPOOL dd88e6db3e57ed74d7acc972e555fc8543b63d0378b246d921edcaef3d59d32875041f9f60fef5fbd4a466bed4ff75f7c0e8d0a9448b69a9081c35d561dd6f56
+DIST unetbootin-source-581.tar.gz 731879 SHA256 b8bf5972653c023c159358f0e4c743dfaf1c6c27f28fd15cd97739d08c751509 SHA512 0597e64f8f2ba2a2f8530b545564cad0162646b2b3c35f8273c196f6c1fafb27d8d007242146e2bd63e735f036565e84bce9b63b60902f3daff0ad56d24f6717 WHIRLPOOL a5810bec778b7ca2e2e5a026c6de7ed749c822f9dbdf7afd172bf5c7d8a5571ce5cf4536c597f8e89e40f37ac3d09dfa206179c42cc91bb9a2a36986f1ace623
 EBUILD unetbootin-575.ebuild 1405 SHA256 b0177b744e4f0cc8b594b9fa1a659e42e24b971f075b5a539f689a716da92711 SHA512 f175eabfa9929b22a75f6a2d43b9f47099504d9f1a0da70408ad800e4b388d15848ae138c2710b96ca6b03ad0b66d0c953cf1c54da90a8309fef3afb90f721bd WHIRLPOOL bedcd0a6996362060f15f2d1739af3d77c975b819d4d7c58d6c3c5476be9e3b5596cf79e686cf1eacf05af11c7ddb056c654252a9bf6c837450e74e4c0753dc3
 EBUILD unetbootin-577.ebuild 1407 SHA256 e3d9bfe25ac87a6004f1935c80b526afc836a5233210c8d52b0a613ac43af056 SHA512 dc934252517bd8cfcdd391d96cce00b00a7e5141dd7145740c666e68bfd323158a30e8fa378115c637e5741c7bfa62b4ec2d2e99d28ef869c3375a255da7836f WHIRLPOOL ad757c73535bb2ead7064cf7e83fb8f134760ea2a7d89a212391551146852f988870a9f67fcfc571c20e118bb64cba04b98bef71a3f9ce4618a4e61d623655de
 EBUILD unetbootin-578.ebuild 1993 SHA256 826c549ae3c3d3142ee59ddba4e49c5ed6da98ec491ec71e821fadd8cff2b5e3 SHA512 f782365a1fabdaba66ba26e9e0a7b566341498ae05a41bb9d0a18cd85f4ab06ecd8312ede0a9688404cdc40aec686ec8bce138c76e6ebede7e319086e4c4eaf7 WHIRLPOOL 3ea3451d1a1ebbcb50198d7c3486d8d02edfcc5be10da3ed458f462f924786cc7a89b79c99c2150888d296a94530ddf2e04fe8f14cf05e4a2fc18743fe8f0425
-MISC ChangeLog 11061 SHA256 0933ecde761308a8d43b45c8d45911f7587f9755ebef32b3efaf190f05dd3d1b SHA512 366274395c38ab78e6a001024411f57981e6e8e037b7045c2dbbee2025f2d3749d15e56997bdcaebb3a5a14faccb6207409c46ff0066a8ec348321f923e782fe WHIRLPOOL b722d43cb4c4ca09aa1498f8a2f6c76ccef0a1ff51d71765408c981af8472192125186bb0ee9f460ff493806867c5a1d224c0bc4085823a4bf82c68c5417aa35
+EBUILD unetbootin-581.ebuild 2035 SHA256 f86b838706c368cfe22470e8c3ccf937f5385c31ce783813ad69d9e01e98ab15 SHA512 944848d487362046f29ea8de66e7e40ebc01dc954eed93bff2c009fd7db37f9a1935d3fb0505ae77edd890c42fd0dbb0f5e4b42ad1ffae4990e4af97f49c12ce WHIRLPOOL 829f84dece626ddf3854abed7ce691baa95c86d2297ba4652ff3fb107e77e0c0c81b703eed545e0e301aa40c3491ab1de82a7246aeb809aed5f64f60131a9c63
+MISC ChangeLog 11243 SHA256 f4153440469c69a40eba82f46452e2c13dc9cf2b3a3217716f70457aa3f06638 SHA512 af7ce64e298636a6d810ae95aff109fe41db82bd7854449d971667aa9bb4595e56e4cc715a569ebd222135e28503bba106e1444e966f70b85341c079db2f36ce WHIRLPOOL 75d472f2945b4fcb5325ef0ae9f90b4ccb834769b97f586c084a70da5ff149de55dc6a6159d9daa98c9283a80a0092c56467aee45ff3f555a51bf5422e3383bd
 MISC metadata.xml 226 SHA256 88817c5db4b254f26efc82b473413bba06447886ec74fce421d23f9e2fce32d3 SHA512 3add3c25669dbb90c2cadd16f8517098eb61adec5c1a65277ee92f6b7b4e2c7b47ae5dc4710cb04ca5ab85a1db1613ea8065a47d695f26644c7e8bbc89e3986a WHIRLPOOL e97e2e62289e7b2f7f2667ba416b597407ab7f8cda2d4e70f7d04ce42fc2f2dc6e47bbea3514004094973c0bfa95c91e453461d1ce22f8e03c792ce1049d6fce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQLKtwAAoJEO+t9ga+3I3abZMH/0ac+QsbR7wQihOIOsDS0f5p
-2g572K6MOF3XhrMUKuci0MfZVQh7WCGmUCwliQotaGFAvU6sjZ8L+Hp0GCF28L+9
-Y7sfmAr6YyEqAVy011U7d5H+GqRunScvHkKMmGfhkqRgsDk6Z6DBGp2NXizI5UWm
-O75Lo/7y2+6AXUmcx42EtyOXyHFQic54Y43SbzOKXZ6UkSnXo10nIM0JhMJmw4T4
-ELL21lxm9agRf3hXwXpfdj0fe4CfLaGmwJ0fYiemOBMufLWTKNT1wrspBFyjAXvm
-fY2GpzvelQ54Qv/HTrSEtB6eGewx7cmWR/fMbbNSfA8s7bixy5R6zMo9LHaGz9k=
-=TluW
+iEYEAREIAAYFAlA7Rr4ACgkQVWmRsqeSphMxqQCfXbyVa7idduWcVQQxzJgIoXiC
+X+kAn3IemvVMiZ707v1L8/bv3/DtR2Mh
+=tQmK
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/unetbootin/files/unetbootin-581-desktop.patch b/sys-boot/unetbootin/files/unetbootin-581-desktop.patch
new file mode 100644
index 000000000000..ab1912b2e8a0
--- /dev/null
+++ b/sys-boot/unetbootin/files/unetbootin-581-desktop.patch
@@ -0,0 +1,24 @@
+ * unetbootin.desktop: error: key "GenericName[en_US]" in group "Desktop Entry"
+   is a localized key, but there is no non-localized key "GenericName"
+ * unetbootin.desktop: warning: value "Application;System;" for key
+   "Categories" in group "Desktop Entry" contains a deprecated value
+ * "Application"
+
+
+
+--- a/unetbootin.desktop
++++ b/unetbootin.desktop
+@@ -2,11 +2,11 @@
+ Version=1.0
+ Name=UNetbootin
+ Comment=Tool for creating Live USB drives
+-Categories=Application;System;
++Categories=System;
+ Exec=/usr/bin/unetbootin
+ Terminal=false
+ Type=Application
+ Name[en_US]=UNetbootin
+-GenericName[en_US]=UNetbootin
++GenericName=UNetbootin
+ Comment[en_US]=Tool for creating Live USB drives
+ Icon=unetbootin
diff --git a/sys-boot/unetbootin/unetbootin-581.ebuild b/sys-boot/unetbootin/unetbootin-581.ebuild
new file mode 100644
index 000000000000..41c8bb98717f
--- /dev/null
+++ b/sys-boot/unetbootin/unetbootin-581.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/unetbootin-581.ebuild,v 1.1 2012/08/27 10:06:48 jer Exp $
+
+EAPI="4"
+
+inherit qt4-r2
+
+DESCRIPTION="Universal Netboot Installer creates Live USB systems for various OS
+distributions."
+HOMEPAGE="http://unetbootin.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+UNBI_LINGUAS="
+	am ar ast be bg bn ca cs da de el eo es et eu fi fo fr gl he hr hu id it ja lt
+	lv ml ms nan nb nl nn pl pt pt_BR ro ru sk sl sr sv sw tr uk ur vi zh_CN zh_TW
+"
+
+for lingua in ${UNBI_LINGUAS}; do
+	IUSE="${IUSE} linguas_${lingua}"
+done
+
+S="${WORKDIR}"
+
+DEPEND="x11-libs/qt-gui:4"
+RDEPEND="${DEPEND}
+		 sys-fs/mtools
+		 sys-boot/syslinux
+		 app-arch/p7zip"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-desktop.patch"
+
+	# QA check in case linguas are added or removed
+	enum() {
+		echo ${#}
+	}
+	[[ $(enum ${UNBI_LINGUAS}) -eq $(( $(enum $(echo ${PN}_*.ts) ) -1 )) ]] \
+		|| die "Numbers of recorded and actual linguas do not match"
+	unset enum
+
+	# Put all localisation file names on a single line
+	sed -i ${PN}.pro \
+		-e ':a;/unetbootin_[[:graph:]]*\.ts \\/{N;s|\\\n| |;s|    ||g;ba}' \
+		|| die
+
+	# Remove localisations
+	local lingua
+	for lingua in ${UNBI_LINGUAS}; do
+		if ! use linguas_${lingua}; then
+			sed -i ${PN}.pro -e "s| ${PN}_${lingua}.ts||g" || die
+			rm ${PN}_${lingua}.ts || die
+		fi
+	done
+}
+
+src_configure() {
+	lupdate ${PN}.pro || die
+	lrelease ${PN}.pro || die
+	eqmake4 ${PN}.pro || die
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/applications
+	doins ${PN}.desktop
+
+	for file in ${PN}*.png; do
+		size="${file/${PN}_}"
+		size="${size/.png}x${size/.png}"
+		insinto /usr/share/icons/hicolor/${size}/apps
+		newins ${file} ${PN}.png
+	done
+
+	local lingua
+	for lingua in ${UNBI_LINGUAS}; do
+		if use linguas_${lingua}; then
+			insinto /usr/share/${PN}
+			doins ${PN}_${lingua}.qm
+		fi
+	done
+}