gentoo resync : 25.01.2018

9 files changed, 9 insertions, 180 deletions

diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 4382b63175dd..6bd2e9cd1336 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 710b38b4db02..42eda6ee5844 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -24,7 +24,7 @@ AUX slapd.tmpfilesd 90 BLAKE2B f9cdde975b45c61c18773e4a3b30e3cb3c2a7d979bfef6d05
 DIST openldap-2.4.44.tgz 5658830 BLAKE2B 0d9101bbc159f78f23ffc5db78943dd602610650cda166a2920c4acba502c04d4a96968b9e7f146fe1dd87b677d5da6513500b57ec42b92f9991d577b3a4ed46 SHA512 132eb81798f59a364c9246d08697e1c7ebb6c2c3b983f786b14ec0233df09696cbad33a1f35f3076348b5efb77665a076ab854a24122c31e8b58310b7c7fd136
 DIST openldap-2.4.45.tgz 5672845 BLAKE2B e1f97553482a2e8630b62bc0f439af2484f1a2349a1a077382a124354424fe510ab55f32c073565b142d0c9318870fe31a2652268ebabd97d3afd8c833bc7aab SHA512 1c9fc84efed8998f107ce6e1c6be3f5466388241afdca0cb3847720c9def0bc263a2dbc15bf0f9112d1b4c391fd01e8531a4fb08c5532c30fb86924c08daedab
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
-EBUILD openldap-2.4.44-r1.ebuild 27234 BLAKE2B 2344ef9c45146155e4aa81609b26a047a4a6f327ec06df506e4b29026648aac91cbad7e46a86f3683b6d947ab38f709553712f56cc0bcc5e0396e793eb556680 SHA512 a0b9ed30a1392a72e5ba0733ece46a2dfbe93937a1d59d28687f7963173287d87baf58830d24d54e1342734b1796955c8db5df1ff9c1988921ee83ef77a15614
-EBUILD openldap-2.4.44.ebuild 26565 BLAKE2B a2d9e9a6f3949a7fd10c58afbafe927500d1202a628b4ac9944fb05ecb6350881c388644755df6829709e0c2b37175a56811f88fe93ddea207440a4c7c415de8 SHA512 790e70619e39a79fd409b30a05b035b24a2951fe36e15df3d6d0ece1adc47d3268ce2499c9132c6b582f1bac04001461fdd3ea3ba0f8a76875c1355542fd3e9c
-EBUILD openldap-2.4.45.ebuild 28111 BLAKE2B 4844d2b3ad3d2a081b740f84560a6b210500d77ab781821c3e81e8cb1b5e7d4250a23cf9b02f27dc4fa2217b2c7790f19b0f992fbf43a576933b9228403de011 SHA512 95234ffcb21a9d0e9c3f67babcf8c7cfa1bcc18215392fe6cb1af0ed32a75d5abaceda8582e442d212b389f94fb45345933ce20bfbace1498e2ad91b9f6ea37d
+EBUILD openldap-2.4.44-r1.ebuild 27222 BLAKE2B 20fdb07cfdc605b1cf03f2c47c2a3a56dc3cbf8b5cd2b238a197e0b97ea71830e5a41c7d191e1700455cff03cf929b9e682f0babfedf588e83991f427234590c SHA512 e48876bcdcd9bbb5e4c5b85d21e5b92abfab00850784f31a9c475e037dab5c31e4530c744e08500d0c748310be84a79be48e70c6406fb2a5e530812c0f33bfb5
+EBUILD openldap-2.4.44.ebuild 26553 BLAKE2B 1e4c192358bf3903c1240193d513575fa49ba5c1ad5ef40bc2b03ad95a99c40110147348868f743c67ed3c6af37cdc2c24d88b631283d03e98a95e5d2922b586 SHA512 9377752be3ff0c3c773771507688c9d3992e98e6b2943500e60f192bf246481849a85c1b0accc648d4c0a37815d5230149b49b4023b329a4e54beed913162e04
+EBUILD openldap-2.4.45.ebuild 28099 BLAKE2B bd9fd4634f326fbac2115c3ff751882f81a2610191531a7c7ada790a7a4a8cb01ba5a6fd8a7cdf8930d1acd1d5ef0b30f37337322a508b97b0d71e071868c736 SHA512 2a512ff9d5e925f5241787cd4bf60d80708107f7f851c550c07ded81218beb4ddccfbc684933a0d57b40289f56756f30b854f7493591357a8eb6ba5f67197e99
 MISC metadata.xml 922 BLAKE2B f99c4b3703f1a22dccbc0bbb109d11ba747c61229ebc811b036784dee829c4f7ce4bd85d4f5b8d7780cf20194d5175511129b9256416eea7daf4094e20d8c1a7 SHA512 fc9eb245cde878a93e08b8213f58b829266b2171ee73a74a39b47e700e506225da36e7d51952586f3d97ad6e0a3b3792fa59b5620bad0749afc87b8d59678ff9
