gentoo resync : 20.05.2018

3 files changed, 2 insertions, 43 deletions

diff --git a/net-nds/yp-tools/Manifest b/net-nds/yp-tools/Manifest
index 45b4fcf00166..bf7c073d73e2 100644
--- a/net-nds/yp-tools/Manifest
+++ b/net-nds/yp-tools/Manifest
@@ -1,6 +1,5 @@
 AUX domainname.service 165 BLAKE2B b36bb4877585f69503c319743a2e78f62f419852f235498791b007c4477d8622934263e3690cc2ba619d1c8ba925ca682b379720126915e5057210d893027105 SHA512 dc6cc79a1e6636f31706901bec45adc479231c883e149748989c038d4a9e2d3b1e15e3ba45ca7276700c68600cf6489b92bc4ada0c8ba630921a6d8cb8368de6
 AUX domainname.service.conf 89 BLAKE2B 22b81d78eb5df449658413dd2b23ceab02376fca3c061e328a3db36f88b3840296db961748679c8df9719dfb6cf3f4fd100ad6ed79916585aa79edbcf27c7577 SHA512 529f85f41e8204cc3dda72eb3c94c81443b8aa9f5af1ce4cab4510cbc42da79a4554d223893f0a968afb4476898b8a74ea061f8e9f40518b3066584ea9c7ad6c
 DIST yp-tools-4.2.2.tar.bz2 368673 BLAKE2B ddc0e6ff81042a632713afc201e8195f42346dd557e44770f8e0d48d2d510a5df1b51d9229912214cb6840a6cc97c6bbf8bbbfcac2eac5dbe06596a4fbd875be SHA512 e2856465e650823de87fcf0e7f18c4875b0540f271b3e564b3afe07d0df35dded7f09ecdf2494d099b31a15e098fc5e9065339f19df45c0489ca91a736c3eac9
-EBUILD yp-tools-4.2.2-r1.ebuild 835 BLAKE2B dd04c376ae7dfd6cd12066e781c735f6bd5ec3977defabf8157cdb9343afa8005f1b1e5c79aca9adc6085f3415dcee70d42777dd2d3400f5cba7463eed12d460 SHA512 4abd7395deab57828a0e2fad6e18bcc94814c7bd5fac3e683305c5e0a45e9188e8faa29d078bf66ef9e42623a259e67da2ba267cc1e1dbd9d29f0589ac8d8f98
-EBUILD yp-tools-4.2.2-r2.ebuild 803 BLAKE2B d81daec493c7ef13b23368e839bc3fd3f1a84d5faea48d1b3ec5b91bc96d4705ba48a632447d89a79ff3ef41c326855c4e05ee9cf456f10ca477aa49a1587530 SHA512 7a148cf2fb27cceb99c74b672deb7836d2ba628d54d5f1ce9cea1b8573991cdca193b8fc00c5ec544b13e4f8bc3b32dbe86619ea26888708fae5da18cfb0d228
+EBUILD yp-tools-4.2.2-r2.ebuild 797 BLAKE2B 20fabc250ae82db3265133d1ce3ae89996d8c447b0e40cf429c4679997feb71714a2ae602acddb4b53d8fea3d0ca9bfd55c138a82f9553b11fc275d06eaacba7 SHA512 781a2e1eb133c7613ce113701772f613d3c91c70327dad1452fc523ffe856c0029958990f3eed345dee8481cb337efaf19f450a5cf98384ec04bcaea42b25f76
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-nds/yp-tools/yp-tools-4.2.2-r1.ebuild b/net-nds/yp-tools/yp-tools-4.2.2-r1.ebuild
deleted file mode 100644
index 4cd838a241e7..000000000000
--- a/net-nds/yp-tools/yp-tools-4.2.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd
-
-DESCRIPTION="Network Information Service tools"
-HOMEPAGE="http://www.linux-nis.org/nis/"
-SRC_URI="http://www.linux-nis.org/download/yp-tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="nls"
-
-DEPEND="
-	|| ( <sys-libs/glibc-2.26[rpc] net-libs/libtirpc )
-	net-libs/libnsl:0=
-"
-RDEPEND=${DEPEND}
-# uses always libtirpc if present
-
-RESTRICT=test # do not compile
-
-src_configure () {
-	econf \
-		--disable-static \
-		--sysconfdir=/etc/yp \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	insinto /etc/yp
-	doins etc/nicknames
-
-	systemd_dounit "${FILESDIR}/domainname.service"
-	systemd_install_serviced "${FILESDIR}"/domainname.service.conf
-}
diff --git a/net-nds/yp-tools/yp-tools-4.2.2-r2.ebuild b/net-nds/yp-tools/yp-tools-4.2.2-r2.ebuild
index d94e1bf5ae65..a4e1ae7b214f 100644
--- a/net-nds/yp-tools/yp-tools-4.2.2-r2.ebuild
+++ b/net-nds/yp-tools/yp-tools-4.2.2-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.linux-nis.org/download/yp-tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="nls"
 
 DEPEND="