multilib for nss-pam-ldapd

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

6 files changed, 34 insertions, 193 deletions

diff --git a/sys-auth/nss-pam-ldapd/ChangeLog b/sys-auth/nss-pam-ldapd/ChangeLog
index b4565e915886..c84fde277e52 100644
--- a/sys-auth/nss-pam-ldapd/ChangeLog
+++ b/sys-auth/nss-pam-ldapd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-auth/nss-pam-ldapd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.22 2015/05/09 00:06:24 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.23 2015/05/15 18:12:17 prometheanfire Exp $
+
+*nss-pam-ldapd-0.8.14-r2 (15 May 2015)
+
+  15 May 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +nss-pam-ldapd-0.8.14-r2.ebuild, -nss-pam-ldapd-0.8.13.ebuild,
+  -nss-pam-ldapd-0.8.14-r1.ebuild, -nss-pam-ldapd-0.8.14.ebuild,
+  nss-pam-ldapd-0.9.5-r1.ebuild:
+  multilib for nss-pam-ldapd
 
   09 May 2015; Zac Medico <zmedico@gentoo.org> files/nslcd.service:
   Fix systemd service unit content.
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index a1397b3ed265..30ebe11d2974 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -7,19 +7,26 @@ AUX nslcd-tmpfiles.conf 32 SHA256 670cad7afe9938464a1e2edd6bbb588e138318795ed689
 AUX nslcd.rc 815 SHA256 7e68c0387282d045016c371c3888946955e7c74281f3d92f677c1f80d39833d9 SHA512 fca3a13f259293adf5fac1f1b574019752103ea83aef261a3a83be81eba59e779399179a82c57e2d504663c455efd2cdd3662ffe12bc2bfdc323f425c58d0906 WHIRLPOOL 2b3ced109aebafff42981b18b142dfed90bc2f1c10f228098f38ab2a1f03402fb79d986cf7a1b309e7649fc91d10c184f3fe5f9caf39933d12bc716de5c6c819
 AUX nslcd.service 324 SHA256 9a194c0cc0f43fac5de3ac974cf8efef1911e233c05d7cdef22a9922161d940a SHA512 8055407704c445b4b90046cc4f6b68544d8955bf65fc6b4a2fdf986548a353c2292de70edcf7cb2356619cb122cd3341a82156b6f71eec914471406447cb26a7 WHIRLPOOL bfe549b354ebe56aeb8442a081fdecd7326391d789bb733933606dac8a118a66f169561ea07e389206f971dc93b6d665ae9f8d374a6e36160db218c1b5c0f973
 AUX nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch 403 SHA256 d47afa040e8c282bf7f294583ae2c11a66c12cc702082c138eebaf972afcfa68 SHA512 c8cccb044a641f673f12db9717bda4c0c4d91bd1933342595d8f3f540449459c5cf14263133487195b223670d450873f608e3ce5b6f1ca775ca7fe0180a9f962 WHIRLPOOL 916c2b506e9133864c4063bc6ab420b6c6a7759b8b7adc6f6964b9b33bbcd5966b89135bf37eb3a511646806a11073210a68be9ea379fb214539f4a41934cc22
-DIST nss-pam-ldapd-0.8.13.tar.gz 487295 SHA256 b792ae98c98402ac25db49d54c4c53b860d45c9a7a7e24587e03a5fda7ee5d22 SHA512 fbc1baac3957cfe1a0f5a29563ba37e045b45931867815d2a5ac2e11b9c985df0723a1086fa4cb5251b9a20c87e91028bf93ee0deb9128ed525863076a301f01 WHIRLPOOL 18c93663a12af9d0f1ae25476693a1772ee9d74b6894af7b7a87e609c353d4e39dc71b0b5bf336bed1aba6693c745048a5dffa35c7be66b1d8a5a4a3d7084d4b
 DIST nss-pam-ldapd-0.8.14.tar.gz 508949 SHA256 a29ceb9b7eda386ca38f16115ffec61425462cca6b5e560c44c3d51edc03a63f SHA512 70abb1836b5b3304e583fd3b71f11fee7586e181b26f4630779ec1d90b856da6e4fcc76327c51b20a158aa36708dd12ceb5f543a33c826881f2ad3e092f542c9 WHIRLPOOL 5d30088d73e464bf380dd5e7d34f8c5200680712693c97ee1f1df1880b4680236d9168ac7ec08b161ae463236c0feddc2171442a956c872113caa6e2b07a6bb8
 DIST nss-pam-ldapd-0.9.5.tar.gz 750988 SHA256 49080058d85f60213c1b661a899ffe44e30770b5034e5a6ce48486a8d92bee6c SHA512 78df39c7db10b8787ad4e3b4ccc4c764f390db85c1ef3da1de5344cca668fc54945537425e1c89c7899c66c6246652475386009b8fcd3f4d3144b790b1fc4015 WHIRLPOOL c6bbae2c174df83fd27ba90ec3c7a9cbbb20ef1e1b048c8b730735897d356bd2087289c8e5e669f3681f615cc466c540ddc78893edcf487f796e3a5396a30ccf
