| 1 |
commit: c70bcdff453a57f03a9fabbdd63616e91c4fe456 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 18 14:26:39 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 18 14:34:06 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c70bcdff |
| 7 |
|
| 8 |
media-libs/openjpeg: EAPI-6 bump |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.47, Repoman-2.3.10 |
| 11 |
|
| 12 |
media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild | 18 ++++++++++-------- |
| 13 |
1 file changed, 10 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild |
| 16 |
index 0f2a1158f9a..3c43e9ed3c2 100644 |
| 17 |
--- a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild |
| 18 |
+++ b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild |
| 19 |
@@ -1,8 +1,9 @@ |
| 20 |
# Copyright 1999-2018 Gentoo Foundation |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
|
| 23 |
-EAPI=5 |
| 24 |
-inherit multilib cmake-multilib |
| 25 |
+EAPI=6 |
| 26 |
+ |
| 27 |
+inherit cmake-multilib |
| 28 |
|
| 29 |
DESCRIPTION="An open-source JPEG 2000 library" |
| 30 |
HOMEPAGE="http://www.openjpeg.org" |
| 31 |
@@ -13,7 +14,8 @@ SLOT="0/5" # based on SONAME |
| 32 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 33 |
IUSE="doc static-libs test" |
| 34 |
|
| 35 |
-RDEPEND="media-libs/lcms:2= |
| 36 |
+RDEPEND=" |
| 37 |
+ media-libs/lcms:2= |
| 38 |
media-libs/libpng:0= |
| 39 |
media-libs/tiff:0= |
| 40 |
sys-libs/zlib:=" |
| 41 |
@@ -22,7 +24,7 @@ DEPEND="${RDEPEND} |
| 42 |
|
| 43 |
DOCS=( AUTHORS CHANGES NEWS README THANKS ) |
| 44 |
|
| 45 |
-RESTRICT="test" #409263 |
| 46 |
+RESTRICT="test" # bug 409263 |
| 47 |
|
| 48 |
src_prepare() { |
| 49 |
cmake-utils_src_prepare |
| 50 |
@@ -33,20 +35,20 @@ src_prepare() { |
| 51 |
multilib_src_configure() { |
| 52 |
local mycmakeargs=( |
| 53 |
-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)" |
| 54 |
- $(cmake-utils_use_build test TESTING) |
| 55 |
+ -DBUILD_TESTING=$(usex test) |
| 56 |
-DBUILD_DOC=$(multilib_native_usex doc ON OFF) |
| 57 |
-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF) |
| 58 |
- ) |
| 59 |
+ ) |
| 60 |
|
| 61 |
cmake-utils_src_configure |
| 62 |
|
| 63 |
if use static-libs; then |
| 64 |
mycmakeargs=( |
| 65 |
-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)" |
| 66 |
- $(cmake-utils_use_build test TESTING) |
| 67 |
+ -DBUILD_TESTING=$(usex test) |
| 68 |
-DBUILD_SHARED_LIBS=OFF |
| 69 |
-DBUILD_CODEC=OFF |
| 70 |
- ) |
| 71 |
+ ) |
| 72 |
BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_configure |
| 73 |
fi |
| 74 |
} |
Archives