gentoo resync : 21.06.2020

2 files changed, 39 insertions, 25 deletions

diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest
index d2261b10efea..38df8c72b344 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -1,8 +1,8 @@
 AUX ngircd-25-fix-gcc-10.patch 1762 BLAKE2B ad5085da2c8f0fbc01e4fc77c4dc20c461cd8a3aad4dff78ace70d8673b8607f4621d80dd6bd122549882be1a9c3f461812617ebf59bce877ab4e87b9414e5b4 SHA512 73b07fc2fe5475fc7eb999f93504e2cfbbd1a2720335ae4332fd43e2621824626eb0df606585d9424df9e05a21416126692859fd1dc9689883960c8708bf3adf
 AUX ngircd-25-make-env.patch 2331 BLAKE2B c65567046e00f3dfa3e5c14e06071bf14fd28257eb799850610b7fe55c4a4745b766d754670be99f635a81239328c27ea3218e878e6f921f1601233e34d08539 SHA512 e32b5e852953cdff7f565e3dc2f521edbf25a42afca62f3fa76d8f33f72e4de96bb4b7b190d036dd573fef04879ecc891d3342353f8f46361c08943f85196329
 AUX ngircd.init-r1.d 388 BLAKE2B 10b6d4eb2cd39fe4e3087461cdc15f2ee8f1002e826552e145903b69e16ce46169a2dde19e03af38228ed9ede0473a828aa8cd123ab4a2b043fde448bb180954 SHA512 12e62e23899d1143a35e60bf983c319f72aa13c49123b497963f96317b2990cb2529919336da5a9b5c230e55479c289358261af92d25ef54bd19079908e18158
-DIST ngircd-24.tar.gz 524968 BLAKE2B 8ec0518d54f43a4c42fbf9744d217eb2aae498fe4f0010bce6ad68164037c2e55dc2b9681babce8ca5f7e26bac60a91389c63dab397d349dd4bcbcce6c2e9839 SHA512 66d1b9576c03d0a70be17a235f2da50ee661646cd428d18a6c61975407671dd4a3a545069258536773b27d4fb63523527366bbbf4f35cb08111dc60842924395
 DIST ngircd-25.tar.gz 527886 BLAKE2B ab75c9a904fae8da4c89e07bd66bb000bc9b614e27269be3ac6f55254c77abeb2d6f7d0afc6d05630f7c548ea13d842d4c0376123035f9417eda55565a69dcec SHA512 0c96e97da312fe86c50007a72db03f85b9f79df053806f50badd07c7ca8e8bddd99adb478eab8be9630330707d7aa578b5d0bd3017b59bf4515319a64c29ea6c
-EBUILD ngircd-24.ebuild 1685 BLAKE2B eb31abc6faf507e55bf9a88abe98fd83eb4dd9fee3e580e0b9f9fb187c47b29a2b7ab16e11f347769ad82e4f4f495eccf5622205215f91b3d920e833f6d7d8d8 SHA512 66d47dd1029301755ae43fbfcc5d25930a3965011884c5c965a9bd6983e187d79086b182958b9bb7942232e7705e419f8aaa11ed334aebbb76a9d8d55caec4df
+DIST ngircd-26.tar.gz 565579 BLAKE2B edd005179a79bbb51a1401f7d580ebf66cb5bf65d1427453c471a4e7e667d7fd6b320c292e9a7993c5fef6beeae88126fefb73284063451b080ecc0d3e6ca0f1 SHA512 2502baf83e3bfca3e6b83c22fe660fee24732ee875b32a7071a489a8babcc08124738142215b55d4f9bd4e94bec3f2a41889ab18324f772b1674b02883cbfb91
 EBUILD ngircd-25.ebuild 2271 BLAKE2B e77f07b0d40e5e9c2bae30e46d76f9ecac7d999b4e4805856a6e14449c73ce66dba7222843e60bc8271aa9fa935e7253ce50bdf455ec34e0476fa4cf61c57631 SHA512 771716ee4e3fa58df6428cf0d5b3c5bf155827a363521f7943611cfb602f143152e41cb995b885899c35cddf70d8269bed60ee5f568e94633326ebfe43f84fff
