Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/xapian/
Date: Sun, 11 Aug 2019 11:20:47
Message-Id: 1565522367.4445e6a31eb91dd65b4a8bdcd775367034bdfbdb.soap@gentoo
1 commit: 4445e6a31eb91dd65b4a8bdcd775367034bdfbdb
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 11 11:19:27 2019 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 11 11:19:27 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4445e6a3
7
8 dev-libs/xapian: [QA] Fix missing trailing slash
9
10 Package-Manager: Portage-2.3.71, Repoman-2.3.17
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 dev-libs/xapian/xapian-1.4.10.ebuild | 14 ++++++++------
14 dev-libs/xapian/xapian-1.4.11.ebuild | 14 ++++++++------
15 2 files changed, 16 insertions(+), 12 deletions(-)
16
17 diff --git a/dev-libs/xapian/xapian-1.4.10.ebuild b/dev-libs/xapian/xapian-1.4.10.ebuild
18 index 0c23be4d11e..0e1129a1b5b 100644
19 --- a/dev-libs/xapian/xapian-1.4.10.ebuild
20 +++ b/dev-libs/xapian/xapian-1.4.10.ebuild
21 @@ -58,21 +58,23 @@ MULTILIB_WRAPPED_HEADERS=(
22 /usr/include/xapian/registry.h
23 )
24
25 +multilib_src_test() {
26 + emake check VALGRIND=
27 +}
28 +
29 multilib_src_install() {
30 emake DESTDIR="${D}" install
31 }
32
33 multilib_src_install_all() {
34 # bug #573466
35 - ln -sf "${D}usr/bin/xapian-config" "${D}usr/bin/xapian-config-1.3"
36 + dosym xapian-config /usr/bin/xapian-config-1.3
37
38 - use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
39 + if use doc; then
40 + rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
41 + fi
42
43 dodoc AUTHORS HACKING PLATFORMS README NEWS
44
45 find "${D}" -name "*.la" -type f -delete || die
46 }
47 -
48 -multilib_src_test() {
49 - emake check VALGRIND=
50 -}
51
52 diff --git a/dev-libs/xapian/xapian-1.4.11.ebuild b/dev-libs/xapian/xapian-1.4.11.ebuild
53 index f5aa42950fd..917f435049f 100644
54 --- a/dev-libs/xapian/xapian-1.4.11.ebuild
55 +++ b/dev-libs/xapian/xapian-1.4.11.ebuild
56 @@ -56,21 +56,23 @@ MULTILIB_WRAPPED_HEADERS=(
57 /usr/include/xapian/registry.h
58 )
59
60 +multilib_src_test() {
61 + emake check VALGRIND=
62 +}
63 +
64 multilib_src_install() {
65 emake DESTDIR="${D}" install
66 }
67
68 multilib_src_install_all() {
69 # bug #573466
70 - ln -sf "${D}usr/bin/xapian-config" "${D}usr/bin/xapian-config-1.3"
71 + dosym xapian-config /usr/bin/xapian-config-1.3
72
73 - use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
74 + if use doc; then
75 + rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
76 + fi
77
78 dodoc AUTHORS HACKING PLATFORMS README NEWS
79
80 find "${D}" -name "*.la" -type f -delete || die
81 }
82 -
83 -multilib_src_test() {
84 - emake check VALGRIND=
85 -}