From: Andreas Hüttel <dilfridge@gentoo.org>
Date: Sat, 30 Jul 2011 12:14:02 +0000 (+0000)
Subject: Make mediawiki and gpssync optional, bug 376999
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=32b06b1756db8f2739c5d7cad194bed1d83e2eea;p=gentoo.git

Make mediawiki and gpssync optional, bug 376999

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

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 8f545ecd8f31..3baad362e2e3 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/kipi-plugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.97 2011/07/29 19:20:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.98 2011/07/30 12:14:02 dilfridge Exp $
+
+  30 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kipi-plugins-2.0.0.ebuild, metadata.xml:
+  Make mediawiki and gpssync optional, bug 376999
 
 *kipi-plugins-2.0.0 (29 Jul 2011)
 
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index db0f63fefe2e..7a71e941d358 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -7,23 +7,23 @@ DIST digikam-2.0.0.tar.bz2 53906557 RMD160 010f6b37920828003fa56159f1a7cf8452226
 DIST kipi-plugins-1.9.0.tar.bz2 5775775 RMD160 9bc1ae309e556335fa770e20b31b2527ddc4856b SHA1 fc12c018f4f73f7a7d025d7af2af99d4ae2dedc5 SHA256 d52466586725492788514c1b8d7bbea02f95c9deb744a0814d221c99c34e934c
 DIST kipi-plugins-doc-1.5.0.tar.bz2 1689039 RMD160 f4342798caf14817b96afdb11959f53ab175ae1d SHA1 55a57e1fffbd291ed2f31dbbe840ccd85cb499cc SHA256 13dfda13a1f5e276020dbae3f7c2227f5cc1ac4264070250eeff0a3eb59b67cf
 EBUILD kipi-plugins-1.9.0.ebuild 2697 RMD160 b42df2225066d816b710a7e76ef615c57ddc6b01 SHA1 ed22d2c0cab6e53944de8f6b739f5926ccb30d29 SHA256 5b6cf08ba75620d9701a997e243d205e8543187e3c95fc65372089d50aed37be
