Revbump to use system's qtsingleapplication package. Bug #487540. Patch by John Brezerk <brezerk@gmail.com>. Also change package version format to comply with portage standards

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

4 files changed, 111 insertions, 10 deletions

diff --git a/app-emulation/q4wine/ChangeLog b/app-emulation/q4wine/ChangeLog
index 3999fe027e03..a8866a6df861 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.43 2013/06/27 12:55:22 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/ChangeLog,v 1.44 2013/10/14 18:57:04 hwoarang Exp $
+
+*q4wine-1.0_p3-r1 (14 Oct 2013)
+
+  14 Oct 2013; Markos Chandras <hwoarang@gentoo.org>
+  +files/q4wine-qtsingleapp.patch, +q4wine-1.0_p3-r1.ebuild:
+  Revbump to use system's qtsingleapplication package. Bug #487540. Patch by
+  John Brezerk <brezerk@gmail.com>. Also change package version format to comply
+  with portage standards
 
   27 Jun 2013; Michael Palimaka <kensington@gentoo.org> -q4wine-0.121.ebuild,
   -q4wine-1.0-r1.ebuild, -q4wine-1.0-r2.ebuild:
diff --git a/app-emulation/q4wine/Manifest b/app-emulation/q4wine/Manifest
index 0bfa3a03048c..b5943d4ba4ff 100644
--- a/app-emulation/q4wine/Manifest
+++ b/app-emulation/q4wine/Manifest
@@ -1,18 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
 EBUILD q4wine-1.0-r3.ebuild 1384 SHA256 21a736e0e5f8145ec010e2317e07aa4c311b7c853886190e0895dd814e99a67e SHA512 bf09c8f9ceab46a3e6347a29a17d2ac7bcfeb60bf738932242226c0bb980aaf897213680790a04e75a7117f76ff42e43dd7d823d6cc64a088076057130d22d77 WHIRLPOOL 904d03fc4e7561788f226d82cba4094cf66d482868d2e6c466add482c6bddf02ae450fed43e3898f6a3c8835f96bc31c338e58e371cf72baff03fab96913661b
-MISC ChangeLog 6252 SHA256 40bcbc6a33f88e4891be6e514f447be14c31aacd39e3016a7de6a0973b672ac3 SHA512 84170dac7e9487da50641d9b761161bc9d36c9db499e41d0059211424abeae931eba42aba59fbc517da9edf676f51db6b38f5a7609d36693fb441d6fe973910c WHIRLPOOL af99337305ae458d5df3361980f1066c56c00bece75ca8859c83e20146bca76ac782b1eedfb23cb639dec5c678dd6c54cc36f8ffe52e3242429fdd504bbd0994
+EBUILD q4wine-1.0_p3-r1.ebuild 1642 SHA256 5f03702efdc3d36163f203f727f40a293d35885bd97055ea34de20499f618917 SHA512 e1b5d0a3b590ba57b0aaa675012982b9d626bf1cb40bd51271074f428e4c23929dd99e85bcbf5f835d8610fc6ff0031da78dc49b10bff71c8727d7dfbe0628bf WHIRLPOOL 77e203c64aadf24ac065dcd0c53320d42c4b2c2ae9d674d258ec2c4a535fbb5131c0d8bae2c5cb9b3a0cdcf3382ab85c6a4f7ee575ec91858d37a137e0a6e374
+MISC ChangeLog 6581 SHA256 c2ab7d823ff2f308cd7c08656a8f31fe67c34b6a5762e1898b364ddfcc85710a SHA512 878502e5059f7f2c0f4a051ffbcf21be80b2de2702e1301e38ade6cd467eb751f808e4be449ecbfe669b9e3172c104b7886a481d8af431a4fe6f2a902051c99f WHIRLPOOL 396cff638578b09724f1c5d158666802fabb139a976a0068ddc84eaebf106e7f626f68a9ecafe36529672fac2a7690d13183fa7949ac248370ea0929dd2b2140
 MISC metadata.xml 573 SHA256 96d79c7c8ff29ff28fdd83df03ab65f1c4fe5987e1be2305e0fd426b876fa97a SHA512 75a4ae6413af0c66e3e01881d56a0cca93574933198deb5c75a7b42c6bcc297c3feb3a63eb58e346bc5e1770f66f7140b1439fbb0a02e10f6d7d37e3f84bfce1 WHIRLPOOL f3e20f9a6c5d209434237ad151fa24aef26baf71d358979a7d25ef8af5bb14bfc550c02d5c72dc0962a700e3bbf1111f613daafe11d64a4ba6559295a5180d2f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRzDXXAAoJEMbwO6tnXQ0sUMAH/ic3+zZBZQDyU0Rrx/rD2nTL
