Remove old; add missing qt dependencies, bug 380611

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

5 files changed, 27 insertions, 68 deletions

diff --git a/kde-misc/kdocker/ChangeLog b/kde-misc/kdocker/ChangeLog
index 5b749a30cdcc..b6f8ed3ecea4 100644
--- a/kde-misc/kdocker/ChangeLog
+++ b/kde-misc/kdocker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kdocker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdocker/ChangeLog,v 1.9 2011/06/19 09:00:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdocker/ChangeLog,v 1.10 2011/08/27 21:58:24 dilfridge Exp $
+
+  27 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdocker-4.5.ebuild,
+  -kdocker-4.6.ebuild, kdocker-4.6-r1.ebuild:
+  Remove old; add missing qt dependencies, bug 380611.
 
 *kdocker-4.6-r1 (19 Jun 2011)
 
diff --git a/kde-misc/kdocker/Manifest b/kde-misc/kdocker/Manifest
index ab16856a525e..5afc808d6cad 100644
--- a/kde-misc/kdocker/Manifest
+++ b/kde-misc/kdocker/Manifest
@@ -2,27 +2,24 @@
 Hash: SHA512
 
 AUX kdocker-4.6-icon.patch 360 RMD160 83221b9495bd098cf41ed794bc75d2934f8e1063 SHA1 6d0f6ceb0f8482560fbbf80338fe071f6c5bced7 SHA256 68f797c8c09aadfaf8aa45c1b4fc8bf048244fd66ab93aaf1b6d9887cc85426b
-DIST kdocker-4.5.tar.gz 87557 RMD160 77418277695cd2f07ec7248402e4aed3ca7e9c5f SHA1 036a5aeb0b8e0399fb65703ca18f83672aadaf7e SHA256 84277100a8875b7b1cc074500e1838c379184d5f4807d61e0f2622d05b7cf347
 DIST kdocker-4.6.tar.gz 87125 RMD160 ca4147d34300ba9d7228a0d02c53eb9977b0fb74 SHA1 c2a3cbba9d9f44fd70ecdfcea37925643115dbb6 SHA256 3a25682202cddbfea05618e65461570e33cd75642b40c68e02b31a12c865d406