+EBUILD ngircd-26.ebuild 2190 BLAKE2B dad5fdf6f9ec88b6c706f60aea17f6a61e917e90668cb861005b1c530627c54ec091baa09b06daee67134f0cdb831c627d55c74c3c8a8a2cef8ddf5db5d4472a SHA512 cbd0ec09e22d43dda8228135cb22a57015f1f8631750636b2f4340954948c4c89b2032012d2588fa85842b6a9187d0cbcbcf857c9b699dff262186f33a0462be
 MISC metadata.xml 632 BLAKE2B c27dd54558ef8f4670a5c888fbe81fffd77c20eb8e487a45bd61cfe8703fb3c379217e3ee8a0304a1b27eddc3a9fea0826b1cacd8c464a20fbd0bce43a109074 SHA512 27891662b1e62cd3d19faf621a3e06efcc0b51ad092cde32cf7cbf5817b7e7840cb57e948389547ecfbe70a022419dbe23b46870117ccb9c26da6581da426eb9
diff --git a/net-irc/ngircd/ngircd-24.ebuild b/net-irc/ngircd/ngircd-26.ebuild
index 104e09904175..06a17a180d81 100644
--- a/net-irc/ngircd/ngircd-24.ebuild
+++ b/net-irc/ngircd/ngircd-26.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit user
+# Bug: https://github.com/ngircd/ngircd/issues/261
+WANT_AUTOMAKE=1.11.6
+inherit autotools
 
 DESCRIPTION="An IRC server written from scratch"
 HOMEPAGE="https://ngircd.barton.de/"
@@ -11,11 +13,15 @@ SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="debug gnutls iconv ident ipv6 libressl pam ssl tcpd test zlib"
+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 )"
 
 RDEPEND="
-	iconv? ( virtual/libiconv )
+	acct-user/ngircd
+	acct-group/ngircd
+	irc-plus? ( virtual/libiconv )
 	ident? ( net-libs/libident )
 	pam? ( sys-libs/pam )
 	ssl? (
@@ -29,15 +35,17 @@ RDEPEND="
 	zlib? ( sys-libs/zlib )
 "
 
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
+BDEPEND="sys-devel/automake:1.11"
+
+DEPEND="
+	${RDEPEND}
 	test? (
 		dev-tcltk/expect
 		net-misc/netkit-telnetd
 	)
 "
 
-# Testsuite fails server-login-test
+# Flaky test needs investigation (bug 719256)
 RESTRICT="test"
 
 src_prepare() {
@@ -46,9 +54,13 @@ src_prepare() {
 	if ! use prefix; then
 		sed -i \
 			-e "s:;ServerUID = 65534:ServerUID = ngircd:" \
-			-e "s:;ServerGID = 65534:ServerGID = nogroup:" \
+			-e "s:;ServerGID = 65534:ServerGID = ngircd:" \
 			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
 }
 
 src_configure() {
@@ -56,8 +68,10 @@ src_configure() {
 		--sysconfdir="${EPREFIX}"/etc/"${PN}"
 		$(use_enable debug sniffer)
 		$(use_enable debug)
+		$(use_enable irc-plus ircplus)
 		$(use_enable ipv6)
-		$(use_with iconv)
+		$(use_enable strict-rfc)
+		$(use_with irc-plus iconv)
 		$(use_with ident)
 		$(use_with pam)
 		$(use_with tcpd tcp-wrappers)
@@ -65,15 +79,15 @@ src_configure() {
 	)
 
 	if use ssl; then
-		myconf+=(
-			$(use_with !gnutls openssl)
-			$(use_with gnutls)
-		)
-	else
-		myconf+=(
-			--without-gnutls
-			--without-openssl
-		)
+		if use gnutls; then
+			myconf+=(
+				$( use_with gnutls )
+			)
+		else
+			myconf+=(
+				$( use_with !gnutls openssl )
+			)
+		fi
 	fi
 
 	econf "${myconf[@]}"
@@ -85,8 +99,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! use prefix; then
-		enewuser ngircd
-		chown ngircd "${EROOT%/}"/etc/ngircd/ngircd.conf || die
+	if [[ -z ${REPLACING_VERSIONS} ]] && use pam; then
+		elog "ngircd will use PAMIsOptionalPAM by default, please change this option."
+		elog "You may not be able to login until you change this."
 	fi
 }