Version bump wrt #288214, thanks to Daniel Lin for initial ebuild.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

6 files changed, 40 insertions, 114 deletions

diff --git a/kde-misc/kdocker/ChangeLog b/kde-misc/kdocker/ChangeLog
index 20afb7c22bcc..d505acd7184f 100644
--- a/kde-misc/kdocker/ChangeLog
+++ b/kde-misc/kdocker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/kdocker
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdocker/ChangeLog,v 1.4 2008/07/27 20:52:18 carlo Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdocker/ChangeLog,v 1.5 2009/10/13 17:57:43 ssuominen Exp $
+
+*kdocker-4.2.2.1 (13 Oct 2009)
+
+  13 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +kdocker-4.2.2.1.ebuild:
+  Version bump wrt #288214, thanks to Daniel Lin for initial ebuild.
 
   27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> kdocker-1.3.ebuild:
   QA: Get rid of deprecated qt_min_version().
diff --git a/kde-misc/kdocker/Manifest b/kde-misc/kdocker/Manifest
index 890476d09a47..0ff3df6f2bff 100644
--- a/kde-misc/kdocker/Manifest
+++ b/kde-misc/kdocker/Manifest
@@ -1,6 +1,4 @@
-AUX kdocker-desktop_file.patch 678 RMD160 1493d3b0af3d191a86d6ef0a6c8be281484aff5d SHA1 74cda26d981113b76b51aed73b3319565f30db2c SHA256 ef9a9c79421af672337523317976d2b6a4ce09c12cb35cecc8807629b9c609d0
-AUX kdocker-installdir.patch 613 RMD160 d41c524a1306918ea3e309c9378ddb4345bf196e SHA1 02ad49e3fd8778204a6fba22a30e9e63da5faba6 SHA256 b4fa54f86a777bcba892641648c2f72dc14dff30e7676f96ce1f8baff8ce9e11
-DIST kdocker-1.3.tar.gz 90402 RMD160 2b8f9fd8858ec53dfbf9dbae866df0041e613592 SHA1 7650ec5f3aea0c291525d0fd1f30d75f883c3fca SHA256 f4dcb52c812ea1171a70b0720624d6869c6eb7b5ba55930f9da9b45d74e3ef20
-EBUILD kdocker-1.3.ebuild 1584 RMD160 fb817f44ee772c1afa1d2459624df3c32e05d63c SHA1 400f95f60181159d84a66d6dcc0446ac5d4a7140 SHA256 32e08745ba4aee325cffb438cb0d4a05fc6f6ea0e3d98a01b7abcd68378238c2
-MISC ChangeLog 750 RMD160 7653bd0a23c976bad1c3034572b11297904d8333 SHA1 7d069f97d1cdcf1ed08dc5947a9655dade9b014e SHA256 b0769d28e17d9b8c9eaff88df9b53899828b5b6a97663c6586e35d903fe4f945
+DIST kdocker-4.2.2.1.tar.gz 80221 RMD160 872bacefcb48b71280e1b6cdcd0c1c21f964ff9d SHA1 4d0ad7c230c6b1c0b73856f4cc139e6aac38184b SHA256 41a6ac56f695cb6f09603ffe1dfd96facf250e6686663db5b10a228ed032cf25
+EBUILD kdocker-4.2.2.1.ebuild 716 RMD160 2c1386e181c6278fa223ef6881fed70e51a65ea9 SHA1 09705c827bf984bc415d6008a9b0c56afdb96504 SHA256 e59ddc87b53f42ed84a2804d3f04083d53085422965e86b79a0210ee681bb975
+MISC ChangeLog 937 RMD160 c67cf925ab1475af9e124cfd585ec8493a85f26f SHA1 439f55c35c122b7ffb96a47ca80fb310089f8acd SHA256 50f3dc958ce3fd359459685b4c6b5cbfd0a0a35c9db8bba3d4eda3573026ad70
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/kde-misc/kdocker/files/kdocker-desktop_file.patch b/kde-misc/kdocker/files/kdocker-desktop_file.patch
deleted file mode 100644
index dc17deccbea5..000000000000
--- a/kde-misc/kdocker/files/kdocker-desktop_file.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nuar kdocker-orig/kdocker.desktop kdocker/kdocker.desktop
---- kdocker-orig/kdocker.desktop	2004-11-22 16:11:49.000000000 +0000
-+++ kdocker/kdocker.desktop	2006-01-27 19:03:05.000000000 +0000
-@@ -1,10 +1,14 @@
- [Desktop Entry]
- Name=KDocker
-+Name[pl]=KDocker
- GenericName=Docking utility
-+GenericName[pl]=Program dokujący aplikacje
- Comment=Docks any application into system tray
-+Comment[pl]=Pozwala umieścić dowolną aplikację w zasobniku systemowym
- Exec=kdocker
- TryExec=kdocker
--Icon=/usr/local/share/kdocker/icons/kdocker.png
-+Icon=/usr/share/kdocker/icons/kdocker.png
- Terminal=false
- Type=Application
- Categories=Application;Utility;
-+X-KDE-StartupNotify=false
diff --git a/kde-misc/kdocker/files/kdocker-installdir.patch b/kde-misc/kdocker/files/kdocker-installdir.patch
deleted file mode 100644
index 4c0a98fe017e..000000000000
--- a/kde-misc/kdocker/files/kdocker-installdir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- kdocker.pro.orig	2005-04-06 12:43:59.000000000 +0000
-+++ kdocker.pro	2005-04-06 12:44:29.000000000 +0000
-@@ -4,7 +4,7 @@
- LIBPATH += /usr/X11/lib /usr/X11R6/lib
- LIBS = -lX11 -lXpm -lXmu
- TARGET = kdocker
--INSTALL_PATH = /usr/local/share/kdocker
-+INSTALL_PATH = /usr/share/kdocker
- DOCS_PATH = $$INSTALL_PATH/docs
- 
- # Defines
-@@ -27,9 +27,9 @@
- desktop.path = /usr/share/applications
- desktop.files = kdocker.desktop
- 
--target.path = /usr/local/bin
-+target.path = /usr/bin
- 
--INSTALLS += target icons docs translations desktop
-+INSTALLS += target icons desktop
- 
- # Input
- HEADERS += src/customtraylabel.h \
diff --git a/kde-misc/kdocker/kdocker-1.3.ebuild b/kde-misc/kdocker/kdocker-1.3.ebuild
deleted file mode 100644
index 169804c9b38c..000000000000
--- a/kde-misc/kdocker/kdocker-1.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdocker/kdocker-1.3.ebuild,v 1.3 2008/07/27 20:52:18 carlo Exp $
-
-EAPI=1
-
-inherit eutils qt3
-
-IUSE=""
-LANGS="cs de en es fr id it pl pt_BR ru"
-for x in ${LANGS}; do
-	IUSE="${IUSE} linguas_${x}"
-done;
-
-DESCRIPTION="KDocker will help you dock any application in the system tray"
-HOMEPAGE="http://www.kde-apps.org/content/show.php?content=13356"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="x11-libs/qt:3"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-desktop_file.patch
-	epatch "${FILESDIR}"/${PN}-installdir.patch
-}
-
-src_compile() {
-	${QTDIR}/bin/qmake ${PN}.pro \
-		QMAKE=${QTDIR}/bin/qmake \
-		QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
-		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
-		QMAKE_RPATH= \
-		"CONFIG += no_fixpath release thread" \
-		|| die "couldn't create fresh Makefiles"
-	emake || die "make failed"
-
-	# langpacks
-	cd "${S}"/i18n
-	for i in ${LANGS}; do
-		use linguas_${i} && [ -f ${PN}_${i}.ts ] && lrelease ${PN}_${i}.ts
-	done;
-}
-
-src_install() {
-	make INSTALL_ROOT="${D}" install || die "installation failed"
-
-	dodoc AUTHORS BUGS CREDITS ChangeLog HACKING INSTALL README TODO
-
-	# langpacks are being installed only if
-	# approperiare LINGUAS variable is set
-	insinto /usr/share/${PN}/i18n
-	cd "${S}"/i18n
-	for i in ${LANGS}; do
-		use linguas_${i} && [ -f ${PN}_${i}.qm ] && doins ${PN}_${i}.qm
-	done;
-}
diff --git a/kde-misc/kdocker/kdocker-4.2.2.1.ebuild b/kde-misc/kdocker/kdocker-4.2.2.1.ebuild
new file mode 100644
index 000000000000..ee59a80eda77
--- /dev/null
+++ b/kde-misc/kdocker/kdocker-4.2.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdocker/kdocker-4.2.2.1.ebuild,v 1.1 2009/10/13 17:57:43 ssuominen Exp $
+
+EAPI=2
+inherit qt4
+
+DESCRIPTION="KDocker will help you dock any application into the system tray"
+HOMEPAGE="https://launchpad.net/kdocker/"
+SRC_URI="http://launchpad.net/kdocker/trunk/4.2.2/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	qt4_src_prepare
+	sed -i -e 's:/local/:/:g' ${PN}.pro || die
+}
+
+src_configure() {
+	eqmake4
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die
+	dodoc AUTHORS BUGS ChangeLog CREDITS README TODO
+}