summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2011-07-30 12:14:02 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2011-07-30 12:14:02 +0000
commitaa4470e8d6009eda041cf0ebf77fc6ecc179f125 (patch)
tree6e1bb1a712f5ab48d27a56ddee5fb3464224b157 /media-plugins/kipi-plugins
parentDrop ~sparc-fbsd KEYWORD (diff)
downloadgentoo-2-aa4470e8d6009eda041cf0ebf77fc6ecc179f125.tar.gz
gentoo-2-aa4470e8d6009eda041cf0ebf77fc6ecc179f125.tar.bz2
gentoo-2-aa4470e8d6009eda041cf0ebf77fc6ecc179f125.zip
Make mediawiki and gpssync optional, bug 376999
(Portage version: 2.1.10.9/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins/kipi-plugins')
-rw-r--r--media-plugins/kipi-plugins/ChangeLog6
-rw-r--r--media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild10
-rw-r--r--media-plugins/kipi-plugins/metadata.xml2
3 files changed, 13 insertions, 5 deletions
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/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>