[gentoo-commits] repo/proj/guru:master commit in: www-servers/hinsightd/

[Michał Górny]

commit:     35125f480a229bdfa738c6c0b7dee924e2d883a5
Author:     tiotags <tiotags1 <AT> gmail <DOT> com>
AuthorDate: Thu Apr 29 07:27:18 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 29 07:27:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=35125f48

www-servers/hinsightd: fixed compilation errors

* removed version v0.9.0
* added warnings for old kernels
* removed dep on dev-util/ninja, let sys decide

Closes: https://bugs.gentoo.org/785007
Closes: https://bugs.gentoo.org/784965
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alexandru Campeanu <tiotags1 <AT> gmail.com>

 www-servers/hinsightd/Manifest               |  1 -
 www-servers/hinsightd/hinsightd-0.9.0.ebuild | 70 ----------------------------
 www-servers/hinsightd/hinsightd-0.9.1.ebuild |  9 +++-
 www-servers/hinsightd/hinsightd-9999.ebuild  |  9 +++-
 4 files changed, 14 insertions(+), 75 deletions(-)

diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest
index 37be5d923..e91d4ba71 100644
--- a/www-servers/hinsightd/Manifest
+++ b/www-servers/hinsightd/Manifest
@@ -1,2 +1 @@
-DIST hin9-v0.9.0.tar.gz 65320 BLAKE2B c1348bc5afffa8804494f6ae228f54874d25cc5f40c17ee2a36f23104286f96f5d616cdc3e98de0854cf7d4b18165a2b70600b32f58024b679d213b2156c1f18 SHA512 60a1ff72d1abf57d8f764ebb77ab77f7069b40bfdbb5bb1c95324b366d1052378ffe36198112a595e08238622654a9c1e1d89679924883f8ff42b98ca7cf139e
 DIST hin9-v0.9.1.tar.gz 64851 BLAKE2B ca646af3b2a752f2b0ba2eec983f807d148b302a7a2db627117686dea3d16811829a1f89a3347708c775d8141372dd91ca46c79c32684b9366b703eb7018706e SHA512 175bbb25bd8be5052bcda96b709b33a996945c63f71249750ab11a46bafdb425818437023a882858e34692abc341d99141954ca31f6296383b26f617e76ac11a

diff --git a/www-servers/hinsightd/hinsightd-0.9.0.ebuild b/www-servers/hinsightd/hinsightd-0.9.0.ebuild
deleted file mode 100644
index b81f198f9..000000000
--- a/www-servers/hinsightd/hinsightd-0.9.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 )
-
-inherit fcaps lua-single systemd
-
-DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals"
-HOMEPAGE="https://gitlab.com/tiotags/hin9"
-SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="" #+openssl
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-S="${WORKDIR}/hin9-v${PV}"
-
-BDEPEND="
-	dev-util/ninja
-	virtual/pkgconfig
-"
-
-RDEPEND="
-	${LUA_DEPS}
-	acct-user/hinsightd
-	acct-group/hinsightd
-	sys-libs/liburing
-	sys-libs/zlib
-	dev-libs/openssl
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/hinsightd-redefine-directories.patch"
-)
-
-#src_configure() {
-#}
-
-src_compile() {
-	cd build
-	ninja || die
-}
-
-src_install() {
-	newbin "${S}/build/hin9" hinsightd
-	newinitd "${FILESDIR}/init.d.sh" hinsightd
-	systemd_dounit "${FILESDIR}/hinsightd.service" # not tested
-
-	insinto /etc/hinsightd
-	newins "${S}/workdir/main.lua" hinsightd.lua
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/logrotate.d.sh hinsightd
-
-	keepdir /var/www/localhost/htdocs
-	keepdir /var/log/hinsightd
-	keepdir /var/tmp/hinsightd
-}
-
-pkg_postinst() {
-	fcaps CAP_NET_BIND_SERVICE /usr/bin/hinsightd
-}

diff --git a/www-servers/hinsightd/hinsightd-0.9.1.ebuild b/www-servers/hinsightd/hinsightd-0.9.1.ebuild
index 924a614e4..a7e45d693 100644
--- a/www-servers/hinsightd/hinsightd-0.9.1.ebuild
+++ b/www-servers/hinsightd/hinsightd-0.9.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} )
 
-inherit fcaps lua-single systemd cmake
+inherit fcaps lua-single systemd cmake linux-info
 
 DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals"
 HOMEPAGE="https://gitlab.com/tiotags/hin9"
@@ -26,7 +26,6 @@ IUSE="+openssl"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 BDEPEND="
-	dev-util/ninja
 	dev-util/cmake
 	virtual/pkgconfig
 "
@@ -73,4 +72,10 @@ src_install() {
 
 pkg_postinst() {
 	fcaps CAP_NET_BIND_SERVICE /usr/bin/hinsightd
+
+	if kernel_is lt 5 7; then
+		ewarn ""
+		ewarn "hinsightd requires io_uring and kernel ~5.6.0"
+		ewarn ""
+	fi
 }

diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild b/www-servers/hinsightd/hinsightd-9999.ebuild
index 924a614e4..a7e45d693 100644
--- a/www-servers/hinsightd/hinsightd-9999.ebuild
+++ b/www-servers/hinsightd/hinsightd-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} )
 
-inherit fcaps lua-single systemd cmake
+inherit fcaps lua-single systemd cmake linux-info
 
 DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals"
 HOMEPAGE="https://gitlab.com/tiotags/hin9"
@@ -26,7 +26,6 @@ IUSE="+openssl"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 BDEPEND="
-	dev-util/ninja
 	dev-util/cmake
 	virtual/pkgconfig
 "
@@ -73,4 +72,10 @@ src_install() {
 
 pkg_postinst() {
 	fcaps CAP_NET_BIND_SERVICE /usr/bin/hinsightd
+
+	if kernel_is lt 5 7; then
+		ewarn ""
+		ewarn "hinsightd requires io_uring and kernel ~5.6.0"
+		ewarn ""
+	fi
 }