-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.5-r1.ebuild 3097 SHA256 6787b95dfe839f5cc9c1e59a8bc0a7ba16b50ec76f5ee9285a8d03edae4a43af SHA512 e798f18b7f894557f7b7f26439d54617bb0b2a179916d7f1cb0c9ec0c0ea7cc249309d84c1b1f148543bf4cc421d8b68fbc8ed90c283d271688fd35a61b7ab97 WHIRLPOOL ec2919142c7e7bedfea25873e4031c44c192640f43257489a58f8d9e29725ab58d799708da37127dec3b14ad4f69620c30812dbb1edb584dd2ef3de4d155a3ba
-MISC ChangeLog 5689 SHA256 c8535a0f7e0d8d196551351fe3ebf19845d3670fa6a8deabbd876895c829b1de SHA512 3ff4464d9e3058be7c3ef9bf973949744ba2234ac38a1f93c4e6b105152c7b5541316568d216bca659c6bf86d3c95f9f13bda06b3455bfbfb6d37db93c3e4ba0 WHIRLPOOL 2fec3b61a14d3520ddd95d26a807c2d270b1add5eb1d20a704a3face56ac6e2b45a6a3254f09aaf8b6d47b274de732e7db4eb4749b9741e6a1be77d2443b178c
+EBUILD nss-pam-ldapd-0.8.14-r2.ebuild 2144 SHA256 f36b6e4138dc6346f8440fc530f2be42dd4856243faec07058079f9d55f7b562 SHA512 ca6749205a478d4d7f526c46164fa8ce0c22b8ad8d18af6e3c0dfc9f41ca37f1bfeb29e428bc3836a94aae4a810a954851842aa527f424a7aa4bf4fad3307756 WHIRLPOOL 0755f53e9f56e745c37753d62747ac8efc01404e778648b353076d1ee43815411f6db60b404faa600602299f819decdad9b7d364442b76e9cc43f91c1d162ed4
+EBUILD nss-pam-ldapd-0.9.5-r1.ebuild 3121 SHA256 786ecef074556bcf3dfbca459f5cacde6c5d8dc30cec2d634b964b8ddc769dda SHA512 a1dcb24faead16545afb073d97753c030cb0e8401238a0d36907fcffdda73052e4b2eee8aef1cd6203ba414bdbd25a8b09a2b0c0d278472539b08ddcba2bfb09 WHIRLPOOL 6469669f168a15c8fefb0cac2b3cefde8ff1147f79f771a111dfec25604c1deade7665cf2695ebbcb7f829c399abdf302c9c6717f645265cdf6e813eeb631520
+MISC ChangeLog 5986 SHA256 18b13dfd5d05b0c4a99c9b2653046ad7aadf8d7f19a7cdee6ce6ddefe6511eaa SHA512 1b29b5c8be9c92307942a7cf6b187e5d4155c5a6f9af6b99f1361734f5ccde73e74eadce46cde684638dcca9bbf47d8cc4e3a09a77dc3b814513a6e08d662ce0 WHIRLPOOL 05a78c34895373fd19ca709d99b6cd4f06971b0567bd5ddd2f039ac2ef00d970ca71e814b7a3b63b45ff09efee5b4609ca045ad7fe76d057fa2ad7338258d1ee
 MISC metadata.xml 1036 SHA256 81bb1d41ad1502e088be7041ee4ab827d770bf21c5eb4617553d45fa27356218 SHA512 532558a294e12659b86691c324fe9d4e90530aa56d985a450057363e3c966bb1a18d354be536106b83c24b7bff54c4a8d3852ba8be7a1e5e270921c7828507bf WHIRLPOOL 7a73016266565c39cf732006384ea266ce00f8119786cebd7fb39e40408b07bad864601a96d747f7488c92acb39e1c96e3f170dc4d708d8dc5b61f12fc8a26b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVNT4IACgkQ/ejvha5XGaOuyACg5i+kHlMxfbj3YJ7qKNrelQ9v
