1 |
commit: 9db2ef6f8d5226898586b31ea23e58c58d682a3e |
2 |
Author: Amy Liffey <amynka <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 3 13:21:54 2018 +0000 |
4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 3 13:32:11 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9db2ef6f |
7 |
|
8 |
sci-libs/libgeotiff: remove not needed ewarn message |
9 |
|
10 |
- EAPI 6 bump |
11 |
- remove eutils |
12 |
- Remove not needed ewarn messages |
13 |
- Add missing dies |
14 |
|
15 |
Closes: https://bugs.gentoo.org/546618 |
16 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
17 |
|
18 |
...iff-1.4.1.ebuild => libgeotiff-1.4.1-r1.ebuild} | 25 +++++++--------------- |
19 |
1 file changed, 8 insertions(+), 17 deletions(-) |
20 |
|
21 |
diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild |
22 |
similarity index 70% |
23 |
rename from sci-libs/libgeotiff/libgeotiff-1.4.1.ebuild |
24 |
rename to sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild |
25 |
index d2e161b24ea..d30e21eb05f 100644 |
26 |
--- a/sci-libs/libgeotiff/libgeotiff-1.4.1.ebuild |
27 |
+++ b/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild |
28 |
@@ -1,9 +1,9 @@ |
29 |
-# Copyright 1999-2017 Gentoo Foundation |
30 |
+# Copyright 1999-2018 Gentoo Foundation |
31 |
# Distributed under the terms of the GNU General Public License v2 |
32 |
|
33 |
-EAPI=5 |
34 |
+EAPI=6 |
35 |
|
36 |
-inherit autotools eutils |
37 |
+inherit autotools |
38 |
|
39 |
MY_P=${P/_rc/RC} |
40 |
|
41 |
@@ -30,7 +30,7 @@ S=${WORKDIR}/${MY_P/RC*/} |
42 |
DOCS=( README ChangeLog ) |
43 |
|
44 |
src_prepare() { |
45 |
- epatch_user |
46 |
+ default |
47 |
sed -i \ |
48 |
-e "s:-O3::g" \ |
49 |
configure.ac || die |
50 |
@@ -40,7 +40,7 @@ src_prepare() { |
51 |
src_configure() { |
52 |
econf \ |
53 |
$(use_enable static-libs static) \ |
54 |
- --enable-debug=$(use debug && echo yes || echo no) \ |
55 |
+ --enable-debug=$(usex debug) \ |
56 |
--with-jpeg="${EPREFIX}"/usr/ \ |
57 |
--with-zip="${EPREFIX}"/usr/ |
58 |
|
59 |
@@ -49,8 +49,8 @@ src_compile() { |
60 |
default |
61 |
|
62 |
if use doc; then |
63 |
- mkdir -p docs/api |
64 |
- cp "${FILESDIR}"/Doxyfile Doxyfile |
65 |
+ mkdir -p docs/api || die |
66 |
+ cp "${FILESDIR}"/Doxyfile Doxyfile || die |
67 |
doxygen -u Doxyfile || die "updating doxygen config failed" |
68 |
doxygen Doxyfile || die "docs generation failed" |
69 |
fi |
70 |
@@ -60,14 +60,5 @@ src_install() { |
71 |
default |
72 |
|
73 |
use doc && dohtml docs/api/* |
74 |
- prune_libtool_files |
75 |
-} |
76 |
- |
77 |
-pkg_postinst() { |
78 |
- echo |
79 |
- ewarn "You should rebuild any packages built against ${PN} by running:" |
80 |
- ewarn "# revdep-rebuild" |
81 |
- ewarn "or using preserved-rebuild features of portage-2.2:" |
82 |
- ewarn "# emerge @preserved-rebuild" |
83 |
- echo |
84 |
+ find "${D}" -name '*.la' -delete || die |
85 |
} |