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

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

2 files changed, 30 insertions, 1 deletions

diff --git a/kde-base/nsplugins/ChangeLog b/kde-base/nsplugins/ChangeLog
index 298009df94d8..049a725cecb5 100644
--- a/kde-base/nsplugins/ChangeLog
+++ b/kde-base/nsplugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/nsplugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.130 2009/03/08 20:53:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.131 2009/03/15 14:41:50 scarabeus Exp $
+
+*nsplugins-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +nsplugins-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -nsplugins-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/nsplugins/nsplugins-4.2.1-r1.ebuild b/kde-base/nsplugins/nsplugins-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..8e563dd59d0d
--- /dev/null
+++ b/kde-base/nsplugins/nsplugins-4.2.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:41:50 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-apps"
+inherit kde4-meta
+
+DESCRIPTION="Netscape plugins support for Konqueror."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	x11-libs/libXt
+"
+RDEPEND="${DEPEND}
+	>=kde-base/konqueror-${PV}:${SLOT}[kdeprefix=]
+"
+
+KMEXTRACTONLY="
+	konqueror/settings/
+"