[gentoo-commits] repo/gentoo:master commit in: dev-libs/xapian/

[David Seifert]

commit:     4445e6a31eb91dd65b4a8bdcd775367034bdfbdb
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 11:19:27 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 11:19:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4445e6a3

dev-libs/xapian: [QA] Fix missing trailing slash

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-libs/xapian/xapian-1.4.10.ebuild | 14 ++++++++------
 dev-libs/xapian/xapian-1.4.11.ebuild | 14 ++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/dev-libs/xapian/xapian-1.4.10.ebuild 
b/dev-libs/xapian/xapian-1.4.10.ebuild
index 0c23be4d11e..0e1129a1b5b 100644
--- a/dev-libs/xapian/xapian-1.4.10.ebuild
+++ b/dev-libs/xapian/xapian-1.4.10.ebuild
@@ -58,21 +58,23 @@ MULTILIB_WRAPPED_HEADERS=(
        /usr/include/xapian/registry.h
 )
 
+multilib_src_test() {
+       emake check VALGRIND=
+}
+
 multilib_src_install() {
        emake DESTDIR="${D}" install
 }
 
 multilib_src_install_all() {
        # bug #573466
-       ln -sf "${D}usr/bin/xapian-config" "${D}usr/bin/xapian-config-1.3"
+       dosym xapian-config /usr/bin/xapian-config-1.3
 
-       use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
+       if use doc; then
+               rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
+       fi
 
        dodoc AUTHORS HACKING PLATFORMS README NEWS
 
        find "${D}" -name "*.la" -type f -delete || die
 }
-
-multilib_src_test() {
-       emake check VALGRIND=
-}

diff --git a/dev-libs/xapian/xapian-1.4.11.ebuild 
b/dev-libs/xapian/xapian-1.4.11.ebuild
index f5aa42950fd..917f435049f 100644
--- a/dev-libs/xapian/xapian-1.4.11.ebuild
+++ b/dev-libs/xapian/xapian-1.4.11.ebuild
@@ -56,21 +56,23 @@ MULTILIB_WRAPPED_HEADERS=(
        /usr/include/xapian/registry.h
 )
 
+multilib_src_test() {
+       emake check VALGRIND=
+}
+
 multilib_src_install() {
        emake DESTDIR="${D}" install
 }
 
 multilib_src_install_all() {
        # bug #573466
-       ln -sf "${D}usr/bin/xapian-config" "${D}usr/bin/xapian-config-1.3"
+       dosym xapian-config /usr/bin/xapian-config-1.3
 
-       use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
+       if use doc; then
+               rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
+       fi
 
        dodoc AUTHORS HACKING PLATFORMS README NEWS
 
        find "${D}" -name "*.la" -type f -delete || die
 }
-
-multilib_src_test() {
-       emake check VALGRIND=
-}