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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C46DA158094 for ; Wed, 24 Aug 2022 15:52:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF400E0874; Wed, 24 Aug 2022 15:52:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4C611E087E for ; Wed, 24 Aug 2022 15:52:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0709A341035 for ; Wed, 24 Aug 2022 15:52:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8DF665C7 for ; Wed, 24 Aug 2022 15:52:14 +0000 (UTC) From: "Ronny Gutbrod" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ronny Gutbrod" Message-ID: <1661188844.77ee3b850d6821231da9f44003346033ebd5b94a.tastytea@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: www-servers/hinsightd/ X-VCS-Repository: repo/proj/guru X-VCS-Files: www-servers/hinsightd/Manifest www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild www-servers/hinsightd/hinsightd-9999.ebuild X-VCS-Directories: www-servers/hinsightd/ X-VCS-Committer: tastytea X-VCS-Committer-Name: Ronny Gutbrod X-VCS-Revision: 77ee3b850d6821231da9f44003346033ebd5b94a X-VCS-Branch: master Date: Wed, 24 Aug 2022 15:52:14 +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: f403fdf9-ceec-4093-b074-7001cbcf2535 X-Archives-Hash: 82529363d0db85cbadc04f82c8ae86d4 commit: 77ee3b850d6821231da9f44003346033ebd5b94a Author: Alexandru Campeanu gmail com> AuthorDate: Mon Aug 22 17:20:44 2022 +0000 Commit: Ronny Gutbrod tastytea de> CommitDate: Mon Aug 22 17:20:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=77ee3b85 www-servers/hinsightd: added 0.9.15_p20220822 switched to meson Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 1 + ...99.ebuild => hinsightd-0.9.15_p20220822.ebuild} | 33 +++++++++++++++------- www-servers/hinsightd/hinsightd-9999.ebuild | 31 +++++++++++++------- 3 files changed, 45 insertions(+), 20 deletions(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index ff67c26cb..ee98956b4 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1 +1,2 @@ +DIST hin9-0c584cbe00c2227d4cb29675e8e2da2c6bd57371.tar.gz 116295 BLAKE2B 69c6a9593fa721e113172696523beb39c63385e8fe319687b2e12c9eb8ff91bb63e45e3c33429026e45522d535c6acb305af1dcc8f120d552dab5fcda3d7734c SHA512 9d66c58545b64c66365c74935be8e3988022b1f3902af5bec7996df86f37bf2fdd54fb913826a0bcf5f9f4ba07e30abc5e6573cf8b4c2f11ec67c1917ed7f000 DIST hin9-af60390e3ade1e617ef76c5ab778934acd76a16e.tar.gz 115019 BLAKE2B a8f15d07dfa7adea3665cc4f8189bb9dc4afa9e9ebd457f78fd0975dad65b4741c1e14b9f701b9bfedafc8d138c96022895b17b9628a8569d60818f46ca791fd SHA512 fb125099500b049e5f371ae1d84b2e07f77b28358d5ad7ff8a655baa86bc77a940a9d9321fbbcd6b1d7ac54e14aa214aeb792ade24cb7140fdb494799686efa8 diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild b/www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild similarity index 77% copy from www-servers/hinsightd/hinsightd-9999.ebuild copy to www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild index 0a2fda199..d5510534f 100644 --- a/www-servers/hinsightd/hinsightd-9999.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild @@ -5,13 +5,15 @@ EAPI=8 LUA_COMPAT=( lua5-{1..4} luajit ) -inherit fcaps lua-single systemd cmake linux-info +inherit fcaps lua-single systemd meson linux-info DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://tiotags.gitlab.io/hinsightd" LICENSE="BSD" SLOT="0" +mycommit="0c584cbe00c2227d4cb29675e8e2da2c6bd57371" + if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git" @@ -31,7 +33,7 @@ IUSE="+ssl cgi +fcgi +rproxy +ffcall" REQUIRED_USE="${LUA_REQUIRED_USE}" BDEPEND=" - dev-util/cmake + dev-util/meson virtual/pkgconfig " @@ -52,19 +54,30 @@ FILECAPS=( cap_net_bind_service usr/sbin/${PN} ) +pkg_setup() { + linux-info_pkg_setup; + lua-single_pkg_setup +} + src_configure() { - local mycmakeargs=( - -DUSE_OPENSSL=$(usex ssl) - -DUSE_CGI=$(usex cgi) - -DUSE_FCGI=$(usex fcgi) - -DUSE_RPROXY=$(usex rproxy) - -DUSE_FFCALL=$(usex ffcall) + version=$(ver_cut 1-2 $(lua_get_version)) + if [ "$version" == "2.1" ]; then + version="jit" + fi + local emesonargs=( + $(meson_use ssl openssl) + $(meson_use cgi) + $(meson_use fcgi) + $(meson_use rproxy) + $(meson_use ffcall) + -Dforce-lua-version=$version ) - cmake_src_configure + meson_src_configure } src_install() { - cmake_src_install + meson_src_install + newinitd "${S}/external/packaging/$PN.initd.sh" $PN newconfd "${S}/external/packaging/$PN.confd.sh" $PN systemd_dounit "${FILESDIR}/$PN.service" # not tested diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild b/www-servers/hinsightd/hinsightd-9999.ebuild index 0a2fda199..bb4f22005 100644 --- a/www-servers/hinsightd/hinsightd-9999.ebuild +++ b/www-servers/hinsightd/hinsightd-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 LUA_COMPAT=( lua5-{1..4} luajit ) -inherit fcaps lua-single systemd cmake linux-info +inherit fcaps lua-single systemd meson linux-info DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://tiotags.gitlab.io/hinsightd" @@ -31,7 +31,7 @@ IUSE="+ssl cgi +fcgi +rproxy +ffcall" REQUIRED_USE="${LUA_REQUIRED_USE}" BDEPEND=" - dev-util/cmake + dev-util/meson virtual/pkgconfig " @@ -52,19 +52,30 @@ FILECAPS=( cap_net_bind_service usr/sbin/${PN} ) +pkg_setup() { + linux-info_pkg_setup; + lua-single_pkg_setup +} + src_configure() { - local mycmakeargs=( - -DUSE_OPENSSL=$(usex ssl) - -DUSE_CGI=$(usex cgi) - -DUSE_FCGI=$(usex fcgi) - -DUSE_RPROXY=$(usex rproxy) - -DUSE_FFCALL=$(usex ffcall) + version=$(ver_cut 1-2 $(lua_get_version)) + if [ "$version" == "2.1" ]; then + version="jit" + fi + local emesonargs=( + $(meson_use ssl openssl) + $(meson_use cgi) + $(meson_use fcgi) + $(meson_use rproxy) + $(meson_use ffcall) + -Dforce-lua-version=$version ) - cmake_src_configure + meson_src_configure } src_install() { - cmake_src_install + meson_src_install + newinitd "${S}/external/packaging/$PN.initd.sh" $PN newconfd "${S}/external/packaging/$PN.confd.sh" $PN systemd_dounit "${FILESDIR}/$PN.service" # not tested