Fix up a slight mistake.

Package-Manager: portage-2.1_rc1-r2

3 files changed, 38 insertions, 18 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/Manifest b/net-misc/memcached/Manifest
index b32fdc744488..297d3bd85619 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -37,14 +37,14 @@ EBUILD memcached-1.1.12.ebuild 1054 RMD160 98caf28e9bd14b478cfc4fc665aa8bf43a581
 MD5 aaefa2ae771cffd672aa6c46f30e7d50 memcached-1.1.12.ebuild 1054
 RMD160 98caf28e9bd14b478cfc4fc665aa8bf43a581ff6 memcached-1.1.12.ebuild 1054
 SHA256 efe4d348ff42eb2bc0070ec3b5c33db7e8c47e493d34c859b57b9bd7450ba3da memcached-1.1.12.ebuild 1054
-EBUILD memcached-1.1.13_pre.ebuild 1112 RMD160 21231d8c56a7dca0000487e8eb0a75e7120ee6cb SHA1 a7260d295dd098ffaaf85822817e69928f4405d5 SHA256 966a6c4352391acc0ed209ffc0c1fe8af5fc8d6554e3330f8efba6513b624f73 size 1112
-MD5 364115b4b6a8bdae0ea17cbcc1a7d6c3 memcached-1.1.13_pre.ebuild 1112
-RMD160 21231d8c56a7dca0000487e8eb0a75e7120ee6cb memcached-1.1.13_pre.ebuild 1112
-SHA256 966a6c4352391acc0ed209ffc0c1fe8af5fc8d6554e3330f8efba6513b624f73 memcached-1.1.13_pre.ebuild 1112
-MISC ChangeLog 5830 RMD160 f9ea86ad75d583ae40154b9ae1138b900afa9913 SHA1 f1e8ed6888dc1c1a4ce843766bbb1c84b8ea484c SHA256 db72253728b68d6e05a2eaa0e3c232fe10937b6c0bcfb99e258359b36c390eb1 size 5830
-MD5 8597213259271690c8772dd3a9e75808 ChangeLog 5830
-RMD160 f9ea86ad75d583ae40154b9ae1138b900afa9913 ChangeLog 5830
-SHA256 db72253728b68d6e05a2eaa0e3c232fe10937b6c0bcfb99e258359b36c390eb1 ChangeLog 5830
+EBUILD memcached-1.1.13_pre.ebuild 1643 RMD160 7f439ddecbef46bdf7928cf7a10a1a1f2cc3df4b SHA1 44e4a6ba32fb3cab44ffc6578606c9f67fb504c0 SHA256 988d1b365b481f37bdac902c032c6ef10cd69544b981e36485d4f31f3cc714da size 1643
+MD5 e4f85664c9a984d75705ba3917ebd671 memcached-1.1.13_pre.ebuild 1643
+RMD160 7f439ddecbef46bdf7928cf7a10a1a1f2cc3df4b memcached-1.1.13_pre.ebuild 1643
+SHA256 988d1b365b481f37bdac902c032c6ef10cd69544b981e36485d4f31f3cc714da memcached-1.1.13_pre.ebuild 1643
+MISC ChangeLog 5945 RMD160 e923f9278412cbb3585ab93b6e01c361316a0cc4 SHA1 e44ade41d2fb7e70202fe6eb10f1a53527b8133d SHA256 b6539afe89a542868110f090b99b5c60f993c838ef0f022e23bb3d6ea22d868a size 5945
+MD5 adefe5e5b346233ccc5eadcd0d3613a6 ChangeLog 5945
+RMD160 e923f9278412cbb3585ab93b6e01c361316a0cc4 ChangeLog 5945
+SHA256 b6539afe89a542868110f090b99b5c60f993c838ef0f022e23bb3d6ea22d868a ChangeLog 5945
 MISC metadata.xml 220 RMD160 adeee6d24269e2c36fa264eb0f5d3105cbcf0c5f SHA1 6bede79555a57b50e9b78c8869866db9d3c76366 SHA256 6d5549afe8cd878ebb18c6e97ad3b486283e14e0fb5ad2e5e0ea413e17e36fbb size 220
 MD5 0f18e4c1a9a4b09570cfc7719b927e83 metadata.xml 220
 RMD160 adeee6d24269e2c36fa264eb0f5d3105cbcf0c5f metadata.xml 220
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"
 }