[gentoo-commits] repo/gentoo:master commit in: app-office/orage/

[Michał Górny]

commit:     92073a16cab4eb4a1c5a8525e85a946bbf2474f8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  1 07:37:10 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul  9 21:41:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92073a16

app-office/orage: Stop hacking docdir over

 app-office/orage/orage-4.12.1-r1.ebuild | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/app-office/orage/orage-4.12.1-r1.ebuild 
b/app-office/orage/orage-4.12.1-r1.ebuild
index 85e10a53d98..85276d99385 100644
--- a/app-office/orage/orage-4.12.1-r1.ebuild
+++ b/app-office/orage/orage-4.12.1-r1.ebuild
@@ -27,11 +27,6 @@ DEPEND="${RDEPEND}
        >=sys-devel/libtool-2.2.6
        virtual/pkgconfig"
 
-pkg_setup() {
-       # PM doesn't let directory to be replaced by a symlink, see 
src_install()
-       rm -rf "${EROOT}"/usr/share/${PN}/doc || die
-}
-
 src_configure() {
        local myconf=(
                --libexecdir="${EPREFIX}/usr/$(get_libdir)"
@@ -46,16 +41,17 @@ src_configure() {
 }
 
 src_install() {
-       emake DESTDIR="${D}" install \
-               docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-               imagesdir="${EPREFIX}"/usr/share/doc/${PF}/html/images
-
-       # Create compability symlink for retarded path hardcoding in 
src/{mainbox,parameters}.c
-       dosym /usr/share/doc/${PF}/html /usr/share/${PN}/doc/C
-
+       default
        find "${D}" -name '*.la' -delete || die
 }
 
+pkg_preinst() {
+       # Replacing directory by symlink is unreliable
+       if [[ -L ${EROOT}/usr/share/orage/doc/C ]]; then
+               rm -f "${EROOT}/usr/share/orage/doc/C" || die
+       fi
+}
+
 pkg_postinst() {
        gnome2_icon_cache_update
        xdg_desktop_database_update