1 |
commit: 8da8156d73a42697931f4ae3429212d2370100ca |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 29 06:46:33 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 29 06:47:14 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8da8156d |
7 |
|
8 |
media-libs/libcddb: Fixed build with CONFIG_SHELL != bash |
9 |
|
10 |
Switched to EAPI-7 |
11 |
|
12 |
Closes: https://bugs.gentoo.org/528012 |
13 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
14 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
15 |
|
16 |
media-libs/libcddb/libcddb-1.3.2-r1.ebuild | 43 +++++++++++++++++++----------- |
17 |
1 file changed, 28 insertions(+), 15 deletions(-) |
18 |
|
19 |
diff --git a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild |
20 |
index 06c26b85450..527e22390ba 100644 |
21 |
--- a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild |
22 |
+++ b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild |
23 |
@@ -1,11 +1,9 @@ |
24 |
# Copyright 1999-2020 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
-EAPI=5 |
28 |
+EAPI=7 |
29 |
|
30 |
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all |
31 |
- |
32 |
-inherit autotools-multilib |
33 |
+inherit autotools multilib-minimal |
34 |
|
35 |
DESCRIPTION="A library for accessing a CDDB server" |
36 |
HOMEPAGE="http://libcddb.sourceforge.net/" |
37 |
@@ -17,7 +15,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-lin |
38 |
IUSE="doc static-libs" |
39 |
|
40 |
RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]" |
41 |
-DEPEND="doc? ( app-doc/doxygen )" |
42 |
+RDEPEND="${DEPEND}" |
43 |
+BDEPEND="doc? ( app-doc/doxygen )" |
44 |
|
45 |
RESTRICT="test" |
46 |
|
47 |
@@ -25,22 +24,36 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) |
48 |
|
49 |
MULTILIB_WRAPPED_HEADERS=( /usr/include/cddb/version.h ) |
50 |
|
51 |
-src_configure() { |
52 |
- local myeconfargs=( --without-cdio ) |
53 |
- autotools-multilib_src_configure |
54 |
+src_prepare() { |
55 |
+ default |
56 |
+ # Required for CONFIG_SHELL != bash (bug #528012) |
57 |
+ eautoreconf |
58 |
+} |
59 |
+ |
60 |
+multilib_src_configure() { |
61 |
+ local myeconfargs=( |
62 |
+ --without-cdio |
63 |
+ $(use_enable static-libs static) |
64 |
+ ) |
65 |
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
66 |
} |
67 |
|
68 |
-src_compile() { |
69 |
- autotools-multilib_src_compile |
70 |
+multilib_src_compile() { |
71 |
+ default |
72 |
|
73 |
- if use doc; then |
74 |
- cd "${S}"/doc |
75 |
+ if use doc ; then |
76 |
+ cd "${S}"/doc || die |
77 |
doxygen doxygen.conf || die |
78 |
fi |
79 |
} |
80 |
|
81 |
-src_install() { |
82 |
- autotools-multilib_src_install |
83 |
+multilib_src_install_all() { |
84 |
+ default |
85 |
|
86 |
- use doc && dohtml "${S}"/doc/html/* |
87 |
+ find "${ED}" -type f -name "*.la" -delete || die |
88 |
+ |
89 |
+ if use doc ; then |
90 |
+ docinto html |
91 |
+ dodoc "${S}"/doc/html/* |
92 |
+ fi |
93 |
} |