Revision bump uses system qtsingleapplication instead of bundled lib wrt bug #489146.

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

4 files changed, 80 insertions, 17 deletions

diff --git a/x11-misc/kdocker/ChangeLog b/x11-misc/kdocker/ChangeLog
index 75f3b4176ef0..2ee40f9ee0ca 100644
--- a/x11-misc/kdocker/ChangeLog
+++ b/x11-misc/kdocker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/kdocker
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/kdocker/ChangeLog,v 1.6 2013/06/11 15:53:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/kdocker/ChangeLog,v 1.7 2013/10/27 15:14:14 johu Exp $
+
+*kdocker-4.8-r1 (27 Oct 2013)
+
+  27 Oct 2013; Johannes Huber <johu@gentoo.org>
+  +files/kdocker-4.8-unbundle-qtsingleapplication.patch, +kdocker-4.8-r1.ebuild:
+  Revision bump uses system qtsingleapplication instead of bundled lib wrt bug
+  #489146.
 
   11 Jun 2013; Agostino Sarubbo <ago@gentoo.org> kdocker-4.8.ebuild:
   Stable for x86, wrt bug #472986
diff --git a/x11-misc/kdocker/Manifest b/x11-misc/kdocker/Manifest
index 930950940f13..40557617a832 100644
--- a/x11-misc/kdocker/Manifest
+++ b/x11-misc/kdocker/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX kdocker-4.8-unbundle-qtsingleapplication.patch 425 SHA256 ccacb2b0e8df33808017a5ac28e054e95ded6d45c31a4be8af85c4212447c098 SHA512 b30cf6fd65df88eee8395f7f6d3d73fbaff2575fb36977c5a16ce1c3983804f1045e6beea787796eb9ef1878cc1c18ef7e033fbc7f1d113630850457a0d00262 WHIRLPOOL 881fd1bcf8bbb280ec1607bcfa1f45380f7d52c26fff557396510e5dedc9c051265d94b8759037e4eb3bfc3dc5a58b103b4ecb5c02335e17c15274156fd01f76
 DIST kdocker-4.8.tar.gz 379186 SHA256 16e5d6dab6957139343b29d2bab7d1f7154d74bb4a60dace897b23cf6f8921a9 SHA512 4e7d716dba1ec7d45cb1134e4d28b4d4461a837d2f88f1460d54297594f617c414ba231515e1ca5c284e75099ac5db9762712085aba6c374991c8c642d903a91 WHIRLPOOL 059c018059e29f5259adfeb23f3bf1d6b1967aa06a1cf991bcfa050324c3459ea08c304c869a77c4f6ac16e508546051d6484cc6806217fb39afd8fdd01f9970
+EBUILD kdocker-4.8-r1.ebuild 974 SHA256 28ed376c462fac8e3e9f4ae692ed28e60c218cba0a606c17cd9e527ce5096eb6 SHA512 c5cb2e74d708e0f6ea78cc00a9edb054fb65295aa6c0b9a7fb59dd567c969dd6283e11af1df18a0aa3c57b61c886e762baa0e11f8b0547724e7e3b7b2fd871e8 WHIRLPOOL d76ee382c16e9e02f4d2f8654ace61d80138fb6cc43515c04eb9a5922a8447c05a7351a24dcc555ebffbc8c43f34f1da073474aafa1088fc9c58ab54bf65c445
 EBUILD kdocker-4.8.ebuild 805 SHA256 d73182e6f850dbe2f044444efb81978c2f5ced4c8ad76994e90a3b9d5318dd5a SHA512 ddb98b0fba56e0d80db789806a353455a980732d62e1e4ac42fa3a68bd095555fe3c71094e11d29bff5df7ab6d1641659b6a42be6960b1979a4a4123fb914c45 WHIRLPOOL 3dc7526edff47e2d99afb7a186479ff08e4d95b4cf082d202c0813c26c247a2222aa261f05ee455aec1e395c920f4a1e4979ee145d07c04cf8d075a3c3cba15a
-MISC ChangeLog 3125 SHA256 0ae09c367dc64ae121397c7dc892b6f289d3e3ee3fcfe05b765df3c3088202bf SHA512 ff6cbb040e10ac60ebe8ea349e1bd9597cc770f7794ec6f0d7324b8987cae7072a5005fbd5532d8a5e7cff40f7ce6edb1fdbdc85f21a28ece125568caed14f47 WHIRLPOOL 5dabb6a2eded9e13af98eef6c7574f21dc7192e004df153df3d94125dd628741e692100bd60a9911bc7d72f5f6fafc7c5baf3079e20e73139251199b8881aadf
+MISC ChangeLog 3377 SHA256 0bc4e98acdc320effe58bb65eb6e9f88fbc3cd176d91c7f4597b85f2f01e5019 SHA512 8215c71259d552e8b3c06eb4d52bcf2cc41b8993c91dafc5bcc0c6df21376f88a7a62a4b8435740634cbe2429985c794098eebb1f9ba895dccb91e92e2a427c3 WHIRLPOOL a1dc36638c1f53d35f36eb97803efbc28c2597d7bfb24a5c768033194ecee4cc7007d070068c49be3cf5dd64de5d0477513a43acb141dac5c7ca3fc1576898c1
 MISC metadata.xml 287 SHA256 b9cb206b9c40564e8b5ef090e166f72b8d8dbf5a747015cb23f71ab50221322b SHA512 0f35596a28a1d41d72e7645b5f8273d3a59552c2731aa0adb7ac830dce60806eb3fa12158d4bd46e031459609a5b03e2db9cc5c05452bf5b4b77db7ee165e740 WHIRLPOOL eab86e0725d06e32af9a87668f11954acdf379d7e1a1118de9fbf23c21ed82a5c245f2a061a98de99e7eaec46835d2feb5fdc0eb0e2efcc0c3b753e461221daf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRt0fyAAoJELp701BxlEWfsyoP/2IK6Z03fpa0xw+O7eZx8cA0
