Drop pointless gksu/kdesu dependency (bug 486442); major ebuild cleanup; remove older versions.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

7 files changed, 88 insertions, 289 deletions

diff --git a/app-emulation/q4wine/ChangeLog b/app-emulation/q4wine/ChangeLog
index f37edff00685..1f88da219ba8 100644
--- a/app-emulation/q4wine/ChangeLog
+++ b/app-emulation/q4wine/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/q4wine
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/ChangeLog,v 1.47 2013/12/17 21:31:52 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/ChangeLog,v 1.48 2013/12/28 00:07:53 pesa Exp $
+
+*q4wine-1.1_p2-r1 (28 Dec 2013)
+
+  28 Dec 2013; Davide Pesavento <pesa@gentoo.org> +q4wine-1.1_p2-r1.ebuild,
+  -q4wine-1.0_p3-r1.ebuild, -q4wine-1.1.ebuild, -q4wine-1.1_p1.ebuild,
+  -q4wine-1.1_p2.ebuild:
+  Drop pointless gksu/kdesu dependency (bug 486442); major ebuild cleanup;
+  remove older versions.
 
 *q4wine-1.1_p2 (17 Dec 2013)
 
diff --git a/app-emulation/q4wine/Manifest b/app-emulation/q4wine/Manifest
index 6afd1c73f3d8..0bcda5897fba 100644
--- a/app-emulation/q4wine/Manifest
+++ b/app-emulation/q4wine/Manifest
@@ -3,32 +3,25 @@ Hash: SHA256
 
 AUX q4wine-qtsingleapp.patch 693 SHA256 a2ed34ff25ffbc8a0e6d8e894bd20e2339b60dd025588922b8ec67d50467a8b9 SHA512 9be87c8896a85378090d0967a0b1ab221e744c0dc386bb9a67ede3e4b973efdf170e0091723c364cd41d9e566e1345cddf5cec1397df76add55014ad6bbbcd4f WHIRLPOOL 7610b84dcc3981e1e25d5f2256d31537d7c59285e47ba9d616ba42e7b171176aae95d5983f83d6c44fa5278d26fe5ae65b9c256981bf7f277534f80a2fbe83cf
 DIST q4wine-1.0-r3.tar.bz2 889308 SHA256 9f1319dd0baff3834a3938e0a048c1529cb9ea521158370176b706fce0d4d2ff SHA512 df10a2fbf6874f4c4e02dd9c43031453a46c76f03d83321f2d6e9544d0540dd07da1bc9246767c5c91ce17d67d5d236227294efaed9de09f3d5a18afbd60b224 WHIRLPOOL 51b5b4cfc157da6b99154269ef4ef9f38ff91f861864158b789352505af485d8b523a21c6d4b59544804ed3c15cb1c6c756db3f3203c8e3ba55c8396c3630df3
-DIST q4wine-1.1-r1.tar.bz2 888706 SHA256 bb95c2acdb2e4d56366cfd6c1cab21941032709414b740e7133fb8ded2f430ec SHA512 1c4505bea7457ffea9b6e9e2dbd7169a3a85f59275e09cb8ecbab25dbd22c715a1985d16a57ffea5bfc775659a62b6dfdef30757fa3cdaa25b95b7e59888ed83 WHIRLPOOL ee7f329d62b56c1998944327d89377f6d4d504dc3106623829e7478ac56819281f6aa0114d05ba5e0047b120a0d321ec46c043037e50f0f0ad43eabd4f0985c7
 DIST q4wine-1.1-r2.tar.bz2 888990 SHA256 01463f9ec3ef9f7ef987d2b77425f2806cf2b60f574deb6644458366782eafc7 SHA512 8aaeec46d239a86a9eb10377842d63d84a35864f920f9dc46a022ae1cf3e010273d3759701595e058a089f6418a297a0bf94ed62b580a71fa1c8c27a80f4ec7e WHIRLPOOL 6ae891e33a2bf3759c45930820e21a273b2bf36f2c386a841a96c3bf14cfdb6741871d3c90383dde3b6b01df1a87f5b1537ae40bac5a494bdd3023248c526244
