version bump and substantial changes to init file. please test 1.1.12_rc1

7 files changed, 146 insertions, 11 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index 1ec505262373..1f16a0d64498 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/memcached
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.5 2005/01/05 07:11:23 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.6 2005/01/15 02:39:45 lisa Exp $
+
+*memcached-1.1.12_rc1 (14 Jan 2005)
+
+  14 Jan 2005; Lisa Seelye <lisa@gentoo.org> +metadata.xml,
+  +files/1.1.12/conf, +files/1.1.12/init, +memcached-1.1.12_rc1.ebuild:
+  Add 1.1.12-rc1 and retool the conf/init scripts to take advantage of the new
+  -P (pidfile) option. The default behavior is to save the pidfile in
+  /var/run/memcached/memcached-PORT.pid. This, it seems would make it easier
+  for people to have multiple instances of memcached running (simply rename
+  /etc/init.d/memcached to /etc/init.d/memcached.instance and the conf.d file
+  accordingly.
 
   05 Jan 2005; Lisa Seelye <lisa@gentoo.org> memcached-1.1.11.ebuild:
   Dependency update: dev-libs/memcached-api-perl -> dev-perl/Cache-Memcached.
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index c536dfedac5c..747d19c4de1a 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -1,15 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 926c5a3c066ad58685ad4297201fbb4d ChangeLog 2404
 MD5 78e87627d069d6d3cbd28f91aa91475b memcached-1.1.11.ebuild 1348
+MD5 1d1b040e487e12d3772c4aa3ab06ff62 memcached-1.1.12_rc1.ebuild 1448
 MD5 7d313d0464bf2dcec9d83b20646b0a95 files/conf 537
 MD5 a513989dda7189a51c6d117b5c997223 files/init 532
+MD5 33089c8ff1d665c9ace3e19bad48aac0 files/digest-memcached-1.1.12_rc1 72
 MD5 66a850e16ef028f59367429466d54cc3 files/digest-memcached-1.1.11 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFB26lrI1lqEGTUzyQRAuG2AKCtVJr+mjB7cSnAaH+Iy2LqgtPHeQCghseq
-/YE3xcZ1c91IheRzK1wt+A0=
-=d4z1
------END PGP SIGNATURE-----
+MD5 96eeedcb358de016ecfc7497e902842b files/1.1.12/conf 608
+MD5 46958f1937063c47fa62b81cf2b04979 files/1.1.12/init 871
diff --git a/net-misc/memcached/files/1.1.12/conf b/net-misc/memcached/files/1.1.12/conf
new file mode 100644
index 000000000000..ab007298389b
--- /dev/null
+++ b/net-misc/memcached/files/1.1.12/conf
@@ -0,0 +1,25 @@
+# Copyright 2003 Gentoo Technologies, Inc
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.1.12/conf,v 1.1 2005/01/15 02:39:45 lisa Exp $
+# memcached config file
+
+MEMCACHED_BINARY="/usr/bin/memcached"
+
+#Specify memory usage in megabytes (do not use letters)
+#64MB is default
+MEMUSAGE="64"
+
+#User to run as
+MEMCACHED_RUNAS="nobody"
+
+#Specify maximum number of concurrent connections
+#1024 is default
+MAXCONN="1024"
+
+#Listen for connections on what address?
+LISTENON=""
+
+#Listen for connections on what port?
+PORT="11211"
+
+#PID file location
+PIDFILE="/var/run/memcached/memcached-${PORT}.pid"
diff --git a/net-misc/memcached/files/1.1.12/init b/net-misc/memcached/files/1.1.12/init
new file mode 100644
index 000000000000..4eb573bd0a19
--- /dev/null
+++ b/net-misc/memcached/files/1.1.12/init
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.1.12/init,v 1.1 2005/01/15 02:39:45 lisa Exp $
+
+depend() {
+	need net
+}
+
+checkconfig() {
+        if [ -z "${LISTENON}" ]; then
+          eerror "Edit /etc/conf.d/memcached and specify an address to listen on."
+          return 1
+        fi
+
+}
+
+start() {
+	ebegin "Starting memcached"
+        checkconfig || return 1
+        local dir="$(dirname ${PIDFILE})"
+        if [ ! -d "${dir}" ]; then
+          einfo " Creating ${dir}"
+          mkdir "${dir}"
+          chown ${MEMCACHED_RUNAS} "${dir}"
+        fi
+        if [ -f ${PIDFILE} ]; then
+          einfo "  Removing stale pidfile ${PIDFILE}"
+          rm -f ${PIDFILE} 1>/dev/null
+        fi
+        
+	/sbin/start-stop-daemon --start \
+	        --exec ${MEMCACHED_BINARY} --startas ${MEMCACHED_BINARY} -- \
+	        -d -p ${PORT} -l ${LISTENON} -m ${MEMUSAGE} \
+		-c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P ${PIDFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping memcached"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+	rm -f ${PIDFILE}
+	eend $?
+}
+
diff --git a/net-misc/memcached/files/digest-memcached-1.1.12_rc1 b/net-misc/memcached/files/digest-memcached-1.1.12_rc1
new file mode 100644
index 000000000000..20744406c282
--- /dev/null
+++ b/net-misc/memcached/files/digest-memcached-1.1.12_rc1
@@ -0,0 +1 @@
+MD5 7d11048ac11429c5cfa76789f4d4472c memcached-1.1.12-rc1.tar.gz 114055
diff --git a/net-misc/memcached/memcached-1.1.12_rc1.ebuild b/net-misc/memcached/memcached-1.1.12_rc1.ebuild
new file mode 100644
index 000000000000..6e69d78ec181
--- /dev/null
+++ b/net-misc/memcached/memcached-1.1.12_rc1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.1.12_rc1.ebuild,v 1.1 2005/01/15 02:39:45 lisa Exp $
+
+
+PATCHLEVEL="1.1.12"
+
+DESCRIPTION="memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load."
+
+HOMEPAGE="http://www.danga.com/memcached/"
+
+MY_PV="${PV/_rc/-rc}"
+S="${WORKDIR}/${PN}-${MY_PV}"
+SRC_URI="http://www.danga.com/memcached/dist/testing/memcached-${MY_PV}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="static perl php"
+
+DEPEND=">=dev-libs/libevent-0.6
+	perl? ( dev-perl/Cache-Memcached )
+	php? ( dev-libs/memcached-api-php )"
+
+src_compile() {
+	einfo $S
+	local myconf=""
+	use static || myconf="--disable-static ${myconf}"
+	econf ${myconf} || die "econf failed"
+	emake || die
+}
+
+src_install() {
+	dobin ${S}/memcached
+	dodoc ${S}/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
+
+	insinto /etc/conf.d
+	newins "${FILESDIR}/${PATCHLEVEL}/conf" memcached
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/${PATCHLEVEL}/init" memcached
+}
+
+pkg_postinst() {
+	if ! use php; then
+		ewarn "This package uses a special \"php\" USE flag to include the PHP"
+		ewarn "API. If you emerged this without setting that USE flag, you can"
+		ewarn "still get the API by doing:"
+		einfo "   emerge dev-libs/memcached-api-php"
+		echo
+	fi
+}
diff --git a/net-misc/memcached/metadata.xml b/net-misc/memcached/metadata.xml
new file mode 100644
index 000000000000..31b0f7d3aeb4
--- /dev/null
+++ b/net-misc/memcached/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>lisa@gentoo.org</email>
+</maintainer>
+</pkgmetadata>