summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-03-13 17:47:49 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-03-13 17:47:49 +0000
commit515ee1fb8923f41273a68cf1274432a7e71f2443 (patch)
tree229f8f8f7908dc7bdca194263240e628665f5f33
parentDeclare a local variable. (diff)
downloadhistorical-515ee1fb8923f41273a68cf1274432a7e71f2443.tar.gz
historical-515ee1fb8923f41273a68cf1274432a7e71f2443.tar.bz2
historical-515ee1fb8923f41273a68cf1274432a7e71f2443.zip
Update kmextra.
Package-Manager: portage-2.2_rc24/cvs/Linux x86_64
-rw-r--r--kde-base/akonadi/Manifest4
-rw-r--r--kde-base/kfind/ChangeLog5
-rw-r--r--kde-base/kfind/Manifest4
-rw-r--r--kde-base/kfind/kfind-4.2.1.ebuild15
4 files changed, 19 insertions, 9 deletions
diff --git a/kde-base/akonadi/Manifest b/kde-base/akonadi/Manifest
index 1e823a58d33c..21294064a617 100644
--- a/kde-base/akonadi/Manifest
+++ b/kde-base/akonadi/Manifest
@@ -1,4 +1,4 @@
DIST kdepim-4.2.1.tar.bz2 13562215 RMD160 5c98ae5a8ccc92ef08f739d59dba855fc00705dc SHA1 be97f4d34eb19b08c30988e07a75c24d5ccad08c SHA256 01dd85971722cc49d588130c21efea898315926bbc5baa6796053fcfb7d5536c
-EBUILD akonadi-4.2.1.ebuild 2052 RMD160 84c2164f94c8fcc38fddc93ac86955fed8c8d5eb SHA1 083c632a01d460322386755e102b80f70b1fb602 SHA256 edc76479af0dc031e0e28fc506eeb00ffc24623dc4b308ff18903ce6fed62e88
-MISC ChangeLog 2166 RMD160 ac16ea169fab5b35fdaca4d0172e35db8833df16 SHA1 3cb989c91eaabe429cb520b0f5772f69a9fe2f9b SHA256 9379454c8ea2d54c0b7b25a8e142012cfbe01db86c294a307aef16caa1da98b0
+EBUILD akonadi-4.2.1.ebuild 1996 RMD160 30db9b035e675533e5311c3a5fdc7e898f9b5df5 SHA1 b39e518948c346693322f4613542872f908b4b74 SHA256 37cc101e049e2f7a3f1037b667c4be43d49cb669ad07a115f3504577a9f0d4ab
+MISC ChangeLog 2350 RMD160 24156cb7efd901aa744025e392093ba5ecd91c5c SHA1 54066e85b0980988eb310124f57e106ca691ced7 SHA256 14aaacaf7baf4dc65c9c464c53022b17fc70bbc07f9eb1c9bc9193da0b80349c
MISC metadata.xml 264 RMD160 4d66ebe451b6634cb712a67519338b16a556b983 SHA1 272c64cf9e24ac997a3a9d4ce32249a09f4d62bd SHA256 7c3b87ecba257c3c302e5beccf9e21d858c9651ea7b6b723b79a3364f671b7e5
diff --git a/kde-base/kfind/ChangeLog b/kde-base/kfind/ChangeLog
index e7485f7f5829..1012086f389c 100644
--- a/kde-base/kfind/ChangeLog
+++ b/kde-base/kfind/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/kfind
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/ChangeLog,v 1.111 2009/03/09 11:48:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/ChangeLog,v 1.112 2009/03/13 17:47:49 scarabeus Exp $
+
+ 13 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kfind-4.2.1.ebuild:
+ Update kmextra.
09 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kfind-4.2.1.ebuild:
Fix wrong kmextra.
diff --git a/kde-base/kfind/Manifest b/kde-base/kfind/Manifest
index 8589fa8af12a..2e193648907b 100644
--- a/kde-base/kfind/Manifest
+++ b/kde-base/kfind/Manifest
@@ -3,6 +3,6 @@ DIST kdebase-3.5.9.tar.bz2 24239563 RMD160 2552d850e62efd044c178e2eb04efdcce90e4
DIST kdebase-4.2.1.tar.bz2 4255541 RMD160 0c01dc28fb3da9e8101efef4c7fb7fdfc123cd10 SHA1 c500024294a7621d176d26bdabdd138d18ec827d SHA256 05c2111bcd0b5809f212c7f8f0e8b401bd68b4e684843c9dcd3658ba294482c1
EBUILD kfind-3.5.10.ebuild 492 RMD160 35785c7af02439e080e27e0fe4de114632a3204a SHA1 a6e2e20b3f06237256a02beb4375191802c0ac1e SHA256 68c9f1ba7a585f7a8934a8ce1583cd22ffef4fdbd3aae7b76eeb9efa7e5efe80
EBUILD kfind-3.5.9.ebuild 484 RMD160 249de96101e09ae370c28739d314e19e2d164e28 SHA1 28fcb0b95a9f751492bd1e28b0dec52e0dd0b761 SHA256 d4f7c51bb99a5c77ce1ba0c596e39e36e9c151eea924fe8c205366ee4f1c29a5
-EBUILD kfind-4.2.1.ebuild 402 RMD160 6998f1e3e50fa39009651eb3e2f10891b06878be SHA1 c1bd7bd2b0c1ce0b42143c91cf4f461bdcfe19f5 SHA256 d79201852557f9e46897540c40312961d25f6867057537cb6fe32a387dfcaed3
-MISC ChangeLog 13222 RMD160 644727a4fcaa5a4821ae078061a6d4cd183d30b0 SHA1 2b9b469d86fbe1221b99fb3b6048b914bbcc24a8 SHA256 4b068fb09437a6775ae1fd36cdd0d0aa89b428a023784024378f04e0a1cc961e
+EBUILD kfind-4.2.1.ebuild 563 RMD160 18625d82787ffbc8d76c3f48147154c3b5bd13af SHA1 e3d1e2fa6b9c77267cf5a1a9c49049ceeaf79582 SHA256 a5ad8a02db1af8fdc391a7762e496ade1dabff9ac147cfef34fd480be6ef2944
+MISC ChangeLog 13313 RMD160 fb530ff9e7394a2e840da18bd1c051a6c1d8113a SHA1 14a6e3b9c6ce09d59391fd47274730264a73d1ec SHA256 4f0cec37665c63a84630b98c5377c6cbfbdcf21e619e9e56b837fc9190ded86f
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kfind/kfind-4.2.1.ebuild b/kde-base/kfind/kfind-4.2.1.ebuild
index 8052fb8e2301..b14e2e9ff92b 100644
--- a/kde-base/kfind/kfind-4.2.1.ebuild
+++ b/kde-base/kfind/kfind-4.2.1.ebuild
@@ -1,10 +1,9 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-4.2.1.ebuild,v 1.4 2009/03/09 11:48:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-4.2.1.ebuild,v 1.5 2009/03/13 17:47:49 scarabeus Exp $
EAPI="2"
-KMNAME="kdebase"
-KMMODULE="apps/${PN}"
+KMNAME="kdebase-apps"
inherit kde4-meta
DESCRIPTION="KDE file finder utility"
@@ -12,5 +11,13 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="debug"
KMEXTRA="
- apps/doc/${PN}/
+ doc/${PN}/
"
+
+src_prepare() {
+ kde4-meta_src_prepare
+
+ # Note that this is already fixed for 4.2.2
+ sed -i -e 's/ konq / /' \
+ kfind/CMakeLists.txt || die "failed to disable libkonq from link"
+}