Version bump, remove old.

Package-Manager: portage-2.2.0_alpha115/cvs/Linux x86_64

4 files changed, 53 insertions, 44 deletions

diff --git a/kde-misc/kdocker/ChangeLog b/kde-misc/kdocker/ChangeLog
index 255b1be2ba5d..ced2e43176b9 100644
--- a/kde-misc/kdocker/ChangeLog
+++ b/kde-misc/kdocker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/kdocker
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdocker/ChangeLog,v 1.12 2012/07/04 08:29:14 johu Exp $
+
+*kdocker-4.7 (04 Jul 2012)
+
+  04 Jul 2012; Johannes Huber <johu@gentoo.org> +kdocker-4.7.ebuild,
+  -kdocker-4.6-r1.ebuild:
+  Version bump, remove old.
 
 *kdocker-4.6-r2 (04 Jun 2012)
 
@@ -54,4 +60,3 @@
   +files/kdocker-desktop_file.patch, +files/kdocker-installdir.patch,
   +kdocker-1.3.ebuild:
   Initial release
-
diff --git a/kde-misc/kdocker/Manifest b/kde-misc/kdocker/Manifest
index e1a6b736dc5a..5d71eac2e74e 100644
--- a/kde-misc/kdocker/Manifest
+++ b/kde-misc/kdocker/Manifest
@@ -1,21 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 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
+DIST kdocker-4.7.tar.gz 87226 RMD160 c96d7bd25018e93999044db51c25b1e0c5752edd SHA1 0132253ee50e75ab73d747c96db624d6bdc402e0 SHA256 2bcf8c9439801ec57a728ce34897ac9bd716f52d0f7e1ade5c027cb725a1a8cf
 EBUILD kdocker-4.6-r2.ebuild 895 RMD160 1a8a0ad9789107c019034bc72249956c92f29e06 SHA1 3bcaa149e05a9e3578b1fc81d05792272bf4ed1e SHA256 8afd370bda5ed9ddac4baed65f47b2e00e8a181d433a9ef08b34fc8f633d5b43
-MISC ChangeLog 1962 RMD160 fc807e268ff86f5c146ad3086c0b2af1057c22dd SHA1 70d4df65af1e87fc829384374e1176f016852be7 SHA256 705be6e368a01ac6f5a4818717ce0ed4efb6dbd68cd8b64e039a5a0ad1011bb0
+EBUILD kdocker-4.7.ebuild 808 RMD160 92ec709dedf4e106806848768d2cad4fcdb26dd5 SHA1 250ab93fdd9eb09a662cd8bff74e26dc53a9101d SHA256 8b60074de47f16034be463488279a47b05c4fd7741a3337282c7e87a1b12ee22
+MISC ChangeLog 2107 RMD160 c8f533579c718a5df10633172678972a23b5fa70 SHA1 778f4a096617d4e8a3155e9dbcb4776b55cbb937 SHA256 7682caae3c58c34728d5c63b0f38aa76fb4e76285ba94802c00aa6812c04d1a5
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPzId7AAoJEMbwO6tnXQ0s9s0IAKy2ybgeG2tNxu0wM2R+mmLi
-xdabuJu4rycuhymItXjKkdO+wm3/WJslQCNjbAb1TclW+ByaFbe2GSvel7zv7Bzr
-2iAnmds/pHtr88KtFow797gZnXUudBNK+iU5JbPy+4mAA3kQfyDB2uWTwRn72+XR
-9k92egs2AxgBxcLZ1gCKiUKIdAkhW2NUNkhG/VFztPGJk8jDnw0sYyREihlzrSIv
-x9+pA8rrrAYZLdZRM3pTOE/OrjUEITO7SmniMINwAQoKZ0rpuLw2jQIuq6ZZU5bh
-DmJDHqwwwiX/LagpOQ9CsYXmYxgK0OenWBhWbkUlhwL0LvKK9aeYHc05A4gnK70=
-=u1KU
+iQEcBAEBCgAGBQJP8/7fAAoJEO+t9ga+3I3aRJ8IAKrXgJ/EGZE3+7tWDbfdjUwR
+j1vLacRc6qJIvfpoRxE3YYxB6f2O5EmNWp2gawdHv2bJsAOhGuIHyvJL27Ir0EyG
+MIL/gRrJqUFC87clMpu+XDzInvBBOPbp2WqltGAmwMp1GBnhx2fpRSXUBZ1d7k+y
+B0DfaGBFAqBBblU40G/+pyuO53C1M2+djEVRGBuuozT8eLh7mEOtItN3Yztn70H2
+jRQ4PtJY7Q7S7Pwjam36orLiQBE+RqoSQAYwyOyFV3fs23T+2upzHqxq3vPVKWyt
+TY4I6KvPceTmtkemlBjwriayMVgLMmLRzmJa8dzyoxku+gPIncEJWabZs5Mm4n8=
+=puEA
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kdocker/kdocker-4.6-r1.ebuild b/kde-misc/kdocker/kdocker-4.6-r1.ebuild
deleted file mode 100644
index 13bb94686045..000000000000
--- a/kde-misc/kdocker/kdocker-4.6-r1.ebuild
+++ /dev/null
@@ -1,32 +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-r1.ebuild,v 1.2 2011/08/27 21:58:24 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=""
-
-DEPEND="
-	x11-libs/qt-core
-	x11-libs/qt-gui
-"
-RDEPEND=${DEPEND}
-
-PATCHES=( "${FILESDIR}/${P}-icon.patch" )
-
-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.7.ebuild b/kde-misc/kdocker/kdocker-4.7.ebuild
new file mode 100644
index 000000000000..04df0d14a317
--- /dev/null
+++ b/kde-misc/kdocker/kdocker-4.7.ebuild
@@ -0,0 +1,35 @@
+# 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.7.ebuild,v 1.1 2012/07/04 08:29:14 johu 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"
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	if ! use linguas_it ; then
+		sed -e '/^INSTALLS +=/s/translations//' -i kdocker.pro || die "sed failed"
+	fi
+}