1 |
commit: faeddcb8b86ab72b5c2a428e400faad48a9dbd7b |
2 |
Author: Chaos <andrzej.pauli <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jun 14 12:49:02 2016 +0000 |
4 |
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 27 05:49:30 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faeddcb8 |
7 |
|
8 |
media-video/qgifer: fix deps and doc path, EAPI bump |
9 |
|
10 |
Fix the version range for media-libs/giflib dependency |
11 |
Use subslots with opencv |
12 |
Fix doc path so it uses ${PF} instead of ${PN} |
13 |
|
14 |
Gentoo-bug: 579246 |
15 |
Closes: https://github.com/gentoo/gentoo/pull/1677 |
16 |
|
17 |
...ifer-0.2.1-r1.ebuild => qgifer-0.2.1-r3.ebuild} | 24 +++++++------ |
18 |
media-video/qgifer/qgifer-0.2.1.ebuild | 39 ---------------------- |
19 |
2 files changed, 14 insertions(+), 49 deletions(-) |
20 |
|
21 |
diff --git a/media-video/qgifer/qgifer-0.2.1-r1.ebuild b/media-video/qgifer/qgifer-0.2.1-r3.ebuild |
22 |
similarity index 60% |
23 |
rename from media-video/qgifer/qgifer-0.2.1-r1.ebuild |
24 |
rename to media-video/qgifer/qgifer-0.2.1-r3.ebuild |
25 |
index 2c646a9..9f2cdc5 100644 |
26 |
--- a/media-video/qgifer/qgifer-0.2.1-r1.ebuild |
27 |
+++ b/media-video/qgifer/qgifer-0.2.1-r3.ebuild |
28 |
@@ -1,8 +1,8 @@ |
29 |
-# Copyright 1999-2015 Gentoo Foundation |
30 |
+# Copyright 1999-2016 Gentoo Foundation |
31 |
# Distributed under the terms of the GNU General Public License v2 |
32 |
# $Id$ |
33 |
|
34 |
-EAPI="5" |
35 |
+EAPI="6" |
36 |
|
37 |
inherit cmake-utils |
38 |
|
39 |
@@ -10,31 +10,35 @@ DESCRIPTION="A video-based animated GIF creator" |
40 |
HOMEPAGE="https://sourceforge.net/projects/qgifer/" |
41 |
SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz" |
42 |
|
43 |
-LICENSE="GPL-3" |
44 |
+LICENSE="GPL-3+" |
45 |
SLOT="0" |
46 |
KEYWORDS="~amd64 ~x86" |
47 |
|
48 |
IUSE="debug imagemagick opencv3" |
49 |
|
50 |
-RDEPEND="media-libs/giflib:0 |
51 |
+RDEPEND="<media-libs/giflib-4.2.3:0 |
52 |
dev-qt/qtcore:4 |
53 |
dev-qt/qtgui:4 |
54 |
imagemagick? ( media-gfx/imagemagick:0 ) |
55 |
- !opencv3? ( >=media-libs/opencv-2.4.9[ffmpeg] <media-libs/opencv-3.0.0[ffmpeg] ) |
56 |
- opencv3? ( >=media-libs/opencv-3.0.0[ffmpeg] ) |
57 |
+ !opencv3? ( media-libs/opencv:0/2.4[ffmpeg] ) |
58 |
+ opencv3? ( media-libs/opencv:0/3.0[ffmpeg] ) |
59 |
virtual/ffmpeg:0" |
60 |
|
61 |
-DEPEND="${RDEPEND} |
62 |
- >=dev-util/cmake-2.8:0" |
63 |
+DEPEND="${RDEPEND}" |
64 |
|
65 |
S="${WORKDIR}/${P}-source" |
66 |
|
67 |
src_prepare() { |
68 |
- epatch "${FILESDIR}"/${P}-desktop.patch |
69 |
+ eapply -p0 "${FILESDIR}/${P}-desktop.patch" |
70 |
|
71 |
if use opencv3 ; then |
72 |
- epatch "${FILESDIR}"/${P}-opencv3.patch |
73 |
+ eapply "${FILESDIR}/${P}-opencv3.patch" |
74 |
fi |
75 |
+ |
76 |
+ # Fix the doc path |
77 |
+ sed -i -e "s|share/doc/qgifer|share/doc/${PF}|" CMakeLists.txt |
78 |
+ |
79 |
+ eapply_user |
80 |
} |
81 |
|
82 |
src_configure() { |
83 |
|
84 |
diff --git a/media-video/qgifer/qgifer-0.2.1.ebuild b/media-video/qgifer/qgifer-0.2.1.ebuild |
85 |
deleted file mode 100644 |
86 |
index 47c8279..0000000 |
87 |
--- a/media-video/qgifer/qgifer-0.2.1.ebuild |
88 |
+++ /dev/null |
89 |
@@ -1,39 +0,0 @@ |
90 |
-# Copyright 1999-2014 Gentoo Foundation |
91 |
-# Distributed under the terms of the GNU General Public License v2 |
92 |
-# $Id$ |
93 |
- |
94 |
-EAPI="5" |
95 |
- |
96 |
-inherit cmake-utils |
97 |
- |
98 |
-DESCRIPTION="A video-based animated GIF creator" |
99 |
-HOMEPAGE="https://sourceforge.net/projects/qgifer/" |
100 |
-SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz" |
101 |
- |
102 |
-LICENSE="GPL-3" |
103 |
-SLOT="0" |
104 |
-KEYWORDS="~amd64 ~x86" |
105 |
- |
106 |
-IUSE="debug imagemagick" |
107 |
- |
108 |
-RDEPEND="media-libs/giflib:0 |
109 |
- dev-qt/qtcore:4 |
110 |
- dev-qt/qtgui:4 |
111 |
- imagemagick? ( media-gfx/imagemagick:0 ) |
112 |
- media-libs/opencv:0[ffmpeg] |
113 |
- virtual/ffmpeg:0" |
114 |
- |
115 |
-DEPEND="${RDEPEND} |
116 |
- >=dev-util/cmake-2.8:0" |
117 |
- |
118 |
-S="${WORKDIR}/${P}-source" |
119 |
- |
120 |
-PATCHES=( "${FILESDIR}"/${P}-desktop.patch ) |
121 |
- |
122 |
-src_configure() { |
123 |
- local mycmakeargs="" |
124 |
- |
125 |
- use debug && mycmakeargs+=" -DRELEASE_MODE=OFF" |
126 |
- |
127 |
- cmake-utils_src_configure |
128 |
-} |