gentoo resync : 25.08.2018

4 files changed, 63 insertions, 57 deletions

diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index a828ac246d92..a551de2f6eda 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -9,9 +9,10 @@ AUX xinetd.confd 90 BLAKE2B 4fd6cce15cffc6de5b59e83646cafbf52f61b203292ac4ecbbae
 AUX xinetd.rc6 721 BLAKE2B d273c33bdd9df218f8dfdc765c0e3a788baaee0fbb3fd20e63be0f1d4b587b19550107c1818015077ce9fa194fca7180748b39089c51101f10ceeb6066a323af SHA512 bfe591f83a03e26ccbe06c489fa8c2e7af0f05203e0239b7cbde521dbe22700ba63d4bc50465e01a3fc101a7c7cfa40d0a6a02e881e950143bef7ac4046a6604
 AUX xinetd.service 192 BLAKE2B e13bdc35380da5805e9fbec1a1d05f7290bc154b1adea73b23468f909eea22c411be11cf3e2c68757e8120db73ccc8ca624c808c6563859a29c095b94c10bbf9 SHA512 c2b324c1116485996c414543f67c5dae89de3f82ac85634009da4dc04ea720a860626f6bb0ece0bb734616c6e4394e31ca00a71f697dc93e38b05fbad06dedc0
 DIST xinetd-2.3.15.3.tar.xz 383204 BLAKE2B dada7e1efb8c70d9b47efbb33de54e643e195fc043a2fe8b1b61a1d9e597a5a10feda8d6692e665af1f1690870e619098a9a2367df3a73f7821a91777532f1fa SHA512 3a744d5ce66da46743eec28d5b95a44709b1828187078984e59d7220ac325abce1198927e9156f343a4e16a9dc63e8846f1dcb0facbf05ea44c73aecbe7e504f
+DIST xinetd-2.3.15.4.tar.xz 384504 BLAKE2B e6981d7143c5e39d45a6274d003467f372b1e97637112c66a3fd3a1cb47fe948228d72c914cca5b2db1d65a626b83ff36f10768d343579aa48353d20e2541f4d SHA512 1d9bbf5f60b299746adf3e57a669bf1a554b50066563b65cdb7584f00dcab2d3d331df705eefb56b51c52a16b5ed6b109cd832c27df87c7f262bb304e17ddc0e
 DIST xinetd-2.3.15.tar.gz 309774 BLAKE2B b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d4716325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa
-EBUILD xinetd-2.3.15-r2.ebuild 1467 BLAKE2B c0413e497292f044b847c6b84867857eacad275dfdd2f008b5474c58f495a198e35c59a4dd03b91025637f4ceab1e5ad8c194ca8afc8feacebc6bdb4d0a56427 SHA512 b8a942166b119cf6cf8aa3038db1b19fd1e8d818a3adfb56305ac29dfc7088364401ec3e4f10f2669084ae4685b24419eaf3c694615367a8be7dda4febe7ce24
 EBUILD xinetd-2.3.15-r3.ebuild 1574 BLAKE2B 86753bd03b2b446abd848b56e9180ce5bca615bd5dd0faf55a3f92e7d5093908e968164356c4ea7b9d5f16cca4086cfecfc149de5a491164884ea0949d5a9839 SHA512 ca0e166253b5cb80c9180a2bee4610c7d6aaaf1d38b62c10b024d7dda91be57b71fa22c742188f1357b3af9feea82af60f818c42de377bc40746adf6ef09cacd
 EBUILD xinetd-2.3.15.3-r2.ebuild 1381 BLAKE2B 6c16dedba41a1f9ce0d6ee3d51f88b2d03137a8d3bc9068ac2a0db2550efa9d68174b075981391839a1abe13073ec392ef7fb5e0e91eac048f7d7831891713ec SHA512 86e8fa9e66d95313d05b6c7b3def44e26452846b889f335013be14cf051ac82eb292505e48bc1bd017f961cd0df5300345b32374ea15153a54da02d007b43a62
