1 |
commit: b01246dd43f29611331530be23b5f1f8a1a5053b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 30 22:05:35 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 30 22:44:43 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b01246dd |
7 |
|
8 |
media-libs/kvazaar: EAPI-6 bump and general cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
media-libs/kvazaar/kvazaar-1.2.0.ebuild | 45 +++++++++++++------------------ |
14 |
media-libs/kvazaar/kvazaar-9999.ebuild | 47 ++++++++++++++------------------- |
15 |
2 files changed, 39 insertions(+), 53 deletions(-) |
16 |
|
17 |
diff --git a/media-libs/kvazaar/kvazaar-1.2.0.ebuild b/media-libs/kvazaar/kvazaar-1.2.0.ebuild |
18 |
index 3c2dc94003a..46bae358eb2 100644 |
19 |
--- a/media-libs/kvazaar/kvazaar-1.2.0.ebuild |
20 |
+++ b/media-libs/kvazaar/kvazaar-1.2.0.ebuild |
21 |
@@ -1,45 +1,40 @@ |
22 |
-# Copyright 1999-2018 Gentoo Foundation |
23 |
+# Copyright 1999-2018 Gentoo Authors |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
-EAPI=5 |
27 |
- |
28 |
-SCM="" |
29 |
+EAPI=6 |
30 |
|
31 |
GREATEST_PV="1.2.1" |
32 |
|
33 |
-if [ "${PV#9999}" != "${PV}" ] ; then |
34 |
- SCM="git-r3" |
35 |
+if [[ ${PV} = *9999 ]] ; then |
36 |
+ inherit git-r3 |
37 |
EGIT_REPO_URI="https://github.com/ultravideo/kvazaar" |
38 |
-fi |
39 |
- |
40 |
-inherit eutils multilib autotools multilib-minimal toolchain-funcs flag-o-matic ${SCM} |
41 |
- |
42 |
-DESCRIPTION="An open-source HEVC encoder" |
43 |
-HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar" |
44 |
- |
45 |
-if [ "${PV#9999}" = "${PV}" ] ; then |
46 |
+else |
47 |
SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz |
48 |
test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )" |
49 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
50 |
fi |
51 |
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs |
52 |
+ |
53 |
+DESCRIPTION="Open-source HEVC encoder" |
54 |
+HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar" |
55 |
|
56 |
LICENSE="LGPL-2.1" |
57 |
# subslot = libkvazaar major |
58 |
SLOT="0/4" |
59 |
IUSE="static-libs test" |
60 |
- |
61 |
-DEPEND="" |
62 |
-RDEPEND="${DEPEND}" |
63 |
REQUIRED_USE="test? ( static-libs )" |
64 |
|
65 |
ASM_DEP=">=dev-lang/yasm-1.2.0" |
66 |
-DEPEND="${DEPEND} |
67 |
+RDEPEND="" |
68 |
+DEPEND="${RDEPEND} |
69 |
abi_x86_32? ( ${ASM_DEP} ) |
70 |
- abi_x86_64? ( ${ASM_DEP} )" |
71 |
+ abi_x86_64? ( ${ASM_DEP} ) |
72 |
+" |
73 |
|
74 |
src_prepare() { |
75 |
+ default |
76 |
eautoreconf |
77 |
- if use test && [ "${PV#9999}" = "${PV}" ]; then |
78 |
+ if use test && [[ ${PV} != *9999 ]]; then |
79 |
# https://bugs.gentoo.org/show_bug.cgi?id=595932 |
80 |
rmdir "${S}/greatest" || die |
81 |
mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die |
82 |
@@ -49,13 +44,11 @@ src_prepare() { |
83 |
} |
84 |
|
85 |
multilib_src_configure() { |
86 |
- ECONF_SOURCE="${S}" \ |
87 |
- econf \ |
88 |
- --disable-werror \ |
89 |
- --docdir "/usr/share/doc/${PF}" \ |
90 |
- $(use_enable static-libs static) |
91 |
+ ECONF_SOURCE="${S}" econf \ |
92 |
+ --disable-werror \ |
93 |
+ $(use_enable static-libs static) |
94 |
} |
95 |
|
96 |
multilib_src_install_all() { |
97 |
- find "${ED}" -name '*.la' -delete |
98 |
+ find "${ED}" -name '*.la' -delete || die |
99 |
} |
100 |
|
101 |
diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-9999.ebuild |
102 |
index 17d2a2b7eca..46bae358eb2 100644 |
103 |
--- a/media-libs/kvazaar/kvazaar-9999.ebuild |
104 |
+++ b/media-libs/kvazaar/kvazaar-9999.ebuild |
105 |
@@ -1,45 +1,40 @@ |
106 |
-# Copyright 1999-2017 Gentoo Foundation |
107 |
+# Copyright 1999-2018 Gentoo Authors |
108 |
# Distributed under the terms of the GNU General Public License v2 |
109 |
|
110 |
-EAPI=5 |
111 |
- |
112 |
-SCM="" |
113 |
+EAPI=6 |
114 |
|
115 |
GREATEST_PV="1.2.1" |
116 |
|
117 |
-if [ "${PV#9999}" != "${PV}" ] ; then |
118 |
- SCM="git-r3" |
119 |
+if [[ ${PV} = *9999 ]] ; then |
120 |
+ inherit git-r3 |
121 |
EGIT_REPO_URI="https://github.com/ultravideo/kvazaar" |
122 |
-fi |
123 |
- |
124 |
-inherit eutils multilib autotools multilib-minimal toolchain-funcs flag-o-matic ${SCM} |
125 |
- |
126 |
-DESCRIPTION="An open-source HEVC encoder" |
127 |
-HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar" |
128 |
- |
129 |
-if [ "${PV#9999}" = "${PV}" ] ; then |
130 |
+else |
131 |
SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz |
132 |
test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )" |
133 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" |
134 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
135 |
fi |
136 |
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs |
137 |
+ |
138 |
+DESCRIPTION="Open-source HEVC encoder" |
139 |
+HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar" |
140 |
|
141 |
LICENSE="LGPL-2.1" |
142 |
# subslot = libkvazaar major |
143 |
SLOT="0/4" |
144 |
IUSE="static-libs test" |
145 |
- |
146 |
-DEPEND="" |
147 |
-RDEPEND="${DEPEND}" |
148 |
REQUIRED_USE="test? ( static-libs )" |
149 |
|
150 |
ASM_DEP=">=dev-lang/yasm-1.2.0" |
151 |
-DEPEND="${DEPEND} |
152 |
+RDEPEND="" |
153 |
+DEPEND="${RDEPEND} |
154 |
abi_x86_32? ( ${ASM_DEP} ) |
155 |
- abi_x86_64? ( ${ASM_DEP} )" |
156 |
+ abi_x86_64? ( ${ASM_DEP} ) |
157 |
+" |
158 |
|
159 |
src_prepare() { |
160 |
+ default |
161 |
eautoreconf |
162 |
- if use test && [ "${PV#9999}" = "${PV}" ]; then |
163 |
+ if use test && [[ ${PV} != *9999 ]]; then |
164 |
# https://bugs.gentoo.org/show_bug.cgi?id=595932 |
165 |
rmdir "${S}/greatest" || die |
166 |
mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die |
167 |
@@ -49,13 +44,11 @@ src_prepare() { |
168 |
} |
169 |
|
170 |
multilib_src_configure() { |
171 |
- ECONF_SOURCE="${S}" \ |
172 |
- econf \ |
173 |
- --disable-werror \ |
174 |
- --docdir "/usr/share/doc/${PF}" \ |
175 |
- $(use_enable static-libs static) |
176 |
+ ECONF_SOURCE="${S}" econf \ |
177 |
+ --disable-werror \ |
178 |
+ $(use_enable static-libs static) |
179 |
} |
180 |
|
181 |
multilib_src_install_all() { |
182 |
- find "${ED}" -name '*.la' -delete |
183 |
+ find "${ED}" -name '*.la' -delete || die |
184 |
} |