Version bump; remove old

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

4 files changed, 66 insertions, 22 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 6b0fe34ad864..b143761011e6 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/kipi-plugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.113 2012/04/04 19:32:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.114 2012/04/08 19:48:38 dilfridge Exp $
+
+*kipi-plugins-2.6.0_beta3 (08 Apr 2012)
+
+  08 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kipi-plugins-2.3.0.ebuild, +kipi-plugins-2.6.0_beta3.ebuild,
+  +files/kipi-plugins-2.6.0_beta3-options.patch:
+  Version bump; remove old
 
   04 Apr 2012; Agostino Sarubbo <ago@gentoo.org> kipi-plugins-2.5.0.ebuild:
   Stable for amd64, wrt bug #409403
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 0ce66323c0f4..ab86f019f159 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -4,22 +4,29 @@ Hash: SHA512
 AUX kipi-plugins-1.7.0-expoblending.patch 570 RMD160 c08b628dceb39b4a2dbe15fd376256785dd8cacf SHA1 763aec7f286f4cd208aa38f5665c62986bcfaddb SHA256 31788bac46a0af39e2b8475bdd84e07710af5d6655efbdaa6939795eb8b7d7f0
 AUX kipi-plugins-2.0.0-tests.patch 933 RMD160 bcd1974a98a0471f381cde6ea91b2e980df63b74 SHA1 a77124e7c2b66616546b218ae9bc5e0bc0644ee0 SHA256 b8640df52463422dd53f0a4ac411eac67f15e8652157f820171ae85acd3ccb9f
 AUX kipi-plugins-2.2.0-panorama.patch 637 RMD160 af10aa9d372525b726f6127c5708c94ec0d8d2c6 SHA1 04ffe616b1bd516009b8ff46bf138fc3f3a620eb SHA256 d83477c7b1c67342863aeb1b03ec6f8b7fa4a7b1ca0194d1d42e4ebaf920edee
-DIST digikam-2.3.0.tar.bz2 54522109 RMD160 304bce5841f5d36a72a064784c90c91960c9a7c3 SHA1 15b8b16d7cce6ac50fb958d30166214f2f2b83ee SHA256 29ddf83a160817314e9274a35d678678da58006e41d961dcebc6afb0ab200a33
+AUX kipi-plugins-2.6.0_beta3-options.patch 1091 RMD160 17da79d58a00afe62953f9f137d05b494da5ce4e SHA1 7e8777edfd7e46070513b8a87c94f54649795f5d SHA256 2550af0eb24416a145fbfa5de5493dfb9568f20bf98b86efb108dd2c6fc5cb58
 DIST digikam-2.4.1.tar.bz2 54531119 RMD160 2a07c061927e7cec7a0128a68e60f9d7c6d1e78b SHA1 2ec3a20225462d277d5f0c3aa17b1ecfbb61f98c SHA256 aca967a4cc5312923cb2340502eb10a571684c14cf63896a68a1796d0483de3b
 DIST digikam-2.5.0.tar.bz2 54976375 RMD160 4ff1b5fbc2cc4a8cb9994f7c7796086418dd43fb SHA1 6cadb838669d1bdcbd6abb677889f7d68d696383 SHA256 55292c79b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a
-EBUILD kipi-plugins-2.3.0.ebuild 3377 RMD160 7c5671b53c59a7b613227e98beb1047ef0a23b10 SHA1 9c939727aea2dab3074bab0d0e92eb96fbffa0ad SHA256 a6695f2124f996c570aa3b9d3a936e2619b3699f26717b69fbfaee6c23457d08
+DIST digikam-2.6.0-beta3.tar.bz2 55694232 RMD160 4337411d074a9f940270a8929293d5457cd283c9 SHA1 8ad5d6d482bbac582aaa2943c0d86272181e1565 SHA256 697ab7fdc0aff0a2a842df21608158f2abd1f7a4619cae9818749012267e6fec
 EBUILD kipi-plugins-2.4.1.ebuild 3267 RMD160 2e8fdd07e4ef24121e37b02b3ef2fbb36d44b270 SHA1 d8a5fbdd9786c46a29f1155faef79ec9bf5d73df SHA256 201a3ffc035d7a2340f3d5b71b72cd9a4d2fe7c2090fdb9b8b5552bcf742dbdf
 EBUILD kipi-plugins-2.5.0.ebuild 3229 RMD160 462dd0ebc1905708d5e2abb2f28e26649974c9d9 SHA1 71d1ec0170988abd4cdcc2586e7aac605fb554b9 SHA256 65d56cd9ed327b1a21e191398a6da52067d6ac78f3174bc8db0501b0605cdd16
