summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2011-06-11 18:51:58 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2011-06-11 18:51:58 +0000
commit95069704b33e33ca701d3a1a598888f2fc0563ff (patch)
tree7867af3386cba5fdb599cb581e4c3ac53db9e44f /kde-base
parentMark myself as maintainer of net-irc/atheme-services. (diff)
downloadgentoo-2-95069704b33e33ca701d3a1a598888f2fc0563ff.tar.gz
gentoo-2-95069704b33e33ca701d3a1a598888f2fc0563ff.tar.bz2
gentoo-2-95069704b33e33ca701d3a1a598888f2fc0563ff.zip
Remove duplicate file, bug 371123
(Portage version: 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/ksaneplugin-4.6.4.ebuild11
2 files changed, 15 insertions, 2 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/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