-Za4An2MvG7EQpIljHoJ1+caXlyTQUdCe
-=esU8
+iQIcBAEBCAAGBQJVVjckAAoJEGSje+quGaTorq0P/2OGl6TYV3oz9bc0FAeo5L2v
+/I3TuQJ0ISZNhqhbiEvTLPOo3tMM9dECfRc1XMldPjdxyTaSHC8/IwLKKs1GhcA+
+7L3JmaPdkE556Myb+1/jFo5ClpTMJcGiT6RKRmRYBeySdEFZoox5QWlecEiDNmj7
+XjBT9FscuymWRLqqjk6Kwfi0NPwGdgGM7kSLvvKfDumhut/v24O2LlN3pycZLFFx
+i8yUSaEHV7Ytr7q2Q4s65HzjG06lSCNaBgcsHsRbpu3VEJmgP0EeyCgKbQrWhBAM
+pAItMW+3fm0LbKLQzHSb5BMCV+B5zMYrMWVjXdbt6G2kcIPGfZp2G5yIqxODeskd
+50L1ZBaX98W3rQ5FpEGem9hvhiYumuLOME+alNQJqki/hncfrM6Te3uMNJKSs/NL
+MYnKOIaMQYb27Hq2gir8oIRsZNyvogBifeXZ7Un59dudC4O7AFGPOPeynUtn7bNn
+IEMra1I8TVAQX3Mt8HxRMAiotXOy9WGX0kiGzNrMKPn7qhsJ3KSSqqwJnbTFxmvH
+ByaN629ijdcK3mtJnLv57NKZ+nWa/cmWlOc6cL1OjFGc7/3pZYrrR3j55EZ1LpXz
+Mkgd9EO2UZvj6SCHVWphNXDNvnqZ0Ga4+IzGoYekOelyLZyco//YyiozLsQT3R/t
+RYXvcquFH5gXw2yNUX8R
+=ejAs
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.13.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.13.ebuild
deleted file mode 100644
index e0c891cb98af..000000000000
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.13.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2013 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.8.13.ebuild,v 1.1 2013/05/06 15:04:35 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
-		!sys-auth/pam_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
-	--with-pam-seclib-dir=/$(get_libdir)/security
-	--libdir=/$(get_libdir)
-	$(use_enable debug)
-	$(use_enable kerberos)
-	$(use_enable pam)
-	$(use_enable sasl)"
-
-	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 (not needed bug 452992)
-	#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
-}
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r1.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild
index 62b4f80b4670..6111a4e10849 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r1.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.8.14-r1.ebuild,v 1.1 2014/05/26 12:36:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild,v 1.1 2015/05/15 18:12:17 prometheanfire Exp $
 
 EAPI=5
 
-inherit multilib user
+inherit multilib-minimal user
 
 DESCRIPTION="NSS module for name lookups using LDAP"
 HOMEPAGE="http://arthurdejong.org/nss-pam-ldapd/"
@@ -29,7 +29,7 @@ pkg_setup() {
 	enewuser nslcd -1 -1 -1 nslcd
 }
 
-src_configure() {
+multilib_src_configure() {
 	# nss libraries always go in /lib on Gentoo
 	myconf="
 		--enable-warnings
@@ -50,10 +50,10 @@ src_configure() {
 		myconf+=" --with-nss-flavour=glibc"
 	fi
 
-	econf ${myconf}
+	ECONF_SOURCE="${S}" econf ${myconf}
 }
 
-src_install() {
+multilib_src_install() {
 	default
 
 	# for socket and pid file (not needed bug 452992)
@@ -64,7 +64,7 @@ src_install() {
 
 	# make an example copy
 	insinto /usr/share/nss-pam-ldapd
-	doins nslcd.conf
+	doins "${WORKDIR}/${P}/nslcd.conf"
 
 	fperms o-r /etc/nslcd.conf
 }
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14.ebuild
deleted file mode 100644
index aba07c0aa159..000000000000
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2014 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.8.14.ebuild,v 1.1 2014/03/16 18:53:14 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
-		!sys-auth/pam_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
-	--with-pam-seclib-dir=/$(get_libdir)/security
-	--libdir=/$(get_libdir)
-	$(use_enable debug)
-	$(use_enable kerberos)
-	$(use_enable pam)
-	$(use_enable sasl)"
-
-	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 (not needed bug 452992)
-	#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
-}
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild
index 6f13acae2c69..0044c38e0582 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.5-r1.ebuild,v 1.1 2015/04/07 01:04:53 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild,v 1.2 2015/05/15 18:12:17 prometheanfire Exp $
 
 EAPI=5
 
@@ -82,7 +82,7 @@ multilib_src_install_all() {
 	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
 
 	insinto /usr/share/nss-pam-ldapd
-	doins nslcd.conf
+	doins "${WORKDIR}/${P}/nslcd.conf"
 
 	fperms o-r /etc/nslcd.conf