Automatic-merge: merge updates for 4.2.1 from kde-testing.

(Portage version: 2.2_rc25/cvs/Linux x86_64)

2 files changed, 28 insertions, 1 deletions

diff --git a/kde-base/ksaneplugin/ChangeLog b/kde-base/ksaneplugin/ChangeLog
index 5cbc08353bde..f1cabc873ba9 100644
--- a/kde-base/ksaneplugin/ChangeLog
+++ b/kde-base/ksaneplugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksaneplugin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ChangeLog,v 1.5 2009/03/08 20:22:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ChangeLog,v 1.6 2009/03/15 14:35:37 scarabeus Exp $
+
+*ksaneplugin-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +ksaneplugin-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -ksaneplugin-4.2.0.ebuild:
diff --git a/kde-base/ksaneplugin/ksaneplugin-4.2.1-r1.ebuild b/kde-base/ksaneplugin/ksaneplugin-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..610cdb40ca90
--- /dev/null
+++ b/kde-base/ksaneplugin/ksaneplugin-4.2.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ksaneplugin-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:35:37 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdegraphics"
+
+inherit kde4-meta
+
+DESCRIPTION="SANE Plugin for KDE"
+HOMEPAGE="http://www.kipi-plugins.org"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	>=kde-base/libksane-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}"