[gentoo-commits] repo/gentoo:master commit in: app-text/linuxdoc-tools/

[Patrice Clement]

commit:     c9fde0661308f1686a8d88065293e20f36745939
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 08:39:19 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 08:43:19 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9fde066

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

 app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild    | 2 +-
 app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

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 11654a7..ad31eca 100644
--- 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 b45639c..b9883e7 100644
--- 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
 }