Fix icon file location, bug 357097.

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

4 files changed, 68 insertions, 2 deletions

diff --git a/kde-misc/kdocker/ChangeLog b/kde-misc/kdocker/ChangeLog
index d9eb02c0dcc8..5b749a30cdcc 100644
--- a/kde-misc/kdocker/ChangeLog
+++ b/kde-misc/kdocker/ChangeLog
@@ -1,6 +1,12 @@
 # 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.8 2011/06/13 14:04:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdocker/ChangeLog,v 1.9 2011/06/19 09:00:04 dilfridge Exp $
+
+*kdocker-4.6-r1 (19 Jun 2011)
+
+  19 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdocker-4.6-r1.ebuild, +files/kdocker-4.6-icon.patch:
+  Fix icon file location, bug 357097.
 
 *kdocker-4.6 (13 Jun 2011)
 
diff --git a/kde-misc/kdocker/Manifest b/kde-misc/kdocker/Manifest
index 4c4db1fdf6da..ab16856a525e 100644
--- a/kde-misc/kdocker/Manifest
+++ b/kde-misc/kdocker/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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 1295 RMD160 1ce151c98b30e98d0bf81bc98b239ad3b118841c SHA1 f96ee8a342ed90503700902a4a6965982ca0242e SHA256 38a08eeda2c242dd3d9d1924eb6ef2e4cf2310de9d1277199a3f63784aa4e521
+MISC ChangeLog 1479 RMD160 87cddbae21e9620ada4280949c2bcfd6a0e00322 SHA1 fbdb521cdd1fe0612b2a19658b97f471939f900f SHA256 477261171d128a517ede1d0993e3362210bf4194d82c01bdae3b28388fd346f3
 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
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/kdocker/files/kdocker-4.6-icon.patch b/kde-misc/kdocker/files/kdocker-4.6-icon.patch
new file mode 100644
index 000000000000..fc20f21735fd
--- /dev/null
+++ b/kde-misc/kdocker/files/kdocker-4.6-icon.patch
@@ -0,0 +1,12 @@
+--- kdocker.pro	2010-11-07 14:10:59 +0000
++++ kdocker.pro	2011-05-31 00:45:06 +0000
+@@ -29,8 +29,7 @@ 
+ translations.path = $$TRANSLATIONS_PATH
+ translations.files = build/i18n
+ 
+-ICONS_PATH = $$INSTALL_PATH/icons
+-icons.path = $$ICONS_PATH
++icons.path = /usr/share/pixmaps
+ icons.files = resources/images/kdocker.png
+ 
+ desktop.path = /usr/share/applications
diff --git a/kde-misc/kdocker/kdocker-4.6-r1.ebuild b/kde-misc/kdocker/kdocker-4.6-r1.ebuild
new file mode 100644
index 000000000000..219650a052e8
--- /dev/null
+++ b/kde-misc/kdocker/kdocker-4.6-r1.ebuild
@@ -0,0 +1,26 @@
+# 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 $
+
+EAPI=3
+inherit base 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=""
+
+PATCHES=( "${FILESDIR}/${P}-icon.patch" )
+
+src_configure() {
+	eqmake4
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die
+	dodoc AUTHORS BUGS ChangeLog CREDITS README TODO
+}