Bump to EAPI=4, add missing dependencies, and respect LINGUAS. Fix build with GCC-4.7 thanks to Nikos Chantziaras <realnc@gmail.com> in bug #419565.

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

4 files changed, 71 insertions, 18 deletions

diff --git a/kde-misc/kdocker/ChangeLog b/kde-misc/kdocker/ChangeLog
index b6f8ed3ecea4..255b1be2ba5d 100644
--- a/kde-misc/kdocker/ChangeLog
+++ b/kde-misc/kdocker/ChangeLog
@@ -1,6 +1,13 @@
 # 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.10 2011/08/27 21:58:24 dilfridge Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdocker/ChangeLog,v 1.11 2012/06/04 10:01:56 kensington Exp $
+
+*kdocker-4.6-r2 (04 Jun 2012)
+
+  04 Jun 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/kdocker-4.6-gcc-4.7.patch, +kdocker-4.6-r2.ebuild:
+  Bump to EAPI=4, add missing dependencies, and respect LINGUAS. Fix build with
+  GCC-4.7 thanks to Nikos Chantziaras <realnc@gmail.com> in bug #419565.
 
   27 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdocker-4.5.ebuild,
   -kdocker-4.6.ebuild, kdocker-4.6-r1.ebuild:
diff --git a/kde-misc/kdocker/Manifest b/kde-misc/kdocker/Manifest
index 5afc808d6cad..e1a6b736dc5a 100644
--- a/kde-misc/kdocker/Manifest
+++ b/kde-misc/kdocker/Manifest
@@ -1,25 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX kdocker-4.6-gcc-4.7.patch 279 RMD160 cb5e57f830fd0b3ba773a49692998cac18515196 SHA1 bb54813d6f0ffd6f00aa72349374af965303bacc SHA256 3e6af9888ecc38c1ac5bc6bbf03ec046c708b076c3a2c02554d5f11dc176878b
 AUX kdocker-4.6-icon.patch 360 RMD160 83221b9495bd098cf41ed794bc75d2934f8e1063 SHA1 6d0f6ceb0f8482560fbbf80338fe071f6c5bced7 SHA256 68f797c8c09aadfaf8aa45c1b4fc8bf048244fd66ab93aaf1b6d9887cc85426b
 DIST kdocker-4.6.tar.gz 87125 RMD160 ca4147d34300ba9d7228a0d02c53eb9977b0fb74 SHA1 c2a3cbba9d9f44fd70ecdfcea37925643115dbb6 SHA256 3a25682202cddbfea05618e65461570e33cd75642b40c68e02b31a12c865d406
 EBUILD kdocker-4.6-r1.ebuild 755 RMD160 3e4ebddf41df971570574639373431f5446093db SHA1 1736f65b4baee921cc87dac698414e4126dc7170 SHA256 c6571418f0f82a8a849f92925301b1797b8f07c9a12b3f40c763b9ef715169b9
-MISC ChangeLog 1660 RMD160 fc664c5452bffaed61ccebff5b15b5667b63d330 SHA1 579829738f76a56a95c47b94373bd48a773ecaeb SHA256 72011f953a87a1ea2cf01d6f0a389305610a9cfee2e6ace476541d10af6de3c1
+EBUILD kdocker-4.6-r2.ebuild 895 RMD160 1a8a0ad9789107c019034bc72249956c92f29e06 SHA1 3bcaa149e05a9e3578b1fc81d05792272bf4ed1e SHA256 8afd370bda5ed9ddac4baed65f47b2e00e8a181d433a9ef08b34fc8f633d5b43
+MISC ChangeLog 1962 RMD160 fc807e268ff86f5c146ad3086c0b2af1057c22dd SHA1 70d4df65af1e87fc829384374e1176f016852be7 SHA256 705be6e368a01ac6f5a4818717ce0ed4efb6dbd68cd8b64e039a5a0ad1011bb0
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-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
+iQEcBAEBAgAGBQJPzId7AAoJEMbwO6tnXQ0s9s0IAKy2ybgeG2tNxu0wM2R+mmLi
+xdabuJu4rycuhymItXjKkdO+wm3/WJslQCNjbAb1TclW+ByaFbe2GSvel7zv7Bzr
+2iAnmds/pHtr88KtFow797gZnXUudBNK+iU5JbPy+4mAA3kQfyDB2uWTwRn72+XR
+9k92egs2AxgBxcLZ1gCKiUKIdAkhW2NUNkhG/VFztPGJk8jDnw0sYyREihlzrSIv
+x9+pA8rrrAYZLdZRM3pTOE/OrjUEITO7SmniMINwAQoKZ0rpuLw2jQIuq6ZZU5bh
+DmJDHqwwwiX/LagpOQ9CsYXmYxgK0OenWBhWbkUlhwL0LvKK9aeYHc05A4gnK70=
+=u1KU
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kdocker/files/kdocker-4.6-gcc-4.7.patch b/kde-misc/kdocker/files/kdocker-4.6-gcc-4.7.patch
new file mode 100644
index 000000000000..50253e359e51
--- /dev/null
+++ b/kde-misc/kdocker/files/kdocker-4.6-gcc-4.7.patch
@@ -0,0 +1,10 @@
+--- solutions/qtsingleapplication/qtlocalpeer.cpp
++++ solutions/qtsingleapplication/qtlocalpeer.cpp
+@@ -48,6 +48,7 @@
+ #include "qtlocalpeer.h"
+ #include <QtCore/QCoreApplication>
+ #include <QtCore/QTime>
++#include <unistd.h>
+ 
+ #if defined(Q_OS_WIN)
+ #include <QtCore/QLibrary>
diff --git a/kde-misc/kdocker/kdocker-4.6-r2.ebuild b/kde-misc/kdocker/kdocker-4.6-r2.ebuild
new file mode 100644
index 000000000000..c6b3ad8d8f65
--- /dev/null
+++ b/kde-misc/kdocker/kdocker-4.6-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdocker/kdocker-4.6-r2.ebuild,v 1.1 2012/06/04 10:01:55 kensington Exp $
+
+EAPI=4
+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
+	x11-libs/qt-core
+	x11-libs/qt-gui
+"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS BUGS ChangeLog CREDITS README TODO"
+
+PATCHES=(
+	"${FILESDIR}/${P}-icon.patch"
+	"${FILESDIR}/${P}-gcc-4.7.patch"
+)
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	if ! use linguas_it ; then
+		sed -e '/^INSTALLS +=/s/translations//' -i kdocker.pro || die "sed failed"
+	fi
+}