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

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

3 files changed, 30 insertions, 33 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/Manifest b/kde-misc/konq-plugins/Manifest
index 8f01387dabc3..ac356c4bc16d 100644
--- a/kde-misc/konq-plugins/Manifest
+++ b/kde-misc/konq-plugins/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST konq-plugins-4.2.4.tar.bz2 920388 RMD160 9895d6e466ce4dd9447dcc499262c2a919abfc08 SHA1 72d79d65f101d322a9cb9d17acfdb5ccf8594ea2 SHA256 ea05f7fffc31a27fdb33b0e083061ee25f7ebff6284f7fe8d93553f713c3c633
 DIST konq-plugins-4.3.0.tar.bz2 1058131 RMD160 d129d8be7df29af952f93860ba98a7586dbf751a SHA1 ba6212bd6e3ce076fbe51b47bfc7a9bbcfddb826 SHA256 d67f719283bde6bff1438050db69c83197e5d5e30cd0b563bc338b2463c6ea18
-EBUILD konq-plugins-4.2.4-r1.ebuild 1210 RMD160 c3fed5a13be316e90629ba697780d8e870fd10be SHA1 d851d3b7b3e99465b752e4586d74f174dcd6ae2f SHA256 00915c2380ee4e6d6ee8d046dbe785077e6d4aba0a1be9a0301b7750d266abc1
+DIST konq-plugins-4.3.3.tar.bz2 1086891 RMD160 b6f92cc3ebeccba35cb32b7c19f1d60f92735fbe SHA1 ac4e4b9731fa18ababe9528ef04ce007ecdb6bd8 SHA256 0ff2213da8f7fb6d2c2c9b79eb0059c2ed95590498d50c257ad40e115f262db3
 EBUILD konq-plugins-4.3.0.ebuild 1211 RMD160 61b6eca2f335d908e8305b35dce3a35855515369 SHA1 7adcff329bdb469789da13963b45eca16faeb069 SHA256 e68c279f2f3d41b90289642ddb663ea8e0ad479c2da589e1c72e1c38786f84e9
-MISC ChangeLog 1196 RMD160 543a9a2bac9d588eb963d8cc92fb7fbacbe4b110 SHA1 d936b23cde8c8e60f3a50a660736cacad601ea48 SHA256 6b2e3dbcb14431c9110d54595b94a3f21001111e7d2fb64d1f3a3113d486d152
+EBUILD konq-plugins-4.3.3.ebuild 1369 RMD160 44f4352dab90ddc7e6e150e7969e0beda38207cf SHA1 6a2a97f460a27c7a3e5e916ce9a10c743d4992d2 SHA256 7f026c6a1ff698d3a5e0fe27c662754cc171a9e599ab44599d4851b3aabb206e
+MISC ChangeLog 1390 RMD160 a71ae555aaf71f725ed4537da9c982e999768db9 SHA1 61dac65a2ceb4881f432e3fe18ff8019ac90cec4 SHA256 afc2817b99b6d3a0a9c860d08c2564dc84694a69301331c320ea0c6d67319af9
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqCrmoACgkQHB6c3gNBRYdH3ACgkhprZNmZUoBMZ50x2yJF0AMA
-/XUAn2KTlrxFymD3E+D6U2Ul2F8U9KAx
-=Wher
------END PGP SIGNATURE-----
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
 }