From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C191A13933E for ; Fri, 23 Jul 2021 20:37:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1605EE0AC9; Fri, 23 Jul 2021 20:37:51 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DBEB8E0AC9 for ; Fri, 23 Jul 2021 20:37:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF39D342A40 for ; Fri, 23 Jul 2021 20:37:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 69CFB7DE for ; Fri, 23 Jul 2021 20:37:48 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1627072645.6c4f427ab246a5cf8d2d562a0fb069a5720e02cf.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/h2o/h2o-2.2.6-r1.ebuild www-servers/h2o/h2o-9999.ebuild X-VCS-Directories: www-servers/h2o/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 6c4f427ab246a5cf8d2d562a0fb069a5720e02cf X-VCS-Branch: master Date: Fri, 23 Jul 2021 20:37:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4208dad8-5e20-4bc8-8684-1042791bb99f X-Archives-Hash: bb944b0364579572eb2fef9a615a575c commit: 6c4f427ab246a5cf8d2d562a0fb069a5720e02cf Author: Conrad Kostecki gentoo org> AuthorDate: Fri Jul 23 20:32:36 2021 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Fri Jul 23 20:37:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c4f427a www-servers/h2o: migrate to GLEP 81 Bug: https://bugs.gentoo.org/781539 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Conrad Kostecki gentoo.org> .../h2o/{h2o-9999.ebuild => h2o-2.2.6-r1.ebuild} | 40 +++++++++++----------- www-servers/h2o/h2o-9999.ebuild | 37 ++++++++++---------- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-2.2.6-r1.ebuild similarity index 76% copy from www-servers/h2o/h2o-9999.ebuild copy to www-servers/h2o/h2o-2.2.6-r1.ebuild index 24da7a20118..3c0c14adba6 100644 --- a/www-servers/h2o/h2o-9999.ebuild +++ b/www-servers/h2o/h2o-2.2.6-r1.ebuild @@ -1,28 +1,33 @@ # 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 ruby-single ssl-cert systemd toolchain-funcs DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server" HOMEPAGE="https://h2o.examp1e.net/" -EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="" +KEYWORDS="amd64 x86" 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 +37,14 @@ DEPEND="${RDEPEND} ) sys-devel/bison virtual/pkgconfig - )" -RDEPEND+=" - !sci-libs/libh2o" - -PATCHES=( "${FILESDIR}"/${PN}-2.3-mruby.patch ) + ) +" +RDEPEND+="!sci-libs/libh2o" -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} -} +PATCHES=( "${FILESDIR}"/${PN}-2.2-mruby.patch ) src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare local ruby="ruby" if use mruby; then @@ -75,11 +75,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 +98,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 } diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild index 24da7a20118..d1f780ab5f1 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 }