-UalG5QODQGJWS5Dyw/FYcZXpzDAdUYFSqlZEihI/Y9/XAd/1vM8hUT9G1s4ucYEE
-wx8cVKxlZ3ZMSDr2D72QKdOyfickvuW51hmscpQdYYeVk5hquP9MZe6uI9cWBHYr
-SF4of1VBKFllp4lGDfdIQDkl7Wk9iZMnNbkUapKzEWRLh4OUFGvlLhd2cEX+CTiE
-pBFfAMRKF5aCus8Y7nt8jvTbobYHNWrqoA9ikuKfFFhGmCMLfDmSrLkmb/5AfzV+
-s81LSlNg8LdA8EjLANq6Oof1GV+yCCKQQ2W9UAFBUn6A+ZTA9p4buH4Msxj778qN
-jj2nuYQ23/DD0IAgHMqV24WjJYPovsDU+i8d3zIheZ6nnzOeeyhD09e2kezV2lVV
-Tv0xJLyW+KrtKtAK9P7QzNRxfeKlDFE+gV+nXZMFyV2KsI6D6cJEGGoy/9aj0zwx
-LzAtHSMcyhA49jci4Ou5tbYlz8ZhlCIi6saqeh2jfX4taYfgswYVo3Hpj/Prx236
-3PESHnLlaumL8T8QUDw9eMePftV9FLDlHWNV1qcNzRSWUGBgvRQvUX+rc7kclveM
-D/bY7otL12gZ8Ztl1yj6cLA9/umfXZfs5UhlVgphToS6EcWApBFjNG/nkUouoYlr
-qDKMRBu9OoMYPx3a4Yzp
-=XIPj
+iQEcBAEBCAAGBQJSbS3LAAoJEO+t9ga+3I3a61kH/iTgGeVcWMpAcIz0xRM+nskv
+cLNEw302ebKUZk2aiJuZZTbmo791XmuKeNv3OTOoIp6L8xOa5NYOzmFbZXToGXfF
+ONFyy/8vGRcpvqOeEzbHnW9DV+Yo8BhZAOO1EOWa/TV01DGgbF1pn0IwXovrhJpq
+Nwpm3dM2IHbKZsGiHo/kVh+WItZ+PRcuYjIDh17+VL+OipGOB3HfFqEtkW9k6lY9
+VE5ctDJdfKe/UAjPwHufp5MEsI2ngzgkzcW62S7ItIrjuJ+9ShWpiCNSAjBHB4EZ
+9Qfysub2LB0tRt0Uw7S4eCXJfsd0ev3aI1dLeN3ndn+ue4w5y2kMd4sLz5Fn/jc=
+=qVDm
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/kdocker/files/kdocker-4.8-unbundle-qtsingleapplication.patch b/x11-misc/kdocker/files/kdocker-4.8-unbundle-qtsingleapplication.patch
new file mode 100644
index 000000000000..798769e6907c
--- /dev/null
+++ b/x11-misc/kdocker/files/kdocker-4.8-unbundle-qtsingleapplication.patch
@@ -0,0 +1,17 @@
+=== modified file 'kdocker.pro'
+--- kdocker.pro	2011-05-31 00:46:31 +0000
++++ kdocker.pro	2013-10-27 14:41:36 +0000
+@@ -2,7 +2,11 @@
+ CONFIG += qt
+ TARGET = kdocker
+ 
+-include(solutions/qtsingleapplication/qtsingleapplication.pri)
++isEmpty(SYSTEMQTSA) {
++	include(3rdparty/qtsingleapplication/qtsingleapplication.pri)
++} else {
++	CONFIG += qtsingleapplication
++}
+ 
+ DEPENDPATH += src
+ INCLUDEPATH += . src  /usr/include/X11
+
diff --git a/x11-misc/kdocker/kdocker-4.8-r1.ebuild b/x11-misc/kdocker/kdocker-4.8-r1.ebuild
new file mode 100644
index 000000000000..219de5a1088b
--- /dev/null
+++ b/x11-misc/kdocker/kdocker-4.8-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/kdocker/kdocker-4.8-r1.ebuild,v 1.1 2013/10/27 15:14:14 johu Exp $
+
+EAPI=5
+
+LANGS="it"
+inherit qt4-r2
+
+DESCRIPTION="Helper to dock any application into the system tray"
+HOMEPAGE="https://launchpad.net/kdocker/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV:0:3}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXpm
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsingleapplication
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS BUGS ChangeLog CREDITS README TODO )
+
+PATCHES=( "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" )
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	if ! use linguas_it ; then
+		sed -e '/^INSTALLS +=/s/translations//' -i kdocker.pro || die "sed failed"
+	fi
+}
+
+src_configure() {
+	eqmake4 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1
+}