summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2014-02-17 06:24:16 +0000
committerMatthew Thode <prometheanfire@gentoo.org>2014-02-17 06:24:16 +0000
commit03df4b0501279a0dd7fd4c41e9c76e2ef4f6e078 (patch)
treea72ccaa668975be1e60499d3ed7bd06986d0855d /net-misc/memcached
parentfixes for bug 420607 (diff)
downloadgentoo-2-03df4b0501279a0dd7fd4c41e9c76e2ef4f6e078.tar.gz
gentoo-2-03df4b0501279a0dd7fd4c41e9c76e2ef4f6e078.tar.bz2
gentoo-2-03df4b0501279a0dd7fd4c41e9c76e2ef4f6e078.zip
installing systemd unit file bug 500248
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Diffstat (limited to 'net-misc/memcached')
-rw-r--r--net-misc/memcached/ChangeLog9
-rw-r--r--net-misc/memcached/files/memcached.service4
-rw-r--r--net-misc/memcached/memcached-1.4.17-r2.ebuild (renamed from net-misc/memcached/memcached-1.4.17-r1.ebuild)5
3 files changed, 13 insertions, 5 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/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() {