media-video/qgifer: fix dependencies, remove broken version

- Fix subslot dependencies
- Remove broken version
- Change patch to p1

Package-Manager: portage-2.3.0

3 files changed, 9 insertions, 57 deletions

diff --git a/media-video/qgifer/files/qgifer-0.2.1-desktop.patch b/media-video/qgifer/files/qgifer-0.2.1-desktop.patch
index 2804caef7dba..8e021630f13a 100644
--- a/media-video/qgifer/files/qgifer-0.2.1-desktop.patch
+++ b/media-video/qgifer/files/qgifer-0.2.1-desktop.patch
@@ -1,7 +1,7 @@
 Index: doc/qgifer.desktop
 ===================================================================
---- doc/qgifer.desktop	(revision 91)
-+++ doc/qgifer.desktop	(working copy)
+--- a/doc/qgifer.desktop	(revision 91)
++++ b/doc/qgifer.desktop	(working copy)
 @@ -3,7 +3,7 @@
  Name=QGifer
  Icon=/usr/share/icons/qgifer.xpm
diff --git a/media-video/qgifer/qgifer-0.2.1-r2.ebuild b/media-video/qgifer/qgifer-0.2.1-r2.ebuild
deleted file mode 100644
index 03035688d4df..000000000000
--- a/media-video/qgifer/qgifer-0.2.1-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit cmake-utils
-
-DESCRIPTION="A video-based animated GIF creator"
-HOMEPAGE="https://sourceforge.net/projects/qgifer/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug imagemagick opencv3"
-
-RDEPEND="media-libs/giflib:0
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	imagemagick? ( media-gfx/imagemagick:0 )
-	!opencv3? ( media-libs/opencv:0/2.4[ffmpeg] )
-	opencv3? ( media-libs/opencv:0/3.0[ffmpeg] )
-	virtual/ffmpeg:0"
-
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.8:0"
-
-S="${WORKDIR}/${P}-source"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-desktop.patch
-
-	if use opencv3 ; then
-		epatch "${FILESDIR}"/${P}-opencv3.patch
-	fi
-}
-
-src_configure() {
-	local mycmakeargs
-
-	use debug && mycmakeargs=( -DRELEASE_MODE=OFF )
-
-	cmake-utils_src_configure
-}
diff --git a/media-video/qgifer/qgifer-0.2.1-r3.ebuild b/media-video/qgifer/qgifer-0.2.1-r4.ebuild
index 721698efdc29..e0ddb0a49029 100644
--- a/media-video/qgifer/qgifer-0.2.1-r3.ebuild
+++ b/media-video/qgifer/qgifer-0.2.1-r4.ebuild
@@ -20,25 +20,23 @@ RDEPEND="<media-libs/giflib-4.2.3:0
 	dev-qt/qtcore:4
 	dev-qt/qtgui:4
 	imagemagick? ( media-gfx/imagemagick:0 )
-	!opencv3? ( media-libs/opencv:0/2.4[ffmpeg] )
-	opencv3? ( media-libs/opencv:0/3.0[ffmpeg] )
+	!opencv3? ( <media-libs/opencv-3.0.0:0[ffmpeg] )
+	opencv3? ( >=media-libs/opencv-3.0.0:0[ffmpeg] )
 	virtual/ffmpeg:0"
 
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P}-source"
 
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${P}-desktop.patch"
+PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
 
-	if use opencv3 ; then
-		eapply "${FILESDIR}/${P}-opencv3.patch"
-	fi
+src_prepare(){
+	use opencv3 && PATCHES+=( "${FILESDIR}/${P}-opencv3.patch" )
+
+	cmake-utils_src_prepare
 
 	# Fix the doc path
 	sed -i -e "s|share/doc/qgifer|share/doc/${PF}|" CMakeLists.txt || die
-
-	eapply_user
 }
 
 src_configure() {