Fix locale handling by using full locale names, wrt bug #496508. Minor QA fixes. Thanks to Kjell Claesson <kjell.claesson AT epost.tidanet.se> for discovering this issue

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

3 files changed, 29 insertions, 35 deletions

diff --git a/app-emulation/q4wine/ChangeLog b/app-emulation/q4wine/ChangeLog
index 8bfe5e0e642f..d7a5c28fcdda 100644
--- a/app-emulation/q4wine/ChangeLog
+++ b/app-emulation/q4wine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/q4wine
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/ChangeLog,v 1.50 2014/01/02 20:13:14 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/ChangeLog,v 1.51 2014/06/23 10:02:57 pinkbyte Exp $
+
+  23 Jun 2014; Sergey Popov <pinkbyte@gentoo.org> q4wine-1.1_p2-r1.ebuild:
+  Fix locale handling by using full locale names, wrt bug #496508. Minor QA
+  fixes. Thanks to Kjell Claesson <kjell.claesson AT epost.tidanet.se> for
+  discovering this issue
 
   02 Jan 2014; Markos Chandras <hwoarang@gentoo.org> q4wine-1.1_p2-r1.ebuild:
   Depend on qtsingleapplication[X] to fix configure failure
diff --git a/app-emulation/q4wine/Manifest b/app-emulation/q4wine/Manifest
index fdb53a4c5e64..04a64700336f 100644
--- a/app-emulation/q4wine/Manifest
+++ b/app-emulation/q4wine/Manifest
@@ -5,25 +5,17 @@ AUX q4wine-qtsingleapp.patch 693 SHA256 a2ed34ff25ffbc8a0e6d8e894bd20e2339b60dd0
 DIST q4wine-1.0-r3.tar.bz2 889308 SHA256 9f1319dd0baff3834a3938e0a048c1529cb9ea521158370176b706fce0d4d2ff SHA512 df10a2fbf6874f4c4e02dd9c43031453a46c76f03d83321f2d6e9544d0540dd07da1bc9246767c5c91ce17d67d5d236227294efaed9de09f3d5a18afbd60b224 WHIRLPOOL 51b5b4cfc157da6b99154269ef4ef9f38ff91f861864158b789352505af485d8b523a21c6d4b59544804ed3c15cb1c6c756db3f3203c8e3ba55c8396c3630df3
 DIST q4wine-1.1-r2.tar.bz2 888990 SHA256 01463f9ec3ef9f7ef987d2b77425f2806cf2b60f574deb6644458366782eafc7 SHA512 8aaeec46d239a86a9eb10377842d63d84a35864f920f9dc46a022ae1cf3e010273d3759701595e058a089f6418a297a0bf94ed62b580a71fa1c8c27a80f4ec7e WHIRLPOOL 6ae891e33a2bf3759c45930820e21a273b2bf36f2c386a841a96c3bf14cfdb6741871d3c90383dde3b6b01df1a87f5b1537ae40bac5a494bdd3023248c526244
 EBUILD q4wine-1.0-r3.ebuild 1384 SHA256 21a736e0e5f8145ec010e2317e07aa4c311b7c853886190e0895dd814e99a67e SHA512 bf09c8f9ceab46a3e6347a29a17d2ac7bcfeb60bf738932242226c0bb980aaf897213680790a04e75a7117f76ff42e43dd7d823d6cc64a088076057130d22d77 WHIRLPOOL 904d03fc4e7561788f226d82cba4094cf66d482868d2e6c466add482c6bddf02ae450fed43e3898f6a3c8835f96bc31c338e58e371cf72baff03fab96913661b
