installing systemd unit file bug 500248

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

4 files changed, 29 insertions, 21 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index a3f722e466ad..ec2508ed9ecc 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/memcached
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.147 2014/01/27 07:19:49 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.148 2014/02/17 06:24:16 prometheanfire Exp $
+
+*memcached-1.4.17-r2 (17 Feb 2014)
+
+  17 Feb 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +memcached-1.4.17-r2.ebuild, -memcached-1.4.17-r1.ebuild,
+  files/memcached.service:
+  installing systemd unit file bug 500248
 
 *memcached-1.4.17-r1 (27 Jan 2014)
 
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 8248aa119e66..8b1591b4da83 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -16,7 +16,7 @@ AUX memcached-1.4.17-EWOULDBLOCK.patch 506 SHA256 c0f2be207fd5a6185c70d16482d1d2
 AUX memcached-1.4.4-as-needed.patch 1135 SHA256 4b08e69c7a3f97e6add4fb337b095b7b0aba55c3d62ed793858cbf1dad036421 SHA512 16f1ebae169d47836a83857e9da1ba4498b061367979d2ec5d271b91c939b1b5655ced68f37653c8996e41266e2daa64c2ae63d787b54d221ce92d544cea722e WHIRLPOOL baf83fc9213b04f35e6c503606f6b6b386ce0b5c50ba173a0cb48e8b7aa5576361b541d9a2af0da34795b64d5d58cbcee62bcb8d50e5695d8fb4ccd0b23137e3
 AUX memcached.confd 872 SHA256 700e2d718cb9d15de92a334cd8fe5f966bc3a34bba32878c1b95b5ce7696963b SHA512 77dd11565172336c3db24663510ab15ce3c919a656d1c7a12b0bae830c1576247844f84e6b4fe10c96a54f2e64ae8f6c502eee3d84d68ea1d370fea99a586f63 WHIRLPOOL 07465aef2fdc867a2e2c4dbad801715f65030ee5d83bc73a38ff887c2cc022ea7b299564b560a315db9ee2bc441cab3d732453c591ca32e82042edcc6ebe4032
 AUX memcached.init 2261 SHA256 e06423a32d23c7c3231f186d1ff89e0e3d92612c81168db7bf23e69926aebdee SHA512 66b6bfea619cdb0d6d118bcfcff06139f9f01d0ef5d01394234c3aab474beca2aab8a749541dd83f4d01d6e725e2d9ce415a5c39f87e316270939f844f845705 WHIRLPOOL e7eac88553c144d95918f64087bbe493540dc5531fe80fc9ef504abbb21a3875c423d5bbccd87015042d46bc6922701fe8d1023256c3b18ca024d6c5be3ae77e
-AUX memcached.service 273 SHA256 ac7b65867203f195ed1aa2064072869a75f2a7c652de5a404f9b936a78a4180f SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95 WHIRLPOOL cca378cb72a08b6b5177434ec1add5edd3d6a744b0999226fe22628b29edf31e7aadedfa6721a706bf7d4122bdf2a3953cdfeb3f0c2c8dfccb97372d9fb8737f
+AUX memcached.service 357 SHA256 75cc3494931e2104f46ffd01c9a42206d3855e221c9e96f85334787aca17579d SHA512 d2c2d6d359fdd9aba90b4626a93603aa4ceeed05c2077f8b5e30a758c45dad84f8c6206b9687dec81a28845b8de7213d8774e2a3991698faaef2869eb931a5c2 WHIRLPOOL 6fee825241eacfbe845e18db5710f3a41ff93a3cee30fead51034e910b261878077262e1200357352525fb5d7a1b50aa4eae961df7c3253e98e0cc7daebd7c2f
 DIST memcached-1.1.13.tar.gz 133734 SHA256 cb46911afde64f627af277b46b879b4a66d0653c22b9e6ccd31392a9a4ebbe5f SHA512 f7136c5d728eee71cd74bb32583567a3e6178db19a94608115d12e207a4bd801c942d220fe5d2f37bf61b89f6e14377806598bc2ea9b4992ab6de5b13b6d8072 WHIRLPOOL c379623888b6cba1c2687f90e75b0957f043b3c64c43d161dc6bc074cd2730324e3cbc945ceb2b8e5f253539b31018f7ee53490b9ff47fa81ea96ccd1e4f2425
 DIST memcached-1.2.6.tar.gz 217651 SHA256 365c5719997af9477aedf4ff0435fbd83aadf5fa9b1c7a2e0d744f865aac578e SHA512 0e492c0dbd84321533588b9373827c41e90b6ef0ce233e5849c3291c25179947e4e332c7e972285c6899e45317edfcc718e558bf63ce1f2d00180dd95b927c63 WHIRLPOOL 0b08ff9534ac983bbc7f4ec5190d61f7f55d217080d18f406bb655fc6c202ef162a91043070b18875b80af28e5ce5c5ae15cfcbda18044de5f85c9701f3f9b9a
 DIST memcached-1.2.8.tar.gz 221285 SHA256 9e36702833a9213d607801a44325d108e6b86abc7af82fe265cce4b96eb2269e SHA512 582a40aa1ebe20232ecb004830919d0ba4fe3d6fa15e6d51d1d929ab13719d90629858ae7fda4f45a78b877a03dd68241938e6b18a48bc5421df99a8437498df WHIRLPOOL f84a494951d95bd14ed43713f8b61425c01cc58efdabb844a2b8092d20ee00afb4dd239e950618bf0e8bc85ec79ecb4f0904f068049e507d653b8be218f5850e
