diff options
author | Alex Alexander <wired@gentoo.org> | 2009-09-01 21:46:18 +0000 |
---|---|---|
committer | Alex Alexander <wired@gentoo.org> | 2009-09-01 21:46:18 +0000 |
commit | c394bfa8c60eccf604c23f674d39bc19e067ab79 (patch) | |
tree | 05417536d0de55efa00f0314acfa7bc011b3a0bd /kde-base/kdelirc | |
parent | Updated version for EMBASSY 6.1.0. (diff) | |
download | historical-c394bfa8c60eccf604c23f674d39bc19e067ab79.tar.gz historical-c394bfa8c60eccf604c23f674d39bc19e067ab79.tar.bz2 historical-c394bfa8c60eccf604c23f674d39bc19e067ab79.zip |
fixed collision with kscd
Package-Manager: portage-2.2_rc40/cvs/Linux x86_64
Diffstat (limited to 'kde-base/kdelirc')
-rw-r--r-- | kde-base/kdelirc/ChangeLog | 5 | ||||
-rw-r--r-- | kde-base/kdelirc/Manifest | 4 | ||||
-rw-r--r-- | kde-base/kdelirc/kdelirc-4.3.1.ebuild | 9 |
3 files changed, 14 insertions, 4 deletions
diff --git a/kde-base/kdelirc/ChangeLog b/kde-base/kdelirc/ChangeLog index 150f6be7f184..c5724c620e2f 100644 --- a/kde-base/kdelirc/ChangeLog +++ b/kde-base/kdelirc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kdelirc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/ChangeLog,v 1.77 2009/09/01 15:11:33 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/ChangeLog,v 1.78 2009/09/01 21:46:18 wired Exp $ + + 01 Sep 2009; Alex Alexander <wired@gentoo.org> kdelirc-4.3.1.ebuild: + fixed collision with kscd *kdelirc-4.3.1 (01 Sep 2009) diff --git a/kde-base/kdelirc/Manifest b/kde-base/kdelirc/Manifest index 0f01bdc2e48d..c30b4d1a764e 100644 --- a/kde-base/kdelirc/Manifest +++ b/kde-base/kdelirc/Manifest @@ -5,6 +5,6 @@ DIST kdeutils-4.3.1.tar.bz2 2524224 RMD160 72dcc9d0a5592b371873398604e1bf59acb9e EBUILD kdelirc-3.5.10.ebuild 412 RMD160 0bd2a28487c4800b644f8345fd9d196b03d6220c SHA1 6cec8eace2c9bd90ab595b33e9cf626e52653a90 SHA256 e09b3de0c4539e8c612be610cd2ec8ecd6f9a540ca4681bde542ae54978702f5 EBUILD kdelirc-3.5.9.ebuild 410 RMD160 bb175db036c76633da36946a374b41a9967ab058 SHA1 0974c6b97e03b7a4873a0bef6c7fcbd2d5611497 SHA256 c1b5135107769eaace9d7582227f56c1c8e824fa6561cd8ed056c652bf3638f8 EBUILD kdelirc-4.3.0.ebuild 431 RMD160 a7ad066f1aec948690573175d5165e04ce98d634 SHA1 3b83d106f1ede79698f1a73ac89d64729adc167e SHA256 4773b8f45503f2115c00bce41dd100f9b11982331507fd0ef925dd30f29a059d -EBUILD kdelirc-4.3.1.ebuild 435 RMD160 c19c1bb9d8030f6a7753ce7abf6bd4dcc514f740 SHA1 2916e40627a73b24feca267715e950fd75a4cce9 SHA256 244e72412153737f0a464182582244b0be51af5c24463715f1c1251b22e7983e -MISC ChangeLog 9413 RMD160 b58b9f4d693f963730c7bb8f470ebe3dd2f96421 SHA1 64f33d4a7ec62c13a7ce8b1b92cdcb17d18274d8 SHA256 cccce08a7e3a09f926743de0a60ae0b7c5f2a8871bd762a6a2d4e67fd28dd644 +EBUILD kdelirc-4.3.1.ebuild 578 RMD160 9d7951a3d02efa55a449b189d5f1fb6f92b9fb36 SHA1 4f45123be4e1170d0d7500f47a19edd9fd875314 SHA256 738e10c0ef03394827c0843c465425449e6873d940005ab95019c3326fca8999 +MISC ChangeLog 9509 RMD160 2b3fb3f49b7ba23a7da77d22833d5793e1c3d39e SHA1 947123438dc985bbf4b2b725465bb7b6b2e519a5 SHA256 3121e7cb11d35385bb980be5c2e384e27a035ed6810ce883ec025e6a739d7919 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdelirc/kdelirc-4.3.1.ebuild b/kde-base/kdelirc/kdelirc-4.3.1.ebuild index 81194b2b46b1..a8a82d7ec496 100644 --- a/kde-base/kdelirc/kdelirc-4.3.1.ebuild +++ b/kde-base/kdelirc/kdelirc-4.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/kdelirc-4.3.1.ebuild,v 1.1 2009/09/01 15:11:33 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/kdelirc-4.3.1.ebuild,v 1.2 2009/09/01 21:46:18 wired Exp $ EAPI="2" @@ -15,3 +15,10 @@ RDEPEND=" !kde-misc/kdelirc app-misc/lirc " + +src_prepare() { + kde4-meta_src_prepare + + sed -i "/kscd.profile/d" "${S}"/kdelirc/profiles/CMakeLists.txt || + die "collision fixing sed failed" +} |