-quI0LB2fmaRNLP3m/odKFP1af4Yt1OqktTliwSs1+baB+J6urXo61oIm3ckxHsPw
-UhpExpxmyOJBfJWidCAfGbOMem/aiGmfu/LVtdaj0ZDwIZJGgTTJmv/CF1p39ZRG
-b5OPWkLzMScxbMmVoECsA5YcFzd6Gpwiy+dHkhAOYYoPGOuTzPevZ9qaqsIyAZGf
-6pZq1i3RajeM6Ew9Hq9ruwYxAW3tz1hz+JvxzU8ZZKPPSefogQzBMuhC6mbmcxaM
-TnJoOEp82xaf90DysbQ/9azLeCAZBsuILDFd000hHU/pCI62iRQQDKazEUz2+MM=
-=KGV6
+iQJ8BAEBCABmBQJSXD4pXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88xv0P/156tUYhvqP9vb/PAm3et8sh
+9dqgDraoJFJTJwFeZwlEjQbAM+V/6U+SmjBAlh+lpfJF5BjBzfzGb5AbCOKNgWaM
+Vx9gL60AAGQY6HqZ/ss793ufAOfGAXekecwXegdS9aH7mLodtUTayS8HA/+pEpB4
++jr9s3GsxSiLlJYlcFQcWniLg28lCG2pv0U0EWxoM7ZWY0kHDbW9CdpuI/m95rKl
+c/7W0kYdLWafmxwW4l1lp9YPF44dt3VvgODnMZoLezcO9Vz6ztqvmwec5u7RUJLx
+holJ0mRU4zOdsd126SwicfcLkUVHT68pEWfesK5DRPLyqp0i3TXwJ2ViqPtgNWyJ
+gZxIugAHO9sqHmZcADzM2qKWP0/P0nUJja2fyJANF/WiIVZ9b/vP3Hgs5LufFWvN
+CXbFmx18wc2khCReiqgPkgrxaLWkPrORNbGkgRooKSTeuY7hoHlTtVkULueWHh9v
+UU7L/SbknV4a9Df+Y2MSsxLMeTwCtS6u91/8OiSoJepzERTQ7NvrI2YH6x/7kOBh
+jJCpvgwyjh85dyYRS8M2/mSIEkZIgN6wedeDTmYwdqCaSkf2ARq+RJr2Jukw97lD
+wXQB46HcFPCgVkW2F4u9h9U5Lq1V02jp9vCYpGXEG3aGqFojTMTJfG0t+iJJbSqX
+7AfjQ0J682pjOylWxun/
+=zNCS
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/q4wine/files/q4wine-qtsingleapp.patch b/app-emulation/q4wine/files/q4wine-qtsingleapp.patch
new file mode 100644
index 000000000000..803284dbdb17
--- /dev/null
+++ b/app-emulation/q4wine/files/q4wine-qtsingleapp.patch
@@ -0,0 +1,15 @@
+https://github.com/brezerk/q4wine/issues/39
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index adb8db6..7c0d0d2 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -275,7 +275,7 @@ SET ( Q4WINE_HEADERS_DIR
+ 
+ IF (${WITH_SYSTEM_SINGLEAPP} MATCHES ON )
+     MESSAGE(STATUS "Searching for QtSingleApplication package (WITH_SYSTEM_SINGLEAPP=ON) --\n")
+-    find_path(QTSINGLEAPPLIB_INCLUDE_DIR QtSingleApplication PATH_SUFFIXES QtSolutions)
++    find_path(QTSINGLEAPPLIB_INCLUDE_DIR QtSingleApplication PATH_SUFFIXES QtSolutions PATHS /usr/include/qt4)
+     find_library(QTSINGLEAPPLIB QtSolutions_SingleApplication-2.6)
+ 
+     IF (QTSINGLEAPPLIB_INCLUDE_DIR AND QTSINGLEAPPLIB )
diff --git a/app-emulation/q4wine/q4wine-1.0_p3-r1.ebuild b/app-emulation/q4wine/q4wine-1.0_p3-r1.ebuild
new file mode 100644
index 000000000000..953e0fd83a3b
--- /dev/null
+++ b/app-emulation/q4wine/q4wine-1.0_p3-r1.ebuild
@@ -0,0 +1,68 @@
+# 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
+}