summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2011-06-11 18:51:58 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2011-06-11 18:51:58 +0000
commit1a8d173b4da1af3e6e221cbae93a132b6821c600 (patch)
treede712a59c30a9dda512f874d07a8530b2dd7707b /kde-base
parentMark myself as maintainer of net-irc/atheme-services. (diff)
downloadhistorical-1a8d173b4da1af3e6e221cbae93a132b6821c600.tar.gz
historical-1a8d173b4da1af3e6e221cbae93a132b6821c600.tar.bz2
historical-1a8d173b4da1af3e6e221cbae93a132b6821c600.zip
Remove duplicate file, bug 371123
Package-Manager: portage-2.1.10.1/cvs/Linux x86_64
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/ksaneplugin/ChangeLog6
-rw-r--r--kde-base/ksaneplugin/Manifest24
-rw-r--r--kde-base/ksaneplugin/ksaneplugin-4.6.4.ebuild11
3 files changed, 17 insertions, 24 deletions
diff --git a/kde-base/ksaneplugin/ChangeLog b/kde-base/ksaneplugin/ChangeLog
index d2d7c26d7c1a..305ca33e03c8 100644
--- a/kde-base/ksaneplugin/ChangeLog
+++ b/kde-base/ksaneplugin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/ksaneplugin
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ChangeLog,v 1.66 2011/06/10 18:00:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ChangeLog,v 1.67 2011/06/11 18:51:58 dilfridge Exp $
+
+ 11 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ ksaneplugin-4.6.4.ebuild:
+ Remove duplicate file, bug 371123
*ksaneplugin-4.6.4 (10 Jun 2011)
diff --git a/kde-base/ksaneplugin/Manifest b/kde-base/ksaneplugin/Manifest
index d0c4f76ae6a0..c5b259bfc326 100644
--- a/kde-base/ksaneplugin/Manifest
+++ b/kde-base/ksaneplugin/Manifest
@@ -1,28 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
DIST kdegraphics-4.6.2.tar.bz2 5165180 RMD160 eb5cf8a113b901fa5c7e8f85bbb4332e03ab523c SHA1 9c9f31c88c1c9e6dcaa7fb177847402d874ffc94 SHA256 7941c4b1caedca839b27c7d405fb5a63bb76ae98f2ba332fcb319ee1dd4efeaa
DIST kdegraphics-4.6.3.tar.bz2 5164818 RMD160 60a3b8ec32976a8a5741309651804d9d9ed1d80a SHA1 c16dc9c55e7459418fa9887aa532ea0a269e7179 SHA256 82af65d9db40fdf693c205fec2492834a9bed17d018cb389cc3abe26fda09231
DIST kdegraphics-4.6.4.tar.bz2 5176987 RMD160 da143f8f5577ab85ea8f496e72bb0d14fac83d5c SHA1 a208cef52de6345996a7cc68b1c09944da7253aa SHA256 11f1fdb0f34c2dda1dadfc3410c890dbd22bf8d76d5ba62b4c9bc8975f720d7f
EBUILD ksaneplugin-4.6.2.ebuild 496 RMD160 b8e46eeb999d073ba2ec67aa901f973990dcae7a SHA1 7faaef52e0d185962c6ca406d23eddf4062d4185 SHA256 eacc2f06922bdfbfa5ecb960797448ab300c0e7bd55b7fb412aab2a46c9fd52a
EBUILD ksaneplugin-4.6.3.ebuild 499 RMD160 6bce9c7b694bc73c5c4342dc75465d241018f2f3 SHA1 642fc38c150c14984d4b7161352deef856969e42 SHA256 9b9ff9da2bab1cc511eccd1bcb7694cea633c4292a724a81b8f8980c8d7622ce
-EBUILD ksaneplugin-4.6.4.ebuild 607 RMD160 4b5fe18dd2d835c78eeedf694a459b7c0e622449 SHA1 3b5eaef03f94d9b2b3bda792195e54172b47b736 SHA256 74965218683fbf4a31083f011d992f9dbc3965f9c50ae4c60506c774c1f3be61
-MISC ChangeLog 8626 RMD160 9c5bf0a2ef52bd28102a82b89909b8b9f08fd64d SHA1 a4159e06c50dcd99f5ebde5cc1dab3970876bdcd SHA256 aadf09c129bec4dfbaaae4f2ade34484f58670c31b0a55b67135509e4e4f5e74
+EBUILD ksaneplugin-4.6.4.ebuild 764 RMD160 d202ecb8981a745f250abf2a33d5da5ee49779cf SHA1 6642b98d988e3eb99092a65f54fc406d425a15ac SHA256 7c71c8e4992a6e2fd5e176cafca81c9728b82e13adff8c9834d5320984e0eb99
+MISC ChangeLog 8748 RMD160 bb8cc19d01ced8da86a0706a64d24409322ee5e6 SHA1 21afa7684906460bdc3dcad97385a964ce5e3a48 SHA256 4ac3c62b3fedf48d36eec4ab20dcb3e2f7605c2fad7ef4565cfff7b21ed40f05
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJN8lxXAAoJENwGBM22xffehNcP/0BNRqxc7Ia1DPbt9XjlfMUe
-ui7MQ9DUZk+0Hm6SNr7OViaKzTaa0eGXBa0RLp0A8pit/kAIJb767mV7ihvGQNbu
-ztiBuQ7s4l1e7qdrcXk0PgXc5KzJcGzKyzLblzCbjS91nUA+785lTPtngcC0NCgZ
-sRUlz829jbJ45pWUUFpD34Wz/85XHKDERVhfaUEkJ4a+2YvGOoXjRVnWD4njfxD6
-L/kt4dErLnUupWh1MwVi7LWFFLv6en7+kEnqfDmEMTPo5SSPxe6jqXg6pRyphQLO
-GwXL/4iIH4G9acJSCay+d7ZiLK3MHWDO/WSzlIcEbU8CoSYE5NuykRUvPoTHXxd+
-k498cYYq4aqWdg69uvWNMx8H4MVnI0L44GZR1TMjhSxgiCZFoVU9kaDXBbgNFHft
-WHTZF0thRSSJwVmp/0CVywe0QgpkLaT+DQRJ3pJCfuchnRsgrWPFwkWQM1lWxtpC
-9tBs8NxMmVDsBEPbLzbg6Ng7RZcQTxBuu67ItgtjGJZneRpLk+Gw65abBICqlDG1
-qjjEvib1v7YUL8+o+or5cFykad4HQm58F0m9ZyHhjbFqmLqR0b529WS+iwx8l7R+
-u9ahDANNKbiyKILqV6XkQpprTQGHnigc0cdPj623o44mhIxWBo4rX9yFjr+VSJHN
-wl5W9a3nS0CkHmGoERYr
-=GZg6
------END PGP SIGNATURE-----
diff --git a/kde-base/ksaneplugin/ksaneplugin-4.6.4.ebuild b/kde-base/ksaneplugin/ksaneplugin-4.6.4.ebuild
index 3adbf753e904..3e6c8960ed25 100644
--- a/kde-base/ksaneplugin/ksaneplugin-4.6.4.ebuild
+++ b/kde-base/ksaneplugin/ksaneplugin-4.6.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ksaneplugin-4.6.4.ebuild,v 1.1 2011/06/10 18:00:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ksaneplugin-4.6.4.ebuild,v 1.2 2011/06/11 18:51:58 dilfridge Exp $
EAPI=4
@@ -24,3 +24,12 @@ DEPEND="
$(add_kdebase_dep libksane)
"
RDEPEND="${DEPEND}"
+
+if [[ ${PV} != *9999 ]]; then
+src_install() {
+ kde4-meta_src_install
+
+ # why, oh why?!
+ rm "${ED}/usr/share/apps/cmake/modules/FindKSane.cmake" || die
+}
+fi