gentoo resync : 10.02.2019

5 files changed, 16 insertions, 85 deletions

diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index cc3be97a3cac..07598f051024 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -8,14 +8,11 @@ AUX oidentd-2.0.8-no-conntrack-masquerading.patch 1141 BLAKE2B cda18949cdc768592
 AUX oidentd-2.2.2-confd 69 BLAKE2B 37fac35c28304f92942844ee7652f52496cdc4c66da67d449127c3e9b61c715afb25cae7379137d8b9e2863d44e72535734c595c8edcc18f94b8c3841cd216ab SHA512 639f062b61b3aac829d6d16497d548290d8de3e161a1d8037b689593374b89028243b9369109b1b4b55d125ec665f1433bb971ea873a2e6e1b6b15eabfad8e6a
 AUX oidentd.conf 298 BLAKE2B cc234d09546ac12fc51440ad4a24234a348c947f15bdd750b88bb0e87b0276a3b27ac2d7ef10d1e30911e851b64894953d7ac53eeb2e873d7a9a15fe83ca44ad SHA512 a05de9b08f87a200309c39d3bc3aba0aa2c6461c3c43a9d851299e6083f0ca9a362409b0db93ca069c7a50d3a14169a308aea51b3d42ebf0180a4b4c99bf5126
 AUX oidentd.service 186 BLAKE2B 2c5e3d68b2cc71ce369d063b27de0ba698f899003967d2eaf4e5746bd0637774070d951b23f040b6536ddda14ab8ba69a24d3f9c5ca1d98f86b785a0629127fd SHA512 dd89471b232c0cce1113ea8550a3cb0ad55bd0791b7c916ea13b533051fe10271cd8e41aff13bf4071b507251ab6b14de20c8b63a525074a728f007fe0d647e8
-AUX oidentd.service-r1 188 BLAKE2B adf68f123ad057936e92aee7de77d84781e13444508b65ad0f1c973192631f41623221a0be0330a5bb7e8b1800421b274dad755e21d85d002ae5e59e33e4c75b SHA512 8f0bc4a8ffd7800ca2c11a9eacf560e5297efbbd2c477fea85c2dfe9a4f3871a2ba67b7037149eea58cceeceaca20251480a5866c88f0a86b6de7485c58a3ce9
 AUX oidentd.socket 142 BLAKE2B d085224442446c55f6850f15537ab9c4f51a4093e12de58a8765851131c41b3df1e5961115bfbed616b02862dd7a0bc6f1f9bae1abb9d189b3d05cd2aed8224d SHA512 151f846a889968084f4b6900e42806ea2c16f184fe65fe67b77bd9176318faeb3db3f7a43d6eec8d70bca7c2919952ad9059301ba396ec56a9da1ab0371b44d4
 AUX oidentd_at.service 179 BLAKE2B 54ab7d09f950927a2dac5bc473d0533c6bc9d437e6f5c80d481795b46b67ce779682480084a02234c2a9f6b4b052eaed7a6ab8d9e31df34e4b1c81e5201e7a4c SHA512 513e49d74c25ea0392a4b9541df0b275fa497bf2cb1d55a3c1c31a9cfe207ec2de69e76d7813531c90b5b378d1dd55b3ee21371ad281ff5f2a89ab70f59a25b4
-AUX oidentd_at.service-r1 181 BLAKE2B bc930b3eb87d310eeb41ba7be5cdc2075703220385d6fc24f922c89ddefcf6422bc259ed425ee0855ed0df1cf1504e3520fa1f0cf89dcd2178b551b81e004512 SHA512 788f822926549418dfc16b9c5ada7b31079fac385926edecec2f3924746341f4deee1c361bc67f9592a0f0c9eb4151a6d3b9b7c79967982158f9f750d536f304
 AUX oidentd_masq.conf 429 BLAKE2B 08612753eb38386b0a20cf4432856d935697684680894a9303df3315d3708042cedb77ea60f913c448c311741fc19de757f7e3c55b148dd95b821457b839f27c SHA512 72e48e1923adf594d53ae325b0ba5a6ab406ac934985a699f6f3b2a88010f312ddac279a752bba6b237aa87451348a0933ee4166aa267a0b08919c37eaaac40a
 DIST oidentd-2.0.8.tar.gz 212354 BLAKE2B 46f4c4478822e832885f5f38a2ab5b2132ff5c1e5071fd1dc6050e55992d50bd96be096064996853af69d16316e6aff648c5320714b53b60c038cc9aaedfedda SHA512 86229a4ef9892121c25a7140616e180f862ca34b73ea3ad9f0fbb008f657abb17e9f14c2c25ae14c14bfc14bf1ea10b50fd68318631a9c52227bbfd6e6d43288