@@ -27,24 +27,24 @@ EBUILD memcached-1.1.13-r3.ebuild 1516 SHA256 08d1a6d7cb4cfe07aab639e1343e218a69
 EBUILD memcached-1.2.6-r1.ebuild 1623 SHA256 68b721cefb4ed0430809c57a64f4b2e3f4970d25c6c3da24c926eb61f7292541 SHA512 9b1a7b2c9ba445aa1dfa06f2bb13ce5cedb8802ce00420722a354e7f5050486be0f6fefc6516e23d51eaee96ece17183ed4666098e37cab713a4770dd7aefabc WHIRLPOOL 0286fbf7ea2a5b9863088b60fca542c3408a37a196d463ab5723a58b641481bce4cd477e7824fe35b8665ef544a4a470422abc5b8a1543291a8e188af690b156
 EBUILD memcached-1.2.8-r1.ebuild 1720 SHA256 fdafda09b3b89f1a09c9072a2030e594c9f365913fe99247cf9f5ca72f413783 SHA512 a73f001ecb8d03cf4af489ab122b12219695cf1cc4a920e13f33f7b0a088b83f315532def2f80a0e7fc3b1abbbf15a9565a05f61394aed53b718d303a5007308 WHIRLPOOL 17c74daf29b75e98426e67a728b383323adab35c4d0a59fdf6bd4fa01d358966ed3638a4a3ed7f963fd8da4d1a48a6167a57374dfdc3c34e109fedfb814fc789
 EBUILD memcached-1.3.3-r5.ebuild 1824 SHA256 e66192d4a4e10fa382a587f6aff61ece0da3651cc576e90433a045bfa91fbb03 SHA512 89ad0576342f26d6328958ebf94e4195c27fa93b317a969055a770e719cac4a3876e0628de395166b0e29384ea98bbd2f24e11adfdcc9e075bdd6d9fbdac152a WHIRLPOOL 05a45c917cb2d7eecff54527fd48183afa16e179e9317ca85410814e7f66563078cd117088ed9dd8c80558e3b5b604be8ff34b8c37ec6ae0e16f29d6375f90c0
