1 |
commit: 09912d918f80af86ca29e8791b51107847768ff1 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 16 15:28:07 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 16 15:28:07 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09912d91 |
7 |
|
8 |
media-libs/tiff: Minor ebuild adjustments. |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
media-libs/tiff/tiff-4.0.9-r2.ebuild | 23 +++++++++++++---------- |
13 |
1 file changed, 13 insertions(+), 10 deletions(-) |
14 |
|
15 |
diff --git a/media-libs/tiff/tiff-4.0.9-r2.ebuild b/media-libs/tiff/tiff-4.0.9-r2.ebuild |
16 |
index aafbb887102..26a1889a21c 100644 |
17 |
--- a/media-libs/tiff/tiff-4.0.9-r2.ebuild |
18 |
+++ b/media-libs/tiff/tiff-4.0.9-r2.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="6" |
24 |
-inherit autotools eutils libtool multilib-minimal |
25 |
+EAPI=6 |
26 |
+ |
27 |
+inherit autotools libtool ltprune multilib-minimal |
28 |
|
29 |
DESCRIPTION="Tag Image File Format (TIFF) library" |
30 |
HOMEPAGE="http://libtiff.maptools.org" |
31 |
@@ -47,14 +48,16 @@ src_prepare() { |
32 |
} |
33 |
|
34 |
multilib_src_configure() { |
35 |
- ECONF_SOURCE="${S}" econf \ |
36 |
- $(use_enable static-libs static) \ |
37 |
- $(use_enable zlib) \ |
38 |
- $(use_enable jpeg) \ |
39 |
- $(use_enable jbig) \ |
40 |
- $(use_enable lzma) \ |
41 |
- $(use_enable cxx) \ |
42 |
+ local myeconfargs=( |
43 |
--without-x |
44 |
+ $(use_enable cxx) |
45 |
+ $(use_enable jbig) |
46 |
+ $(use_enable jpeg) |
47 |
+ $(use_enable lzma) |
48 |
+ $(use_enable static-libs static) |
49 |
+ $(use_enable zlib) |
50 |
+ ) |
51 |
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
52 |
|
53 |
# remove useless subdirs |
54 |
if ! multilib_is_native_abi ; then |
55 |
@@ -76,5 +79,5 @@ multilib_src_test() { |
56 |
|
57 |
multilib_src_install_all() { |
58 |
prune_libtool_files --all |
59 |
- rm -f "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} |
60 |
+ rm -f "${ED%/}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} |
61 |
} |