-EBUILD q4wine-1.1_p2-r1.ebuild 1496 SHA256 bfd59d12bc4b3d4d0a5348e603fba7bd60bdfe185ec782f45e72552f41b71fd2 SHA512 1413ed2c0a7cff1c9667c5c819285c4e791af86f4b2edd3987b76b1d5be8ef41d355996b7af3b717093e3485b275a376d9f9f27d78acdb0d357a76184d8713e3 WHIRLPOOL 321c72fb3cb799da92e6295a805e2f61df913c441977d8fec67eec57d2935b01013a6c98d2c2856eb8b0ce2d783c344e7e31b379cb8f84250d4c18aad016ca62
-MISC ChangeLog 7511 SHA256 b4a5b83895592a08ec5fdaf6347c299d6411c40f1fe7ef458cb01757f5d19dae SHA512 24ec08fcf0c00d39cd4c77fd3ebb58d142b7e4d6f76c19ffed2303dd2dc601bcdc94a9cf8bb49104c4e8db9592c150504d4f23d787f398f2ad5870d1c21c5c55 WHIRLPOOL 37e7279dde9f73bcb72ed657c6e4d2f0ec03de8201f51bfae861decee83675aa17f683b1f9c258732121088885c737366d00791a960db529b29dc111e8710153
+EBUILD q4wine-1.1_p2-r1.ebuild 1582 SHA256 a7a9f2195997fc8b26e2b70a63a4c866984878511b6ff8907a5099762c143fca SHA512 a5c568c94355bf6df03a83be98c6e7c604c1ecbdd396a7350b2ae67ccdee24ee89007137f7445ff0957ddddbd9cabbe4c500b33e4f022cf1701d29dca795ffdd WHIRLPOOL 0492cc88f9b449e209aca254c93a75147465c5ec5eaf4b197bb6aa07435c7df10aca8e65c54fe8f6baf716132f5b14c9abed3c2a0c20aafeb8fc7385da76a1b4
+MISC ChangeLog 7763 SHA256 33ac311ac8e72be496d42ea913b939056fa3b059ac73fd349b2d1698506247bd SHA512 388d1ffb4d6bc756b927aea19e3b3a1340efc4b7411863030a3281716bb196f238d02b99afba440b6afa2f6c591a283b435c2303890d800b94e4fcfbf23e4e4e WHIRLPOOL 238c826e06aaaf91a857b5084ef4d1d9b0d774f2db5faaef81727657fe0a24060891546facfdd675c5eb82ae49e89c67d6186649c2641e33236504b37298f05c
 MISC metadata.xml 528 SHA256 6f671f64742c996dcd05a5c3291cc0b37cdde29b988150afac5faeb6e3831001 SHA512 a8ce73d6cda01406af000638e99d38c086389833f8bafc9fb8a5dd3adbd55f0b157fc5e886e136c84aa570cccb910b15ed5dadbfb73ad0b41cf82aab504f2d61 WHIRLPOOL ea43f0b41aa229c4e384c245e2ea1bb37ccf11b97a4961a8df75a20ef73d8f86110c13026e287e6ae2e292f7301c8042625f7b128a2a0381a04c544e3297514c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSxcg/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88WIgP/iKo/w/vmj0Z+tiTnRpSHJCg
