Remove old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

9 files changed, 42 insertions, 708 deletions

diff --git a/net-nds/389-ds-base/389-ds-base-1.3.0.2.ebuild b/net-nds/389-ds-base/389-ds-base-1.3.0.2.ebuild
deleted file mode 100644
index be164da965b5..000000000000
--- a/net-nds/389-ds-base/389-ds-base-1.3.0.2.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/389-ds-base-1.3.0.2.ebuild,v 1.2 2014/03/04 21:44:36 dilfridge Exp $
-
-EAPI=5
-
-WANT_AUTOMAKE="1.9"
-MY_P=${P/_alpha/.a}
-MY_P=${MY_P/_rc/.rc}
-inherit user eutils multilib flag-o-matic autotools
-
-DESCRIPTION="389 Directory Server (core librares and daemons )"
-HOMEPAGE="http://port389.org/"
-SRC_URI="http://directory.fedoraproject.org/sources/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2-with-exceptions"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="autobind auto-dn-suffix debug doc +pam-passthru +dna +ldapi +bitwise +presence kerberos selinux"
-
-ALL_DEPEND="!>=sys-libs/db-5.0
-	>=dev-libs/cyrus-sasl-2.1.19
-	>=dev-libs/icu-3.4:=
-	dev-libs/nss[utils]
-	dev-libs/nspr
-	dev-libs/svrcore
-	dev-libs/openssl
-	dev-libs/libpcre:3
-	dev-perl/perl-mozldap
-	>=net-analyzer/net-snmp-5.1.2
-	net-nds/openldap
-	sys-apps/tcp-wrappers
-	>=sys-libs/db-4.5
-	sys-libs/pam
-	sys-libs/zlib
-	kerberos? ( >=app-crypt/mit-krb5-1.7-r100[openldap] )
-	selinux? ( >=sys-apps/policycoreutils-1.30.30
-		sec-policy/selinux-base-policy )"
-
-DEPEND="${ALL_DEPEND}
-	virtual/pkgconfig
-	sys-devel/libtool
-	doc? ( app-doc/doxygen )
-	selinux? ( sys-devel/m4 >=sys-apps/checkpolicy-1.30.12 )
-	sys-apps/sed"
-RDEPEND="${ALL_DEPEND}
-	virtual/perl-Time-Local
-	virtual/perl-MIME-Base64"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup dirsrv
-	enewuser dirsrv -1 -1 -1 dirsrv
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/selinux.patch"
-	# Fix compilation against mozldap
-	# epatch "${FILESDIR}/389-ds-base-1.2.11-fix-mozldap.patch"
-
-	# as per 389 documentation, when 64bit, export USE_64
-	use amd64 && export USE_64=1
-
-	sed -i -e 's/nobody/dirsrv/g' configure.ac || die "sed failed on configure.ac"
-	eautoreconf
-
-	# enable nsslapd-allow-unauthenticated-binds by default
-	sed -i '/^nsslapd-allow-unauthenticated-binds/ s/off/on/' "${S}"/ldap/ldif/template-dse.ldif.in || \
-		die "cannot tweak default setting: nsslapd-allow-unauthenticated-binds"
-
-}
-
-src_configure() {
-	local myconf=""
-
-	use auto-dn-suffix && myconf="${myconf} --enable-auto-dn-suffix"
-	use selinux && myconf="${myconf} --with-selinux"
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable pam-passthru) \
-		$(use_enable ldapi) \
-		$(use_enable autobind) \
-		$(use_enable dna) \
-		$(use_enable bitwise) \
-		$(use_enable presence) \
-		$(use_with kerberos) \
-		--enable-maintainer-mode \
-		--enable-autobind \
-		--with-fhs \
-		--with-openldap \
-		$myconf || die "econf failed"
-}
-
-src_compile() {
-	append-lfs-flags
-
-	emake || die "compile failed"
-	if use selinux; then
-		emake -f selinux/Makefile || die " build selinux policy failed"
-	fi
-}
-
-src_install () {
-	# Use -j1 otherwise libacl-plugin.so could fail to install properly
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	if use selinux;then
-		emake -f selinux/Makefile DESTDIR="${D}" install || die "Install selinux policy failed"
-	fi
-
-	# install not installed header
-	insinto /usr/include/dirsrv
-	doins ldap/servers/slapd/slapi-plugin.h
-
-	# for build free-ipa require winsync-plugin
-	doins ldap/servers/plugins/replication/winsync-plugin.h
-	doins ldap/servers/plugins/replication/repl-session-plugin.h
-
-	# make sure perl scripts have a proper shebang
-	cd "${D}"/usr/share/dirsrv/script-templates/
-
-	for i in $(find ./  -iname '*.pl') ;do
-		sed -i -e 's/#{{PERL-EXEC}}/#\!\/usr\/bin\/perl/' $i || die
-	done
-
-	# remove redhat style init script
-	rm -rf "${D}"/etc/rc.d || die
-	rm -rf "${D}"/etc/default || die
-
-	# and install gentoo style init script
-	newinitd "${FILESDIR}"/389-ds.initd 389-ds
-	newinitd "${FILESDIR}"/389-ds-snmp.initd 389-ds-snmp
-
-	# install Gentoo-specific start/stop scripts
-	rm -f "${D}"/usr/sbin/{re,}start-dirsrv || die "cannot remove 389 start/stop executables"
-	exeinto /usr/sbin
-	doexe "${FILESDIR}"/{re,}start-dirsrv
-
-	# cope with libraries being in /usr/lib/dirsrv
-	dodir /etc/env.d
-	echo "LDPATH=/usr/$(get_libdir)/dirsrv" > "${D}"/etc/env.d/08dirsrv
-
-	# create the directory where our log file and database
-	diropts -m 0755
-	dodir /var/lib/dirsrv
-	keepdir /var/lib/dirsrv
-	dodir /var/lock/dirsrv
-	keepdir /var/lock/dirsrv
-	# snmp agent, required directory
-	keepdir /var/agentx
-	dodir /var/agentx
-
-	if use doc; then
-		cd "${S}"
-		doxygen slapi.doxy || die "cannot run doxygen"
-		dohtml -r docs/html
-	fi
-}
-
-pkg_postinst() {
-	if use selinux; then
-		if has "loadpolicy" $FEATURES; then
-			einfo "Inserting the following modules into the module store"
-			cd /usr/share/selinux/targeted # struct policy not supported
-			semodule -s dirsrv -i dirsrv.pp
-		else
-			elog
-			elog "Policy has not been loaded.  It is strongly suggested"
-			elog "that the policy be loaded before continuing!!"
-			elog
-			elog "Automatic policy loading can be enabled by adding"
-			elog "\"loadpolicy\" to the FEATURES in make.conf."
-			elog
-			ebeep 4
-		fi
-	fi
-
-	elog
-	elog "If you are planning to use 389-ds-snmp (ldap-agent),"
-	elog "make sure to properly configure: /etc/dirsrv/config/ldap-agent.conf"
-	elog "adding proper 'server' entries, and adding the lines below to"
-	elog " => /etc/snmp/snmpd.conf"
-	elog
-	elog "master agentx"
-	elog "agentXSocket /var/agentx/master"
-	elog
-	elog
-	elog "To start 389 Directory Server (LDAP service) at boot:"
-	elog
-	elog "    rc-update add 389-ds default"
-	elog
-
-	elog "If you are upgrading from previous 1.2.6 release candidates"
-	elog "please see:"
-	elog "http://directory.fedoraproject.org/wiki/Subtree_Rename#warning:_upgrade_from_389_v1.2.6_.28a.3F.2C_rc1_.7E_rc6.29_to_v1.2.6_rc6_or_newer"
-	elog
-
-}
diff --git a/net-nds/389-ds-base/ChangeLog b/net-nds/389-ds-base/ChangeLog
index 0bbebb2346e3..02186ffb00ba 100644
--- a/net-nds/389-ds-base/ChangeLog
+++ b/net-nds/389-ds-base/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nds/389-ds-base
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/ChangeLog,v 1.27 2014/06/22 20:36:26 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/ChangeLog,v 1.28 2014/06/26 12:49:39 kensington Exp $
+
+  26 Jun 2014; Michael Palimaka <kensington@gentoo.org>
+  -389-ds-base-1.3.0.2.ebuild, -files/389-ds-base-1.2.11.16-cve-2012-4450.patch,
+  -files/selinux.patch:
+  Remove old.
 
   22 Jun 2014; Fabio Erculiani <lxnay@gentoo.org> metadata.xml:
   reset to maintainer-needed@
