commit:     5bb189641338e5066a1b8656eb5c62fb5c84932d
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 13:15:03 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 13:15:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bb18964

www-servers/h2o: fix docs installation path

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 www-servers/h2o/files/h2o.conf   | 3 ---
 www-servers/h2o/h2o-2.2.4.ebuild | 2 ++
 www-servers/h2o/h2o-9999.ebuild  | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/www-servers/h2o/files/h2o.conf b/www-servers/h2o/files/h2o.conf
index a135cc35735..23f2d76d51e 100644
--- a/www-servers/h2o/files/h2o.conf
+++ b/www-servers/h2o/files/h2o.conf
@@ -15,6 +15,3 @@ hosts:
     paths:
       "/":
         file.dir: /var/www/localhost/htdocs
-      "/doc":
-        file.dir: /usr/share/doc/h2o/
-        file.index: [ 'index.html' ]

diff --git a/www-servers/h2o/h2o-2.2.4.ebuild b/www-servers/h2o/h2o-2.2.4.ebuild
index 47d1794fa4a..63228398d26 100644
--- a/www-servers/h2o/h2o-2.2.4.ebuild
+++ b/www-servers/h2o/h2o-2.2.4.ebuild
@@ -54,6 +54,8 @@ src_prepare() {
        fi
 
        sed -i \
+               -e "/INSTALL/s:\(/doc/${PN}\) :\1/html :" \
+               -e "/INSTALL/s:\(/doc\)/${PN}:\1/${PF}:" \
                -e "s: ruby: ${ruby}:" \
                CMakeLists.txt
 

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 56f77212526..e1d9604c4b4 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -51,6 +51,8 @@ src_prepare() {
        fi
 
        sed -i \
+               -e "/INSTALL/s:\(/doc/${PN}\) :\1/html :" \
+               -e "/INSTALL/s:\(/doc\)/${PN}:\1/${PF}:" \
                -e "s: ruby: ${ruby}:" \
                CMakeLists.txt
 

Reply via email to