adding multilib support from bug 542374

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

3 files changed, 120 insertions, 17 deletions

diff --git a/sys-auth/nss-pam-ldapd/ChangeLog b/sys-auth/nss-pam-ldapd/ChangeLog
index 7c483d997d55..cdede0eb56dd 100644
--- a/sys-auth/nss-pam-ldapd/ChangeLog
+++ b/sys-auth/nss-pam-ldapd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/nss-pam-ldapd
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.16 2014/06/15 03:51:13 prometheanfire Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.17 2015/03/09 00:36:52 prometheanfire Exp $
+
+*nss-pam-ldapd-0.9.4-r1 (09 Mar 2015)
+
+  09 Mar 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +nss-pam-ldapd-0.9.4-r1.ebuild:
+  adding multilib support from bug 542374
 
 *nss-pam-ldapd-0.9.4 (15 Jun 2014)
 
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index 2975319ef0b6..249bcc372134 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -10,23 +10,24 @@ DIST nss-pam-ldapd-0.9.4.tar.gz 746269 SHA256 fd2e3e0935acfd3d2b13682962f51d28d5
 EBUILD nss-pam-ldapd-0.8.13.ebuild 2135 SHA256 8cce84f8a1229937b393d175edfa5d2446b7010b82a25cb9d742f730e44e7db7 SHA512 34022b794f2090a2b18dcac92913af133275330fc53071616eb616c2062ccd2538f9f6b36ecd586a00cb54b00ccb26bc7717b3247da06690e9638540b5006299 WHIRLPOOL 04062e9a7a11305cc250020b29498b74b1f14b729c24494a9f3d44cc1409bfdc7b45bbd756428ac9171e1fee8c3a7a9c66415ea890e3cbb0acaff6cabbec4679
 EBUILD nss-pam-ldapd-0.8.14-r1.ebuild 2070 SHA256 15e1322d9b5de5796a7f0d294089df31c6345fd1106759c68456fa2cffaf8e17 SHA512 bf0bd6b0dba89fdaf777c5afcb7969f23e8e47f4c5d0a4631beae5c627e267c97b020c75ce46bbba896711fb179a0984682ed74698400459edfb963b141d1fd7 WHIRLPOOL c6f988bf8d87bb2fcb509c78e75f205501137e8c1d007ce50cd1ac0e4ccaf970ce457b211f9e9b096e8036c76d452d436cfa9f0e33d3fccca8e021c8854cb585
 EBUILD nss-pam-ldapd-0.8.14.ebuild 2135 SHA256 51a090cdd09c1a0b01249d3c89302fae5b4dffba98371c3d09cccef8ba166ccc SHA512 81a579a39e15a279d5b06216f63e38cfa2908a6b9f4cda3da93d9120212095a1722bcea8e85559f1142fcf4263d7ebe558993e0c026d11d29390f2810cf8c5ad WHIRLPOOL 1e5fd88790faa5fa03d9a8eaa59ed1c1f53051389cfcd2fcc259d51578b9edd743610866b85f7b7dfd20ad38ae68af78ad1cf06d3107d18cca7ee0f8f416e76a
+EBUILD nss-pam-ldapd-0.9.4-r1.ebuild 2448 SHA256 629cec8f9b64a2e09d4c2fa9705609a2f7636b4213c770ff09f221bff9d9f4d2 SHA512 36fa4abbbb52b725bb73fb9babb9527699047f430398b9973b48e00ae7b75bfc8e7962ecade59249122bb8dd4fb4d6e8064d81ff61070a91ea1969c305a47e7a WHIRLPOOL 77cb7ea18f24aac843ee93d861ac168245ccc99b5aeeb3c6d3801d49a678689dd7f2111708321bf6af25b162d277bdbbf9b667d336d2d3cf936e68363d274465
 EBUILD nss-pam-ldapd-0.9.4.ebuild 2128 SHA256 6dfb282bf3fee3219b214b5d978aa8c60ebf9931092b0cf55a22d054f2cffec0 SHA512 f16e57892f85c22d73a8cf226f8b54d69bacc8de38fa062e9e15559b80644f40c17ca89ad8976709477057cd7ed88236893d4313673b65d71f1d349b321812fc WHIRLPOOL 00ed56a4e3f870117c38f116a85c39313b6497fcd69a7441214c0a796233ebaf33fce26be3f068e046b16669ce2e5987503ea5685b6246f97471620b6a5f6ac3
