From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- net-irc/ngircd/Manifest | 3 ++- net-irc/ngircd/ngircd-26.1.ebuild | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'net-irc/ngircd') diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest index ca045587a6db..fa8d90745b35 100644 --- a/net-irc/ngircd/Manifest +++ b/net-irc/ngircd/Manifest @@ -1,4 +1,5 @@ AUX ngircd.init-r1.d 388 BLAKE2B 10b6d4eb2cd39fe4e3087461cdc15f2ee8f1002e826552e145903b69e16ce46169a2dde19e03af38228ed9ede0473a828aa8cd123ab4a2b043fde448bb180954 SHA512 12e62e23899d1143a35e60bf983c319f72aa13c49123b497963f96317b2990cb2529919336da5a9b5c230e55479c289358261af92d25ef54bd19079908e18158 DIST ngircd-26.1.tar.gz 562938 BLAKE2B a1a4ca8b6e12a02cb4ba2e07d777cf77051b5330464c91634cfac0b385157ab7c648e3b71151247bc8ee6cc847e84755fdca3d9b4a25205bbb57b8296995dd17 SHA512 4a3ee379dd8d8655a71134c745f750359ceb0512e184db555f65f2bcab68087480365a35680a9ec75b1e6eb0fef23e1cbe0a0e13c3c58d211e5a520a8eeaa71c -EBUILD ngircd-26.1.ebuild 2190 BLAKE2B fe90ba70bb50f1fb59a3a596a075ff78c4bb3fe2b33f5e6d5d3fc01308d0d8b32ee81a079579107ca02f282dd6bd1d53fd8f928b2e245ac67b18f8fb74f9f481 SHA512 447b1298b91ba147bafd87b705f2f7d33c5fdc4e8ba747dcb703aaf2c7355caca83ec59b79124c2fae0d4682fbe89c5362466566f7460d42197f2290fd0e6694 +DIST ngircd-26.1.tar.gz.sig 310 BLAKE2B 108daa66aeccd51468aa0c6ab2de18c3ce476e812145902186ac4b3b8b29b0da32057c5a6f44133cfa4507310a9a76a001301ebe2d37ca809e1b7d8502aaa492 SHA512 e0b6b28c65f1363c0e8043378d52bccc0a634d7c17018edbc33130c9dbc4c2896f3b3a3ab758746707b37e3e527abbd61e5af8c1455d5fcc5b1b202758c82576 +EBUILD ngircd-26.1.ebuild 2284 BLAKE2B 86c9400a33199c8afa126f516b1a1f060cdb09b3026e55896f1cad5d08489924b6c09501b42eb16dbe4562598bdfd669a1ab88d6ae778b36be581b693ddfae2e SHA512 5ed1ffc9a714f11da86283ca92aad28bdb882dfeeba6be18d95b420c60b70a74a9d70840457506239974b745543452a20254271de100a1f67ac0d2f0213566b9 MISC metadata.xml 650 BLAKE2B dd80efa442d59f04e26bb338e371ffa8380a4cdbb630db30e25adbaa930d9f0e4a486bbd05321b8185c23558ad4e29023153a69d1214294c345b46685eb7de86 SHA512 9b8879892c2edc6c7792c22a684f87ae559a43b034ee66f6242e73075012e1f53a33a63fc3ffa62c41f5fd620a4be6c1ffc57a1b62cf42ffa3c032cec4ff743b diff --git a/net-irc/ngircd/ngircd-26.1.ebuild b/net-irc/ngircd/ngircd-26.1.ebuild index a19285e647eb..2e0537871e32 100644 --- a/net-irc/ngircd/ngircd-26.1.ebuild +++ b/net-irc/ngircd/ngircd-26.1.ebuild @@ -3,20 +3,19 @@ EAPI=7 -# Bug: https://github.com/ngircd/ngircd/issues/261 -WANT_AUTOMAKE=1.11.6 -inherit autotools +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/alexbarton.asc +inherit verify-sig DESCRIPTION="An IRC server written from scratch" HOMEPAGE="https://ngircd.barton.de/" SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.gz" +SRC_URI+=" verify-sig? ( https://arthur.barton.de/pub/${PN}/${P}.tar.gz.sig )" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~arm arm64 x86 ~x64-macos" IUSE="debug gnutls ident irc-plus +ipv6 libressl pam +ssl strict-rfc tcpd test zlib" -#RESTRICT="!test? ( test )" # Flaky test needs investigation (bug 719256) RESTRICT="test" @@ -43,6 +42,7 @@ BDEPEND=" dev-tcltk/expect net-misc/netkit-telnetd ) + verify-sig? ( app-crypt/openpgp-keys-alexbarton ) " src_prepare() { @@ -55,9 +55,9 @@ src_prepare() { doc/sample-ngircd.conf.tmpl || die fi - # Once https://github.com/ngircd/ngircd/pull/270 is in a release (ngircd 26), we can remove - # the eautomake/autotools machinery. - eautomake + # Note that if we need to use automake, we need a certain version (for now): + # https://github.com/ngircd/ngircd/issues/261 + # eautomake } src_configure() { -- cgit v1.2.3