Version bump wrt #292242, thanks to Jean-Noël Rivasseau for reporting.

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

2 files changed, 27 insertions, 20 deletions

diff --git a/kde-misc/konq-plugins/ChangeLog b/kde-misc/konq-plugins/ChangeLog
index e662fbead919..bf4da3989003 100644
--- a/kde-misc/konq-plugins/ChangeLog
+++ b/kde-misc/konq-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/konq-plugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/konq-plugins/ChangeLog,v 1.6 2009/08/12 11:58:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/konq-plugins/ChangeLog,v 1.7 2009/11/09 19:34:57 ssuominen Exp $
+
+*konq-plugins-4.3.3 (09 Nov 2009)
+
+  09 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +konq-plugins-4.3.3.ebuild:
+  Version bump wrt #292242, thanks to Jean-Noël Rivasseau for reporting.
 
   12 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   -konq-plugins-4.2.3.ebuild, -konq-plugins-4.2.4.ebuild:
diff --git a/kde-misc/konq-plugins/konq-plugins-4.2.4-r1.ebuild b/kde-misc/konq-plugins/konq-plugins-4.3.3.ebuild
index 1af333fe09fe..d92ed7ce88a5 100644
--- a/kde-misc/konq-plugins/konq-plugins-4.2.4-r1.ebuild
+++ b/kde-misc/konq-plugins/konq-plugins-4.3.3.ebuild
@@ -1,43 +1,44 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/konq-plugins/konq-plugins-4.2.4-r1.ebuild,v 1.1 2009/07/22 22:56:01 wired Exp $
-
-EAPI="2"
-
-KDE_LINGUAS="af ar be bg bn br ca cs cy da de el en_GB eo es et eu fa fi fr fy ga
-	gl he hi hr hsb hu is it ja kk km ko ku lt lv mai mk ml ms nb nds ne nl nn oc pa
-	pl pt pt_BR ro ru se sk sl sr sv ta tg th tr uk uz uz@cyrillic vi xh zh_CN zh_TW"
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/konq-plugins/konq-plugins-4.3.3.ebuild,v 1.1 2009/11/09 19:34:57 ssuominen Exp $
 
+EAPI=2
+KDE_LINGUAS="af ar be bg bn br ca cs cy da de el en_GB eo es et eu fa fi fr fy
+ga gl he hi hne hr hsb hu is it ja kk km ko ku lt lv mai mk ml ms nb nds ne nl
+nn oc pa pl pt pt_BR ro ru se sk sl sr sv ta tg th tr uk uz uz@cyrillic vi xh
+zh_CN zh_TW"
 KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
-
-KMNAME="extragear/base"
 inherit kde4-base
 
 DESCRIPTION="Various plugins for konqueror"
 HOMEPAGE="http://kde.org/"
 SRC_URI="mirror://kde/stable/${PV}/src/extragear/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 SLOT="4"
 IUSE="debug +handbook tidy"
 
-DEPEND="
-	>=kde-base/libkonq-${KDE_MINIMAL}
-	tidy? ( app-text/htmltidy )
-"
+DEPEND=">=kde-base/libkonq-${KDE_MINIMAL}
+	tidy? ( app-text/htmltidy )"
 RDEPEND="${DEPEND}
-	!kde-base/konq-plugins:4.1[-kdeprefix]
-	!kde-base/konq-plugins:4.2[-kdeprefix]
 	>=kde-base/kcmshell-${KDE_MINIMAL}
-	>=kde-base/konqueror-${KDE_MINIMAL}
-"
+	>=kde-base/konqueror-${KDE_MINIMAL}"
+
+src_prepare() {
+	# FIXME. Doesn't compile for 4.3.3:
+	# adblock.cpp:284: error: ‘const class KHTMLSettings’ has no member named
+	# ‘adFilteredBy’
+	sed -i \
+		-e 's:add_subdirectory(adblock)::' \
+		CMakeLists.txt || die
+	kde4-base_src_prepare
+}
 
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		-DKdeWebKit=OFF
 		-DWebKitPart=OFF
 		$(cmake-utils_use_with tidy LibTidy)"
-
 	kde4-base_src_configure
 }