diff --git a/net-nds/openldap/openldap-2.4.44-r1.ebuild b/net-nds/openldap/openldap-2.4.44-r1.ebuild
index d8a585339a5c..7c85e867ef54 100644
--- a/net-nds/openldap/openldap-2.4.44-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.44-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
 
 LICENSE="OPENLDAP GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE_DAEMON="crypt samba slp tcpd experimental minimal"
 IUSE_BACKEND="+berkdb"
diff --git a/net-nds/openldap/openldap-2.4.44.ebuild b/net-nds/openldap/openldap-2.4.44.ebuild
index a9d3fd556cbe..68058c56614c 100644
--- a/net-nds/openldap/openldap-2.4.44.ebuild
+++ b/net-nds/openldap/openldap-2.4.44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
 
 LICENSE="OPENLDAP GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE_DAEMON="crypt samba slp tcpd experimental minimal"
 IUSE_BACKEND="+berkdb"
diff --git a/net-nds/openldap/openldap-2.4.45.ebuild b/net-nds/openldap/openldap-2.4.45.ebuild
index 83ca893c0e1a..4024eb34308a 100644
--- a/net-nds/openldap/openldap-2.4.45.ebuild
+++ b/net-nds/openldap/openldap-2.4.45.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
 
 LICENSE="OPENLDAP GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE_DAEMON="crypt samba slp tcpd experimental minimal"
 IUSE_BACKEND="+berkdb"
diff --git a/net-nds/rpcbind/Manifest b/net-nds/rpcbind/Manifest
index 1bb7744aa284..612d85b9dc31 100644
--- a/net-nds/rpcbind/Manifest
+++ b/net-nds/rpcbind/Manifest
@@ -5,11 +5,7 @@ AUX rpcbind-0.2.4-CVE-2017-8779.patch 646 BLAKE2B 648010974bfc732f39ad0eaea6a6f5
 AUX rpcbind.confd 68 BLAKE2B 2309602d38fd5119fc5e6c123ca9da7a6f86526a0dddad12e1be24a7af9724b5d1b389cf44299722fb4af7932b26fc2a62996bb815cebd258e56a3248e63b393 SHA512 f11f6785708bde3ace7b55c1585e283ed07078faf310077c3d26e8e584baec6152d3f86f3d99d7a34fd10f22a7de4d8d70568c9e7f914a82eeb786b08b379044
 AUX rpcbind.initd 414 BLAKE2B 38636c24567ab930a5222711112bb197f7bdf2289773adda1e19421459eee23ad3ea77118a053c72cda96d8d2ba8a2ab63faf8bf74d9b238ec4f37b059f62108 SHA512 43f26570fbff0970c5aa0a1ee5f4f561645d31c90e3bb997bd63e05678814f199263a5aaa5051bfe88622a156f8260825ffd905301d158cb410f25631d75cc55
 AUX rpcbind.service 193 BLAKE2B 6e95819841fbc7fb793ec6f6884ae070aa2c420298fc96a111722beae700da71cd5c96ec5c9296a9d80e8e9119b9bb1206df8f1999204f7e0d80badd85e55f47 SHA512 7ec717ebd69cdf3230d09c51c9b3f926a0860967baccbc2345bf8214a2251441b528bbceaa571c84bdcca17c272d43697567885b517501515d15d42f913f3f49
