media-video/qgifer: fix deps and doc path, EAPI bump

Fix the version range for media-libs/giflib dependency
Use subslots with opencv
Fix doc path so it uses ${PF} instead of ${PN}

Gentoo-bug: 579246
Closes: https://github.com/gentoo/gentoo/pull/1677

2 files changed, 14 insertions, 49 deletions

diff --git a/media-video/qgifer/qgifer-0.2.1-r1.ebuild b/media-video/qgifer/qgifer-0.2.1-r3.ebuild
index 2c646a902fed..9f2cdc5313e3 100644
--- a/media-video/qgifer/qgifer-0.2.1-r1.ebuild
+++ b/media-video/qgifer/qgifer-0.2.1-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
 inherit cmake-utils
 
@@ -10,31 +10,35 @@ 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"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 IUSE="debug imagemagick opencv3"
 
-RDEPEND="media-libs/giflib:0
+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-2.4.9[ffmpeg] <media-libs/opencv-3.0.0[ffmpeg] )
-	opencv3? ( >=media-libs/opencv-3.0.0[ffmpeg] )
+	!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"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P}-source"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-desktop.patch
+	eapply -p0 "${FILESDIR}/${P}-desktop.patch"
 
 	if use opencv3 ; then
-		epatch "${FILESDIR}"/${P}-opencv3.patch
+		eapply "${FILESDIR}/${P}-opencv3.patch"
 	fi
+
+	# Fix the doc path
+	sed -i -e "s|share/doc/qgifer|share/doc/${PF}|" CMakeLists.txt
+
+	eapply_user
 }
 
 src_configure() {
diff --git a/media-video/qgifer/qgifer-0.2.1.ebuild b/media-video/qgifer/qgifer-0.2.1.ebuild
deleted file mode 100644
index 47c8279b3b79..000000000000
--- a/media-video/qgifer/qgifer-0.2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 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"
-
-RDEPEND="media-libs/giflib:0
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	imagemagick? ( media-gfx/imagemagick:0 )
-	media-libs/opencv:0[ffmpeg]
-	virtual/ffmpeg:0"
-
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.8:0"
-
-S="${WORKDIR}/${P}-source"
-
-PATCHES=( "${FILESDIR}"/${P}-desktop.patch )
-
-src_configure() {
-	local mycmakeargs=""
-
-	use debug && mycmakeargs+=" -DRELEASE_MODE=OFF"
-
-	cmake-utils_src_configure
-}