-7WoyD1iTdpArYx8ytX5PZAxAfa3uWgaZqHPcnGnm+ASi7AmqHlO7KbxUjbnn5qEK
-9eCaVkyatZRCjELXdkOIYwgWnOIwqbwbywLXw372a0TA8LibCPXp90ez+vqA3OWT
-bqGKjVWUP4uPv3yAOGaYhnUll/eoBcv0dcQDHq1w2Pzmws9WXeZJSOq4MMG5Wp/5
-zc2mCA8rPK8TH//376x890Qa4Fphb1y3vFwsC6u/fYlciAt22xj1JzZsCyEGPpH3
-NCVDLN+27s4Hl6kQLjY7F2GngZB7bO+vUGaoaDVjtkFioL23Zy6WGL7bJvnMY3m4
-TroHIly7WN1tHZXLYzpdTJOr+eZBNbLtzYdd8PZO7Fb0cAm2l/i+MuyuaxO1w1uA
-0vuhpKj/a25Qz8YLrlyCVl5HZyqGvUvgSf0/pxCxwSMSWOyov8sRMS0o/xB7fYhc
-9qcg97suEum8P+2SqUOfQVrIuydjvBbVJ7Q4UWrZH/kp8ztVA494TZLXDy09kJ0y
-PDkVmxSNhqFMsNiTaUpCetK41ORvFBLL2lic2sDY4W256TNeRRf0otlNjtfbtsjG
-zF1uZh4bVSAQEdxUW+40zuYqZAAOu/R+8eZmutAGC0KVSuu5FoekdsZhjm+lCL+Z
-6jiB9fB1UR5UQATU6h5o
-=nyKk
+iQEcBAEBCAAGBQJTp/r6AAoJECo/aRed9267TmwIAIX+WcQ1uX1QLJuWBGAoVsuZ
+eUG5EaGtlYcmg2bz1VcGn0ij+Tgth+rEb/gfjg0K9jNJwNd6xBTRh09LdGFMHmWA
+Rn8w1SIweUVTYwprKQ3F0U0ceq/6UVQx5GUWwjpFJAwQBZlDn2y66WSgx9nacMx4
+tx24C0hCP6Qe1O8v6qBwjEFEVRIZb0pOYS60wNDQ/SW4risc/1rAU7EXO1y13Usg
+xAFL4OEUilnaZevcdXJdQu8vfyVRovcK4SH3s3DzXGwWqSb2CYd1xtnkhZZ3NT7O
+Qbmd+WpBZ+Op13Trae51R9PrMdSdJ2+8+owQAweHV5sbpsTDCl77hea0BJcnCIM=
+=gkIA
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild b/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild
index 3470bb6f63c2..12758a09c096 100644
--- a/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild
+++ b/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild,v 1.2 2014/01/02 20:13:14 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild,v 1.3 2014/06/23 10:02:57 pinkbyte Exp $
 
 EAPI=5
 
-PLOCALES="af cs de en es fa he it ru uk pl pt"
+PLOCALES="af_ZA cs_CZ de_DE en_US es_ES fa_IR he_IL it_IT pl_PL pt_BR ru_RU uk_UA"
 PLOCALE_BACKUP="en_US"
 
 inherit cmake-utils l10n
@@ -14,8 +14,8 @@ HOMEPAGE="http://q4wine.brezblock.org.ua/"
 
 # Upstream names the package PV-rX. We change that to
 # PV_pX so we can use portage revisions.
-MY_PV=${PV/_p/-r}
-MY_P=${PN}-${MY_PV}
+MY_PV="${PV/_p/-r}"
+MY_P="${PN}-${MY_PV}"
 SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${MY_PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
@@ -26,7 +26,7 @@ IUSE="+dbus debug +icoutils +wineappdb"
 DEPEND="
 	dev-qt/qtcore:4
 	dev-qt/qtgui:4
-	dev-qt/qtsingleapplication[X(+)]
+	dev-qt/qtsingleapplication[X]
 	dev-qt/qtsql:4[sqlite]
 	dbus? ( dev-qt/qtdbus:4 )
 "
@@ -38,22 +38,19 @@ RDEPEND="${DEPEND}
 	icoutils? ( >=media-gfx/icoutils-0.26.0 )
 "
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
-DOCS=(README AUTHORS ChangeLog)
-
-remove_from_LINGUAS() {
-	sed -i -e "/SET\s*(\s*LINGUAS / s: ${1}_\w\w::" \
-		src/CMakeLists.txt || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	l10n_for_each_disabled_locale_do remove_from_LINGUAS
-}
+DOCS=( AUTHORS ChangeLog README )
 
 src_configure() {
+	local enabled_linguas
+	construct_LINGUAS() {
+		local current_locale="$(echo ${1} | tr '[:upper:]' '[:lower:]')"
+		enabled_linguas="${enabled_linguas};${current_locale}"
+	}
+	l10n_for_each_locale_do construct_LINGUAS
 	local mycmakeargs=(
+		-DLINGUAS="${enabled_linguas}"
 		-DQT5=OFF
 		-DWITH_SYSTEM_SINGLEAPP=ON
 		$(cmake-utils_use debug)