-DIST q4wine-1.1.tar.bz2 888249 SHA256 a33cec421e6680f739cb710a0827be9b10f4271e98de51be6079a771da312255 SHA512 d5fda2283be89b6dc08a6cd46b892e65e104954ee2711ccd032d7455d2d8f037b77dea7f23a6b0987807e3ae8d7ed5f80b360f582b53544debbe819a1eb8032a WHIRLPOOL e4c81e2f2d9cee084a8e72ae661bcc609667931a0021dd3718309a68d90af88c1d04e01c08560997309bd31f14d0330726f718242e0851cccd03308fe182831b
 EBUILD q4wine-1.0-r3.ebuild 1384 SHA256 21a736e0e5f8145ec010e2317e07aa4c311b7c853886190e0895dd814e99a67e SHA512 bf09c8f9ceab46a3e6347a29a17d2ac7bcfeb60bf738932242226c0bb980aaf897213680790a04e75a7117f76ff42e43dd7d823d6cc64a088076057130d22d77 WHIRLPOOL 904d03fc4e7561788f226d82cba4094cf66d482868d2e6c466add482c6bddf02ae450fed43e3898f6a3c8835f96bc31c338e58e371cf72baff03fab96913661b
-EBUILD q4wine-1.0_p3-r1.ebuild 1642 SHA256 5f03702efdc3d36163f203f727f40a293d35885bd97055ea34de20499f618917 SHA512 e1b5d0a3b590ba57b0aaa675012982b9d626bf1cb40bd51271074f428e4c23929dd99e85bcbf5f835d8610fc6ff0031da78dc49b10bff71c8727d7dfbe0628bf WHIRLPOOL 77e203c64aadf24ac065dcd0c53320d42c4b2c2ae9d674d258ec2c4a535fbb5131c0d8bae2c5cb9b3a0cdcf3382ab85c6a4f7ee575ec91858d37a137e0a6e374
-EBUILD q4wine-1.1.ebuild 1587 SHA256 644d7ffe2a0c032515d69c4a430512c872b551e2b0ff601976a829b07161e92c SHA512 2c639b490852af7be680d02d49fb57237cc0c8c3cc486435e144443e29540e572981ffb2a2799d99e84f8135bd9b4a0eb2606ddaca3d25db94062f28151088b3 WHIRLPOOL bc097c9f75e41c15b3c7ea45b73f483ca571323b9a13144c2091cec0fe19ab1a3814eec8aa8be61905dc4e059983d7fbca908392aa60cfd9c529510aa4273793
-EBUILD q4wine-1.1_p1.ebuild 1593 SHA256 329071841fc42c9afd9a919e2d0413c1a95cc2029d24082731c963e0605c0d7a SHA512 94effca27b3c65c1e4c84390e5489bfc9497ce00b04bcabb38f78bb9fe91a6ce9a338744490da94aef21c3ab74d022eec9fd364acf2096023cfaec01dd78f6ad WHIRLPOOL e0287c1dc119a7e43e6fda4a6400d71ca9d8994c6b9bbca8ee309fc876c68afea5c97b9a1777af93e50cdb31ed65fdf4ebab377da442ef025cdb64025f478a7e
-EBUILD q4wine-1.1_p2.ebuild 1593 SHA256 efea3d6906c69d5a1c31c260604cb249ebbc213f7a7e90155addfa212058fcca SHA512 ff835bd5d88c1de3ffddddf235a1197e7f751670641068b22514ad2c58b163620c6b91556ec5e04924fccacc5668b08051450fc752130473b3a19d03504cc066 WHIRLPOOL 340a39ff82a408e9bf74e254653b4146614531e5c351f6e4e313b7ff87a6bce86c82fa7c0c5b946d41a65e5379184d37a5915b92fe020b1413a15cff0b4f8fe7
-MISC ChangeLog 6991 SHA256 ffa82eadb012b87c7bb17bc8cc3916d2f2abf15a82416ec4e48bcb734063b245 SHA512 48df231e21e7d15f46caa265759b02153048363112a36a40dfb334a36cfe1b3b5ad7b7f6a7f9bcfcd11df3cf9ecd74a5cc2abf05efc69f84553d874b20023cfd WHIRLPOOL e4583e127c2852f9217cab289fc3faaa1394c308fa64341143b3f4d1306ecb0c50b73678076110795d130b90011982c79d606afac95f995b7d61ec16ae85447d
+EBUILD q4wine-1.1_p2-r1.ebuild 1463 SHA256 ffa8e6ed75212fee61b2db87421864ad8b4cb4589230eaec56c4c2ed4adeb676 SHA512 b431556cee42029f9997ea06d29a90d882d80e361eabbba5a6a36efe5fb0e7d8838f9f1ccf6131ce531a15f57f1984b1139e93c6229af204513afaccfa475de1 WHIRLPOOL 1fb341a2e012fc2d1c74b98278ae7d453d22c7b1744216e347ca2894816a8292e5f9936509194888587e2f0c1c9dbad995169a5026f52d181cba27b57ff351d1
+MISC ChangeLog 7293 SHA256 5c5c1105b5b863cffe246ba24a74493b99125b59ce914f7318cdb4849a4c9896 SHA512 f956412962a38562c85d74d107f57961cd73564d8fe8de17e7cb5d9e2a69fcb90790228aab91057e07698d914aa03cb3743a32af6bdbabc814ce439cb681e681 WHIRLPOOL 7e15dbef4af5051816ce19439ca9c7365969943da3c6995e3a36c61d295a2ae970b6e3413ac5a5dd7c722f55dc8a3011f5633b4c4b6c54aff7e0f70bb0c08eba
 MISC metadata.xml 573 SHA256 96d79c7c8ff29ff28fdd83df03ab65f1c4fe5987e1be2305e0fd426b876fa97a SHA512 75a4ae6413af0c66e3e01881d56a0cca93574933198deb5c75a7b42c6bcc297c3feb3a63eb58e346bc5e1770f66f7140b1439fbb0a02e10f6d7d37e3f84bfce1 WHIRLPOOL f3e20f9a6c5d209434237ad151fa24aef26baf71d358979a7d25ef8af5bb14bfc550c02d5c72dc0962a700e3bbf1111f613daafe11d64a4ba6559295a5180d2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSsMK4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88vnAQALU+dt//gC/X3zPhKStvNpad