-DIST rpcbind-0.2.3.tar.bz2 121306 BLAKE2B 996bae5b58ee20d96dd1f1dcc7adc1ad227e34082184f9537a0d9a2944bf5b22734694acbdd52f65c29df4a8d16df343f74e93bd92d264b84d9c9120cd5a750d SHA512 b91cb4e0849213d344063ccf32d16c49819906b65e4d07c4aa7d3c8842bd83acb408d07aa285da902c389f3c9716f01678012b93a11863eb174a2577cd6ba1d6
 DIST rpcbind-0.2.4.tar.bz2 122781 BLAKE2B ac1c374a1081559bf09bc209256daa1bb530d71f0c7fe45cec4c9b87cf110c15251a05dce2cf2b78ffa4d902f817efed30350ad08a23e12a7f219f10fe626aa8 SHA512 f3966a7284e94bdf120a9b3f0dd66efa1fe8761df2313545a031f77b7c06e27d7955d2780469943deb537d34f95c4cf3f30de523ec9fab9f571322d7224b210c
-EBUILD rpcbind-0.2.3-r1.ebuild 1410 BLAKE2B 95d6250decb76c6abca0167c407fffe40c9c51ae0d6ee6fafc4677c652f2917710d152dd1bb554565b23af0c465cd2e391fb43dd555bd690eec230125fa0419f SHA512 e9df1c9785881072b6db598a952e74dff2714272260dc721a419083bf29c861197c832e63463deb1907664d8155a7114e095def23d8460f853ad0615d9981cfb
-EBUILD rpcbind-0.2.3-r2.ebuild 1478 BLAKE2B 85e727d0557569c260008af7d553980e959eb2f30bf7bbfc0a2579986462a790e245e7a4d035ba60d56f8d1c74683ba6d0b1b2026d12a15a778d69cca57b0dc0 SHA512 c408d69cf97dace84a85069f567646fbf50baa1971fd465b56c9168978ed9a6fad319b199fe6c8b046286189de5881e406a8331c2bd0ad33f83b93a6787d0995
 EBUILD rpcbind-0.2.4-r1.ebuild 1390 BLAKE2B 25c195b4ab61bad2f55f937cb32d898eecfaafc247abc22a419f9dd17d02c7389545b3de828be515ca6cf77644a023ebb39cf4eec0522ab77bd07e438719b3fe SHA512 970b0bad735da4a16479d21f4e304e7efe90556f3a6155dc2c0665c60fdf1aefadf82e32b171a95f57ee627ea81de19462e5b9de57088f75306ace1263838cc4
-EBUILD rpcbind-0.2.4.ebuild 1316 BLAKE2B f0a157835986a3b78825cd35206dcc32987bf38767c10683bd4530fc3156fd0482d570bb407ba755e51dc238e88a6cf6c335a45faf39212636dc6ac6ce6b546b SHA512 1a80496539d3727c0ce19423d6e8f29f4d2e747c3864fb55d572312668b6c037b80176bb74a91f19af2edfb8503170e39aa36f28189ac97f71aefd2fbca26550
 EBUILD rpcbind-9999.ebuild 1272 BLAKE2B 2e0c6e8ff2c7a70f44d9a32d0db88e2c403f23633268c7d0c265656f4bd8ccec90be051108820fa2f974b192944a0df48add921b8241d92bb8080b846288c8e0 SHA512 69a992076b77d001fc037bbb244f6cb3c93b8ceff1fca253c77d71dc17528aae473182fc7f2ffa63414f57f25d398ea0cd0a0ae81e8f7e2479ea42fd397b3b8c
 MISC metadata.xml 405 BLAKE2B e55c92d34f30b03f0305586b1ec0a5ceca21eae2f5ec21979b0ab21d18162607ad7c6a767d7e6b106820a2c02e11034f4c524816185fda8d0fbf3598a39ffb06 SHA512 accad1ef4202c9ebd7292ae6e1e68a1c59ddbfb741779a635058d54aa1efbf8b70b5e045d53dc9dba61256d5981e11c57b540a1c7b8fb38207863a6f2c50a5af
