Fix systemd service unit content.

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

3 files changed, 23 insertions, 37 deletions

diff --git a/sys-auth/nss-pam-ldapd/ChangeLog b/sys-auth/nss-pam-ldapd/ChangeLog
index 51f9e4701c4a..b4565e915886 100644
--- a/sys-auth/nss-pam-ldapd/ChangeLog
+++ b/sys-auth/nss-pam-ldapd/ChangeLog
@@ -1,6 +1,9 @@
 # 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.21 2015/04/07 01:04:53 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.22 2015/05/09 00:06:24 zmedico Exp $
+
+  09 May 2015; Zac Medico <zmedico@gentoo.org> files/nslcd.service:
+  Fix systemd service unit content.
 
 *nss-pam-ldapd-0.9.5-r1 (07 Apr 2015)
 
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index 512e1a95e748..a1397b3ed265 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -5,7 +5,7 @@ AUX nslcd-init 867 SHA256 a8cac89f3bbecde9b4267269a19bbd9cba56b452928346c4027052
 AUX nslcd-init-r1 856 SHA256 d10fd2a3b46af6d9172d4caa9544b66c86783f147c37cc217e52b8d343813090 SHA512 31962bf39ffb3e61cf9b203425ec6fcb7635cfe82add485efd48db212b24c3ed0b77953b524add1c2a07574890bf933f265e7f2a94c63fe7c4203f3ebcc0a20d WHIRLPOOL a5c3243b811a26ee09a9f2d735fd87ad3004afec85837b5eebfa8e3c0673d58c93fbb192bad3bfb45b8866620742c491cf5a6b9da49806ff06c3539858f6cdf3
 AUX nslcd-tmpfiles.conf 32 SHA256 670cad7afe9938464a1e2edd6bbb588e138318795ed6895493c64fa7e666164a SHA512 ccffd327cfa015ec746f4e1506c02beb514763625b0e5818455491b911d9328b19f17620926c15aaf18f5cd9268ea71f5ef35ce7a427aefab950579d5629ee5d WHIRLPOOL fdae80405339264b9c9a491b80d5e68990f2a8c5a42ab2b8b2fc60ea00ee4a5a47ca1b74a256caacb376292302b6e44a888e2d201d9ad2b698e65974ec52aba5
 AUX nslcd.rc 815 SHA256 7e68c0387282d045016c371c3888946955e7c74281f3d92f677c1f80d39833d9 SHA512 fca3a13f259293adf5fac1f1b574019752103ea83aef261a3a83be81eba59e779399179a82c57e2d504663c455efd2cdd3662ffe12bc2bfdc323f425c58d0906 WHIRLPOOL 2b3ced109aebafff42981b18b142dfed90bc2f1c10f228098f38ab2a1f03402fb79d986cf7a1b309e7649fc91d10c184f3fe5f9caf39933d12bc716de5c6c819
-AUX nslcd.service 607 SHA256 35d39f311ebd6f12e848867a419d49fd5c1e34206f513a08e72eabbc82f573de SHA512 cd80b4d51ba7bca9856b08a05886c8636442eb0497a4e495fb97a9ac8771ff23b11a3ddb3274cb7d1849d924d50a741f5e17b2084cb889a4c1a565222a50975e WHIRLPOOL ae3a0b1686c847813050eca44762ca4195374ade2dc0c41edb6eefc74646eba2b44a5460f44052d3c89fcdf15fe077d08f98fa9f5485b0c3d9d0a43e55c5dfbf
+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
@@ -14,22 +14,12 @@ EBUILD nss-pam-ldapd-0.8.13.ebuild 2135 SHA256 8cce84f8a1229937b393d175edfa5d244
 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 5585 SHA256 c4f0972a071817308280a9d36c3761690c86683be58061087a97e9814742f771 SHA512 2050ed4e1265624276456344955adb8b3cd30ac632eed44cae7b993393aa9329512c9e00d2dad952ac1e0de5f1c629ccea3c29ac17669604698380432c686987 WHIRLPOOL 7a45d2dfa0cdeb23fa2d41e82fb78889bbce860a24464061ca5f88b390729edd04654d17f03607128840a15d7f338d65a6ff12abd1a3d594508439fcfc4b840c