@@ -146,4 +151,3 @@
   new ebuild, 389 Directory Server server package, thanks to
   Andreis_Vinogradovs ( slepnoga ) <spamslepnoga@inbox.ru> for the base
   ebuild, will close #104554
-
diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest
index 669372a84fb0..e1c170b818ad 100644
--- a/net-nds/389-ds-base/Manifest
+++ b/net-nds/389-ds-base/Manifest
@@ -2,21 +2,29 @@
 Hash: SHA256
 
 AUX 389-ds-base-1.2.11-fix-mozldap.patch 789 SHA256 55e33e366ad13c22a00a8255ea34fb84786f2d3308ba1cab74b92684897bbdc5 SHA512 30e3fe84d8d5d380e80ccb19cebd73271b540caef61770514f43c3097e34d133cefdbb5abec3ccd25ad7a46df380719c0ce8fa7b10185091f236f622850ebfa4 WHIRLPOOL 271a2f16a52bc599391d167499aad0f2f9658def2becf35e6364b9125cd9c8d2cd33a8bb41c4c7b16ea3a48dec0de786f0059950f1b3a6a172b6cd4881a784d5
-AUX 389-ds-base-1.2.11.16-cve-2012-4450.patch 12046 SHA256 248f9df6bdae5dd24a0c67168a057fd73d9aeb7a5afb288587680678b27d651c SHA512 90378d2cd8347e32952450e8c648951cd8bcf774fcc6536c7f85a870ffd964d3541ebf7a2f44c76ba71514e1151ced1d43cf7de7f85bfe69b997d2c642180b47 WHIRLPOOL db70f8537f0091f172c396f90fb18361cb29c14b475557dab904a0613563efb5d7742fa2db20a7db62686a80a4ab469f8347082d456df76a1771e83aba876e11
 AUX 389-ds-snmp.initd 1076 SHA256 0dccceef42e29b5f696fc241cccdb3641eca3d8e300aef13b13ba1a40f8382e1 SHA512 0e2a6a8519a82d25cc96c0f5b26e9a53e7a56ddd9b842ff830535628d5f55a3eb662cf4d1c93d49fa66176249866a1ed21461ccd7e920869a95297ca5197db8c WHIRLPOOL dcc8efb767eb7d4044424967b26b93d88b827f652146eaabcc5c105ea373ae02d1a89ab0e61057496eec220e8c0111599099ec711d28e61f61e19008dfe775bb
 AUX 389-ds.initd 1995 SHA256 722f0c18f21ccb60054433e62748008ffd908d026220be4f705dcf46e9322a92 SHA512 185704cc96d5238532ba8f3ee7578587b58c76ae864cb2a1d35fd5361edfe2c504286b7ad738d6530661393461447ca2948af4807f58420c5bb83a0fee7d9054 WHIRLPOOL ad55cccb4ddec7c6c98c467e68359c2f2bab7c11b52ad333687600bf5f4b43c1f9f2da6e317759c4b7b1e68c2d1bf106675bfd7d0a752206a0300b627777efe2
 AUX restart-dirsrv 581 SHA256 fd0dfbce5d74b065fc1bef6e11527d56c7fc4f16ae55383841c05d35d03173b2 SHA512 c8b2168977a1884baa35f78ba9a065bf3900413afcd5c38eba0f3695af6b4900785430ec61e34479a22b6888334a46e6c3796e15866a37969497033a9cbdee6e WHIRLPOOL 81ace8c577aeb931d2bda9bacd1ff9b9389c9d6d0ccdbd53867686d0fd3e3bd9bc4bf1965231dcb7803a16fa6e3f438daf54bb569e7a81062f84fc71e3e278f3
