1
0
mirror of https://github.com/dguglielmi/sunny-overlay.git synced 2025-12-06 20:22:38 +01:00

www-servers/tang: Port to EAPI 7, drop old 6

This commit is contained in:
2020-01-05 18:34:38 +01:00
parent f09041962d
commit c420f98eb9
5 changed files with 19 additions and 101 deletions

View File

@@ -1,5 +1,3 @@
AUX tang-6-optional-nagios.patch 1644 BLAKE2B d267fbc83b869b902ccc726526aae1bf1184fc522a601c4eaf545bce07231879e1bedb9f4968a1d2bb71eaeef6684ed88cfb1ac07a5c50f9a26d2c9d71563c29 SHA512 f7cacc3248acccbe8cac0dc60e034b4e2ceaef127357b4e416f2ea8dfae7acab39881b39c3c32aa3a3235c9a94996e6bc9a20c6f486ffa0313001d056a87236f
DIST tang-6.tar.bz2 118040 BLAKE2B 22b0ae89db9d742f488037ce0fb99893d7b963917dd843e36c66650893678e82b312f1fdbe29c7dd7898d473ac69064182836bc3eeae666379a4a2599eb99d42 SHA512 60883e45373a991c1e5e60e2313232bf36eacd0b3fcdc025a5358298636c92a074ac1a6b17f7b4096a20dcfca4402e162ae79137b3447a64d5091e6f96a95e5f
DIST tang-7.tar.bz2 115130 BLAKE2B bb6c7cdf39aa012e51c9e4f9dc60fa5c4c9c7f6ff436570fa06ef5051d448e5e8ba24466d3be2bc990736fa287cfe7a8bcb3d46a8fd0033ccae4002d3affbe32 SHA512 dd4187fa6962523ac2a745ef05a27cdf7e5264c595942e63d406d67a1c595e87bd7e74091cb2e16362f369480cdf8e3b4bfe1fee13b9cb73d5308f42c52f138a
EBUILD tang-6.ebuild 781 BLAKE2B 5b65428a905e9ce6b6c98e0cd14beec4000ee6467a8e7f670580823bd6249eeacb28e729fdc20d86593406075b462ed142e08bd5f9ca6f826ac362a531c0783b SHA512 23e34ebcf225abacc7779f02aef6dd407bfba3f4353ec23e63c820741ade5d13312132e3cbf6a689087892f379b326001eb3fc28e8c1e4db3d9da0ca340c90af
EBUILD tang-7.ebuild 663 BLAKE2B 5be1a3c0731a32cfb919683f2b7d3acb126c34e01a737b602db2ba57aa7bf472305a567d8a1574a0e1d87b55192873432371a4aab8bd824a83dcda99033c864e SHA512 d0d25192626ecab7a0627d8d2fde8f61c46d283d5f5898b0bbbde09065a586c104a03fd43ac9335c0f36889c39009bf5b5a76ad0cb18b9e1538d95835063cde7
EBUILD tang-7.ebuild 658 BLAKE2B bca69a4951d41d366324a9ee430923d6e1afbda9e54fb4973f1b737393a601de886a0d5eafbda22e705ce48d493e6c8f4cafb40fc26969d163a1218446acd230 SHA512 765f1860acca5e6ab5ac9e0c0b097590c11835f23720ad521655312f38f4317a9e513a32349f87e436160abd91cc9f06da7f58175f3814fc55f311a1eb08ee16
MISC metadata.xml 334 BLAKE2B 4b8d934cf034b5ce3636acc13d34b08aa36515da870995e80e7fece45f253aa4f79ef4ccebef444ac2ea4d10c1a402aa120449aae0ff70be970f73cda1964eae SHA512 b00716891bde2430054646106c60a4971201fdf4528ef9af009ae079c8ced3f003daa3fe49f74a3c5b4e4378c92c9ad518a034199c368c844c0326360eaea5be

View File

@@ -1,56 +0,0 @@
diff -dNur a/configure.ac b/configure.ac
--- a/configure.ac 2017-06-14 14:20:42.000000000 +0200
+++ b/configure.ac 2018-07-25 17:19:37.832581622 +0200
@@ -29,6 +29,11 @@
PKG_CHECK_MODULES([jose], [jose >= 8])
PKG_CHECK_MODULES([systemd], [systemd])
+AC_ARG_ENABLE([nagiosplugin],
+ AS_HELP_STRING([--disable-nagiosplugin], [Disable Nagios plugin]))
+
+AM_CONDITIONAL([NAGIOSPLUGIN], [test "x$enable_nagiosplugin" != "xno"])
+
AC_ARG_WITH([systemdsystemunitdir],
[AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],
[],
diff -dNur a/Makefile.am b/Makefile.am
--- a/Makefile.am 2017-06-10 15:29:39.000000000 +0200
+++ b/Makefile.am 2018-07-25 17:21:39.342292389 +0200
@@ -16,12 +16,16 @@
dist_libexec_SCRIPTS = src/tangd-update src/tangd-keygen
libexec_PROGRAMS = src/tangd
+if NAGIOSPLUGIN
nagios_PROGRAMS = src/tang
man1_MANS = doc/tang-nagios.1
+endif
man8_MANS = doc/tang.8
src_tangd_SOURCES = src/http.c src/http.h src/tangd.c
+if NAGIOSPLUGIN
src_tang_SOURCES = src/nagios.c
+endif
%: %.in
$(AM_V_GEN)mkdir -p "`dirname "$@"`"
@@ -32,12 +36,18 @@
$(srcdir)/$@.in > $@
AM_TESTS_ENVIRONMENT = SD_ACTIVATE="@SD_ACTIVATE@" PATH=$(srcdir)/src:$(builddir)/src:$(PATH)
-TESTS = tests/adv tests/rec tests/nagios
+TESTS = tests/adv tests/rec
+if NAGIOSPLUGIN
+TESTS += tests/nagios
+endif
CLEANFILES = $(nodist_systemdsystemunit_DATA)
EXTRA_DIST = \
$(foreach unit,$(nodist_systemdsystemunit_DATA),$(unit).in) \
COPYING \
$(TESTS) \
- $(man1_MANS) \
$(man8_MANS)
+
+if NAGIOSPLUGIN
+EXTRA_DIST += $(man1_MANS)
+endif

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>david.guglielmi@gmail.com</email>
<name>David GUGLIELMI</name>
</maintainer>
<upstream>
<remote-id type="github">latchset/tang</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -1,37 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools systemd
DESCRIPTION="Tang is a server for binding data to network presence"
HOMEPAGE="https://latchset.github.io/"
SRC_URI="https://github.com/latchset/${PN}/releases/download/v${PV}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="nagios"
DEPEND=">=net-libs/http-parser-2.8.0
sys-apps/systemd
>=dev-libs/jose-8"
RDEPEND="${DEPEND}"
PATCHES=( "${FILESDIR}"/${P}-optional-nagios.patch )
src_prepare() {
default
eautoreconf
}
src_configure() {
local myconf=(
$(use_enable nagios nagiosplugin)
--localstatedir="${EPREFIX}/var"
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
)
econf "${myconf[@]}"
}

View File

@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=7
inherit autotools systemd
@@ -14,10 +14,12 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="app-text/asciidoc
DEPEND="
app-text/asciidoc
>=net-libs/http-parser-2.8.0
sys-apps/systemd
>=dev-libs/jose-8"
>=dev-libs/jose-8
"
RDEPEND="${DEPEND}"
src_configure() {