Close bug 122246, please read it for info on how to use multiple instances

(Portage version: 2.1_pre7-r3)

5 files changed, 76 insertions, 18 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index e74bfe9e7c0a..c9ba4a1d9045 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/memcached
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.21 2006/03/30 04:04:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.22 2006/04/04 14:07:55 lisa Exp $
+
+*memcached-1.1.12-r3 (04 Apr 2006)
+
+  04 Apr 2006; Lisa Seelye <lisa@gentoo.org> files/init,
+  +memcached-1.1.12-r3.ebuild:
+  Solve bug 122246 finally.
 
   30 Mar 2006; Aron Griffis <agriffis@gentoo.org>
   memcached-1.1.12-r2.ebuild:
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index bff7bd41c756..87263cfa499c 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b22bf4d206d0d0e7667190e1d5e6258f ChangeLog 5290
-RMD160 5e2488a8795c1b0689d006137a99de6e9ce0b68e ChangeLog 5290
-SHA256 8f479ec2da8e5fa2054978c46f8ee2b614fc546a60023fd92d8c3abdf3267e6c ChangeLog 5290
+MD5 fce354f694f7074b458f2c0dd8385a0f ChangeLog 5443
+RMD160 6eb0aee10ce592130940c8e19f43eb15d2cd4944 ChangeLog 5443
+SHA256 f273ce269a0c09743b5f532338214c236f268afb88d253c2789e9afc5c924516 ChangeLog 5443
 MD5 f838206eac3e3420d7ad751024f64eea files/1.1.12/conf 636
 RMD160 4bae6b67ae0941e74f6f494568ae026949ebd6fa files/1.1.12/conf 636
 SHA256 0a5b83267788e429c2be0c4af1ef6a30320e96becab78aaba5af8d7eb8ff3ee2 files/1.1.12/conf 636
@@ -25,9 +22,12 @@ SHA256 e2a4e6068a012762ca12b506f7a3288029d9bbd85131c5ecd20294993ea88c3a files/di
 MD5 dc66dcc94aa25e2392e3c6575324ee56 files/digest-memcached-1.1.12-r2 68
 RMD160 19eda3e82adb4791d8271d5be09184f768e763e5 files/digest-memcached-1.1.12-r2 68
 SHA256 e2a4e6068a012762ca12b506f7a3288029d9bbd85131c5ecd20294993ea88c3a files/digest-memcached-1.1.12-r2 68
-MD5 a513989dda7189a51c6d117b5c997223 files/init 532
-RMD160 20c425b33cf01db8323159d9a4804d12a53097a2 files/init 532
-SHA256 841ca1a4ffc5b1077bdd660416b0c919038a6de6f152ab37e97b5fd85e077995 files/init 532
+MD5 c2a81c14e708cf5b90ea7e08a334e162 files/digest-memcached-1.1.12-r3 250
+RMD160 cd55eb7b9698790ec353b35ae1263c96b145cde8 files/digest-memcached-1.1.12-r3 250
+SHA256 26a39ffb38fdeb953a3a9324d94c0a0d8147f7f19e460f9ca657cdb9be8bcfb7 files/digest-memcached-1.1.12-r3 250
+MD5 cf56709189930f7e3b57e6a8c6963d60 files/init 571
+RMD160 c39ce9d3acbefa7a21171c7e26e4877615dc9172 files/init 571
+SHA256 b206dcf7ba2d3984161013108ec1045e49e64def791fc52761f07a01ae2ffd69 files/init 571
 MD5 4476799e5b6454df4ff1c06fcc81f3c6 memcached-1.1.11.ebuild 1028
 RMD160 f79b59013eecd86f177c47eeefd14ee7b42b7e4b memcached-1.1.11.ebuild 1028
 SHA256 ce67d442141779682c847ceb022d341cc9c45dadb0502e75c7c825127eeb8cd0 memcached-1.1.11.ebuild 1028
@@ -37,16 +37,12 @@ SHA256 449f3cdee0fc0c49a4d44113d06b417ce5deb72d50582ce350f402209cfeea26 memcache
 MD5 20608aa96e39bb8ce89480bffacf92e5 memcached-1.1.12-r2.ebuild 1264
 RMD160 9d783f84ef3219e2cee471ce0c38b11a4a4a5eb5 memcached-1.1.12-r2.ebuild 1264
 SHA256 a38716389dd4eab26567f7550d40105c8774a15a143ba69e9cc758253fc03cf9 memcached-1.1.12-r2.ebuild 1264
