Merge remote-tracking branch 'github/pr/392'.

diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild
index 11654a737f9436a7a559b8d840dff30ccc38feb3..ad31ecac4a5b185f6a57fd2506a43198d0fbdae3 100644 (file)
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild
@@ -51,7 +51,7 @@ src_prepare() {
        # Fix doc install path.
        sed -e \
                "s%/share/doc/linuxdoc-tools%/share/doc/${PF}%" \
-               -i Makefile.in
+               -i Makefile.in || die
 
        # Upstream developers unconditionally build docs during the install phase.
        # The only sane solution in this case is to patch things out from Makefile.

diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild
index b45639cc35fde915ac560478263808819bbbaedd..b9883e767e8a2a41a884586f8d97aeb26df1d769 100644 (file)
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild
@@ -39,14 +39,13 @@ DOCS=( ChangeLog README )
 
 S="${WORKDIR}/${PN}-upstream/${PV}-${GIT_SHA1}"
 
-sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" \
-       "/usr/share/linuxdoc-tools/linuxdoc-tools.catalog"
+sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" "/usr/share/${PN}/${PN}.catalog"
 
 src_prepare() {
        # Use Gentoo doc install path.
        sed -i \
                -e "s%/share/doc/linuxdoc-tools%/share/doc/${PF}%" \
-               Makefile.in
+               Makefile.in || die
 
        autotools-utils_src_prepare
 }