-MISC ChangeLog 4343 SHA256 7034b5994e0805c5b68fcbc760497fd0c63f42c47af77d221d0162e6b3e953ac SHA512 950741ceb9c6fcc3c9f51536f6ac5d147ebe6d3f4f7b41f90cefcbe41109f58958e1096d4a40cad04737bd23efaf00050e85cbf0a0858b0d9c653256174f5c57 WHIRLPOOL 79b4c82b05c435fb0c01fe86fde6fa6bf9f56aa35eb391fc276734825300cb88c34a0b53856b61342fb7cdbebd266f8e14821fa72af1d121e2b5e0e41e158ac5
+MISC ChangeLog 4516 SHA256 3c6c79d6f4ac1d9df1cbb7e4ed4f60dcb12bcb6d5dfed46c813651f5f00dacdb SHA512 eb468990730e06b50b597462e61aaeeacfe40885f27fbda54606308ffecb0852260cbffdc4771aafb13f9851347e03b0a825760834b3b5627c5864e238c926ea WHIRLPOOL 8491bced008fc92ef835bb6999866131a94149ac94c8a026a2191b158764e7103cacb9fc5c0ae41fdc5e51c43c6a25f8892aa9462242ec255c7a7e86956c8257
 MISC metadata.xml 838 SHA256 eb88b55caa09981444d8d9f684d07f836fac10f08193ade4a909820c2bbc447b SHA512 2f77e6f5fd6147f2548fcd50d80d2e78736c49cb3d45b85dc42a2356365ca043c7268cdb20d64166a45f24a801d0075ae1434f942a98e7a4786394ed65a2fe79 WHIRLPOOL 3ace48e548fea8be6dce2848b517bf21e4616b3d34e7980af202cb318819cb562ce3921db79c3d53a338b4fddd3fc82d8c78a5ab431a52e4ce1810441d4d7dba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTnRhGAAoJECRx6z5ArFrD9g4P/ApT2HVWwsufg5ERqVCXlf/T
