gentoo resync : 25.08.2020

3 files changed, 33 insertions, 20 deletions

diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index 3302830320cc..6d1c1ce9d7f4 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -1,5 +1,5 @@
 AUX irkerd.confd 474 BLAKE2B 150e953ff1db373cb2b9010d4136866156fac7b6816ea12041bbb7d49862e93288d329605da5e935ec92f809d8b9774b5086cb910d1e9741efff707d8fde0edb SHA512 62e2242cbacd6ed35419b6ef78b969602c2c091e0500bf00d989444d96551087a4eef80ec5b70b5a8f88ecfebb633eb628f7912678862fde8ce7bddb75c87010
 AUX irkerd.initd 1125 BLAKE2B 4675bb07c523414810432b22954629e80758745b3ebcd8d9b6e203a699d776066871819a505cc4c249425b01fe04b4e818365d78bb2161f92cac89f3e62fe592 SHA512 c22838ef63cd2165af958724b4306a260018104224969e612b7175d63619f12a18908c155e94210030f0ada6dcedaabaee6eb0690bd6e327a65ee9934b8d4368
-DIST irker-2.18.tar.gz 44284 BLAKE2B 355d9004c77c7635e5ee068d6521b2d1b8c3e0ae4b0d2fa39e71c16a4ecc2272c5a487dafd296a3d02aa5072c734f454875939b99f66c4321ab2970da78216ef SHA512 215f0ab3be03b615f2bb24e04a5e5f6688634c4fb994b5384106b7f3eae62967ac45b2a14d08eee8dbed886dbb0578e077fa19597db599ea9562a67797f75606
-EBUILD irker-2.18-r2.ebuild 1345 BLAKE2B 2b4f67d28725a42b7a0c57fe55d61c14495b8523d47863efb3135c05d3af9cd72725c048e55f44d828d3bc82a0d67a34afda40d5af956292873551e75eb2f9ab SHA512 ce50c953d64f3396e210722998bf7c90d4b5f1625af141d6a40578af6caade752ef385bfe3a51da30bf86296aafa2ff793b69ee07c6069f2f314f07235478287
-MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
+DIST irker-2.19.tar.gz 44502 BLAKE2B d777ed3b4308dca7f6bb2483bc03ba8ba50a55574da3e4de63138fe88483ae6d3ac46f414a94801d7f27c740e38ddcde494cea4c846fbc59d736441b692747f4 SHA512 7516ebe8adc74902eacc657f0a1d421c285a72f4ce08b84fd93b22635d49ba52acf7aedd03dde9012bc16496be3162bda9fa8486af3df1657af4cabf8719d7c7
+EBUILD irker-2.19.ebuild 1513 BLAKE2B 3ae54a387df16313cfce2423d444b275f135d31b4d0feb0b296830dbf40e58f5e880a2f8d780424c27cc33af93a90f87b12273ac2412dfb8e865203d87c46138 SHA512 8b93a6fe5cc45271c1d950f85864044cfe2ca126e4c101c0f7048f729fa6886ef424aa1e4d81055bf3fef41bac9ebcf437b948d6f2a49b830ab67e5c053b34b3
+MISC metadata.xml 445 BLAKE2B ea6b8447fcdd793e0e13d49c545ee8496a82ef50929fa405aeb4b3afc192dbed4636bc23840ca8131ca7d31891f765b25dbed475eb607a5a2b2fd9f70e1a4f51 SHA512 9de852aad0221fb33017a9cd424f9125313bcb367fed5ebadf53cda3b6eba40a2f78c22154f9569e7ac38b2f3c2ab7168807d726aa94fc240a292a3cfed18c26
diff --git a/net-irc/irker/irker-2.18-r2.ebuild b/net-irc/irker/irker-2.19.ebuild
index df9f62a09166..308db034b269 100644
--- a/net-irc/irker/irker-2.18-r2.ebuild
+++ b/net-irc/irker/irker-2.19.ebuild
@@ -1,33 +1,34 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 ) # Doesn't work with python3 bug #619700
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="ssl"
 
-inherit python-single-r1 systemd
+inherit eutils python-single-r1 systemd
 
 DESCRIPTION="Submission tools for IRC notifications"
-HOMEPAGE="http://www.catb.org/esr/irker/"
+HOMEPAGE="http://www.catb.org/esr/irker/ https://gitlab.com/esr/irker"
 SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="socks5"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
+# Dependency notes:
+# NOTE: No pkgconfig dep here because of the systemd sed below
+# NOTE: No need for asciidoc here as it's only used for the
+# 'release' makefile target.
+BDEPEND="
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/xmlto
-	socks5? (
-		$(python_gen_cond_dep '
-			dev-python/PySocks[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
+	${PYTHON_DEPS}
+"
+RDEPEND="${PYTHON_DEPS}"
 
-DOCS=( NEWS README hacking.txt security.txt )
+DOCS=( NEWS README hacking.adoc security.adoc )
 HTML_DOCS=( irkerd.html irkerhook.html )
 
 src_prepare() {
@@ -38,14 +39,14 @@ src_prepare() {
 		|| die "sed failed"
 
 	# Prefix support
-	sed -i -e "/^ExecStart=/ s:=/:=${EPREFIX}:" irkerd.service \
+	sed -i -e "/^ExecStart=/ s:=/:=${EPREFIX}/:" irkerd.service \
 		|| die "sed failed"
 }
 
 src_install() {
 	default
 
-	python_doscript "${ED%/}/usr/bin/irkerd"
+	python_doscript "${ED}/usr/bin/irkerd"
 	# Not installed with the default Makefile
 	python_doscript irk irkerhook.py
 
@@ -57,3 +58,7 @@ src_install() {
 	docinto examples
 	dodoc filter-example.py filter-test.py
 }
+
+pkg_postinst() {
+	optfeature "SOCKS5 proxy support" dev-python/PySocks
+}
diff --git a/net-irc/irker/metadata.xml b/net-irc/irker/metadata.xml
index 40aa45df2b01..ee05af555f14 100644
--- a/net-irc/irker/metadata.xml
+++ b/net-irc/irker/metadata.xml
@@ -2,7 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="gitlab">esr/irker</remote-id>
+	</upstream>
 </pkgmetadata>