-EBUILD memcached-1.4.17-r1.ebuild 2558 SHA256 e460d9879c1e2c5137f83bc993108b12e33de7ec82850fb1efd392f1520246f7 SHA512 b02cd2dd62f4a43978766a49211b67878c1bc29dc86444df9a5d4de92f4f0852f598fd29faa9429ac3443f0ed3919baf801f0dc1c787baab1382cea136b17db3 WHIRLPOOL c716e0668ba7e98ab05e29f4304190277070b5905820e3186c4a9868ca7075796469ad574b043aac002a7d48c9b23f5d12c605400b18a78599af9eb63892ea39
+EBUILD memcached-1.4.17-r2.ebuild 2614 SHA256 f413b430d2903e8a886cb902f2c81efe32fa090aca64f4a7e930642c009af87c SHA512 00f95a52981732f0f2b055f5d72190e19c47f6cbd733582af98a9f83dc89859d61e34abe0aa06f65ed263dfaa9d4f8bf738aa9d5232c6499f18facca897953ba WHIRLPOOL 25f46d0602063dbc0ebb8cac5c8d287749ed7a151573ecb06908485c9fe1fd6a6d3d618403f4c8931b7eb114e04cad621baafdda1b6e9778d036abea9b464168
 EBUILD memcached-1.4.17.ebuild 2483 SHA256 aac261b7f4f0264213aa00df9df1670ab36993694e67d80a4849957f6d4e07fc SHA512 687b0d0ef109e81eb1c4133b78801bb4986b566b75165a6fb7655a3f16b4e3c42aa698d6750f4c95e686536d78a934104700bb10adbc35281f1ad8bbe0f7c3fe WHIRLPOOL 119bbde87a5edaf53e91277645b2df9b9e56958bc78b224e13006c5478b3aa8db086e7de372eb78d593a702b6f9125c90be63b37aff59975361019af496c2c20
-MISC ChangeLog 26702 SHA256 634c9e98c09080975559fc148f7141932f8d5ab3074b4addb027c5192aa61a5a SHA512 0a93bcd5381fc6873d816a4538e4662f198e1734db966390b75e9ecf918f06935adadb6700bca198daf935a583a0a67fdac88123c197e7617c7d80bee2066758 WHIRLPOOL cf6add7ab73f258f76bffe3fc923d1239daead2cf45f5a6692a90ece9ff43ca2a9044da00c7727b20fee80a28d5027d779714163fe5fdd7eaef5670ff4ac63a0
+MISC ChangeLog 26925 SHA256 9b926486838f935cd5e9cd0ed20f9f9db6387c823edf7c4da91c66207be6ba8a SHA512 2f28c1e8c1dd239444211a43e376c0f862fef2c6b78d7f01e2593a5456127b4d1e69dc8351544fd03963d2850f89c80b25b17ac48af4f70f1454c0d9db975ee9 WHIRLPOOL 87ab9e3abea1db1807d588c551175f668b8ed49054fa26dc6cfdba02c8bac49f7d63786b222d2f4022b3593f91ac19e97fdd32214d56cc4fd4ddbf13ead4e87a
 MISC metadata.xml 1101 SHA256 a99106f3b0f91f0cc6e24f72d60af090d308ae02cffe19b05dc082e26578e253 SHA512 071d36e1df0e820b4c2c536a00e9a69ec7c37269030a516e15f361c28457318f8de8e2e077e3f3ffa8de024d4427a3caa1e0c40ba3527b5205bc1a33d6dc4b94 WHIRLPOOL 0c3fab47e7802256a9960e9380b752c9aab1ee026e4743f0d0d64a4ca97b48b181ec148914f6663cbf903336974ae9ed9cc9acf26eb85d8efb93fc86229ec0f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS5gjGAAoJECRx6z5ArFrDWSEP+wVpzNPpgCL/HwmvBl7/hdoH