+MISC ChangeLog 5689 SHA256 c8535a0f7e0d8d196551351fe3ebf19845d3670fa6a8deabbd876895c829b1de SHA512 3ff4464d9e3058be7c3ef9bf973949744ba2234ac38a1f93c4e6b105152c7b5541316568d216bca659c6bf86d3c95f9f13bda06b3455bfbfb6d37db93c3e4ba0 WHIRLPOOL 2fec3b61a14d3520ddd95d26a807c2d270b1add5eb1d20a704a3face56ac6e2b45a6a3254f09aaf8b6d47b274de732e7db4eb4749b9741e6a1be77d2443b178c
 MISC metadata.xml 1036 SHA256 81bb1d41ad1502e088be7041ee4ab827d770bf21c5eb4617553d45fa27356218 SHA512 532558a294e12659b86691c324fe9d4e90530aa56d985a450057363e3c966bb1a18d354be536106b83c24b7bff54c4a8d3852ba8be7a1e5e270921c7828507bf WHIRLPOOL 7a73016266565c39cf732006384ea266ce00f8119786cebd7fb39e40408b07bad864601a96d747f7488c92acb39e1c96e3f170dc4d708d8dc5b61f12fc8a26b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVIy0/AAoJEHy/RO9cNQiDlggP/Asttxpid8DceiY2RfIZTwLG
-r18Gv8cFBZn9MtuUqxrI04GtVF+r+aKl6BYzo/i85vjlMURMKnPIKTp7CcpytvKL
-FUet1KEUh4QDonXbPWNIWIpuCpJ2GMQrYWTLBFFN2dEMB4lLECGWktMf1rcs9dFT
-YsH67evjePOQBDngxFaZk7nI1Wsug8VmspKgUiOxrTI+ai5jkq6UTCIHVlVU4XrD
-g4S+VciAKxBaGuayG4aJoln32cJ/3NZzu0dvCEkywBL007TjO7ZY4glNdgfLLMnO
-xqPJZmvJroHKVbNwgWN44o70CWNIeYK7tM1+C9OZezNe8tzWT9WmMxQBs1vKvNQw
-ZIlEELb6wEEKdp8uqIo7zp0Jg4TwXHjg7iK0rF0VQg27ucCVqEtXWRSM4fHoq41s
-YlYknMja4SGNFxvcdsfWCyuUP5Vn4kQZGVBHn7D9wBDb4NRB60et6MPKxPAwB0D1
-l9p17s6SoKj2I3D7yFSSSDGrri3aFXOSUeTtBCjDKmofnG1Oo5K2PNXWSSMsEWhU
-g3ccG7NvYmnnti/I1rcTz7E+GGASNmHBXwFS/7ubUMx6NvP4ioFcb6WNBjd51kZS
-P+GYr4SKYi7nHXZ8Nji+ZzfzPUffPhQNBi+UhqCpYTg3tAdNcAWnhHNyyQTGUOK5
-mr+/UeDD+P2c4b2tsgoO
-=9qjq
+iEYEAREIAAYFAlVNT4IACgkQ/ejvha5XGaOuyACg5i+kHlMxfbj3YJ7qKNrelQ9v
+Za4An2MvG7EQpIljHoJ1+caXlyTQUdCe
+=esU8
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/nss-pam-ldapd/files/nslcd.service b/sys-auth/nss-pam-ldapd/files/nslcd.service
index c7fef0ec7173..030cc2c90eb1 100644
--- a/sys-auth/nss-pam-ldapd/files/nslcd.service
+++ b/sys-auth/nss-pam-ldapd/files/nslcd.service
@@ -1,21 +1,14 @@
---- nss-pam-ldapd-0.9.5.ebuild
-+++ nss-pam-ldapd-0.9.5.ebuild
-@@ -5,7 +5,7 @@
- EAPI=5
- 
- PYTHON_COMPAT=(python2_7)
--inherit eutils prefix user python-r1 multilib multilib-minimal
-+inherit eutils prefix user python-r1 multilib multilib-minimal systemd
- 
- DESCRIPTION="NSS module for name lookups using LDAP"
- HOMEPAGE="http://arthurdejong.org/nss-pam-ldapd/"
-@@ -94,6 +94,9 @@
- 			python_foreach_impl python_newscript utils/${script}.py ${script}.ldap
- 		done
- 	fi
-+
-+	systemd_newtmpfilesd "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf
-+	systemd_dounit "${FILESDIR}"/nslcd.service
- }
- 
- multilib_src_test() {
+[Unit]
+Description=NSS and PAM LDAP client daemon
+After=network-online.target
+Wants=network-online.target nss-lookup.target syslog.service
+Before=nss-user-lookup.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/nslcd/nslcd.pid
+ExecStart=/usr/sbin/nslcd
+
+[Install]
+WantedBy=multi-user.target
+RequiredBy=nss-user-lookup.target