www-servers/h2o: tidy

Package-Manager: Portage-2.3.40, Repoman-2.3.9

diff --git a/www-servers/h2o/files/h2o.logrotate b/www-servers/h2o/files/h2o.logrotate
index b901bcfacb19ab3440c83f81d8f97b9271b2135f..166b6e7f17b7f0d7dd596625521e3aa36ddcd201 100644 (file)
--- a/www-servers/h2o/files/h2o.logrotate
+++ b/www-servers/h2o/files/h2o.logrotate
@@ -1,8 +1,11 @@
+# h2o logrotate script for Gentoo
+
 /var/log/h2o/*.log {
        missingok
-       delaycompress
+       notifempty
        sharedscripts
+       delaycompress
        postrotate
-               test -r $(grep pid-file "/etc/h2o/h2o.conf" | cut -d' ' -f2) && kill -HUP $(pidof h2o)
+               /bin/kill -HUP $(grep pid-file "/etc/h2o/h2o.conf" | cut -d' ' -f2 | cat) 2>/dev/null || true
        endscript
 }

diff --git a/www-servers/h2o/h2o-2.2.4.ebuild b/www-servers/h2o/h2o-2.2.4.ebuild
index 10c508037d7129bbadbbed704f801a050d697260..579c8e92940ee57a773dfb2abe62c1a0954062ae 100644 (file)
--- a/www-servers/h2o/h2o-2.2.4.ebuild
+++ b/www-servers/h2o/h2o-2.2.4.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 CMAKE_MAKEFILE_GENERATOR="emake"
 USE_RUBY="ruby23 ruby24"
 
 inherit cmake-utils ruby-single systemd user
 
-DESCRIPTION="An optimized HTTP server with support for HTTP/1.x and HTTP/2"
-HOMEPAGE="https://h2o.examp1e.net"
+DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
+HOMEPAGE="https://h2o.examp1e.net/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="libressl +mruby"
 
-RDEPEND="
+RDEPEND="dev-lang/perl
+       sys-libs/zlib
        !libressl? ( dev-libs/openssl:0= )
        libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}
@@ -28,22 +29,14 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
 
 pkg_setup() {
-       enewgroup h2o
-       enewuser h2o -1 -1 -1 h2o
-}
-
-src_prepare() {
-       # Leave optimization level to user CFLAGS
-       sed -i 's/-O2 -g ${CC_WARNING_FLAGS} //g' ./CMakeLists.txt \
-               || die "sed fix failed!"
-
-       cmake-utils_src_prepare
+       enewgroup ${PN}
+       enewuser ${PN} -1 -1 -1 ${PN}
 }
 
 src_configure() {
        local mycmakeargs=(
-               -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/h2o
-               -DWITH_MRUBY="$(usex mruby)"
+               -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}
+               -DWITH_MRUBY=$(usex mruby)
                -DWITHOUT_LIBS=ON
        )
        cmake-utils_src_configure
@@ -52,17 +45,18 @@ src_configure() {
 src_install() {
        cmake-utils_src_install
 
-       newinitd "${FILESDIR}"/h2o.initd h2o
-       systemd_dounit "${FILESDIR}"/h2o.service
-
-       insinto /etc/h2o
-       doins "${FILESDIR}"/h2o.conf
+       keepdir /var/www/localhost/htdocs
 
-       keepdir /var/log/h2o
-       fperms 0700 /var/log/h2o
+       insinto /etc/${PN}
+       doins "${FILESDIR}"/${PN}.conf
 
-       keepdir /var/www/localhost/htdocs
+       newinitd "${FILESDIR}"/${PN}.initd ${PN}
+       systemd_dounit "${FILESDIR}"/${PN}.service
 
        insinto /etc/logrotate.d
-       newins "${FILESDIR}"/h2o.logrotate h2o
+       newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+       keepdir /var/log/${PN}
+       fowners ${PN}:${PN} /var/log/${PN}
+       fperms 0750 /var/log/${PN}
 }

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index b0583fd88558e9e17c9e4a8776c5f50a84727c9d..d6c5d65d8239ec78d089132afb3ccc3cd8ef31c2 100644 (file)
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 CMAKE_MAKEFILE_GENERATOR="emake"
 USE_RUBY="ruby23 ruby24"
 
 inherit cmake-utils git-r3 ruby-single systemd user
 
-DESCRIPTION="An optimized HTTP server with support for HTTP/1.x and HTTP/2"
-HOMEPAGE="https://h2o.examp1e.net"
+DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
+HOMEPAGE="https://h2o.examp1e.net/"
 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 
 LICENSE="MIT"
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS=""
 IUSE="libressl +mruby"
 
-RDEPEND="
+RDEPEND="dev-lang/perl
+       sys-libs/zlib
        !libressl? ( dev-libs/openssl:0= )
        libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}
@@ -26,14 +27,14 @@ DEPEND="${RDEPEND}
        )"
 
 pkg_setup() {
-       enewgroup h2o
-       enewuser h2o -1 -1 -1 h2o
+       enewgroup ${PN}
+       enewuser ${PN} -1 -1 -1 ${PN}
 }
 
 src_configure() {
        local mycmakeargs=(
-               -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/h2o
-               -DWITH_MRUBY="$(usex mruby)"
+               -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}
+               -DWITH_MRUBY=$(usex mruby)
                -DWITHOUT_LIBS=ON
        )
        cmake-utils_src_configure
@@ -42,17 +43,18 @@ src_configure() {
 src_install() {
        cmake-utils_src_install
 
-       newinitd "${FILESDIR}"/h2o.initd h2o
-       systemd_dounit "${FILESDIR}"/h2o.service
-
-       insinto /etc/h2o
-       doins "${FILESDIR}"/h2o.conf
+       keepdir /var/www/localhost/htdocs
 
-       keepdir /var/log/h2o
-       fperms 0700 /var/log/h2o
+       insinto /etc/${PN}
+       doins "${FILESDIR}"/${PN}.conf
 
-       keepdir /var/www/localhost/htdocs
+       newinitd "${FILESDIR}"/${PN}.initd ${PN}
+       systemd_dounit "${FILESDIR}"/${PN}.service
 
        insinto /etc/logrotate.d
-       newins "${FILESDIR}"/h2o.logrotate h2o
+       newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+       keepdir /var/log/${PN}
+       fowners ${PN}:${PN} /var/log/${PN}
+       fperms 0750 /var/log/${PN}
 }

diff --git a/www-servers/h2o/metadata.xml b/www-servers/h2o/metadata.xml
index af6fee5b3de5c19fca2e371249ec859d6f6485df..6a34529b48f05f06f9bce0fb7234d1a6d0b6ab2e 100644 (file)
--- a/www-servers/h2o/metadata.xml
+++ b/www-servers/h2o/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
        <maintainer type="person">
                <email>hattya@gentoo.org</email>
+               <name>Akinori Hattori</name>
        </maintainer>
        <longdescription lang="en">
                H2O is a new generation HTTP server. Not only is it very fast,