dev-libs/xapian: [QA] Fix missing trailing slash
authorDavid Seifert <soap@gentoo.org>
Sun, 11 Aug 2019 11:19:27 +0000 (13:19 +0200)
committerDavid Seifert <soap@gentoo.org>
Sun, 11 Aug 2019 11:19:27 +0000 (13:19 +0200)
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: David Seifert <soap@gentoo.org>
dev-libs/xapian/xapian-1.4.10.ebuild
dev-libs/xapian/xapian-1.4.11.ebuild

index 0c23be4d11e9a954710f990757fefd2a4f0edffd..0e1129a1b5bb218ee36e79eb86e83f0f8069aac2 100644 (file)
@@ -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=
-}
index f5aa42950fd20863bb895af0c9f754c045f86f34..917f435049f594f31d4d6470e1c0651b23047cf2 100644 (file)
@@ -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=
-}