-AUX selinux.patch 280 SHA256 0600d46c02987c69c3c77a2f8f90dd4c31edea983911268227aa708230cdb6f9 SHA512 333aae269ab806057c2e6eb5b6b657bbbbd12334254b7b7a07f46cb89d7a78d6fd573a987bfe3a0cb74df27e01009b68d8510b47a13ac7ab8e7e4c7301842d6e WHIRLPOOL 3f4c9d1ea8907dda7e236f17355a4710dad6a162395999688173c1a818c48505ea47a8cfa43116981a0a978764f7a27d771fd26e551bb0b3e5e123ba7b8e5121
 AUX start-dirsrv 303 SHA256 d29272f92d2c4420da8aad7919861ab667c8f224bde560491f1626957418d361 SHA512 0a150045099e367ed54a3bf9319f3a608ea9b967f13e6f29aac7d3f6ca2e39edc2d8f843bab9a2c7cb93d8d175a8a34e6c0ad1a0dd1a586cf4141a1dcd3d37d6 WHIRLPOOL 936fc295e75ab18e5207eb2fe2eea42eef3807321f3ff526bbc4f4d8d4ef79b0ff8a09b676d7a993c76efb6da8fab3365b085f682d1a0e615092b8bd0b67a6c5
 DIST 389-ds-base-1.3.0.2.tar.bz2 3008002 SHA256 0482f8cddbb32dc44051d59efe085eb744295a32eac65fbcd0b1bfd807319755 SHA512 99d41e2df832eaf8d83ec32fd9e7ef1819d75640fae2c69e62f5d11998c29d780726cb5d97cec7a6ae410c440d5124ca8b9d0cb7091a437a57f2625b16fca29f WHIRLPOOL 8ad72341e15d05e6af0999808a1930f11c7589c211424f7dfa68c1d8d5cd18657086dbf9aa6c856dc84a3926b47ed46484b30e6f72819a22e26277a3c504c1e0
 EBUILD 389-ds-base-1.3.0.2-r1.ebuild 4662 SHA256 aa3fff6115060a66d2bbd7f41a8ac0ae93e1c615b763848d7dbf5cbcf4b1a620 SHA512 119beb2114c280666fee0d600186e870eb159320df46f005d7069a518953875e4ef745223524497d12d494f80365b8dda1d72fe22ed80d61e25c77f123749309 WHIRLPOOL 1e5647fecf96cac65561a2a3a27c8b565c707543e4e89722e911c0aabe66668608576c5ed2bb871656b4336e07dce1efc6ff2137fcc3c2a43b26c429d27d680f
-EBUILD 389-ds-base-1.3.0.2.ebuild 5564 SHA256 af0aec79ad9bfa754fa91a4d99dea36b87273edd6c08e9b6e7dd64bb5233eee0 SHA512 db954708f16dbe8ecdc4456a02271ef0990b65fff88585dc1c9a3f46752ead322cfd1b06c28606aa74d13d604dda2d70801681f8ad36135f1783848f8e624cee WHIRLPOOL a0210d12e3e0ecce650e99e58bc145329b295992f7a6efe1555ba6affd03fdf7b87d9637d2ab4f971eb3d5383213ecda4d2ff5c829203d142f8da7a6c7a392d1
-MISC ChangeLog 5398 SHA256 e65d19305d264ae16c8ef7e22acf135318d36282e1e7b6f43c707889b12f9a21 SHA512 5582209538634a0c9829f75dea497ff0c0784f263b11d976d7dce35f69b8ffa92261299576ac5f4672ff46523435f36aec533c7c9ba423358a647a271da5febc WHIRLPOOL 75bd75b47338cbe2b9777ec9e2841a5caafe725be1f13e68d8398af90913f58bb315e6d3cdbdb6ea279b931d34d829072794b439bdddb081264bf55a67807cdf
+MISC ChangeLog 5578 SHA256 e174059660e6d0bbf9cde915d523f2eabbb2fa59c17761bf09d087f6fe6bcc6d SHA512 0de52a27bec905397544bbac2b757011d228a77150ec2577e1afecd980bb042133bfcd77ae014d49bd3a3a70fb8f5ab1c2f63278455ff59131390fd9543abca6 WHIRLPOOL 55edaf391157b8c722338e15eb7218e67e84dfc74a8d74cad7f1126f12a2174f7b8d1c87cd347a9e5865f948bd167e5087390fafeed9875eaed87795282f2b2f
 MISC metadata.xml 1060 SHA256 3a6fc0dfd206f258e92e1c47eb5dd45f9ef3937e5e3a59837ac112faac7b8fd8 SHA512 b082b570a1a40f75fb905a7df83d107c6873dff55700705999cfe44df3bb121eb424a114d901c05117b6139b8c600066837f2462d75386950a1ba3ca749689d2 WHIRLPOOL a512aa0403de62957e07bd936e216752071ec1e20be035553deebebe3b80ba68d34e3c6842062c5aeffb2090a98cd9bf2f2fd1644fa82c19aadd8efa72fb4ca3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOnPl0ACgkQfaj9zK3JFuWQ7wCfRRj+tvjKGTj12OlPdtTjUz/C
-IpQAn2KdgC6vBfLCCJGiAhkZb158PQxn
-=MpZY
+iQJiBAEBCABMBQJTrBbkRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7H/vD/47N4ML3MmSodhMjWJusIWL72z8uKCTmCtGatw9PK7Z6vHrdLyBUh5wXRnA
+L59ZChrgp0j4jDws2x5r7nvIumgQXZNcBfBnMBCGFrmsMFdUVu/fZlBtIfw/ke+/
+HPDJ3OeovSSqNeidNpF21D1PXY8BX6YoLfkMasLKn8rxb4VaibRctfY4JMuXKeYO
+2r/hsRrixK6O2w5mUu83CP809kS4nq8wwMg5imZ1xoA9nVseITIm9pmdfTj/yuLm
+4T4uzsAqHgRoPo/Osn1zHq4ECuXrBytrAz9D9zur9ccgtEc87ZkqlbR6Vno5aDLH
+mcnCaqJG7rtD8O/ku/tpCtr2hg6RzKjgtcqYEL2s4Mn6YFDWTIzanZUlh13ElbeK
+D81tVYnRNs5dWqBJu57k5ImfKb7ShM5YIgw7T3iPF58mPXAvet93aIw2raEezm+N
+92alvFo/vHbiho9xeNZZ3C1NyIwlFsZ7iaD4Qc4Phlg0SyAEvL5B6gIbSDCvQPqB
+LE/8j061L31W+XY/BpP7c+rDsUEMuLcvcZ3l9dXKuzHSluPkCJM59IPPmOp/UcBm
+AsDyHl34t95567Eqgpu1KqyE+X3nrxlfTNWHSuPek6ISs4UUpAKUT0ADx0TqyhjA
+/NrGm7Z1qgAYikzv54Uwe8+35Z8wdzOMeKRvpQv2B6kfl2TR3w==
+=adxm
 -----END PGP SIGNATURE-----
