Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
Date: Fri, 13 Jul 2018 14:14:51
Message-Id: 1531491278.9c05fa02f959044396492add74ad885002f19035.hattya@gentoo
1 commit: 9c05fa02f959044396492add74ad885002f19035
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 13 14:13:34 2018 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 13 14:14:38 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c05fa02
7
8 www-servers/h2o: drop old
9
10 Bug: https://bugs.gentoo.org/659298
11 Package-Manager: Portage-2.3.40, Repoman-2.3.9
12
13 www-servers/h2o/Manifest | 1 -
14 www-servers/h2o/h2o-2.2.4.ebuild | 100 ---------------------------------------
15 2 files changed, 101 deletions(-)
16
17 diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
18 index 7cce81ca860..ddfd2ff20f2 100644
19 --- a/www-servers/h2o/Manifest
20 +++ b/www-servers/h2o/Manifest
21 @@ -1,2 +1 @@
22 -DIST h2o-2.2.4.tar.gz 16212596 BLAKE2B 0c2702fb3c7e85e7eae107294794f80cee02b6b2488bbc2e880ea356d8362f0de8f08c3c3d686512cbf9ae1558aed23354f44e27edaf449e43d5876940248296 SHA512 508ebe93b890f573e735d9b1f9c91a669144be3523e34fb7455227fd10b38e04a5db73e706fe8d05849fea3019e792754097871c073715c9eef4eae7c33560b5
23 DIST h2o-2.2.5.tar.gz 16257295 BLAKE2B 3c13796eaf9a0aca29bbff7c35fb36d0b5ef47da91f39f71614a89f2d4fea5b1ebbc8f4e3e50bf37a02a84c0fcd96d5ac0be20c83add274157af966134b2d185 SHA512 24b07140d24fbb7796038aab44f44be5ffabc6f2841954273e2ad9f1a864e5482051dd7abfa6446297a46b6868763114695fa4f123ee3175bdac53b4c1868bc2
24
25 diff --git a/www-servers/h2o/h2o-2.2.4.ebuild b/www-servers/h2o/h2o-2.2.4.ebuild
26 deleted file mode 100644
27 index 63228398d26..00000000000
28 --- a/www-servers/h2o/h2o-2.2.4.ebuild
29 +++ /dev/null
30 @@ -1,100 +0,0 @@
31 -# Copyright 1999-2018 Gentoo Foundation
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI="6"
35 -CMAKE_MAKEFILE_GENERATOR="emake"
36 -SSL_DEPS_SKIP=1
37 -USE_RUBY="ruby23 ruby24"
38 -
39 -inherit cmake-utils ruby-single ssl-cert systemd toolchain-funcs user
40 -
41 -DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
42 -HOMEPAGE="https://h2o.examp1e.net/"
43 -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
44 -
45 -LICENSE="MIT"
46 -SLOT="0"
47 -KEYWORDS="~amd64 ~x86"
48 -IUSE="libressl +mruby"
49 -
50 -RDEPEND="dev-lang/perl
51 - sys-libs/zlib
52 - !libressl? ( dev-libs/openssl:0= )
53 - libressl? ( dev-libs/libressl:0= )"
54 -DEPEND="${RDEPEND}
55 - mruby? (
56 - ${RUBY_DEPS}
57 - dev-libs/oniguruma
58 - sys-devel/bison
59 - virtual/pkgconfig
60 - )"
61 -
62 -PATCHES=(
63 - "${FILESDIR}"/${PN}-2.2-mruby.patch
64 - "${FILESDIR}"/${P}-libressl.patch
65 -)
66 -
67 -pkg_setup() {
68 - enewgroup ${PN}
69 - enewuser ${PN} -1 -1 -1 ${PN}
70 -}
71 -
72 -src_prepare() {
73 - cmake-utils_src_prepare
74 -
75 - local ruby="ruby"
76 - if use mruby; then
77 - for ruby in ${RUBY_TARGETS_PREFERENCE}; do
78 - if has_version dev-lang/ruby:${ruby:4:1}.${ruby:5}; then
79 - break
80 - fi
81 - ruby=
82 - done
83 - [[ -z ${ruby} ]] && die "no suitable ruby version found"
84 - fi
85 -
86 - sed -i \
87 - -e "/INSTALL/s:\(/doc/${PN}\) :\1/html :" \
88 - -e "/INSTALL/s:\(/doc\)/${PN}:\1/${PF}:" \
89 - -e "s: ruby: ${ruby}:" \
90 - CMakeLists.txt
91 -
92 - sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" deps/mruby/lib/mruby/gem.rb
93 - tc-export CC
94 - export LD="$(tc-getCC)"
95 -}
96 -
97 -src_configure() {
98 - local mycmakeargs=(
99 - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}
100 - -DWITH_MRUBY=$(usex mruby)
101 - -DWITHOUT_LIBS=ON
102 - )
103 - cmake-utils_src_configure
104 -}
105 -
106 -src_install() {
107 - cmake-utils_src_install
108 -
109 - keepdir /var/www/localhost/htdocs
110 -
111 - insinto /etc/${PN}
112 - doins "${FILESDIR}"/${PN}.conf
113 -
114 - newinitd "${FILESDIR}"/${PN}.initd ${PN}
115 - systemd_dounit "${FILESDIR}"/${PN}.service
116 -
117 - insinto /etc/logrotate.d
118 - newins "${FILESDIR}"/${PN}.logrotate ${PN}
119 -
120 - keepdir /var/log/${PN}
121 - fowners ${PN}:${PN} /var/log/${PN}
122 - fperms 0750 /var/log/${PN}
123 -}
124 -
125 -pkg_postinst() {
126 - if [[ ! -f "${EROOT}"etc/ssl/${PN}/server.key ]]; then
127 - install_cert /etc/ssl/${PN}/server
128 - chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/server.*
129 - fi
130 -}