-EBUILD kdocker-4.5.ebuild 639 RMD160 bb8e6beb82ae75ed4a332b5301e5eaff73919035 SHA1 e5af5947ed1d711e18ad102db4ee9fdb4633e244 SHA256 408aea05050fb37c149cfe2b205e9f6c33182d465d6a2926b43afbf58e95e1cb
-EBUILD kdocker-4.6-r1.ebuild 690 RMD160 45e439c61abb01516c0c5835fa250c0df2459936 SHA1 61ce00c26a15bbdb8434576172cd305a89e51485 SHA256 647180ee146137a61f66929ab99c4c3c7dfd603cda18b7faaeddade2d88d1138
-EBUILD kdocker-4.6.ebuild 639 RMD160 774aabb96938e2baffa8d22b267a14719f8c96cf SHA1 66efb6779d5d5400b8b76f643b208342cc2560b5 SHA256 a08085736e6f325c45541f740e3c0eb9ece6b4678b91b4137b4cefbb2e9f32b2
-MISC ChangeLog 1479 RMD160 87cddbae21e9620ada4280949c2bcfd6a0e00322 SHA1 fbdb521cdd1fe0612b2a19658b97f471939f900f SHA256 477261171d128a517ede1d0993e3362210bf4194d82c01bdae3b28388fd346f3
+EBUILD kdocker-4.6-r1.ebuild 755 RMD160 3e4ebddf41df971570574639373431f5446093db SHA1 1736f65b4baee921cc87dac698414e4126dc7170 SHA256 c6571418f0f82a8a849f92925301b1797b8f07c9a12b3f40c763b9ef715169b9
+MISC ChangeLog 1660 RMD160 fc664c5452bffaed61ccebff5b15b5667b63d330 SHA1 579829738f76a56a95c47b94373bd48a773ecaeb SHA256 72011f953a87a1ea2cf01d6f0a389305610a9cfee2e6ace476541d10af6de3c1
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN/bqgAAoJENwGBM22xffej1gP/0iRKMYy1bAACY6EKzQK5QZ3
-NiN8P2E31MDS99yDNE58XIKQIMZn73agrjo7tNjN1XaQuqMqkCG3AT74tmxwxYoL
-WpqAgY1k2aaFIcRFO0aLrTk53eJf1C94Vm9dG4LmaLSrQH0IdwK8Anf8mtqDysLQ
-hEQqjTVME1b6mfcAevspzh40wmEYiYvEbkSAZu5de4FgI+DgCynbfXq4XeRaNjcy
-5X+S8vy2nzf6WflXmyin3GZWD5FvNNJIJIuRkTY261kDNGiy8Mb62oyzLeFZD8lK
-81QDVtHa4J+cIvdQK0x+1K0Vk6Qc1s19a+uC2YXmu757jNimWSRVOSLYOXcu/J9e
-ofGNODCP2II1jB4BlCJU1bSQDKTPT42ETMpxiGbvExX7ko0fLTDpCxQ4rwKxuM5J
-BXbmHjPDovA5Z2jX8qQqNq0754wSYWWOA7t+Xa2uq5p1zFbf8Yc5rYK3CbUO7Pn8
-WhQVZspUedDb0955CiWTQdxJ7oMshZQ+/ChICBHCKC9Q8ay3G3iNDl06n62V5XA9
-RK2zKcW1O9c/H5loonBKoLiwYLqtN0CRGr74/T7o5UnEf1d6sMEqeZ6quBPyXgqa
-J07zLSVmXCJAM38pQKcALg1CRRC10NAjG+nN8l+fhcR7IXYVXVny0cfSkEIUc+ni
-eRoBXwOBwCM30yks3rv5
-=jNHU
+iQIcBAEBCgAGBQJOWWiTAAoJENwGBM22xffejQ0QAJBuvQB1HlKdx7I0282Llck3
+C3WFnRWPMOBZQZEd+FXpDQ35n5WTIM7oXmWesNp9rDfVuBKPThw0jn4ARFtE+hs2
+cybLbw/lm5edqLig1J/8usyK5ycVA7spsFXGf7RW3wEMdsD6Qw0HtWJzoet5esYs
+P03YAYcSkdsVBJA+M4mQnIP/U6ezIhxz1KT/YxlEqQl/A9m6ej9R5l/1oZQNpDBh
+OSixqC9hc+mLy6KhVFKTfAhsoC3ovNyjUWXfo6mTUZfbwXThQPqe+FSKls9Xts7y
+cYG5r7rL1YxKR+ua3Flrll1sAXBOfYE0cS02I42Zth2pXPkkU27v+rhBzkDFHmpg
+h6rFHGbZ7naShSWhOh3nEG/OWH5cn2HNdXY3uks9OSztgsyN7dDaovNNqEXF8CQ9
+10TpKOZRn+I/4SKQldBkkKLsTYKYI2qppX7aID7RjdPZv/ZIqakSYM5pBY3c7cBV
+c4hD2aXU/28LuXScWG0dfRMRoUFO/MNdlPzlBINwy6cAEHVCEBn7kU0nfpcxXaAi
+LufPvn4pZnXc2vP73cb1nS+UlvNK9iXJpkVYHyd+HA/OF8ZkreK11cFD4OY1vqKR
+vHE3RI5135HDEMtrh+WULR5Xs2MUdTLXO57TZ2I22MAt/IZExyS/hS/FKUV/zeXS
+EUR3YskJBncVonBchMom
+=QBGc
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kdocker/kdocker-4.5.ebuild b/kde-misc/kdocker/kdocker-4.5.ebuild
deleted file mode 100644
index 9947445a5b54..000000000000
--- a/kde-misc/kdocker/kdocker-4.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdocker/kdocker-4.5.ebuild,v 1.1 2011/01/06 17:09:11 dilfridge Exp $
-
-EAPI=3
-inherit qt4-r2
-
-DESCRIPTION="KDocker will help you dock any application into the system tray"
-HOMEPAGE="https://launchpad.net/kdocker/"
-SRC_URI="http://launchpad.net/kdocker/trunk/${PV:0:3}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die
-	dodoc AUTHORS BUGS ChangeLog CREDITS README TODO
-}
diff --git a/kde-misc/kdocker/kdocker-4.6-r1.ebuild b/kde-misc/kdocker/kdocker-4.6-r1.ebuild
index 219650a052e8..13bb94686045 100644
--- a/kde-misc/kdocker/kdocker-4.6-r1.ebuild
+++ b/kde-misc/kdocker/kdocker-4.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdocker/kdocker-4.6-r1.ebuild,v 1.1 2011/06/19 09:00:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdocker/kdocker-4.6-r1.ebuild,v 1.2 2011/08/27 21:58:24 dilfridge Exp $
 
 EAPI=3
 inherit base qt4-r2
@@ -14,6 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+DEPEND="
+	x11-libs/qt-core
+	x11-libs/qt-gui
+"
+RDEPEND=${DEPEND}
+
 PATCHES=( "${FILESDIR}/${P}-icon.patch" )
 
 src_configure() {
diff --git a/kde-misc/kdocker/kdocker-4.6.ebuild b/kde-misc/kdocker/kdocker-4.6.ebuild
deleted file mode 100644
index 29c474214fa0..000000000000
--- a/kde-misc/kdocker/kdocker-4.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdocker/kdocker-4.6.ebuild,v 1.1 2011/06/13 14:04:26 dilfridge Exp $
-
-EAPI=3
-inherit qt4-r2
-
-DESCRIPTION="KDocker will help you dock any application into the system tray"
-HOMEPAGE="https://launchpad.net/kdocker/"
-SRC_URI="http://launchpad.net/kdocker/trunk/${PV:0:3}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die
-	dodoc AUTHORS BUGS ChangeLog CREDITS README TODO
-}