recovering from cvs mistakes

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 23 insertions, 104 deletions

diff --git a/sys-auth/nss-ldapd/ChangeLog b/sys-auth/nss-ldapd/ChangeLog
index 59dff4601198..62d7db9a90a9 100644
--- a/sys-auth/nss-ldapd/ChangeLog
+++ b/sys-auth/nss-ldapd/ChangeLog
@@ -1,6 +1,11 @@
-# ChangeLog for sys-auth/nss-pam-ldapd
+# ChangeLog for sys-auth/nss-ldapd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-ldapd/ChangeLog,v 1.5 2012/07/24 06:34:33 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-ldapd/ChangeLog,v 1.6 2012/07/24 06:58:43 prometheanfire Exp $
+
+  24 Jul 2012; Matthew Thode <prometheanfire@gentoo.org>
+  +nss-ldapd-0.6.7-r1.ebuild, -nss-pam-ldapd-0.6.7-r1.ebuild,
+  -nss-pam-ldapd-0.8.10.ebuild:
+  recovering from cvs mistakes :(
 
 *nss-pam-ldapd-0.8.10 (24 Jul 2012)
 *nss-pam-ldapd-0.6.7-r1 (24 Jul 2012)
diff --git a/sys-auth/nss-ldapd/Manifest b/sys-auth/nss-ldapd/Manifest
index 0e3917baf0e6..97940a8e6f36 100644
--- a/sys-auth/nss-ldapd/Manifest
+++ b/sys-auth/nss-ldapd/Manifest
@@ -4,25 +4,23 @@ Hash: SHA1
 AUX nslcd-init 811 SHA256 b1fd2b84943083b0558e5712d1872d950b5685c7ad8699527e01657bf709b1c5 SHA512 1114219fef76ddc4a189ce254f0d99914b21d303df08307aad185ccfe88050a837e110ca61675ef5eac43839f9dec6aa20364cc6f7ae00b00b1874e744b485c5 WHIRLPOOL 90b65c58d09a62e6d96ff8b477245fa20995d6b377af666754e2d394703f03176d49e1b97501eab8b14d8563964f5aa1b7c495805d345f2062e8de7bdf1c95c6
 AUX nslcd.rc 803 SHA256 badab5c2c2322efa8071ade3b78f3d65a1fa018ee214e4d60c707d568a16d6e1 SHA512 fc4130505bae8276b585248e83051f3290a22b174d8cb1aa00423a846b8831b5ab315fa75011df70e6fd291bd9fe02619ded84e4b7181ae4cd3468621e733e73 WHIRLPOOL 183e5dabe6a50d98d731efdd829b701e916c24beb3e859dbdcb1e1285e922c7ff141242ed9829068322ab9fa57068d0cf56829f5ac1dfd5ec9fed638719ebf88
 DIST nss-ldapd-0.6.7.tar.gz 376893 SHA256 322803b7dd29107d3cec961527166c9b3440786f8a0cdb79fc5a23a62fb1c7fe SHA512 c815442b7792c1226a5e9b7be3a2b8d574ee91776cc2104dd95c5ff580a1f68047ef7ec27194bf6d18b919e7af246232133e1dbe6881ce74622ef24d1b23125b WHIRLPOOL 80bec906072bb3929073c196aaba3fb8f986b7594307656ad5e320d6c05ddc4166bfd47e1f37bf6f126b99b7d862e19cefb3275cfb60e592767d39cf5b606164
-DIST nss-pam-ldapd-0.8.10.tar.gz 475884 SHA256 673a5e235a40fd9aac74082bc64d2ac2280fc155fb00b21092650d2c963e79cc SHA512 0e64d123ada3176a7c72e52c6c77c4f6668010a426b32eb3de457cb8c3d8679c1d36b0772d16c042d8e66d02d6cd97a0f437f89b74bbccf08a9b900c323db118 WHIRLPOOL dd2d89abb3fa8d3c9b5b3bb47897dd6b5868cc80b8bbed8a9b923d844da1c3365ff7f1503d132f474e135eca8bbd0e4359283c9d72216d06031d783f3883fb08
-EBUILD nss-pam-ldapd-0.6.7-r1.ebuild 1584 SHA256 a7b4ac7b5391cb4974cb1dd280e68ec1aa92e0ebd84455166eb237b6694d5ebc SHA512 05738434111c7d735cef2ccf07ac97625f654758827c64c464870547bbd8f851cd0b4038c933645b59ff7cd4628f7beadb6274b6a523421e5ed93541fb8802ea WHIRLPOOL 7eb03073a7b380d87927c6e0d6ba510f5770a4ec097fff3192817bdafa45d66ae21af0268642ca3b8175bcc875df635b172117197538d3481dfdee7dc57cb122
-EBUILD nss-pam-ldapd-0.8.10.ebuild 2018 SHA256 f03481966013e3b12184f0186df64ec4cb5e05901ad54c5b534f84dc2c99ba79 SHA512 2cd70c2a7a08c900e4f61492986239d8be98939b26950a38d93397f6fa587c1740bcd41d2d6ab95e079a49034db21f3bae020d8ade5e5bca304ed48a50dbd6ce WHIRLPOOL efd92deea06141ba6026d4bd597cd7f48e63e7ae9accb86230c1c7afea287664b540b63ce8f8e9502f659e2cebe349bc5e928f045eb30700ae3687fde14fb02d
-MISC ChangeLog 1500 SHA256 adf4b689693e1df9cb5da63c0f0a1acea8c11bb6500b50eac32875d1901f5c88 SHA512 b226288b62ebf97f029de4f72de8e57889e130ab11d3a6cbe353e8211cef54f9e565254716874b48f0a3c8dcb697de91b1249494da1c027102587148575b2b6f WHIRLPOOL fdb8cb549f27a18c49b44edc83107f4476cbbcb8544d9938d094deedd842946f70f8b6ebc690f4f9d90895129cad85ce5df789d0f7a7563d8c9fe795340ed572
+EBUILD nss-ldapd-0.6.7-r1.ebuild 1580 SHA256 0dbfccd9ec5bfbe83dbdfbe15256821b604b4d43d31ab726beda93e47a479a98 SHA512 eb4a7351dcaf8aa91c89755bf6c6a9b01e8f4861636452b3a1f4e37b4f8f2a34593f910b0e7f027e30b104b195c777b7fc54658da8acad0d2b83141d55355d69 WHIRLPOOL 28e0623a4f50f2307d76e439b353ffd1a69231e687dd563dd35da8028fa005f6897035c3504d4214d1857c27198bfb218077146709635aaf7010d9c0ced7d879
+MISC ChangeLog 1682 SHA256 86afe3791a8a0b6ed13a6ef0604dbc60804d1af250deb32809026379c1d28dfb SHA512 dd5b8f6ccc05ea9f68b3050e6b08a6c1839c6e13d6d0526d2365be7b57c2ecebf1bace95deb6d5082ec113a73fb70f6f0d8ab5b90eeb630d6d2bc993d8a316d1 WHIRLPOOL 73c72434e9e2fadf2bd012225e088d9890d252bc326242918ef9337bbab10ca1a1e8b54d53174d6f6a597a8be0c2695d5d428655885acf8c7077adbeab378044
 MISC metadata.xml 241 SHA256 58c2206a9844c7fbfd2ffb5ae2431a552d3d1207dc96aaa94f16ce2c501be545 SHA512 0b22f6d58064e531024e724baccdeda7dc8b411d69f09037f920e86456d7d0c80c06511532eb2fd8bc79b264bbe64033de0012d763e56e070242f571d31d05d3 WHIRLPOOL 3e40e102aca8949ae9993e872ed0bc4f0070256c400f28e4f1e6e2855e19ea9c22f0c7a3022f24b333a6dcadf659ebf6e0228c7a853c9f33d07dc82a641e946a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJQDkIFAAoJECRx6z5ArFrDC4MP/jv6pjvRryx2/H8+pre5GoIU
-GYWC4wLlO7DYMJ0zF7jklFMLLyuB0ituBMthVSNgYc5GgzmIzIVY0+jSxwFce3Ha
-IQDYujBvu9+q4n01/iQwKSL/DOc23kJD6Fo5cx2yydfO1KWXnD7rqCjrz4JDtBq7
-cUvk/kPgWUY65zHSux8zZij73sLPWHTi7Am31T1pyWSfeeGZKQMfUN2XY2wHW1jI
-R4LWccsg7Bt7DUIiHZEUOkkU3wpreXdZ70AV1b4Lv8ODIlg4UGAzY0l9LZRCcYfg
-dhH2QLFyhxh0YLB0O3Ag6JDF7B6LxjCKYPSwYkuLyl4hkEAAB6WZ/00irrjcc5Jx
-T92aP92eFIH4fwLXsJDXjBgWHPbnTmGr0LHNpUUA0JCzuvPCeqXMwCRyp/JH3ZPb
-KXjeyaWnRYCcVvxi0e3AMLbIDR/74voIwk/Jx489XUlKOaZKyHN/3d+8UMUYnhNF
-vZtphZVWzTTQM+eBYEaQg1qNfTfijx4c7Tgygn+IDjn+Dl9dEc5sZnpfOv8R584w
-jpFYfP/cf6cdmWxsqjBggPqXWhVoh/uD9VY8Imif8Dl6s+OS4zMw0b0Ej3/7tGJw
-8IU5tzIxcNc4R0fjFclwK+Hx1K0fa4d78RxuyIaN8KG6aO++hT6y7WegQ9dLQ2qq
-Uez9vwC7k1fzK/1FOqbG
-=GxwI
+iQIcBAEBAgAGBQJQDkevAAoJECRx6z5ArFrD7+MP/3bB3jZEZrHEYPzqiWdQfwwa
+Qr2Y8MQwnqYExqnalw0uC2rt3eHoFXtEcf1WRYO6y7PmppXIkbFdysvHWtlhZEN1
+OzFb4W7IbDLEclsahvBy8iBPf6l00Qu0jpC97y992lOfuzd7jGtyS4wYiQcPatJB
+JGhlI1IeBX0Dg7gHimZ34YqY4ti+f/hdX5j68kS6e0VsZZlC72EDqTTUOB+7q1zD
+/5e72D1sK6vludxkpXTc670bDvjDQO1TUIBiNL6cxZD+d5MgTZgpQiiTlE+0HtXn
+nMC02hqvJ0QtBlwzFKrEJ0a71FT4sA1j5zIu7DdcgW8fSt/qwiCr/+J4hZvb0ac4
+IXJTxvxV02o9lDSywqMY+aIPjSJ9Xd2Io+qVsNYPFH+prHWIhuRdBRsjNQn9YY2t
+vo8jmmFFbT2bHj2zdWBk5ZpLEplnKnWRtUsKp6tp7UDHXSORcVOal2wRUtZpn9g+
+XpSB4wPOgG6yzavvst5XtUjiOyqwZGNj4VJAWhzuBcPnMkXlw11bddEenBhDBo9+
+2+QtLUbiH6zniG6o2chjDwveRpVoGyK44KVvtq5ctmY/r3V8tojv0uESgPYDSYgk
+G6dv2d25c86C1gfZNyFnvSIO9gHm7q2fb1dVOLspqyCuTwNu13kgtRI1jzEqhhu2
+PUCGXOFa6m9DT3zSUzDP
+=52mH
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/nss-ldapd/nss-pam-ldapd-0.6.7-r1.ebuild b/sys-auth/nss-ldapd/nss-ldapd-0.6.7-r1.ebuild
index bcfa2b2f882b..4effdc418835 100644
--- a/sys-auth/nss-ldapd/nss-pam-ldapd-0.6.7-r1.ebuild
+++ b/sys-auth/nss-ldapd/nss-ldapd-0.6.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-ldapd/nss-pam-ldapd-0.6.7-r1.ebuild,v 1.1 2012/07/24 06:34:33 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-ldapd/nss-ldapd-0.6.7-r1.ebuild,v 1.3 2012/07/24 06:58:43 prometheanfire Exp $
 
 inherit multilib
 
diff --git a/sys-auth/nss-ldapd/nss-pam-ldapd-0.8.10.ebuild b/sys-auth/nss-ldapd/nss-pam-ldapd-0.8.10.ebuild
deleted file mode 100644
index c7933d263677..000000000000
--- a/sys-auth/nss-ldapd/nss-pam-ldapd-0.8.10.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-ldapd/nss-pam-ldapd-0.8.10.ebuild,v 1.1 2012/07/24 06:34:33 prometheanfire Exp $
-
-EAPI=4
-
-inherit multilib user
-
-DESCRIPTION="NSS module for name lookups using LDAP"
-HOMEPAGE="http://arthurdejong.org/nss-pam-ldapd/"
-SRC_URI="http://arthurdejong.org/nss-pam-ldapd/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug kerberos sasl +pam"
-
-DEPEND="net-nds/openldap
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )
-		pam? ( virtual/pam )
-		!sys-auth/nss_ldap"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup nslcd
-	enewuser nslcd -1 -1 -1 nslcd
-}
-
-src_configure() {
-	# nss libraries always go in /lib on Gentoo
-	myconf="--enable-warnings
-	--with-ldap-lib=openldap
-	--with-ldap-conf-file=/etc/nslcd.conf
-	--with-nslcd-pidfile=/var/run/nslcd/nslcd.pid
-	--with-nslcd-socket=/var/run/nslcd/socket
-	--libdir=/$(get_libdir)
-	$(use_enable debug)
-	$(use_enable kerberos)
-	$(use_enable pam)"
-
-	if use x86-fbsd; then
-		myconf+=" --with-nss-flavour=freebsd"
-	else
-		myconf+=" --with-nss-flavour=glibc"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc NEWS ChangeLog AUTHORS README
-
-	# for socket and pid file
-	keepdir /var/run/nslcd
-
-	# init script
-	newinitd "${FILESDIR}"/nslcd-init nslcd
-
-	# make an example copy
-	insinto /usr/share/nss-pam-ldapd
-	doins nslcd.conf
-
-	fperms o-r /etc/nslcd.conf
-}
-
-pkg_postinst() {
-	elog
-	elog "For this to work you must configure /etc/nslcd.conf"
-	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
-	elog
-	elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can"
-	elog "start it like this:"
-	elog "  # /etc/init.d/nslcd start"
-	elog
-	elog "You can add it to the default runlevel like so:"
-	elog " # rc-update add nslcd default"
-	elog
-	elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf"
-	elog " is now named /etc/nslcd.conf"
-	elog
-}