-MISC ChangeLog 18976 RMD160 2a0756c1d1aa8326e54616bc7a466461f99867bd SHA1 0adb71de6a55868883043b0f6726ecda5a8caa1e SHA256 bd7edc73685a27a2d487037ebee4b935b94eca6a5114f0289c039d392b02ef34
+EBUILD kipi-plugins-2.6.0_beta3.ebuild 3314 RMD160 a14983e88bbff5de37b85c9b96a43572acb3bf29 SHA1 deca3a1ff6aa4630a72a8505440d41627eff73e4 SHA256 568c2869bd8cc13cb930a35b39c49adc53a7c0bd9a568172840908a47363cd2f
+MISC ChangeLog 19221 RMD160 180f1f11ac480f31cb2b0e3448135a0d22dbeb45 SHA1 5aea056bca7cf40c1ee5e5568dc077686f610cf0 SHA256 28a0bff284dffc75f152e25cf6641a9602939199e981771f52332687a2b3b163
 MISC metadata.xml 961 RMD160 767e890545236003bd89a73778ca0ef347a67e9a SHA1 a5d91c03c129d0ed92d792806ff6ccb22da972b6 SHA256 8a137c5797a41e37989bd78aa7761c84a42b685b59b7f5b3ddbd1639b4637af0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPfKHUAAoJEOTDgjZ80txdl4YIAJl0RMCjyEZzI3eQ3rqxP/ZH
-V5unjUS8RXwNklwLpCZd2qtDloVVfEaYNo1b14/WMgzSiWSvhY3Bt2iunIjQo7bA
-b9SrUERCax8Dx0S2h2XmRTiOfFn/NGErts0u5cWenAz551LRTVF6bmU2V218V+ES
-xbE5tJK4ZfkjDVU/cyDsZhgIjiwZvl12nZivBLzlyi6hOk53KIRz8mWrs/lzQlqD
-eqrbXfHVK/f/ihsWnzIyRV0QPZxa0K4tmQV6wWATJas6ikJA8a1WVw1HCaGWFQc9
-JcttvCb0RgFcsxHnwGedva2wleoKKVTIVgD77eVkkBW/oAvIs8aL0qHFkFY0I04=
-=cITb
+iQIcBAEBCgAGBQJPgeueAAoJENwGBM22xffeQXwP/1e8sezkkQ6AEdBwlywkP+KV
+D9BChNIEiaSy1qBODtZCpmXeYHRB1ecsUneQ7vJ5C7kLyrYdJCOdfsiH1oHVQvtk
+c4F12P1aSD7T4tZa2SQ0DEQVJZxf5GjAaurYci4v20gUfAGsE89HtG7+36EZttLq
+5mhdbcIY1BJ3kpCkf5fVzz33MWVszx/OlVpjrTxc6TAWoKFU35OHYDFwqPAlUDXg
+5MQS65dmOFc818BqYNqBdF/Lue1Gc8F8d/VoDQ05J00jsg5R1X9+2K2LsPHqZIWL
+JQYf87Y80JhQ6hLNZ9xLAzkkIQqi8gl5leu0zHOtSLP4d0T7lrHN6IUzP7IQYJnb
+iPFrvsjCVKMsM9NUngdNqBXVNyK5odXPFoHzM2cPRWX77RLTknNOOwM2pXAveXH5
+ruutQR4k2jTiBD1MZSDxdobzWpKwufoLGHpIcsi2k76UDzxRSPvdD3+aaYsvVUnB
+mYWx0yCOGv1/c02jYenYfwku0ekKhBpJKYv/MDemtCaRVO3nxd0rlGpiOI0uwm6r
+5gNZiqvDaDL73mGqkTs/EWBFC2v0zIQE3at2tixgPRQL8FtLvXnP1+0bthullKVB
+KQemMgrp1FIiNOHm+2E/UDOdpgABuPIJFNQNT/BQeFy9TmtYmqyUg2uNN5nf4b5M
+fVsC3FW7mp/qIo+uf3u+
+=9CPp
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-2.6.0_beta3-options.patch b/media-plugins/kipi-plugins/files/kipi-plugins-2.6.0_beta3-options.patch
new file mode 100644
index 000000000000..86733b15cbc6
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-2.6.0_beta3-options.patch
@@ -0,0 +1,31 @@
+diff -ruN digikam-2.6.0-beta3.orig/extra/kipi-plugins/CMakeLists.txt digikam-2.6.0-beta3/extra/kipi-plugins/CMakeLists.txt
+--- digikam-2.6.0-beta3.orig/extra/kipi-plugins/CMakeLists.txt	2012-04-01 12:54:26.000000000 +0200
++++ digikam-2.6.0-beta3/extra/kipi-plugins/CMakeLists.txt	2012-04-08 18:50:53.918419219 +0200
+@@ -391,7 +391,11 @@
+     ADD_SUBDIRECTORY(picasawebexport)
+     ADD_SUBDIRECTORY(smug)
+     ADD_SUBDIRECTORY(printimages)
+-    ADD_SUBDIRECTORY(expoblending)
++
++    IF(ENABLE_expoblending)
++        ADD_SUBDIRECTORY(expoblending)
++    ENDIF(ENABLE_expoblending)
++
+     ADD_SUBDIRECTORY(kopete)
+     ADD_SUBDIRECTORY(batchprocessimages)
+     ADD_SUBDIRECTORY(rajceexport)
+@@ -457,9 +461,11 @@
+         ADD_SUBDIRECTORY(mediawiki)
+     ENDIF(MEDIAWIKI_FOUND)
+ 
+-    IF(Boost_FOUND)
+-        ADD_SUBDIRECTORY(panorama)
+-    ENDIF(Boost_FOUND)
++    IF(ENABLE_panorama)
++        IF(Boost_FOUND)
++            ADD_SUBDIRECTORY(panorama)
++        ENDIF(Boost_FOUND)
++    ENDIF(ENABLE_panorama)
+ 
+ #   Laurent Montel : wallpaper is currently disabled. Waiting new api with KDE 4.2
+ #
diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.3.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.6.0_beta3.ebuild
index 2a49f003d662..b15e26f49dba 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-2.3.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-2.6.0_beta3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.3.0.ebuild,v 1.3 2011/12/07 22:04:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.6.0_beta3.ebuild,v 1.1 2012/04/08 19:48:38 dilfridge Exp $
 
 EAPI=4
 