-EBUILD xinetd-2.3.15.3.ebuild 1046 BLAKE2B 921c62db32a23a855dfe328213a5a339e09f1fb90842c68dd8197a61eb3d02d28007632e98d15c912a5e3b2883edd775962317777914f1a164a42d19e2bac869 SHA512 f26e677cb3c254aff51a0799bc1ae7329711077b522a83de43d44c1c8a698e81a308e925706a7417c031863cb6221b841cf7047260382677bd370fb8af7e1b32
+EBUILD xinetd-2.3.15.3.ebuild 1043 BLAKE2B 1a20f41890bdd5cdbf87e0037240340e7a7922b3a79bb736df25df731d17512976cf9d7e48ccc1f4382fe64ead5c6d614141e089db05fc3823d15f94a5613279 SHA512 837cb66a769099873c3e2702883fdf69d228b402b9c4f46bd85e08cf3fab60f1e06a8f0dbdf78d77d1779befcee8c41c1ad2f0567db1509a0973819035b3d838
+EBUILD xinetd-2.3.15.4.ebuild 1279 BLAKE2B a98a6f9bca2a0fd7b758d6d95eb65daa140037d8786012e06b21a61d781dae7dfc1c9d214d1f936b713f72f3083d444a3558312bb2301c622c0f4972d7d498b3 SHA512 72245d9fe374be1499dd20f99f0534b262d8fd22b990aacfe3217842dffe3e4f975280728e9bd0d8facfa6539855ee9e1f343af8faa4ffe7570b545bb63a474c
 MISC metadata.xml 401 BLAKE2B b00f11946b61c89e69864bc02fbbb0fb9d97e6e1b58c1f4604a806361a39b2eb5f4ef25c095a8ce42e2e2d1dc0160d6525d58e6ba24c6d63057e4b07291d2052 SHA512 35d6d241dfa7e9811b09f3df32805de026244d966a5e1c62654986c67541038f79acfe64a9b4b574f5cc14611fc68cba043d4d68dfa7cd8d198a738db5685cdb
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild
deleted file mode 100644
index 99bf38e9a727..000000000000
--- a/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="powerful replacement for inetd"
-HOMEPAGE="http://www.xinetd.org/"
-SRC_URI="http://www.xinetd.org/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="perl rpc tcpd"
-
-DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
-	rpc? ( net-libs/libtirpc:= )"
-RDEPEND="${DEPEND}
-	perl? ( dev-lang/perl )"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.3.14-DESTDIR.patch
-	epatch "${FILESDIR}"/${PN}-2.3.14-install-contrib.patch
-	epatch "${FILESDIR}"/${PN}-2.3.14-config.patch
-	epatch "${FILESDIR}"/${PN}-2.3.15-creds.patch #488158
-	find -name Makefile.in -exec sed -i 's:\<ar\>:$(AR):' {} +
-}
-
-src_configure() {
-	if ! use rpc ; then
-		append-cppflags -DNO_RPC
-		export ac_cv_header_{rpc_{rpc,rpcent,pmap_clnt},netdb}_h=no
-	fi
-	tc-export AR PKG_CONFIG
-	LIBS=$(${PKG_CONFIG} --libs libtirpc) \
-	econf \
-		$(use_with tcpd libwrap) \
-		--with-loadavg
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install install-contrib
-	use perl || rm -f "${ED}"/usr/sbin/xconv.pl
-
-	newinitd "${FILESDIR}"/xinetd.rc6 xinetd
-	newconfd "${FILESDIR}"/xinetd.confd xinetd
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	newdoc contrib/xinetd.conf xinetd.conf.dist.sample
-	dodoc AUDIT INSTALL README TODO CHANGELOG
-}
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
index f1156920796f..ccc6459905d9 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="perl selinux tcpd"
 
 DEPEND="
diff --git a/sys-apps/xinetd/xinetd-2.3.15.4.ebuild b/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
new file mode 100644
index 000000000000..73781412652a
--- /dev/null
+++ b/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic systemd toolchain-funcs autotools
+
+DESCRIPTION="powerful replacement for inetd"
+HOMEPAGE="https://github.com/xinetd-org/xinetd https://github.com/openSUSE/xinetd"
+SRC_URI="https://github.com/openSUSE/xinetd/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="perl rpc selinux tcpd"
+
+DEPEND="
+	rpc? ( net-libs/libtirpc:= )
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
+"
+RDEPEND="
+	${DEPEND}
+	perl? ( dev-lang/perl )
+"
+DEPEND="
+	${DEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+
+	sed -i \
+		-e 's:/usr/bin/kill:/bin/kill:' \
+		"contrib/${PN}.service" || die
+}
+
+src_configure() {
+	econf \
+		$(use_with tcpd libwrap) \
+		$(use_with selinux labeled-networking) \
+		$(use_with rpc) \
+		--with-loadavg
+}
+
+src_install() {
+	default
+
+	use perl || rm -f "${ED}"/usr/sbin/xconv.pl
+
+	newinitd "${FILESDIR}"/xinetd.rc6 xinetd
+	newconfd "${FILESDIR}"/xinetd.confd xinetd
+	systemd_dounit "contrib/${PN}.service"
+
+	newdoc contrib/xinetd.conf xinetd.conf.dist.sample
+	dodoc README.md CHANGELOG
+}