1 |
commit: a58b0c2f479b8fc33436db2287ffb15db1cf04a7 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 20 20:40:34 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 20 20:40:34 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a58b0c2f |
7 |
|
8 |
media-libs/libjpeg-turbo: add some EAPI=7 love |
9 |
|
10 |
Package-Manager: Portage-3.0.3, Repoman-3.0.0 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
...eg-turbo-2.0.5.ebuild => libjpeg-turbo-2.0.5-r1.ebuild} | 14 +++++++++----- |
14 |
1 file changed, 9 insertions(+), 5 deletions(-) |
15 |
|
16 |
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r1.ebuild |
17 |
similarity index 97% |
18 |
rename from media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5.ebuild |
19 |
rename to media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r1.ebuild |
20 |
index 43ac98639ee..a29f2348ca2 100644 |
21 |
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5.ebuild |
22 |
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r1.ebuild |
23 |
@@ -18,12 +18,11 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc |
24 |
IUSE="java static-libs" |
25 |
|
26 |
ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )" |
27 |
+ |
28 |
COMMON_DEPEND="!media-libs/jpeg:0 |
29 |
!media-libs/jpeg:62" |
30 |
-RDEPEND="${COMMON_DEPEND} |
31 |
- java? ( >=virtual/jre-1.5 )" |
32 |
-DEPEND="${COMMON_DEPEND} |
33 |
- >=dev-util/cmake-3.16.5 |
34 |
+ |
35 |
+BDEPEND=">=dev-util/cmake-3.16.5 |
36 |
amd64? ( ${ASM_DEPEND} ) |
37 |
x86? ( ${ASM_DEPEND} ) |
38 |
amd64-fbsd? ( ${ASM_DEPEND} ) |
39 |
@@ -31,9 +30,14 @@ DEPEND="${COMMON_DEPEND} |
40 |
amd64-linux? ( ${ASM_DEPEND} ) |
41 |
x86-linux? ( ${ASM_DEPEND} ) |
42 |
x64-macos? ( ${ASM_DEPEND} ) |
43 |
- x64-cygwin? ( ${ASM_DEPEND} ) |
44 |
+ x64-cygwin? ( ${ASM_DEPEND} )" |
45 |
+ |
46 |
+DEPEND="${COMMON_DEPEND} |
47 |
java? ( >=virtual/jdk-1.5 )" |
48 |
|
49 |
+RDEPEND="${COMMON_DEPEND} |
50 |
+ java? ( >=virtual/jre-1.5 )" |
51 |
+ |
52 |
MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h ) |
53 |
|
54 |
src_prepare() { |