@@ -25,9 +25,9 @@ SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 x86"
+KEYWORDS=""
 SLOT="4"
-IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod +mediawiki mjpeg panorama redeyes scanner vkontakte"
+IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki mjpeg panorama redeyes scanner vkontakte"
 
 DEPEND="
 	$(add_kdebase_dep libkipi)
@@ -37,8 +37,7 @@ DEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-libs/qjson
-	gpssync?	( >=media-libs/libkgeomap-${PV} )
-	mediawiki?	( >=media-libs/libmediawiki-${PV} )
+	gpssync?	( media-libs/libkgeomap )
 	media-libs/libpng
 	media-libs/tiff
 	virtual/jpeg
@@ -47,13 +46,15 @@ DEPEND="
 	ipod?		(
 			  media-libs/libgpod
 			  x11-libs/gtk+:2
+	mediawiki?	( >=media-libs/libmediawiki-2.6.0_beta3 )
 			)
+	panorama?	( dev-libs/boost )
 	redeyes?	( >=media-libs/opencv-2.2.0-r10 )
 	scanner? 	(
 			  $(add_kdebase_dep libksane)
 			  media-gfx/sane-backends
 			)
-	vkontakte?	( >=net-libs/libkvkontakte-${PV} )
+	vkontakte?	( net-libs/libkvkontakte )
 "
 RDEPEND="${DEPEND}
 	cdr? 		( app-cdr/k3b )
@@ -69,9 +70,7 @@ RDEPEND="${DEPEND}
 S=${WORKDIR}/${MY_P}/extra/${PN}
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.7.0-expoblending.patch"
-	"${FILESDIR}/${PN}-2.0.0-tests.patch"
-	"${FILESDIR}/${PN}-2.2.0-panorama.patch"
+	"${FILESDIR}/${PN}-2.6.0_beta3-options.patch"
 )
 
 src_prepare() {
@@ -104,8 +103,8 @@ src_configure() {
 		$(cmake-utils_use_with ipod Gdk)
 		$(cmake-utils_use_with ipod Gpod)
 		$(cmake-utils_use_with calendar KdepimLibs)
-		$(cmake-utils_use_with mediawiki Mediawiki)
 		$(cmake-utils_use_with gpssync KGeoMap)
+		$(cmake-utils_use_with mediawiki MEDIAWIKI)
 		$(cmake-utils_use_with redeyes OpenCV)
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with crypt QCA2)