summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2014-08-20 14:43:48 +0000
committerJohannes Huber <johu@gentoo.org>2014-08-20 14:43:48 +0000
commitc2b6a694695e95be1fca0b1b5d8724e9c27521c0 (patch)
treea96ce0ef78aafa7c7a60ff6e79b744b5e89ad754
parentApply upstream commit http://gitorious.org/procps/procps/commit/7f6efed9bb85d... (diff)
downloadgentoo-2-c2b6a694695e95be1fca0b1b5d8724e9c27521c0.tar.gz
gentoo-2-c2b6a694695e95be1fca0b1b5d8724e9c27521c0.tar.bz2
gentoo-2-c2b6a694695e95be1fca0b1b5d8724e9c27521c0.zip
Raise DEPEND on media-libs/libkgeomap by Johannes Niess <johannes_niess@web.de>, bug #520274. Remove RDEPEND on media-video/mjpegtools by Nikoli <nikoli@gmx.us>, bug #517638.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0xF3CFD2BD)
-rw-r--r--media-plugins/kipi-plugins/ChangeLog7
-rw-r--r--media-plugins/kipi-plugins/kipi-plugins-4.2.0.ebuild7
2 files changed, 9 insertions, 5 deletions
diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 2eea893c59b6..b2712ddaeec9 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-plugins/kipi-plugins
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.166 2014/08/15 18:04:34 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.167 2014/08/20 14:43:48 johu Exp $
+
+ 20 Aug 2014; Johannes Huber <johu@gentoo.org> kipi-plugins-4.2.0.ebuild:
+ Raise DEPEND on media-libs/libkgeomap by Johannes Niess
+ <johannes_niess@web.de>, bug #520274. Remove RDEPEND on media-video/mjpegtools
+ by Nikoli <nikoli@gmx.us>, bug #517638.
*kipi-plugins-4.2.0 (15 Aug 2014)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.2.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.2.0.ebuild
index 73677f35c451..5609ed01e9d1 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-4.2.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-4.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-4.2.0.ebuild,v 1.1 2014/08/15 18:04:34 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-4.2.0.ebuild,v 1.2 2014/08/20 14:43:48 johu Exp $
EAPI=5
@@ -28,7 +28,7 @@ LICENSE="GPL-2
handbook? ( FDL-1.2 )"
KEYWORDS="~amd64 ~x86"
SLOT="4"
-IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki mjpeg panorama redeyes scanner upnp videoslideshow vkontakte"
+IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki panorama redeyes scanner upnp videoslideshow vkontakte"
COMMONDEPEND="
$(add_kdebase_dep libkipi)
@@ -39,7 +39,7 @@ COMMONDEPEND="
dev-libs/libxml2
dev-libs/libxslt
dev-libs/qjson
- gpssync? ( media-libs/libkgeomap )
+ gpssync? ( >=media-libs/libkgeomap-4.2.0 )
media-libs/libpng:0=
media-libs/tiff
virtual/jpeg
@@ -72,7 +72,6 @@ RDEPEND="${COMMONDEPEND}
cdr? ( app-cdr/k3b )
expoblending? ( media-gfx/hugin )
imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
- mjpeg? ( media-video/mjpegtools )
panorama? (
media-gfx/enblend
>=media-gfx/hugin-2011.0.0