Fix up a slight mistake.

(Portage version: 2.1_rc1-r2)

2 files changed, 30 insertions, 10 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index 42f99b512b9f..bae4cf680e17 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,10 @@
 # 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.24 2006/05/18 03:28:40 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.25 2006/05/18 04:46:02 robbat2 Exp $
+
+  18 May 2006; Robin H. Johnson <robbat2@gentoo.org>
+  memcached-1.1.13_pre.ebuild:
+  Fix up a slight mistake.
 
 *memcached-1.1.13_pre (18 May 2006)
 
diff --git a/net-misc/memcached/memcached-1.1.13_pre.ebuild b/net-misc/memcached/memcached-1.1.13_pre.ebuild
index 2921d1b5d3a7..a4e1f45e29a4 100644
--- a/net-misc/memcached/memcached-1.1.13_pre.ebuild
+++ b/net-misc/memcached/memcached-1.1.13_pre.ebuild
@@ -1,26 +1,28 @@
 # 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.13_pre.ebuild,v 1.1 2006/05/18 03:28:40 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.1.13_pre.ebuild,v 1.2 2006/05/18 04:46:02 robbat2 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"
+MY_PV="${PV/_pre/-pre}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="static perl"
+KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static perl doc"
 
 DEPEND=">=dev-libs/libevent-0.6
 	perl? ( dev-perl/Cache-Memcached )"
-S="${WORKDIR}/${P/_/-}"
+S="${WORKDIR}/${MY_P}"
 
 src_compile() {
-	einfo `pwd`
-	einfo $S
 	local myconf=""
 	use static || myconf="--disable-static ${myconf}"
 	econf ${myconf} || die "econf failed"
@@ -32,8 +34,22 @@ src_install() {
 	dodoc ${S}/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
 
 	insinto /etc/conf.d
-	newins "${FILESDIR}/${PV}/conf" memcached
+	newins "${FILESDIR}/1.1.12/conf" memcached
 
 	exeinto /etc/init.d
-	newexe "${FILESDIR}/${PV}/init" memcached
+	newexe "${FILESDIR}/1.1.12/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"
 }