-DIST oidentd-2.2.2.tar.gz 260185 BLAKE2B a719413751280d44e134245793c4a88d93dd573d7d85895e341040c2d83a7b201f21f499b931c27e5c0f1d7d0957d730b2cda698ef98b74755e2ca1958457579 SHA512 c5c5040f8955e61e8a7cddd310501d24c3b2a3818e0cd122db85c03dc5b2b18ca7ea4e7edb420df3ad81558a25d4b31c1fea97684a9f53c71c9159014f84678d
-EBUILD oidentd-2.0.8-r5.ebuild 1203 BLAKE2B ddcffc10ec4c3ade58052268aa8eb33d64eca064ffcde17061801ca1103e6ca4ae3c3ac73ac28492ec09327ac048f49d8e71a5e2cafcc64949a8cf78d531111e SHA512 53a4113831796de47144d3bcf0c26528a2567ee3b3473cb53d455f0b51bfeacc2b18ee7d1a5b0d9d71fcc91fd88fe0101f332193a1fab6bdf95bc0509a93ca17
+DIST oidentd-2.3.2.tar.xz 187772 BLAKE2B 460d2959cf9f1f125a76191f8b67a083a7d9bce84c706c76f6e8da6113b12eb6e760345774d15079ff449c153ac54805d4bfa8b057c1238ff703474e118b8458 SHA512 7293339897149a990928105e6cdd77aef7cd273f625496fcc674a414764ebfe835d2a9525e518a7215fc93537c48b70d15999d5669227dbb7fbf5cefb3d04e14
 EBUILD oidentd-2.0.8-r6.ebuild 1452 BLAKE2B dd2938141d3d6d7bd666eec975e1c2a2908688c3da7295cc24a066a46555021657eaee49973f551af2d086a2d98c647650d441e93f658b5ab2401e837699f5c4 SHA512 ec3554673feb64904c19231bd749bc67a333148c61e56e1a57ac8ecfb451b13f739ec9b269f1e7cfb4a4fc2371d516a27c722bb87e269dead98d97a626c3de8f
-EBUILD oidentd-2.2.2.ebuild 1187 BLAKE2B 1245734eef6f751fc7564028231916fc88338236446e4d006802d438ff3052bb319007508ce50bc116d859d2668a665447db76edc04479172fd021b7d8fc103a SHA512 507a1e641075f577e60b9cfea052cab596e33f367214d2ad32d50f566ed56f1458455682ec6d8ab6100cf429580975f8fe5a42520356dfd72ccc8dd66cb7db41
+EBUILD oidentd-2.3.2.ebuild 1243 BLAKE2B c1b922a6e7808203f629631560046bbfc68aee794aeeb9ab3082d1536d0f1f370a04a924ce0103b6b8fc9e2e23807cb47adfc9196749b3741724ba3a96c1ec8d SHA512 dbb12ae0f7c54fb1fa5440dfd3868e7fe43e0114cc7346284c5c53954c5b9db8b78d8f494b16bb1e029cfbf25bacb1a87ab227e8447c315bf93b58515fef3d2d
 MISC metadata.xml 539 BLAKE2B 10058ed518667411899809727711217f873c5ea4f65819a7f70315f1baf9a856f2b017197e1bd5b02e7b1a9c38b9a189df27e572c1eb6b04b08d29429f8f6d03 SHA512 0e2ad57b9a3032c73a0206ff665dbf8d258fdd91e595eaf7b06a309488321809e0f8bd567e37452cf83c89c734c4d57857b95df0472bda0b8c29f4e14b23af84
