From b49088575eb777ced2551f484da86317332d6087 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Jul 2021 02:11:45 +0100 Subject: gentoo resync : 24.07.2021 --- www-servers/h2o/Manifest | 4 +- www-servers/h2o/h2o-2.2.6-r1.ebuild | 105 +++++++++++++++++++++++++++++++++++ www-servers/h2o/h2o-2.2.6.ebuild | 107 ------------------------------------ www-servers/h2o/h2o-9999.ebuild | 37 +++++++------ 4 files changed, 126 insertions(+), 127 deletions(-) create mode 100644 www-servers/h2o/h2o-2.2.6-r1.ebuild delete mode 100644 www-servers/h2o/h2o-2.2.6.ebuild (limited to 'www-servers/h2o') diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest index e4affd5a1f94..38cbd9a33d8c 100644 --- a/www-servers/h2o/Manifest +++ b/www-servers/h2o/Manifest @@ -5,6 +5,6 @@ AUX h2o.initd 845 BLAKE2B f420962962517051c695f00e11a3b6edb899a672d0984db3d68b88 AUX h2o.logrotate 230 BLAKE2B 44eeaf3b0e60104d4f87c7110815a30f907a6fd676e75a2068fb9cddd8192d3e75729aaeabc89d6430eef7c075b21271918fd65b086de188f7df0c6ceb332141 SHA512 88d36e272c52c5df765d8ebac8f2acca378c8b096af7fa8eda68e1ec5597cba6096286f0ab634f128329148e65980128f0612e90a185de781c5d109653e096dd AUX h2o.service 364 BLAKE2B 9995cde4d79e5998624a2cadfc6ec3e954d4609458cc267628c2fbcb44dccd78277bddc032a784a00445c6b399fafc1ee629920355bf7aa84d26b1010bd103b0 SHA512 475b1e7b616eae335e094451532b0de5aa9cf9abc4999aaa44a9a35c43def4fb060ee5e728409bc33960f8ad3a81e6f549783906ac7ebad5b72cb7422ffb96a2 DIST h2o-2.2.6.tar.gz 16257760 BLAKE2B 8474751ca9832ddae2022710654ca58a93ebf9ca01afe934950209b04357b7548b05c598c49fe92684b2910fd6309d6fc3923a0b01cdeeb4b0dc65b08842255f SHA512 f2f28905c01782a0432c9dfdb2f21054e0a4741ac4c5f26802d4b439d0172840aa215aba5dc7c9af62275dcc24de105674a3819384dc38246e43ce3e8263eb20 -EBUILD h2o-2.2.6.ebuild 2224 BLAKE2B fd17796b921cbe3d7661d472994beb73986a20601f5e8340e79aeb05bcb3e206e45f120c2fc0ef7a27ee9b8fa3aa3dc62767cd2c0206d93dc5e0a2bc6a0cf5e2 SHA512 cf53a31af03f929ebaf1636fba907e099e7ce2611ddd1095f17cd18f5f8e45a3fa58ecedd42fca031e87f0477866eac0ed2271748f5f71938191c718e996d9c7 -EBUILD h2o-9999.ebuild 2193 BLAKE2B 28f0e00c529caf8c7902e53d8a1d05d99f86c390f25b23da149049c3c09bc09a5f7b72b58bd46d27a1ec9cd30f016a09374b155d8b23aec8fe9fb218f50ab244 SHA512 34be235676dbde6a78d1be49b2d34b44d72faa85d62f3d5bcb35bf64d1992f442b8b1689aafa0197655acbdbd363b98edf6cd23145197eaf1dfb6e5b72ef5e35 +EBUILD h2o-2.2.6-r1.ebuild 2163 BLAKE2B d6ebe88928543b55862cc873d249936a42bca48a3c346dd35854e8f953b77c935e7ac6a28262e6d81b88dfc85f6b5d607b88caae0828dcdb600db9279460d73e SHA512 a164fac23f2b3b99c7117b3d08be01d70513a364846a088199056faca628de39308bec40758953c3c91a717de5d0b969fca23b382529cebd600f05580625df2c +EBUILD h2o-9999.ebuild 2135 BLAKE2B ff1a8e72fb4201990106aa6cbb5ab04c6b1be6953606cc527ef203ab7c91aa6fc6b07c4dfce4d8c361698fb278c0b7a8ef744a414a3cb13914e9487a4355d73f SHA512 dad92e25d6d9789143606eeb9c2aeab315979294bd2fc5958b29e2553743a3167f7c62e1e380830e13f0059ea37f54e5b1fae723db2c828dc3113b667d4aba02 MISC metadata.xml 664 BLAKE2B 8b54065efeaf5a0506a1a2a3c0b6cfd803812c25b27fba925c5bc88c5cf5062eb7b56a6240f8461d6874f9aeff7f42c3b8b6d80561714106405ee4c7d5cc266b SHA512 171a99429df373753f72898d7b51399738e0c4b792aadec4a74ec0ca64d1651ee2947878db455bb48587b02165d6ec440a14e1c0a567c2e002e2805585086415 diff --git a/www-servers/h2o/h2o-2.2.6-r1.ebuild b/www-servers/h2o/h2o-2.2.6-r1.ebuild new file mode 100644 index 000000000000..3c0c14adba6b --- /dev/null +++ b/www-servers/h2o/h2o-2.2.6-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" +SSL_DEPS_SKIP=1 +USE_RUBY="ruby24 ruby25 ruby26" + +inherit cmake ruby-single ssl-cert systemd toolchain-funcs + +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" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="libh2o +mruby" + +RDEPEND=" + acct-group/h2o + acct-user/h2o + dev-lang/perl + sys-libs/zlib + libh2o? ( dev-libs/libuv ) + dev-libs/openssl:0= +" +DEPEND=" + ${RDEPEND} + libh2o? ( virtual/pkgconfig ) + mruby? ( + ${RUBY_DEPS} + || ( + dev-libs/onigmo + dev-libs/oniguruma + ) + sys-devel/bison + virtual/pkgconfig + ) +" +RDEPEND+="!sci-libs/libh2o" + +PATCHES=( "${FILESDIR}"/${PN}-2.2-mruby.patch ) + +src_prepare() { + cmake_src_prepare + + local ruby="ruby" + if use mruby; then + for ruby in ${RUBY_TARGETS_PREFERENCE}; do + if has_version dev-lang/ruby:${ruby:4:1}.${ruby:5}; then + break + fi + ruby= + done + [[ -z ${ruby} ]] && die "no suitable ruby version found" + fi + + sed -i \ + -e "/INSTALL/s:\(/doc/${PN}\) :\1/html :" \ + -e "/INSTALL/s:\(/doc\)/${PN}:\1/${PF}:" \ + -e "s: ruby: ${ruby}:" \ + CMakeLists.txt + + sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" deps/mruby/lib/mruby/gem.rb + tc-export CC + export LD="$(tc-getCC)" +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN} + -DWITH_MRUBY=$(usex mruby) + -DWITHOUT_LIBS=$(usex !libh2o) + -DBUILD_SHARED_LIBS=$(usex libh2o) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + keepdir /var/www/localhost/htdocs + + insinto /etc/${PN} + doins "${FILESDIR}"/${PN}.conf + + newinitd "${FILESDIR}"/${PN}.initd ${PN} + systemd_dounit "${FILESDIR}"/${PN}.service + + insinto /etc/logrotate.d + newins "${FILESDIR}"/${PN}.logrotate ${PN} + + keepdir /var/log/${PN} + fowners ${PN}:${PN} /var/log/${PN} + fperms 0750 /var/log/${PN} +} + +pkg_postinst() { + if [[ ! -f "${EROOT}"/etc/ssl/${PN}/server.key ]]; then + install_cert /etc/ssl/${PN}/server + chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/server.* + fi +} diff --git a/www-servers/h2o/h2o-2.2.6.ebuild b/www-servers/h2o/h2o-2.2.6.ebuild deleted file mode 100644 index 41caa3e517e4..000000000000 --- a/www-servers/h2o/h2o-2.2.6.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -CMAKE_MAKEFILE_GENERATOR="emake" -SSL_DEPS_SKIP=1 -USE_RUBY="ruby24 ruby25 ruby26" - -inherit cmake-utils ruby-single ssl-cert systemd toolchain-funcs user - -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" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="libh2o +mruby" - -RDEPEND="dev-lang/perl - sys-libs/zlib - libh2o? ( dev-libs/libuv ) - dev-libs/openssl:0= - " -DEPEND="${RDEPEND} - libh2o? ( virtual/pkgconfig ) - mruby? ( - ${RUBY_DEPS} - || ( - dev-libs/onigmo - dev-libs/oniguruma - ) - sys-devel/bison - virtual/pkgconfig - )" -RDEPEND+=" - !sci-libs/libh2o" - -PATCHES=( - "${FILESDIR}"/${PN}-2.2-mruby.patch -) - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} -} - -src_prepare() { - cmake-utils_src_prepare - - local ruby="ruby" - if use mruby; then - for ruby in ${RUBY_TARGETS_PREFERENCE}; do - if has_version dev-lang/ruby:${ruby:4:1}.${ruby:5}; then - break - fi - ruby= - done - [[ -z ${ruby} ]] && die "no suitable ruby version found" - fi - - sed -i \ - -e "/INSTALL/s:\(/doc/${PN}\) :\1/html :" \ - -e "/INSTALL/s:\(/doc\)/${PN}:\1/${PF}:" \ - -e "s: ruby: ${ruby}:" \ - CMakeLists.txt - - sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" deps/mruby/lib/mruby/gem.rb - tc-export CC - export LD="$(tc-getCC)" -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN} - -DWITH_MRUBY=$(usex mruby) - -DWITHOUT_LIBS=$(usex !libh2o) - -DBUILD_SHARED_LIBS=$(usex libh2o) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - keepdir /var/www/localhost/htdocs - - insinto /etc/${PN} - doins "${FILESDIR}"/${PN}.conf - - newinitd "${FILESDIR}"/${PN}.initd ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service - - insinto /etc/logrotate.d - newins "${FILESDIR}"/${PN}.logrotate ${PN} - - keepdir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} - fperms 0750 /var/log/${PN} -} - -pkg_postinst() { - if [[ ! -f "${EROOT}"etc/ssl/${PN}/server.key ]]; then - install_cert /etc/ssl/${PN}/server - chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/server.* - fi -} diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild index 24da7a201180..d1f780ab5f1b 100644 --- a/www-servers/h2o/h2o-9999.ebuild +++ b/www-servers/h2o/h2o-9999.ebuild @@ -1,28 +1,34 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 + CMAKE_MAKEFILE_GENERATOR="emake" SSL_DEPS_SKIP=1 USE_RUBY="ruby24 ruby25 ruby26" -inherit cmake-utils git-r3 ruby-single ssl-cert systemd toolchain-funcs user +inherit cmake git-r3 ruby-single ssl-cert systemd toolchain-funcs + +EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" 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" SLOT="0" KEYWORDS="" IUSE="libh2o +mruby" -RDEPEND="dev-lang/perl +RDEPEND=" + acct-group/h2o + acct-user/h2o + dev-lang/perl sys-libs/zlib libh2o? ( dev-libs/libuv ) dev-libs/openssl:0= " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} libh2o? ( virtual/pkgconfig ) mruby? ( ${RUBY_DEPS} @@ -32,19 +38,14 @@ DEPEND="${RDEPEND} ) sys-devel/bison virtual/pkgconfig - )" -RDEPEND+=" - !sci-libs/libh2o" + ) +" +RDEPEND+="!sci-libs/libh2o" PATCHES=( "${FILESDIR}"/${PN}-2.3-mruby.patch ) -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} -} - src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare local ruby="ruby" if use mruby; then @@ -75,11 +76,11 @@ src_configure() { -DWITHOUT_LIBS=$(usex !libh2o) -DBUILD_SHARED_LIBS=$(usex libh2o) ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install keepdir /var/www/localhost/htdocs @@ -98,8 +99,8 @@ src_install() { } pkg_postinst() { - if [[ ! -f "${EROOT}"etc/ssl/${PN}/server.key ]]; then + if [[ ! -f "${EROOT}"/etc/ssl/${PN}/server.key ]]; then install_cert /etc/ssl/${PN}/server - chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/server.* + chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/server.* fi } -- cgit v1.2.3