gentoo resync : 21.12.2017

4 files changed, 2 insertions, 66 deletions

diff --git a/x11-misc/kdocker/Manifest b/x11-misc/kdocker/Manifest
index 3dafb120d17a..25d6a895f683 100644
--- a/x11-misc/kdocker/Manifest
+++ b/x11-misc/kdocker/Manifest
@@ -1,6 +1,3 @@
-AUX kdocker-4.8-unbundle-qtsingleapplication.patch 425 BLAKE2B 772ca78908f7304456f23f87545b308c78f577c24d20d420b66fd761d30c384dffbf1362b270f5eedbc07ced6027b5e293fea662d2567927528d10b8688ab344 SHA512 b30cf6fd65df88eee8395f7f6d3d73fbaff2575fb36977c5a16ce1c3983804f1045e6beea787796eb9ef1878cc1c18ef7e033fbc7f1d113630850457a0d00262
-DIST kdocker-4.8.tar.gz 379186 BLAKE2B 0ba5d39f5ecfaca1a67c1369239d90edf892db536f65a1f853788941ebb1891c0fd92ddce16250be3c8d613a40626bffebd2ea0e29fe4abf862327dcd62be5cf SHA512 4e7d716dba1ec7d45cb1134e4d28b4d4461a837d2f88f1460d54297594f617c414ba231515e1ca5c284e75099ac5db9762712085aba6c374991c8c642d903a91
 DIST kdocker-5.0.tar.gz 152222 BLAKE2B b4e60a28f497476503f2a40aee4a776ece3a052adce4d29cb75095d9056ba0d6e4993838d6f771fad08532a3fb6d4022a07684f47cbd72289d34bce7196347aa SHA512 7c7702000621204d7e4acab295d43d05f71982af91524bc237878bdc9aa8851dc01a718bbe32412f46c718a1e358de8e710489a4beba9ef5b39359fe43662ba3
-EBUILD kdocker-4.8-r2.ebuild 1008 BLAKE2B d6dbb4ea6b941f6503d2276922770ae68298ec8411f8263c5777d7672f46e300a0ce038bab9e70c6ef3c07dd83e482f65cc134416387ceafb2a51dac42b63dbd SHA512 9b1082d7d8671684342b4876334c286939e6d02d45df704a182c0b5584242b71d3273b0311c68badacaf032551e883f9255ea0daaf6abf1576bb5ced56852c19
-EBUILD kdocker-5.0.ebuild 963 BLAKE2B e8b4bb3c69c04acf478b09da85242772a7aa218d8c2ba5be70cd97da75c162df192d2aaa1514c75d51aef26b8fe4f181a6aefb35562760694d56e976315647c0 SHA512 a4b14f2dd2129a4d4689af2ba7eecfde3270497bd913dfc70f53a2d3e995daa92e9aa76626a27e31bc80d6c296e93af443ac922af54061355fa2a46b918066eb
+EBUILD kdocker-5.0.ebuild 961 BLAKE2B 251a1f7fb3b00e7a7d8d54b58a474f772dcde5ba5cff7739eee05d33c7435ef0ae9931b70081974e8ebbdea5da58c9bf144f1465d93402c8c0b135e6364a05af SHA512 7e7a27df70cb8071ca6bf3af5e4434f39943575983efccb185b50d5cd3e5b5485dd3aa41b20bc55d4cbd2328cff95fbee241a727961b7358a018897bc9b68410
 MISC metadata.xml 314 BLAKE2B 86e414d13727828176c674bd392f94ebe69655ec1d2b7979e4aaca22a49cd2fd0f4656b8be665be1f6d98400328bfef9c9ff80e2f37640ac3b6dbd7632db379a SHA512 7004b14353f87c3c308055f8291e09f8f3b36ce8859f51a055f691afbfb2537fef9f5632793c9977cab36aa8e453d53876d7e2e57ae0bddaaebe261a7cac0ff4
diff --git a/x11-misc/kdocker/files/kdocker-4.8-unbundle-qtsingleapplication.patch b/x11-misc/kdocker/files/kdocker-4.8-unbundle-qtsingleapplication.patch
deleted file mode 100644
index 798769e6907c..000000000000
--- a/x11-misc/kdocker/files/kdocker-4.8-unbundle-qtsingleapplication.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-=== 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-r2.ebuild b/x11-misc/kdocker/kdocker-4.8-r2.ebuild
deleted file mode 100644
index f3e8ad99e0d2..000000000000
--- a/x11-misc/kdocker/kdocker-4.8-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-LANGS="it"
-inherit bash-completion-r1 qt4-r2
-
-DESCRIPTION="Helper to dock any application into the system tray"
-HOMEPAGE="https://github.com/user-none/KDocker"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV:0:3}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsingleapplication[qt4(+),X]
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXpm
-"
-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
-
-	sed -i -e "/completion.path/s%/etc/bash_completion.d%$(get_bashcompdir)%" \
-		kdocker.pro || die "sed failed"
-}
-
-src_configure() {
-	eqmake4 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1
-}
diff --git a/x11-misc/kdocker/kdocker-5.0.ebuild b/x11-misc/kdocker/kdocker-5.0.ebuild
index f5fe8f99707d..ab82f88c525e 100644
--- a/x11-misc/kdocker/kdocker-5.0.ebuild
+++ b/x11-misc/kdocker/kdocker-5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/user-none/KDocker/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="