+MD5 550b1e6cb7db6fcf8d161934f011e4fc memcached-1.1.12-r3.ebuild 1569
+RMD160 b8d8f6546e40e85078a195f598796833b6f6706a memcached-1.1.12-r3.ebuild 1569
+SHA256 4ea73cf4c869f40267c6d99090f36710be5b798f2bf75d580726fdd43e559b1f memcached-1.1.12-r3.ebuild 1569
 MD5 aaefa2ae771cffd672aa6c46f30e7d50 memcached-1.1.12.ebuild 1054
 RMD160 98caf28e9bd14b478cfc4fc665aa8bf43a581ff6 memcached-1.1.12.ebuild 1054
 SHA256 efe4d348ff42eb2bc0070ec3b5c33db7e8c47e493d34c859b57b9bd7450ba3da memcached-1.1.12.ebuild 1054
 MD5 0f18e4c1a9a4b09570cfc7719b927e83 metadata.xml 220
 RMD160 adeee6d24269e2c36fa264eb0f5d3105cbcf0c5f metadata.xml 220
 SHA256 6d5549afe8cd878ebb18c6e97ad3b486283e14e0fb5ad2e5e0ea413e17e36fbb metadata.xml 220
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEK1jnJrHF4yAQTrARAnh4AKC3Ky+7CyxVuD5dTIOu3qD6f4sHHgCeIdYH
-Ul7b1KOXCkh8Rlt70nWlM+s=
-=38d9
------END PGP SIGNATURE-----
diff --git a/net-misc/memcached/files/digest-memcached-1.1.12-r3 b/net-misc/memcached/files/digest-memcached-1.1.12-r3
new file mode 100644
index 000000000000..d2d8a3cc7f57
--- /dev/null
+++ b/net-misc/memcached/files/digest-memcached-1.1.12-r3
@@ -0,0 +1,3 @@
+MD5 a1236dad33e9ac6c36d53faa8da61780 memcached-1.1.12.tar.gz 114103
+RMD160 4a1914d157cdd0d73102733f32dd835a494585c4 memcached-1.1.12.tar.gz 114103
+SHA256 04af8acf08f71fe1e2d9d6cc7818b0009b16a1874fc4fc28c073cc64980317ca memcached-1.1.12.tar.gz 114103
diff --git a/net-misc/memcached/files/init b/net-misc/memcached/files/init
index 96c6e15fb5ea..0203fc107142 100644
--- a/net-misc/memcached/files/init
+++ b/net-misc/memcached/files/init
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/init,v 1.1 2004/07/08 19:14:45 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/init,v 1.2 2006/04/04 14:07:55 lisa Exp $
 
 depend() {
 	need net
@@ -8,6 +8,7 @@ depend() {
 start() {
 	ebegin "Starting memcached"
 	/sbin/start-stop-daemon --start \
+                --pidfile ${PIDFILE} \
 	        --exec ${MEMCACHED_BINARY} --pidfile /var/run/memcached.pid \
 		-- -d -p ${PORT} -l ${LISTENON} -m ${MEMUSAGE} \
 		-c ${MAXCONN} -u ${MEMCACHED_RUNAS}
diff --git a/net-misc/memcached/memcached-1.1.12-r3.ebuild b/net-misc/memcached/memcached-1.1.12-r3.ebuild
new file mode 100644
index 000000000000..49cda883bb69
--- /dev/null
+++ b/net-misc/memcached/memcached-1.1.12-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 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-r3.ebuild,v 1.1 2006/04/04 14:07:55 lisa Exp $
+
+inherit eutils
+
+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/"
+
+SRC_URI="http://www.danga.com/memcached/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static perl doc"
+
+DEPEND=">=dev-libs/libevent-0.6
+	perl? ( dev-perl/Cache-Memcached )"
+
+src_compile() {
+	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}/${PV}/conf" memcached
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/${PV}/init" memcached
+
+	doman ${S}/doc/memcached.1
+
+	if use doc; then
+	  dodoc ${S}/doc/{memory_management.txt,protocol.txt}
+	fi
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+	einfo "With this version of Memcached Gentoo now supporst multiple instances."
+	einfo "To enable this you must create a symlink in /etc/init.d/ for each instance"
+	einfo "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	einfo "Please see Gentoo bug #122246 for more info"
+}