-EBUILD kipi-plugins-2.0.0.ebuild 2805 RMD160 0069280a1ffd1c3cc411e2a31d68b727e479d274 SHA1 848a7ba55e05b4dcad5c12ae426565a95f3759d5 SHA256 3668bb9de49b6c21b90927adf744015ad3d6d49b213292b77e7199a4adb9631f
-MISC ChangeLog 16580 RMD160 2c6f795f69c53941db28334804bfc837b773021a SHA1 2ae5252059f4919cdadf93361e00701e1eee4689 SHA256 6bc81dcf4ed14be6a8608aa4bd814b127591381fcbc8c552d13e98286030bffc
-MISC metadata.xml 644 RMD160 499650f4488659bf84448f0340f5dd3c4ba18d4d SHA1 f5e75eea5094beca7742e90c2c05310d4c528db7 SHA256 98dcaecafb89eaed0a0c8a1ca9e8e09cf671d5a640fff72200432b97d0f5f2d1
+EBUILD kipi-plugins-2.0.0.ebuild 2940 RMD160 9a613d1c3fdd84ff22bfb805e43d02d4e25b87de SHA1 1bc630710fe7ab64d1e88e1173546d5bba0d0dea SHA256 1db119229ad6e2e50e1ba908abc8d8aca6b2967cb7e4f2e39e4a00f42cf7696c
+MISC ChangeLog 16731 RMD160 c4804ddfb75e179daf3a148813d3aeb3588f0269 SHA1 b883ac72aaf3482baa1acba5cedcecd95ec5933d SHA256 0e989884b939fade17254c5d1616698fa68d2021ab5968978bda52e4bf54a4e1
+MISC metadata.xml 821 RMD160 027364a9c743a1e63022c5bef28aacd8c6c8f2d4 SHA1 c204cf22dd75121734996fb26cc3348eeedd41e7 SHA256 6af9d8367a1e61b517b0129ec26e4ca0c4747b66d7e398d0c889094db292e4f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOMwfqAAoJENwGBM22xffeDxUQAJuivk2vUZnWd3H17c6KEEjt
-k0JDgj3Sdrm+BrJU0dfhv++09Yj8sBB0KxIzPrhjkKQvvY0J8wkcTZi+GYbUyCv6
-FFBL0BcJrcb9aA3VryXeeOYMf/AdNC7WxvB9wRb7oWuJseXZP6AHzIV2co9eQjYs
-R4+z+n50T6Ie99xIpiLCtnN/Xaq74r3ER0to9eVXFngMUv3obyzxkPEioa4KXZGR
-i17nN6tqSg5rZzWgb4oqETYnhLPChrGiahmmMZYjSa+zjN/dH9vJppEMI0IO87qt
-bCXlmmGkLuXrUUGnZR6639bK586pm0LxOmgqw2di7XTZmTEuxMGdM2qmbFqR/XoQ
-MCkMyB860K6BFr3EiXkGntNoZc1N1fwd2qq2QwGGk8LG9gWBc/rIt26mdEwnzzVu
-hK3JXyPkvZXXTZ0sD4uL9LYR+ckI5ztEotv8kaBHYQlN81gNpP5AnEe6Ne0d6r0Z
-h20ymmeS2T9PIFFnrA/9+vAimRVYIj3aDSTKLwlywrrSc00XekbuWL2kcdzMp8Y4
-ro/653XReViyrXN0P8OiSPDMPV4YTreknTrY7VMP4soN/dxjAAfX93aHOIKXcw4w
-FOdvtljsoiw03GwrnRv8AIRjXpkTUQLMYKkibO43gDkNTsqs7px936NwX7eNpbm3
-LKUQvu0zVVjZIDpKtkY4
-=7pJV
+iQIcBAEBCgAGBQJOM/WkAAoJEEb+UGWnxTyH7UsP/1k6rIyAkCVS6KPUl5zBb3zH
+tO32LrJ4rFk5EzjaLzNZ61IEFq2hzbTxV4xSF9uWJpQUCN0QFQzl35FXhMM/en1A
+Uv55KflFIIPP0D0aGSP5MvwS1FB4FbTKuuzlzoCVof+yWfzpeugUhrOk4t0LUMgr
+QTMIbk2KwDnEqKP7CB0PdXVCkyW3jJTRsGQDLFcM7BsukwUZfNv8omQyu0drILIX
+lxRhGxkybRTD3IAz6ngbqpi0xgApNHdxlwMj0LUDkTKnzwtDDMvfkSOANFsCMxsF
+rkYmb2Sa2I3d5xU9cP1wNCxDkSq8hUQx0L38BUt+CEoBKDRjb1oxGsbRk2d3TTmR
+TH/kdq9siRgaYGdo6J41xqm5HB2LXT4WaULbSFijg0xmiTWdf1m65fDVJHyRfk/U
+xDjWE9rNTOsZ1LcXFPGQDwY+FJP6h7xJPjfKzo4ZqAEpv1mHBDx5E8jJjHx501Gu
+9DHc/Pm8a3U6NFZQOOEDG96FnrY5YuqoFRSzSf8Mc97KddmjL0AT+f+VEnkAkbEM
+w6cVCKMB6Cgb50NzoGHujPgXsQYPXuAM7BWptV44+vqewqCfjI23tpBu5VhyeJlT
+9aACiBYB9N7FbNscoGe5bVa4+XbO9JxBsEDcOPccyH6Ceg1Xup5F+abXVcDP0TOy
+WmmR1yO4Zu0V7YwPZjs2
+=m8C/
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild
index b7ec39d88d28..b7d98dcb1f0b 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.0.0.ebuild,v 1.1 2011/07/29 19:20:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild,v 1.2 2011/07/30 12:14:01 dilfridge Exp $
 
 EAPI=4
 
@@ -25,7 +25,7 @@ LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
 KEYWORDS="~amd64 ~x86"
 SLOT="4"
-IUSE="cdr calendar crypt debug expoblending handbook +imagemagick ipod mjpeg redeyes scanner"
+IUSE="cdr calendar crypt debug expoblending gpssync handbook +imagemagick ipod +mediawiki mjpeg redeyes scanner"
 
 DEPEND="
 	$(add_kdebase_dep libkipi)
@@ -35,8 +35,8 @@ DEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-libs/qjson
-	>=media-libs/libkgeomap-${PV}
-	>=media-libs/libmediawiki-${PV}
+	gpssync?	( >=media-libs/libkgeomap-${PV} )
+	mediawiki?	( >=media-libs/libmediawiki-${PV} )
 	media-libs/libpng
 	media-libs/tiff
 	virtual/jpeg
@@ -91,6 +91,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 redeyes OpenCV)
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with crypt QCA2)
diff --git a/media-plugins/kipi-plugins/metadata.xml b/media-plugins/kipi-plugins/metadata.xml
index 9ff79a0b6c80..939b80136566 100644
--- a/media-plugins/kipi-plugins/metadata.xml
+++ b/media-plugins/kipi-plugins/metadata.xml
@@ -7,6 +7,8 @@
 	</maintainer>
 	<use>
 		<flag name="expoblending">Build the expoblending plugin, which requires media-gfx/hugin</flag>
+		<flag name="gpssync">Build the gpssync plugin, which requires media-lib/libkgeomap and thereby marble</flag>
+		<flag name="mediawiki">Build the mediawiki export plugin</flag>
 		<flag name="mjpeg">Add mjpeg suppport</flag>
 		<flag name="redeyes">Add redeyes removal suppport</flag>
 		<flag name="linguas_ha">Hausa translation</flag>