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

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xF3CFD2BD)

3 files changed, 68 insertions, 1 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/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
+}