-M55CQKBt1Z1e+a+wpYh1sVcKb7GwF2F1JKHQoC20/IYmBJfMPqM5cd1G6lPtGlvS
-pUFRf2LaWf614sWSGWmF0w9soAKKaYfMufRHvuEqukpWj6IwCnzAUASsdyQjK4cP
-ww7rsjQ0zwswjyz5I6BJ5uepiC2vZ5+HCIkXN2OjVoLqjpuv/ow1iz7+dTH3CMRo
-Bzgf9NW9SIptx8CMOB0b8iA7faVwSQsvk3b/b8R15W3u1oWs6QWklQIczdM6hBaG
-ZF2ye6AkojvqKRXtCRTCfFTYdBx7QeYUaXnMgoMA/m3+KSGKEnk8IY/FDOrxDSXn
-LfZIbK1QWEEWC644wMP9XM12+Wf4oClRDcO5wIwNbgAOBXtGT005NoiHbBwUNffE
-COkoqaC19op9TLAVApWHLQ7xyJOB9PM2YYhLPcxeXBABWkFtArgbhBjGmGeadjr5
-Pz8lJwTqdwWNk09qTTbPNM+EIql7HAoxkpJdbhCi2xB+ygG6DpnW6W1vQyibBb7m
-/HrV0BhFKyS5LD+BSloYfBS2cV6g/GrTwhzzhASA6/qTDDzHhsCTDvrZoBg06EnJ
-Gp4hMqrQ4lSFkOzlP8oqmB8psG8An7gtcD79Jaig+chmNLvn56NFFL88WazXqMZF
-BZTQy7LRLqsh9J5aBP9T
-=ahyY
+iQIcBAEBCAAGBQJSvhZmAAoJENXLsxwXqFxyWlwP/1vAsVH7wP+dwRmEsv4LXTvK
+kNEIIful6ZV5hzBt/iJExt/CajA3iLNRF2tqkKgNe+SNQaQW4O5WJMdyKobLKntw
+szTBI+/OurIVIWcjDo5djyu4F1TG0kuOS0omfa1cfloohZhoD73ACjZ0a0JtMbbb
+vdNRpNwJFWGx/aipDXIo9cHNvfUmTL/qAN6CRzRdSAH6JM5szrj+pax9eVjSbW5y
+UJRsrz/Df2VSe1YRd2BrC7+lWkLyaH0JkkVWzGlAmTFaXmNGczW+XHhqphwD3jhc
+m1Uw1Uzxc/UjfntpLUNbkDp1WqJdZmcuekP3NGKUCyzQTTvbfqF7C0bkYGUzAQi4
+ukfQ/Y8PjP5ZywIQ7qGXphz8p8coaaLE+5ovqJIlchTPnf+g2Z5LltQPOhL1mxw6
+e0Tjk3NYTmAjBvhCPCbdwsQQ7pdxpYvUDoqdUkOpkYO4XWU/Yz/AAp7EYnKkGxi9
+6ie9vSyhgNhWRnUSWUbKwqCQ7pwwTZAMR2k7LfQZuaCb0jBsFgB1jaWe7lvy8xJf
+/BsMWplLnbGDSVIjylvmTKybBlmFc+trL8CsGaff2EO5ktgU1MpppbP1SAwiBvMt
+NX2IYsVsDcSt8RHDzTruYKhzJGB+mh6a5NFQ11U63saNQYFPpPKurmx77ru1S606
+bLbiS/RyH+HjcY0z2m4t
+=mhvd
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/q4wine/q4wine-1.0_p3-r1.ebuild b/app-emulation/q4wine/q4wine-1.0_p3-r1.ebuild
deleted file mode 100644
index 953e0fd83a3b..000000000000
--- a/app-emulation/q4wine/q4wine-1.0_p3-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.0_p3-r1.ebuild,v 1.1 2013/10/14 18:57:04 hwoarang Exp $
-
-EAPI="4"
-LANGS="cs de en es fa he it ru uk pl pt af"
-
-inherit cmake-utils
-
-# Upstream names the package PV-rX. We need to fix that to
-# PV_pX so we can use portage revisions.
-MY_PV="${PV/_p/-r}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Qt4 GUI configuration tool for Wine"
-HOMEPAGE="http://q4wine.brezblock.org.ua/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +icoutils +wineappdb -dbus gnome kde"
-
-for x in ${LANGS}; do
-	IUSE+=" linguas_${x}"
-done
-
-CDEPEND="dev-qt/qtgui:4
-	dev-qt/qtsingleapplication
-	dev-qt/qtsql:4[sqlite]"
-
-DEPEND="${CDEPEND}
-	dev-util/cmake"
-
-RDEPEND="${CDEPEND}
-	app-admin/sudo
-	app-emulation/wine
-	>=sys-apps/which-2.19
-	icoutils? ( >=media-gfx/icoutils-0.26.0 )
-	sys-fs/fuseiso
-	kde? ( kde-base/kdesu )
-	gnome? ( x11-libs/gksu )
-	dbus? ( dev-qt/qtdbus:4 )"
-
-DOCS="README AUTHORS ChangeLog"
-
-PATCHES=( ${FILESDIR}/${PN}-qtsingleapp.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs} \
-		-DWITH_SYSTEM_SINGLEAPP=ON \
-		$(cmake-utils_use debug DEBUG) \
-		$(cmake-utils_use_with icoutils ICOUTILS) \
-		$(cmake-utils_use_with wineappdb WINEAPPDB) \
-		$(cmake-utils_use_with dbus DBUS)"
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			find "${D}" -name "${PN}_${x}*.qm" -exec rm {} \;
-		fi
-	done
-}
diff --git a/app-emulation/q4wine/q4wine-1.1.ebuild b/app-emulation/q4wine/q4wine-1.1.ebuild
deleted file mode 100644
index d9e10954c804..000000000000
--- a/app-emulation/q4wine/q4wine-1.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.1.ebuild,v 1.1 2013/11/16 11:29:23 hwoarang Exp $
-
-EAPI="4"
-LANGS="cs de en es fa he it ru uk pl pt af"
-
-inherit cmake-utils
-
-# Upstream names the package PV-rX. We need to fix that to
-# PV_pX so we can use portage revisions.
-MY_PV="${PV/_p/-r}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Qt4 GUI configuration tool for Wine"
-HOMEPAGE="http://q4wine.brezblock.org.ua/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +icoutils +wineappdb -dbus gnome kde"
-
-for x in ${LANGS}; do
-	IUSE+=" linguas_${x}"
-done
-
-CDEPEND="dev-qt/qtgui:4
-	dev-qt/qtsingleapplication
-	dev-qt/qtsql:4[sqlite]"
-
-DEPEND="${CDEPEND}
-	dev-util/cmake"
-
-RDEPEND="${CDEPEND}
-	app-admin/sudo
-	app-emulation/wine
-	>=sys-apps/which-2.19
-	icoutils? ( >=media-gfx/icoutils-0.26.0 )
-	sys-fs/fuseiso
-	kde? ( kde-base/kdesu )
-	gnome? ( x11-libs/gksu )
-	dbus? ( dev-qt/qtdbus:4 )"
-
-DOCS="README AUTHORS ChangeLog"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs} \
-		-DWITH_SYSTEM_SINGLEAPP=ON \
-		$(cmake-utils_use debug DEBUG) \
-		$(cmake-utils_use_with icoutils ICOUTILS) \
-		$(cmake-utils_use_with wineappdb WINEAPPDB) \
-		$(cmake-utils_use_with dbus DBUS)"
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			find "${D}" -name "${PN}_${x}*.qm" -exec rm {} \;
-		fi
-	done
-}
diff --git a/app-emulation/q4wine/q4wine-1.1_p1.ebuild b/app-emulation/q4wine/q4wine-1.1_p1.ebuild
deleted file mode 100644
index 150fcb5fa286..000000000000
--- a/app-emulation/q4wine/q4wine-1.1_p1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p1.ebuild,v 1.1 2013/12/01 12:26:07 hwoarang Exp $
-
-EAPI="4"
-LANGS="cs de en es fa he it ru uk pl pt af"
-
-inherit cmake-utils
-
-# Upstream names the package PV-rX. We need to fix that to
-# PV_pX so we can use portage revisions.
-MY_PV="${PV/_p/-r}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Qt4 GUI configuration tool for Wine"
-HOMEPAGE="http://q4wine.brezblock.org.ua/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +icoutils +wineappdb -dbus gnome kde"
-
-for x in ${LANGS}; do
-	IUSE+=" linguas_${x}"
-done
-
-CDEPEND="dev-qt/qtgui:4
-	dev-qt/qtsingleapplication
-	dev-qt/qtsql:4[sqlite]"
-
-DEPEND="${CDEPEND}
-	dev-util/cmake"
-
-RDEPEND="${CDEPEND}
-	app-admin/sudo
-	app-emulation/wine
-	>=sys-apps/which-2.19
-	icoutils? ( >=media-gfx/icoutils-0.26.0 )
-	sys-fs/fuseiso
-	kde? ( kde-base/kdesu )
-	gnome? ( x11-libs/gksu )
-	dbus? ( dev-qt/qtdbus:4 )"
-
-DOCS="README AUTHORS ChangeLog"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs} \
-		-DWITH_SYSTEM_SINGLEAPP=ON \
-		$(cmake-utils_use debug DEBUG) \
-		$(cmake-utils_use_with icoutils ICOUTILS) \
-		$(cmake-utils_use_with wineappdb WINEAPPDB) \
-		$(cmake-utils_use_with dbus DBUS)"
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			find "${D}" -name "${PN}_${x}*.qm" -exec rm {} \;
-		fi
-	done
-}
diff --git a/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild b/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild
new file mode 100644
index 000000000000..46915b5100e9
--- /dev/null
+++ b/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 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.1 2013/12/28 00:07:53 pesa Exp $
+
+EAPI=5
+
+PLOCALES="af cs de en es fa he it ru uk pl pt"
+
+inherit cmake-utils l10n
+
+DESCRIPTION="Qt4 GUI configuration tool for Wine"
+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}
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dbus debug +icoutils +wineappdb"
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsingleapplication
+	dev-qt/qtsql:4[sqlite]
+	dbus? ( dev-qt/qtdbus:4 )
+"
+RDEPEND="${DEPEND}
+	app-admin/sudo
+	app-emulation/wine
+	>=sys-apps/which-2.19
+	sys-fs/fuseiso
+	icoutils? ( >=media-gfx/icoutils-0.26.0 )
+"
+
+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
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT5=OFF
+		-DWITH_SYSTEM_SINGLEAPP=ON
+		$(cmake-utils_use debug)
+		$(cmake-utils_use_with dbus)
+		$(cmake-utils_use_with icoutils)
+		$(cmake-utils_use_with wineappdb)
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-emulation/q4wine/q4wine-1.1_p2.ebuild b/app-emulation/q4wine/q4wine-1.1_p2.ebuild
deleted file mode 100644
index eea582b03c2c..000000000000
--- a/app-emulation/q4wine/q4wine-1.1_p2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 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.ebuild,v 1.1 2013/12/17 21:31:52 hwoarang Exp $
-
-EAPI="4"
-LANGS="cs de en es fa he it ru uk pl pt af"
-
-inherit cmake-utils
-
-# Upstream names the package PV-rX. We need to fix that to
-# PV_pX so we can use portage revisions.
-MY_PV="${PV/_p/-r}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Qt4 GUI configuration tool for Wine"
-HOMEPAGE="http://q4wine.brezblock.org.ua/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +icoutils +wineappdb -dbus gnome kde"
-
-for x in ${LANGS}; do
-	IUSE+=" linguas_${x}"
-done
-
-CDEPEND="dev-qt/qtgui:4
-	dev-qt/qtsingleapplication
-	dev-qt/qtsql:4[sqlite]"
-
-DEPEND="${CDEPEND}
-	dev-util/cmake"
-
-RDEPEND="${CDEPEND}
-	app-admin/sudo
-	app-emulation/wine
-	>=sys-apps/which-2.19
-	icoutils? ( >=media-gfx/icoutils-0.26.0 )
-	sys-fs/fuseiso
-	kde? ( kde-base/kdesu )
-	gnome? ( x11-libs/gksu )
-	dbus? ( dev-qt/qtdbus:4 )"
-
-DOCS="README AUTHORS ChangeLog"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs} \
-		-DWITH_SYSTEM_SINGLEAPP=ON \
-		$(cmake-utils_use debug DEBUG) \
-		$(cmake-utils_use_with icoutils ICOUTILS) \
-		$(cmake-utils_use_with wineappdb WINEAPPDB) \
-		$(cmake-utils_use_with dbus DBUS)"
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			find "${D}" -name "${PN}_${x}*.qm" -exec rm {} \;
-		fi
-	done
-}