diff --git a/net-misc/oidentd/files/oidentd.service-r1 b/net-misc/oidentd/files/oidentd.service-r1
deleted file mode 100644
index af426eed6175..000000000000
--- a/net-misc/oidentd/files/oidentd.service-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=TCP/IP IDENT protocol server
-
-[Service]
-ExecStart=/usr/sbin/oidentd -i -S -u oidentd -g oidentd
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/oidentd/files/oidentd_at.service-r1 b/net-misc/oidentd/files/oidentd_at.service-r1
deleted file mode 100644
index dac0e70fd79c..000000000000
--- a/net-misc/oidentd/files/oidentd_at.service-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Ident (RFC 1413) per-connection server
-
-[Service]
-ExecStart=/usr/sbin/oidentd -I -S -u oidentd -g oidentd
-ExecReload=/bin/kill -HUP $MAINPID
-StandardInput=socket
diff --git a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild b/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
deleted file mode 100644
index 1a328a04f7ab..000000000000
--- a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd
-
-DESCRIPTION="Another (RFC1413 compliant) ident daemon"
-HOMEPAGE="http://ojnk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="debug ipv6 masquerade"
-
-PATCHES=(
-	"${FILESDIR}/${P}-masquerading.patch"
-	"${FILESDIR}/${P}-bind-to-ipv6-too.patch"
-	"${FILESDIR}/${P}-gcc5.patch"
-)
-
-src_prepare() {
-	epatch -p1 "${PATCHES[@]}"
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_enable masquerade masq) \
-		$(use_enable masquerade nat)
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog README TODO NEWS \
-		"${FILESDIR}"/${PN}_masq.conf "${FILESDIR}"/${PN}.conf
-
-	newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN}
-	newconfd "${FILESDIR}"/${PN}-2.0.7-confd ${PN}
-
-	systemd_newunit "${FILESDIR}"/${PN}_at.service ${PN}@.service
-	systemd_dounit "${FILESDIR}"/${PN}.socket
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	echo
-	elog "Example configuration files are in /usr/share/doc/${PF}"
-	echo
-}
diff --git a/net-misc/oidentd/oidentd-2.2.2.ebuild b/net-misc/oidentd/oidentd-2.3.2.ebuild
index 73fc0be4d052..3c995fd53776 100644
--- a/net-misc/oidentd/oidentd-2.2.2.ebuild
+++ b/net-misc/oidentd/oidentd-2.3.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit linux-info systemd user
+inherit systemd user
 
 DESCRIPTION="Another (RFC1413 compliant) ident daemon"
 HOMEPAGE="https://oidentd.janikrabe.com/"
-SRC_URI="https://ftp.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.gz"
+SRC_URI="https://files.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,18 +22,21 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-oident )"
 
 pkg_setup() {
-	local CONFIG_CHECK="~INET_TCP_DIAG"
-
-	linux-info_pkg_setup
-
 	enewgroup oidentd
 	enewuser oidentd -1 -1 -1 oidentd
 }
 
+src_prepare() {
+	sed -i '/ExecStart/ s|$| -u oidentd -g oidentd|' contrib/systemd/*.service || die
+
+	default
+}
+
 src_configure() {
 	local myconf=(
 		$(use_enable debug)
 		$(use_enable ipv6)
+		$(use_enable masquerade libnfct)
 		$(use_enable masquerade masq)
 		$(use_enable masquerade nat)
 	)
@@ -46,7 +49,7 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN}
 	newconfd "${FILESDIR}"/${PN}-2.2.2-confd ${PN}
 
-	systemd_newunit "${FILESDIR}"/${PN}_at.service-r1 ${PN}@.service
-	systemd_dounit "${FILESDIR}"/${PN}.socket
-	systemd_dounit "${FILESDIR}"/${PN}.service-r1
+	systemd_dounit contrib/systemd/${PN}@.service
+	systemd_dounit contrib/systemd/${PN}.socket
+	systemd_dounit contrib/systemd/${PN}.service
 }