-pvz90i7BXPlPRQeRw08tR56dm1PUhFv/GViC4jJI00Ds6/3bXRr5VhDmnXHbuGZr
-whUXQYm8G/NVboS4BNxl/vKwptC1z54DAstfeWesRRONnlwOa+vRqrH5bRGEMICT
-5atEFX+vOb4gkZM6aT37MM7K0M7Z2FSaBuU1f0naWtgibeqN9ttvICAAxjQfV3Gs
-Qo9iVIr0QlVSyzqC/dzO/TYl5FU8duXcQ4X52IhaQxBA/ZnZCNzXEV9ib/tudmXv
-ebQm0/Ye7YsnE9QVfX/1Ql+jIFy+7YMTbreELWXqBOmfe4BRM2YJwS0AR+JL+m2Y
-+AKnpQSUHKcglcWN1YFrC7YPcWQIG1iSn/AeIR8MTVzYIretn4E/wUkphyOnVRVt
-6m+POzN91iUC/khzypSeliSf87nOqxg1LEPYZlAk3UYdjFiXRUrBsMzveLa9JdlD
-KOGlolaR9JarUZo7koLKfTIxPBZV91tGVYWa4qCoIsIDKBYiO4EJTg4WdYHVf0oz
-OFTdGRXrEK5RHi+f+bPSdKNovoJwQBM4glrP7vvzB06sdJJ+yK4BVdJ4zHLvaXCo
-N0moAeq/KUAiEnDkqsDsuvEaDr7jI1lhXpemVOtOLEXtvDYzlQ+rOMY/CC4dLWtn
-5AmLTj9eHDSnkWRKQVOD
-=0sJY
+iQIcBAEBCAAGBQJU/OtUAAoJEGSje+quGaTomLkP/iZPg+niQCB5c+3iRXwUtABm
+gXg88dabltXqFr/EyzSkwqlFpCuSpq9Ety0b+N3wTPkvV7uDfoUGt/uCIxDeyAWJ
+rJOLucgkDUy5myCLFEIfOwdVWGHI8H36Cspi3Fwq1DBT3dCuproqj33nAPIPQhFO
+V7UkmFPdpzo5th9wJIoHlXp9CBUqWyuW/+tGPKGGvws2qCQHd+jYRrU/4GNbk9ww
+tUV8wIfjs5EADC0s0BD8mCYfmvyp91WshnlaV1tt2UpZSS3LYfsQ9Hj9VYMm9oAh
+wDS7DVCW6CfbN3BOqGofujHqzeERQPdOYNSymJ2RwN7S99GgyZiNwPSIgAbEAtGZ
+YOhBin/w4W4FDNMiCx8iQZrazIv8+a0vpZ8zkoN8o4/WlJSDbyArTHUJFghRRfG+
+H0dMIz6wQ/m6mF4YBVGr5NZQxLVWfO2ZMOrVeuN6ndL4pUnHYG+HgbeitfDSyr4Y
+98qxwhfgyrVC1IDC0b+NgRsMsAI67q1wWpmZQwgkhhZqGimwrUzb6pC9KhiNwjKS
+PljdKaO5dxdJNYlNFgaslrLZcKG8OANSPggAVyz9bnVFefif4bZacJT+UJFZjOG5
+/QuNiJJW7/4mADTobEO4WkTLkTaf69HZgpih2K5oXxQb9uoBWl/VjEvSa2DhXHVu
+2GQJ2VkkIgBpZecNhVxp
+=17ic
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4-r1.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..a64537e31fe0
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4-r1.ebuild,v 1.1 2015/03/09 00:36:52 prometheanfire Exp $
+
+EAPI=5
+
+inherit eutils multilib multilib-minimal prefix 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=""
+IUSE="debug kerberos sasl +pam"
+
+DEPEND="
+	net-nds/openldap[${MULTILIB_USEDEP}]
+	sasl? ( dev-libs/cyrus-sasl[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	pam? ( virtual/pam[${MULTILIB_USEDEP}] )
+	!sys-auth/nss_ldap
+	!sys-auth/pam_ldap"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup nslcd
+	enewuser nslcd -1 -1 -1 nslcd
+}
+
+src_prepare() {
+	# support user patches
+	epatch_user
+}
+
+multilib_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=/run/nslcd/nslcd.pid
+		--with-nslcd-socket=/run/nslcd/socket
+		$(use_enable debug)
+		$(use_enable kerberos)
+		$(use_enable pam)
+		$(use_enable sasl)"
+
+	if multilib_is_native_abi ; then
+		myconf+=" --with-pam-seclib-dir=${EPREFIX}/$(get_libdir)/security"
+		myconf+=" --libdir=${EPREFIX}/$(get_libdir)"
+	else
+		myconf+=" --with-pam-seclib-dir=/$(get_libdir)/security"
+		myconf+=" --libdir=/$(get_libdir)"
+	fi
+
+	if use x86-fbsd; then
+		myconf+=" --with-nss-flavour=freebsd"
+	else
+		myconf+=" --with-nss-flavour=glibc"
+	fi
+
+	ECONF_SOURCE=${S} econf ${myconf}
+}
+
+multilib_src_install_all() {
+	# for socket and pid file (not needed bug 452992)
+	#keepdir /run/nslcd
+
+	# init script
+	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
+
+	# make an example copy
+	insinto /usr/share/nss-pam-ldapd
+	doins nslcd.conf
+
+	fperms o-r /etc/nslcd.conf
+}
+
+pkg_postinst() {
+	echo
+	elog "For this to work you must configure /etc/nslcd.conf"
+	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
+	echo
+	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"
+	echo
+	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"
+	echo
+}