-b9ADr0hdbGsgy8U6KQuOft9j4eClnvzINr1JQioVYTzHVBEe/TAKnePJcP9hYpaU
-ugVryF6afuSHFBKBrdZyJfifc137q/IphXCm2W+GmIMWvGU5ypSUmlO7tDTNY0vn
-kTmZNhBsgKjnQTlXZ2s5kK6u7KPQRJpMXDjguxiRSWo6HZ6RT7A6vGkweSfEwUn9
-K/BWGzZ7S8nRkhfVqxUtI3n8tKRrFMTSu9kSzNPhiXgDN0edtsMfoYXYZSOdLSoA
-0PQOiyqbc5VQqF/xXYXZRyayeUZakuS3j7fhrLOLLOH+kJRPim0lHaWc+oaiI1Cy
-lXzXWHURYajEqXTdGFtsKVBotVSLqO0XuGq+tmNXHi25vwV+MYWPup2kX1rIoRWU
-3kyK/69p3qRI9O1bKl6JSitPWF+MBYx8tmgsTQB+qBjGls0Af+648p1uM9UXYeLj
-sQKIYMe8HHSqrMnBbEiN5ZfIdgHXHsXbZSwsO2579yVKA3lDTEln9JVKuJnWYZ1i
-Fhlq2GwC+cRJa+VP/l/vJEeFMPcuTdfWQWpq8BjkXEeSZzyGmqoHB23ZeNUVlcer
-NsTu3ygefGCnWOTgeUsbple0Hs2oAxJJWA4OMieIFyxLYM5LtVUSv9XYenPjOagB
-XjMTFraIwH8/J91NSoVe
-=8oQ7
+iQIcBAEBCAAGBQJTAaseAAoJECRx6z5ArFrDSc4QAIC/CFbYKjfN4z6qhD8Xkat4
+dAEQZKMUeOftADUTLTUCxmQMvtMZUQhKTENF52wRO4ovKQHOEUhyqlTRoVzCilfl
+jhx9Jf0t6jZ1gmXuZVRP8nKOTiEU74yFxXhabLAUg7ccJJA7WnG1843NDMoAC6qs
+zduOQlIZEaYh+5soFb6cuLMratfuS13yU6ZPLQZfPPucywrs/4mUS0po1aAGT/lg
+lps3/NBRo3aBVqnRHZUExoU3DOSJ57EwBi1MrZ/6IfG0oisxAFkDlfRWRif2o2FO
+m16xkYPap+uP0A9HhxQSt5UI9aOy0Yuc5ysvCVUKqmBlEk1Dl4NUQ2dstwlv5FW+
+d/E7dofiw86Ud8s5epP/jlDBtis75RdknNFrjTIldP/xaUmRb+3b7acG3EWxyE8Z
+Dz0o/OTCFF9Wwaah2iftnd169QT8vcNUaRsDF3PknBit1fbJI8ncObxa8VOtqLWI
+Fr6v6hmwjtYvUtCXqd9u3N9EP484zO1xrcXP3R/d0lsUNof9VO9fH2OumoLxggCa
+M75VElYjnQaCcaKhPUj1U4KpVI5TsPZl6rz5g3veUZuRQxnAyecZDMqG1QxLZiM0
+IVVJRaAEcv+1Ikcimc4KjyP3LtgNl3a/X4mzvxvYPE3+onVTucOB9cAQcBkBn4k9
+pICo4hsOcW06/Y9/aDD0
+=qkox
 -----END PGP SIGNATURE-----
diff --git a/net-misc/memcached/files/memcached.service b/net-misc/memcached/files/memcached.service
index f51fd1f35730..402d85046e0f 100644
--- a/net-misc/memcached/files/memcached.service
+++ b/net-misc/memcached/files/memcached.service
@@ -5,8 +5,8 @@ Documentation=man:memcached(1)
 Documentation=http://code.google.com/p/memcached/
 
 [Service]
-ExecStart=/usr/bin/memcached
-User=memcached
+EnvironmentFile=/etc/conf.d/memcached
+ExecStart=/usr/bin/memcached -p ${PORT} -u ${USER} -m ${CACHESIZE} -c ${MAXCONN} $OPTIONS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/net-misc/memcached/memcached-1.4.17-r1.ebuild b/net-misc/memcached/memcached-1.4.17-r2.ebuild
index a7e13cfcfda4..e2895ac5b8d3 100644
--- a/net-misc/memcached/memcached-1.4.17-r1.ebuild
+++ b/net-misc/memcached/memcached-1.4.17-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.17-r1.ebuild,v 1.1 2014/01/27 07:19:49 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.17-r2.ebuild,v 1.1 2014/02/17 06:24:16 prometheanfire Exp $
 
 EAPI=5
-inherit eutils autotools flag-o-matic user
+inherit autotools eutils flag-o-matic systemd user
 
 MY_PV="${PV/_rc/-rc}"
 MY_P="${PN}-${MY_PV}"
@@ -64,6 +64,7 @@ src_install() {
 
 	newconfd "${FILESDIR}/memcached.confd" memcached
 	newinitd "${FILESDIR}/memcached.init" memcached
+	systemd_dounit "${FILESDIR}/memcached.service"
 }
 
 pkg_postinst() {