diff --git a/net-nds/389-ds-base/files/389-ds-base-1.2.11.16-cve-2012-4450.patch b/net-nds/389-ds-base/files/389-ds-base-1.2.11.16-cve-2012-4450.patch
deleted file mode 100644
index 54d9b1b975d7..000000000000
--- a/net-nds/389-ds-base/files/389-ds-base-1.2.11.16-cve-2012-4450.patch
+++ /dev/null
@@ -1,367 +0,0 @@
-From 5beb93d42efb807838c09c5fab898876876f8d09 Mon Sep 17 00:00:00 2001
-From: Noriko Hosoi <nhosoi@totoro.usersys.redhat.com>
-Date: Fri, 21 Sep 2012 19:35:18 +0000
-Subject: Trac Ticket #340 - Change on SLAPI_MODRDN_NEWSUPERIOR is not
-
-      evaluated in acl
-
-https://fedorahosted.org/389/ticket/340
-
-Bug Description: When modrdn operation was executed, only newrdn
-change was passed to the acl plugin.  Also, the change was used
-only for the acl search, but not for the acl target in the items
-in the acl cache.
-
-Fix Description: This patch also passes the newsuperior update
-to the acl plugin.  And the modrdn updates are applied to the
-acl target in the acl cache.
----
-diff --git a/ldap/servers/plugins/acl/acl.c b/ldap/servers/plugins/acl/acl.c
-index 15e474e..3389404 100644
---- a/ldap/servers/plugins/acl/acl.c
-+++ b/ldap/servers/plugins/acl/acl.c
-@@ -170,9 +170,9 @@ acl_access_allowed_modrdn(
-  * Test if have access to make the first rdn of dn in entry e.
- */
-  
--static int check_rdn_access( Slapi_PBlock *pb, Slapi_Entry *e, const char *dn,
--						int access) {
--	
-+static int
-+check_rdn_access( Slapi_PBlock *pb, Slapi_Entry *e, const char *dn, int access)
-+{
- 	char **dns;
- 	char **rdns;
- 	int retCode = LDAP_INSUFFICIENT_ACCESS;
-@@ -655,7 +655,8 @@ cleanup_and_ret:
- 	
- }
- 
--static void print_access_control_summary( char *source, int ret_val, char *clientDn,
-+static void
-+print_access_control_summary( char *source, int ret_val, char *clientDn,
- 									struct	acl_pblock	*aclpb,
- 									char *right,
- 									char *attr,
-@@ -1524,11 +1525,12 @@ acl_check_mods(
- *
- **************************************************************************/
- extern void
--acl_modified (Slapi_PBlock *pb, int optype, char *n_dn, void *change)
-+acl_modified (Slapi_PBlock *pb, int optype, Slapi_DN *e_sdn, void *change)
- {
- 	struct  berval	**bvalue;
- 	char			**value;
- 	int				rv=0;		/* returned value */
-+	const char*     n_dn;
- 	char*          	new_RDN;
- 	char*          	parent_DN;
- 	char*          	new_DN;
-@@ -1537,10 +1539,12 @@ acl_modified (Slapi_PBlock *pb, int optype, char *n_dn, void *change)
- 	int				j;
- 	Slapi_Attr 		*attr = NULL;
- 	Slapi_Entry		*e = NULL;
--	Slapi_DN		*e_sdn;
- 	aclUserGroup	*ugroup = NULL;
- 	
--	e_sdn = slapi_sdn_new_normdn_byval ( n_dn );
-+	if (NULL == e_sdn) {
-+		return;
-+	}
-+	n_dn = slapi_sdn_get_dn(e_sdn);
- 	/* Before we proceed, Let's first check if we are changing any groups.
- 	** If we are, then we need to change the signature
- 	*/
-@@ -1768,45 +1772,64 @@ acl_modified (Slapi_PBlock *pb, int optype, char *n_dn, void *change)
- 		}
- 
- 		break;
--	   }/* case op is modify*/
-+	    }/* case op is modify*/
- 
--	   case SLAPI_OPERATION_MODRDN:
--
--		new_RDN = (char*) change;
--		slapi_log_error (SLAPI_LOG_ACL, plugin_name, 
--			   "acl_modified (MODRDN %s => \"%s\"\n", 
--			   n_dn, new_RDN);
-+	    case SLAPI_OPERATION_MODRDN:
-+	    {
-+		char **rdn_parent;
-+		rdn_parent = (char **)change;
-+		new_RDN = rdn_parent[0];
-+		parent_DN = rdn_parent[1];
- 
- 		/* compute new_DN: */
--		parent_DN = slapi_dn_parent (n_dn);
--		if (parent_DN == NULL) {
--			new_DN = new_RDN;
-+		if (NULL == parent_DN) {
-+			parent_DN = slapi_dn_parent(n_dn);
-+		}
-+		if (NULL == parent_DN) {
-+			if (NULL == new_RDN) {
-+				slapi_log_error (SLAPI_LOG_ACL, plugin_name, 
-+				                 "acl_modified (MODRDN %s => \"no change\"\n", 
-+				                 n_dn);
-+				break;
-+			} else {
-+				new_DN = new_RDN;
-+			}
- 		} else {
--			new_DN = slapi_create_dn_string("%s,%s", new_RDN, parent_DN);
-+			if (NULL == new_RDN) {
-+				Slapi_RDN *rdn= slapi_rdn_new();
-+				slapi_sdn_get_rdn(e_sdn, rdn);
-+				new_DN = slapi_create_dn_string("%s,%s", slapi_rdn_get_rdn(rdn),
-+				                                parent_DN);
-+				slapi_rdn_free(&rdn);
-+			} else {
-+				new_DN = slapi_create_dn_string("%s,%s", new_RDN, parent_DN);
-+			}
- 		}
-+		slapi_log_error (SLAPI_LOG_ACL, plugin_name, 
-+		                 "acl_modified (MODRDN %s => \"%s\"\n", n_dn, new_RDN);
- 
- 		/* Change the acls */
--		acllist_acicache_WRITE_LOCK();		
-+		acllist_acicache_WRITE_LOCK();
- 		/* acllist_moddn_aci_needsLock expects normalized new_DN, 
- 		 * which is no need to be case-ignored */
- 		acllist_moddn_aci_needsLock ( e_sdn, new_DN );
- 		acllist_acicache_WRITE_UNLOCK();
- 
- 		/* deallocat the parent_DN */
--		if (parent_DN != NULL)  {
--			slapi_ch_free ( (void **) &new_DN );
--			slapi_ch_free ( (void **) &parent_DN );
-+		if (parent_DN != NULL) {
-+			slapi_ch_free_string(&new_DN);
-+			if (parent_DN != rdn_parent[1]) {
-+				slapi_ch_free_string(&parent_DN);
-+			}
- 		}
- 		break;
--
--	   default:
-+	    } /* case op is modrdn */
-+	    default:
- 		/* print ERROR */
- 		break;
- 	} /*optype switch */
--		
--	slapi_sdn_free ( &e_sdn );	
--
- }
-+
- /***************************************************************************
- *
- * acl__scan_for_acis
-diff --git a/ldap/servers/plugins/acl/acl.h b/ldap/servers/plugins/acl/acl.h
-index 4fa3e3f..28c38e7 100644
---- a/ldap/servers/plugins/acl/acl.h
-+++ b/ldap/servers/plugins/acl/acl.h
-@@ -796,7 +796,8 @@ int  		acl_read_access_allowed_on_attr ( Slapi_PBlock *pb, Slapi_Entry *e, char
-                                   struct berval *val, int access);
- void 		acl_set_acllist (Slapi_PBlock *pb, int scope, char *base);
- void 		acl_gen_err_msg(int access, char *edn, char *attr, char **errbuf);
--void 		acl_modified ( Slapi_PBlock *pb, int optype, char *dn, void *change);
-+void 		acl_modified (Slapi_PBlock *pb, int optype, Slapi_DN *e_sdn, void *change);
-+
- int 		acl_access_allowed_disjoint_resource( Slapi_PBlock *pb, Slapi_Entry *e,
- 					char *attr, struct berval *val, int access );
- int 		acl_access_allowed_main ( Slapi_PBlock *pb, Slapi_Entry *e, char **attrs, 
-@@ -866,7 +867,7 @@ void		acllist_print_tree ( Avlnode *root, int *depth, char *start, char *side);
- AciContainer *acllist_get_aciContainer_new ( );
- void 		acllist_done_aciContainer (  AciContainer *);
- 
--aclUserGroup* aclg_find_userGroup (char *n_dn);
-+aclUserGroup* aclg_find_userGroup (const char *n_dn);
- void 		aclg_regen_ugroup_signature( aclUserGroup *ugroup);
- void		aclg_markUgroupForRemoval ( aclUserGroup *u_group );
- void		aclg_reader_incr_ugroup_refcnt(aclUserGroup* u_group);
-diff --git a/ldap/servers/plugins/acl/aclgroup.c b/ldap/servers/plugins/acl/aclgroup.c
-index c694293..2231304 100644
---- a/ldap/servers/plugins/acl/aclgroup.c
-+++ b/ldap/servers/plugins/acl/aclgroup.c
-@@ -213,7 +213,7 @@ aclg_reset_userGroup ( struct acl_pblock *aclpb )
- */
- 
- aclUserGroup*
--aclg_find_userGroup(char *n_dn)
-+aclg_find_userGroup(const char *n_dn)
- {
- 	aclUserGroup		*u_group = NULL;	
- 	int			i;
-diff --git a/ldap/servers/plugins/acl/acllist.c b/ldap/servers/plugins/acl/acllist.c
-index 9b5363a..e8198af 100644
---- a/ldap/servers/plugins/acl/acllist.c
-+++ b/ldap/servers/plugins/acl/acllist.c
-@@ -600,7 +600,6 @@ void
- acllist_init_scan (Slapi_PBlock *pb, int scope, const char *base)
- {
- 	Acl_PBlock			*aclpb;
--	int					i;
- 	AciContainer		*root;
- 	char				*basedn = NULL;
- 	int					index;
-@@ -671,11 +670,6 @@ acllist_init_scan (Slapi_PBlock *pb, int scope, const char *base)
- 		aclpb->aclpb_state &= ~ACLPB_SEARCH_BASED_ON_LIST ;
- 
- 	acllist_acicache_READ_UNLOCK();
--
--	i = 0;
--	while ( i < aclpb_max_selected_acls && aclpb->aclpb_base_handles_index[i]  != -1 ) {
--		i++;
--	}
- }
- 
- /*
-@@ -893,34 +887,50 @@ acllist_acicache_WRITE_LOCK( )
- int
- acllist_moddn_aci_needsLock ( Slapi_DN *oldsdn, char *newdn )
- {
--
--
- 	AciContainer		*aciListHead;
- 	AciContainer		*head;
-+	aci_t *acip;
-+	const char *oldndn;
- 
- 	/* first get the container */
- 
- 	aciListHead =   acllist_get_aciContainer_new ( );
- 	slapi_sdn_free(&aciListHead->acic_sdn);
--    aciListHead->acic_sdn = oldsdn;
--
-+	aciListHead->acic_sdn = oldsdn;
- 
- 	if ( NULL == (head = (AciContainer *) avl_find( acllistRoot, aciListHead,
--									(IFP) __acllist_aciContainer_node_cmp ) ) ) {
-+	     (IFP) __acllist_aciContainer_node_cmp ) ) ) {
- 
- 		slapi_log_error ( SLAPI_PLUGIN_ACL, plugin_name,
-- 						"Can't find the acl in the tree for moddn operation:olddn%s\n",
--							slapi_sdn_get_ndn ( oldsdn ));
-+		         "Can't find the acl in the tree for moddn operation:olddn%s\n",
-+		         slapi_sdn_get_ndn ( oldsdn ));
- 		aciListHead->acic_sdn = NULL;
- 		__acllist_free_aciContainer ( &aciListHead );
-- 		return 1;
-+		return 1;
- 	}
- 
--
--	/* Now set the new DN */	
--	slapi_sdn_done ( head->acic_sdn );
-- 	slapi_sdn_set_normdn_byval ( head->acic_sdn, newdn );
--
-+	/* Now set the new DN */
-+	slapi_sdn_set_normdn_byval(head->acic_sdn, newdn);
-+
-+	/* If necessary, reset the target DNs, as well. */
-+	oldndn = slapi_sdn_get_ndn(oldsdn);
-+	for (acip = head->acic_list; acip; acip = acip->aci_next) {
-+		const char *ndn = slapi_sdn_get_ndn(acip->aci_sdn);
-+		char *p = PL_strstr(ndn, oldndn);
-+		if (p) {
-+			if (p == ndn) {
-+				/* target dn is identical, replace it with new DN*/
-+				slapi_sdn_set_normdn_byval(acip->aci_sdn, newdn);
-+			} else {
-+				/* target dn is a descendent of olddn, merge it with new DN*/
-+				char *mynewdn;
-+				*p = '\0';
-+				mynewdn = slapi_ch_smprintf("%s%s", ndn, newdn);
-+				slapi_sdn_set_normdn_passin(acip->aci_sdn, mynewdn);
-+			}
-+		}
-+	}
-+    
- 	aciListHead->acic_sdn = NULL;
- 	__acllist_free_aciContainer ( &aciListHead );
- 
-diff --git a/ldap/servers/slapd/dn.c b/ldap/servers/slapd/dn.c
-index 11e56a9..b79d0f2 100644
---- a/ldap/servers/slapd/dn.c
-+++ b/ldap/servers/slapd/dn.c
-@@ -2097,7 +2097,7 @@ slapi_sdn_set_normdn_byval(Slapi_DN *sdn, const char *normdn)
-     slapi_sdn_done(sdn);
-     sdn->flag = slapi_setbit_uchar(sdn->flag, FLAG_DN);
-     if(normdn == NULL) {
--        sdn->dn = slapi_ch_strdup(normdn);
-+        sdn->dn = NULL;
-         sdn->ndn_len = 0;
-     } else {
-         sdn->dn = slapi_ch_strdup(normdn);
-diff --git a/ldap/servers/slapd/plugin_acl.c b/ldap/servers/slapd/plugin_acl.c
-index b878156..3bc3f21 100644
---- a/ldap/servers/slapd/plugin_acl.c
-+++ b/ldap/servers/slapd/plugin_acl.c
-@@ -134,11 +134,10 @@ int
- plugin_call_acl_mods_update ( Slapi_PBlock *pb, int optype )
- {
- 	struct slapdplugin	*p;
--	char 				*dn;
- 	int					rc = 0;
--   	void				*change = NULL;
--   	Slapi_Entry			*te = NULL;
--    Slapi_DN			*sdn = NULL;
-+	void				*change = NULL;
-+	Slapi_Entry			*te = NULL;
-+	Slapi_DN			*sdn = NULL;
- 	Operation			*operation;
- 
- 	slapi_pblock_get (pb, SLAPI_OPERATION, &operation);
-@@ -146,7 +145,7 @@ plugin_call_acl_mods_update ( Slapi_PBlock *pb, int optype )
- 	(void)slapi_pblock_get( pb, SLAPI_TARGET_SDN, &sdn );
- 
- 	switch ( optype ) {
-- 	  case SLAPI_OPERATION_MODIFY:
-+	  case SLAPI_OPERATION_MODIFY:
- 		(void)slapi_pblock_get( pb, SLAPI_MODIFY_MODS, &change );
- 		break;
- 	  case SLAPI_OPERATION_ADD:
-@@ -158,11 +157,27 @@ plugin_call_acl_mods_update ( Slapi_PBlock *pb, int optype )
- 		}
- 		break;
- 	  case SLAPI_OPERATION_MODRDN:
-+	  {
-+		void *mychange[2];
-+		char *newrdn = NULL;
-+		Slapi_DN *psdn = NULL;
-+		char *pdn = NULL;
-+
- 		/* newrdn: "change" is normalized but not case-ignored */
- 		/* The acl plugin expects normalized newrdn, but no need to be case-
- 		 * ignored. */
--		(void)slapi_pblock_get( pb, SLAPI_MODRDN_NEWRDN, &change );
-+		(void)slapi_pblock_get( pb, SLAPI_MODRDN_NEWRDN, &newrdn );
-+		(void)slapi_pblock_get( pb, SLAPI_MODRDN_NEWSUPERIOR_SDN, &psdn );
-+		if (psdn) {
-+			pdn = (char *)slapi_sdn_get_dn(psdn);
-+		} else {
-+			(void)slapi_pblock_get( pb, SLAPI_MODRDN_NEWSUPERIOR, &pdn );
-+		}
-+		mychange[0] = newrdn;
-+		mychange[1] = pdn;
-+		change = mychange;
- 		break;
-+	  }
- 	}
- 	
- 	if (NULL == sdn) {
-@@ -172,10 +187,9 @@ plugin_call_acl_mods_update ( Slapi_PBlock *pb, int optype )
- 	}
- 
- 	/* call the global plugins first and then the backend specific */
--	dn = (char*)slapi_sdn_get_ndn(sdn); /* jcm - Had to cast away const */
- 	for ( p = get_plugin_list(PLUGIN_LIST_ACL); p != NULL; p = p->plg_next ) {
- 		if (plugin_invoke_plugin_sdn(p, SLAPI_PLUGIN_ACL_MODS_UPDATE, pb, sdn)){
--			rc = (*p->plg_acl_mods_update)(pb, optype, dn, change );
-+			rc = (*p->plg_acl_mods_update)(pb, optype, sdn, change );
- 			if ( rc != LDAP_SUCCESS ) break;
- 		}
- 	}
---
-cgit v0.9.0.2
diff --git a/net-nds/389-ds-base/files/selinux.patch b/net-nds/389-ds-base/files/selinux.patch
deleted file mode 100644
index 4b6e093eecca..000000000000
--- a/net-nds/389-ds-base/files/selinux.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- 389-ds-base-1.2.8.3.orig/selinux/Makefile
-+++ 389-ds-base-1.2.8.3/selinux/Makefile
-@@ -1,4 +1,4 @@
--POLICY_MAKEFILE = /usr/share/selinux/devel/Makefile
-+POLICY_MAKEFILE = /usr/share/selinux/targeted/include/Makefile
- POLICY_DIR = $(DESTDIR)/usr/share/selinux/targeted
- 
- all:
diff --git a/net-nds/ypbind/ChangeLog b/net-nds/ypbind/ChangeLog
index 488a8fed2f96..77d1d5f21cd3 100644
--- a/net-nds/ypbind/ChangeLog
+++ b/net-nds/ypbind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nds/ypbind
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ypbind/ChangeLog,v 1.85 2014/03/19 15:17:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypbind/ChangeLog,v 1.86 2014/06/26 12:45:26 kensington Exp $
+
+  26 Jun 2014; Michael Palimaka <kensington@gentoo.org>
+  -files/ypbind-1.31-man-port.patch, -ypbind-1.33.ebuild:
+  Remove old.
 
   19 Mar 2014; Agostino Sarubbo <ago@gentoo.org> ypbind-1.37.1.ebuild:
   Stable for alpha, wrt bug #499314
diff --git a/net-nds/ypbind/Manifest b/net-nds/ypbind/Manifest
index cd28083b8195..7ac44904aa48 100644
--- a/net-nds/ypbind/Manifest
+++ b/net-nds/ypbind/Manifest
@@ -1,30 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ypbind-1.31-man-port.patch 1811 SHA256 29527fcb1acf6f1ad8202a0e998634496e58bf6d93820e959f56cf90f41e16a3 SHA512 0bb5084f38abce4dc6fce0006d437ede8a7fd0f18bece37072bf1a3aaaf28b5acbf7fccf87072d6f9b125d9756b62f425905db92d20de33f6c266b5506c5388a WHIRLPOOL aa11b61adf760c729efe2913eff7a3c79d74262186c24f3d235994cddf08956dfbbbe92b3375d41bc6b70a0d09989e430295e8b4a73645b3156b40bb55d5b321
 AUX ypbind.confd-r1 112 SHA256 79f6c6ed4875f00fe702f69e9a6180a032d5a47f3e58e892e6ba0e2746b6fec8 SHA512 31fb25657d330960e11d0a8bb80c75d7b91bbb10ff57568cef265b6599cd62d9ea7bcb2dd67a1f2b10757c3b95b4b2045887661611c031854378daa036300df1 WHIRLPOOL dae9ebd8490a535fadcc06e777b520f3c317386ea0f63e33bab200d2d3b31fd6c664e8a4c2e331b5db26afde6b0ddb96dc47e66dcbdac24a47fe4d11537b5a5e
 AUX ypbind.initd 907 SHA256 3cdd6872fae15dc8533b3f75ac36ad59ffb946a3f1b445d688629c621cebbe34 SHA512 f7d082e98a4d854974664158d674c4535d09636d101713e4a57fb8b84d110139b3d21b90dbf7ccda69b0d610ef5ec97cf4a3090743d414d7aefc773c81d27e03 WHIRLPOOL 81e12896c0af6848735a6a5585ccb67b2aa474b6277ce9ec011ebadcaa02c1d42cf4946aa991965454429149e46fd30af43b1537282f0d7c3c61e854d1797ceb
 AUX ypbind.service 252 SHA256 91be3d88ca57f491e3f508eaef7c6e1d6d751edf6b1acd50dc8b586730ed1bc6 SHA512 7bcf9e3e63d6e00228dfad1a610a0b5941857874278d31e24eba8d9dd251be9b5a8ba5912f87b4ea51718340c87d87e199509e8216e00f5462e4392dbbbc3fbe WHIRLPOOL 0a3e981091905a2f48cef4179f850ee8cfc4b9f5061ce3d70307c2b97cedca81f6deaefee11a011e75d1046c4bceb82e3fd8d625508f5b222857b7a7b723a95c
-DIST ypbind-mt-1.33.tar.bz2 182631 SHA256 456a77cf655d20f963e0d07b71deb4134b29fa886d30689822afd4ea4d3f0c1b SHA512 51769191f5e262355d74c32fb6cb42e261da0f09dd78a0401be051c48ba00deffe1437c3288b6a6a7dbba2c9debfde0b85eef68cb74af62a6264c041f7b160a6 WHIRLPOOL 6a30e280b98f4e77fa0ae07d6ae6856bdead15670f77d34382833d8caeac29d62a64910c31d0e269377efaf3a31792ccfe39bc54184a4b02c684ce7facc68d68
 DIST ypbind-mt-1.37.1.tar.bz2 193500 SHA256 06caa63bb4755649bd830f88c0c62d7a09077f2a927ceec0789e8bb16d594178 SHA512 ba48facb5512550d3b47a11caeb731b6a661c51819af3ae4c926d630b40ffeb300b5cbf612a84ec07bdbd0e169a7c95b973b72a48584a7e5a916d1736bcbb1cc WHIRLPOOL 505913d70b4b312c3ea7a27a546a211c44d84d5a9d73ab4de85aef836678190d32f588b67887d2dc53a2016d85d0c7889917773b4066e04dc23eba851ecc664f
-EBUILD ypbind-1.33.ebuild 1494 SHA256 e9929ef20acc33b4a797df56255873cdd322b630fe6cb05499fd5dab853d70ae SHA512 ff57a10c9119040bf22347cc87dee4fc72ebc492f646a804c063a16a3cbf7fcabe115aaa7ff4414a07db9a79ba16f4aef8bc6b5317a78d24df13afa05e999909 WHIRLPOOL b3daa2016b1600fbdddb5d7bc5d3c72c49d8fc6df05ce4bfa78027a5483b7c588306c338bb006f9157ab7722a29a9f6d903df9ceb5a95955abd785656de0b157
 EBUILD ypbind-1.37.1.ebuild 1534 SHA256 3e640f86f95119118fae5bb3a772c99473d26010ca2338ef9ee582a376416226 SHA512 69e15225a010256990379c5ba441f48ead262c511a0fd1a730d7700ef9e256daf04cf4799a6784b10bb98ab3c8b8e3b08bf7cd1b8e5f8962dadbdfd18c51535b WHIRLPOOL ad305d9dc8bba44d8e928ea59e632041acf321e2980804722dc681ed4cf1244830adbaa4bc2fd683bafbcb9a57fb8da4ef87c9ba5a14c76c5fc24dbceca0ff70
-MISC ChangeLog 11025 SHA256 df5e12c20aa1c0f1c06fd284dec19f8afa77ee391e3cc6ff74212359a59b7848 SHA512 9971b78d0b755e9830342c8aae4b2a93932dacc4f1b2167e5a5bd271a45ce6084987c22f31ee8721fb1da0fd85a2f221b0f5727718e13ebb8435afdac159b9f6 WHIRLPOOL 0be37c1b0c3d0684682dd5010466c777d344393978f808ca2577c61b6e7b2ed7a005025bff59577f60e04cc912ef04c1077a42af458c27ff6bf1cfec27e18982
+MISC ChangeLog 11161 SHA256 fe9c91e6fc8f4bfe09e60bfba396251a57cdb84bd72e6c22e9be7096ceb02fe6 SHA512 dddb9dff9cdf4f32390f63033299b5c8c64c82040d7e578fd5f5a1b0bdc1dac564ef45147214d156c0ed036c94d987043adb6184a53a9e38d702031ce8a769db WHIRLPOOL 718963a1c46717edfd13ded4ed2c978921d2078da4da56d3af84d457c38db4c755e8d0e8120c28586383b968687e4bf6582f91976427311bdbb159b15dd11b3f
 MISC metadata.xml 212 SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757 SHA512 85ac7770baae8cc7c2c52dcd077a448cfb394ec6585e274ffa01c8f92a862d22c6ba0553b71cf2ae6b6f28f6faa5c3d615537f35f9fe0da9f43a2c9043953784 WHIRLPOOL 221b2f4e9b984954eb7268028287339e8678c794c7b4e40ab2baaa037c8e87bac30c8b64473efade9b3ee1ce226aab4ad36760147eee5af7cfd7c081473c839b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTKbUJAAoJELp701BxlEWf+d4P/1kkKRh/qhSaySUt0lnmc2JB
-CaolnlTndbpDJ3SL3Kq9AUmPdQiBlz9FAdOx5T1WvKhXRkaQJdHrTdVulq/Awt8F
-Q21TneR8rHMGNLKib/xR3ndrtujuF1KShh2KK4Ep8UkAzy/x+d4DhNcU71w4aeIV
-OJ7wiCELM9ypgJ5dZ1Rr8bQHWq4DpOhGrHsQsIkcx2DSLgOQoMswZ+7IpLjivFb1
-kKkdVmVW08ZW8AsSRy7ylcxa5g85HgeDs6BPmpDV3StuOCvN1TtzmLAKEkVIGN/F
-wLDGQgNizN807uNKYHltgN2VA07UedRY+2JHnm19XBKc6oGmwiFDahfACoC1frAZ
-R3RTKzDN/fD/aU4sVHn7nsvydWVpVQbqf+avodoAiw4oC1jek9i5IkHQ4PdBFc32
-oSvmZQB1H6Hvl2Wll0DTqehk6ZEizWQZvTMXYo6qY1xKtzhedO6MJ+F5qos4973Z
-616iZtjYm6OdzHqpzVBivzSgk33TEq+c5yqw27DBsylFpgr9ZnZALCRc+zfZ1joy
-ShEfebs5e3O1JjUncqMiHuuK8ESv8zqif4tUlMjxvMIzSuWY2t+RuJ4gPTAHYPJW
-hVw05rVuvRXavTGJL529ilQxy+LAM0UaI8aMvp59yj26xv7QcSnDBUGy0QiWply6
-hkQpKkhYwwA5anVpHgPS
-=T8lo
+iQJiBAEBCABMBQJTrBXnRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7OzsEAC+cJbRveUudRaMh5GFEs8TrdW26DvdoikH8d4b27Q+zsWreMZTRu4rbSra
+XKykVmb0RQF0sW3Ie52FnJ0azRfANgdOJ87Wrsb+R8ugENblBZK3lBJ/OgTZ4Gsp
+jAHiUJyssyLZS325Oaxog7mowARvAnfowwIuRkdWXhfCgsxMxjVek8p0+vV2b1WH
+vR23pnHNht2MSGI3vcWrWJyeo5YFrWB361bD3AKEWeIDaKeU9eb23KIFOYFb2Mey
+kNgOh1VRtcg20mQGlcBAW6lkqHCYyMVb+GsDQ/fF19JdE2Jvf6CaPQGSUOwpGMWZ
+MxRLXbhomwdMvV+V0N7BTQ/AqrZEeNaYzG2pGwnf7JxNJ20pApz/LUr+S+/T6oMz
+I6LcewJmqgTHC5ivoXPiUgp7xtaMjK99EuXqZjcUJMY41MksqZTJaoYzdeZXj9kw
+EkXIHfNooX8QMgMu365tGqobJ8dCQoMC89tgbU63C2RiuvXwdwPdlD55l4tS2yx2
+qIrgkgzoZunYBwd6tx1hKQ8QgKDKDlTw+I7T/LO7pHj2bJ3WRvfXi3W4UwMZUZLx
+xI8rmfNBmndb4uGjcTKvMVGh+GtxC8+7w6JmgzUwGJj6tXDA7DNzQXyT+6lxgvn3
+QiFqL/UJfjhL/SssVEApxdW0BiJM9rBpEsjQ2IztK6bjPInRhg==
+=S5Ee
 -----END PGP SIGNATURE-----
diff --git a/net-nds/ypbind/files/ypbind-1.31-man-port.patch b/net-nds/ypbind/files/ypbind-1.31-man-port.patch
deleted file mode 100644
index d95743d962a3..000000000000
--- a/net-nds/ypbind/files/ypbind-1.31-man-port.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- man/ypbind.8.xml.orig	2010-02-23 12:46:58.000000000 +0100
-+++ man/ypbind.8.xml	2010-02-23 12:49:14.000000000 +0100
-@@ -49,6 +49,7 @@
-       <arg choice='opt'>-no-ping </arg>
-       <arg choice='opt'>-f <replaceable>configfile</replaceable></arg>
-       <arg choice='opt'>-local-only </arg>
-+      <arg choice='opt'>-p <replaceable>port<replaceable></arg>
-       <arg choice='opt'>-ping-interval <replaceable>ping-interval</replaceable></arg>
-       <arg choice='opt'>-no-dbus </arg>
-   </cmdsynopsis>
-@@ -256,6 +257,12 @@
-   </listitem>
-   </varlistentry>
-   <varlistentry>
-+  <term><option>-p</option> port</term>
-+  <listitem>
-+<para>Bind to the specified port instead of dynamically allocating one.</para>
-+  </listitem>
-+  </varlistentry>
-+  <varlistentry>
-   <term><option>-ping-interval</option> ping-interval</term>
-   <listitem>
- <para>The default value for
---- man/ypbind.8.orig	2010-02-23 12:57:04.000000000 +0100
-+++ man/ypbind.8	2010-02-23 12:59:25.000000000 +0100
-@@ -171,7 +171,7 @@
- .SH "Synopsis"
- .fam C
- .HP \w'\fBypbind\fR\ 'u
--\fBypbind\fR [\-c] [\-d | \-debug] [\-verbose] [\-broadcast] [\-broken\-server] [\-ypset] [\-ypsetme] [\-no\-ping] [\-f\ \fIconfigfile\fR] [\-local\-only] [\-ping\-interval\ \fIping\-interval\fR] [\-no\-dbus]
-+\fBypbind\fR [\-c] [\-d | \-debug] [\-verbose] [\-broadcast] [\-broken\-server] [\-ypset] [\-ypsetme] [\-no\-ping] [\-f\ \fIconfigfile\fR] [\-local\-only] [\-p \fIport\fR] [\-ping\-interval\ \fIping\-interval\fR] [\-no\-dbus]
- .fam
- .fam C
- .HP \w'\fBypbind\fR\ 'u
-@@ -331,6 +331,11 @@
- will only bind to the loopback device and is not reachable from a remote network\&.
- .RE
- .PP
-+\fB\-p\fR port
-+.RS 4
-+Bind to the specified port instead of dynamically allocating one.
-+.RE
-+.PP
- \fB\-ping\-interval\fR ping\-interval
- .RS 4
- The default value for
diff --git a/net-nds/ypbind/ypbind-1.33.ebuild b/net-nds/ypbind/ypbind-1.33.ebuild
deleted file mode 100644
index c1e5d72e400d..000000000000
--- a/net-nds/ypbind/ypbind-1.33.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ypbind/ypbind-1.33.ebuild,v 1.8 2013/09/08 13:56:26 maekke Exp $
-
-EAPI="2"
-
-inherit eutils
-
-MY_P=${PN}-mt-${PV}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Multithreaded NIS bind service (ypbind-mt)"
-HOMEPAGE="http://www.linux-nis.org/nis/ypbind-mt/index.html"
-SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug dbus nls slp"
-
-RDEPEND="
-	net-nds/yp-tools
-	debug? ( dev-libs/dmalloc )
-	dbus? ( dev-libs/dbus-glib )
-	slp? ( net-libs/openslp )
-	|| ( net-nds/portmap net-nds/rpcbind )"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.31-man-port.patch" # bug #77810
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) $(use_enable slp) \
-		$(use_with debug dmalloc) $(use_enable dbus dbus-nm)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-
-	insinto /etc
-	newins etc/yp.conf yp.conf.example
-
-	newconfd "${FILESDIR}/ypbind.confd-r1" ypbind
-	newinitd "${FILESDIR}/ypbind.initd" ypbind
-}
-
-pkg_postinst() {
-	einfo "To complete setup, you will need to edit /etc/conf.d/ypbind."
-	einfo "If you are using dhcpcd, be sure to add the -Y option to"
-	einfo "dhcpcd_eth0 (or eth1, etc.) to keep dhcpcd from clobbering"
-	einfo "/etc/yp.conf."
-}