commit: a58b0c2f479b8fc33436db2287ffb15db1cf04a7
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 20:40:34 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 20:40:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a58b0c2f
media-libs/libjpeg-turbo: add some EAPI=7 love
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
...eg-turbo-2.0.5.ebuild => libjpeg-turbo-2.0.5-r1.ebuild} | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
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
similarity index 97%
rename from media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5.ebuild
rename to media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r1.ebuild
index 43ac98639ee..a29f2348ca2 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r1.ebuild
@@ -18,12 +18,11 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips
~ppc ~ppc64 ~s390 sparc
IUSE="java static-libs"
ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+
COMMON_DEPEND="!media-libs/jpeg:0
!media-libs/jpeg:62"
-RDEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jre-1.5 )"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/cmake-3.16.5
+
+BDEPEND=">=dev-util/cmake-3.16.5
amd64? ( ${ASM_DEPEND} )
x86? ( ${ASM_DEPEND} )
amd64-fbsd? ( ${ASM_DEPEND} )
@@ -31,9 +30,14 @@ DEPEND="${COMMON_DEPEND}
amd64-linux? ( ${ASM_DEPEND} )
x86-linux? ( ${ASM_DEPEND} )
x64-macos? ( ${ASM_DEPEND} )
- x64-cygwin? ( ${ASM_DEPEND} )
+ x64-cygwin? ( ${ASM_DEPEND} )"
+
+DEPEND="${COMMON_DEPEND}
java? ( >=virtual/jdk-1.5 )"
+RDEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jre-1.5 )"
+
MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
src_prepare() {