diff --git a/net-nds/rpcbind/rpcbind-0.2.3-r1.ebuild b/net-nds/rpcbind/rpcbind-0.2.3-r1.ebuild
deleted file mode 100644
index cdbbee00c44a..000000000000
--- a/net-nds/rpcbind/rpcbind-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://linux-nfs.org/~steved/rpcbind.git"
-	inherit autotools git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-fi
-
-DESCRIPTION="portmap replacement which supports RPC over various protocols"
-HOMEPAGE="https://sourceforge.net/projects/rpcbind/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="debug selinux systemd tcpd warmstarts"
-
-CDEPEND=">=net-libs/libtirpc-0.2.3:=
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpcbind )"
-
-src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-	epatch "${FILESDIR}"/${P}-libtirpc.patch
-	epatch "${FILESDIR}"/${P}-mem-corrupt.patch #560990
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--bindir="${EPREFIX}"/sbin \
-		--with-statedir="${EPREFIX}"/run/${PN} \
-		--with-rpcuser=root \
-		--with-systemdsystemunitdir=$(usex systemd "$(systemd_get_unitdir)" "no") \
-		$(use_enable tcpd libwrap) \
-		$(use_enable debug) \
-		$(use_enable warmstarts)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
diff --git a/net-nds/rpcbind/rpcbind-0.2.3-r2.ebuild b/net-nds/rpcbind/rpcbind-0.2.3-r2.ebuild
deleted file mode 100644
index 1d4183d7905b..000000000000
--- a/net-nds/rpcbind/rpcbind-0.2.3-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://linux-nfs.org/~steved/rpcbind.git"
-	inherit autotools git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="portmap replacement which supports RPC over various protocols"
-HOMEPAGE="https://sourceforge.net/projects/rpcbind/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="debug selinux systemd tcpd warmstarts"
-
-CDEPEND=">=net-libs/libtirpc-0.2.3:=
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpcbind )"
-
-src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-	epatch "${FILESDIR}"/${P}-libtirpc.patch
-	epatch "${FILESDIR}"/${P}-mem-corrupt.patch #560990
-	epatch "${FILESDIR}"/${P}-remove-P-macro.patch #589666
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--bindir="${EPREFIX}"/sbin \
-		--with-statedir="${EPREFIX}"/run/${PN} \
-		--with-rpcuser=root \
-		--with-systemdsystemunitdir=$(usex systemd "$(systemd_get_unitdir)" "no") \
-		$(use_enable tcpd libwrap) \
-		$(use_enable debug) \
-		$(use_enable warmstarts)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
diff --git a/net-nds/rpcbind/rpcbind-0.2.4.ebuild b/net-nds/rpcbind/rpcbind-0.2.4.ebuild
deleted file mode 100644
index 79f8f8fe713d..000000000000
--- a/net-nds/rpcbind/rpcbind-0.2.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://linux-nfs.org/~steved/rpcbind.git"
-	inherit autotools git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-fi
-
-DESCRIPTION="portmap replacement which supports RPC over various protocols"
-HOMEPAGE="https://sourceforge.net/projects/rpcbind/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="debug selinux systemd tcpd warmstarts"
-
-CDEPEND=">=net-libs/libtirpc-1.0:=
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpcbind )"
-
-src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--bindir="${EPREFIX}"/sbin \
-		--with-statedir="${EPREFIX}"/run/${PN} \
-		--with-rpcuser=root \
-		--with-systemdsystemunitdir=$(usex systemd "$(systemd_get_unitdir)" "no") \
-		$(use_enable tcpd libwrap) \
-		$(use_enable debug) \
-		$(use_enable warmstarts)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}