Version bump.

(Portage version: 2.2_rc67/cvs/Linux i686)

3 files changed, 69 insertions, 1 deletions

diff --git a/dev-libs/libmemcached/ChangeLog b/dev-libs/libmemcached/ChangeLog
index 3819319f3754..16d213a88aea 100644
--- a/dev-libs/libmemcached/ChangeLog
+++ b/dev-libs/libmemcached/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libmemcached
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcached/ChangeLog,v 1.28 2010/04/10 13:42:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcached/ChangeLog,v 1.29 2010/04/17 18:25:18 robbat2 Exp $
+
+*libmemcached-0.39 (17 Apr 2010)
+
+  17 Apr 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +libmemcached-0.39.ebuild, +files/libmemcached-0.39-runtestsasuser.patch:
+  Version bump.
 
   10 Apr 2010; Raúl Porcel <armin76@gentoo.org> libmemcached-0.31.ebuild:
   arm/ia64/sh/sparc stable wrt #288166
diff --git a/dev-libs/libmemcached/files/libmemcached-0.39-runtestsasuser.patch b/dev-libs/libmemcached/files/libmemcached-0.39-runtestsasuser.patch
new file mode 100644
index 000000000000..b1e0698b8927
--- /dev/null
+++ b/dev-libs/libmemcached/files/libmemcached-0.39-runtestsasuser.patch
@@ -0,0 +1,18 @@
+diff -Nuar --exclude '*~' libmemcached-0.39.orig//tests/server.c libmemcached-0.39//tests/server.c
+--- libmemcached-0.39.orig//tests/server.c	2010-03-03 13:52:47.000000000 -0800
++++ libmemcached-0.39//tests/server.c	2010-04-17 11:12:13.000000000 -0700
+@@ -72,12 +72,12 @@
+ 
+         if (x == 0)
+         {
+-          sprintf(buffer, "%s -d -P /tmp/%umemc.pid -t 1 -p %u -U %u -m 128",
++          sprintf(buffer, "%s -d -P /tmp/%umemc.pid -t 1 -p %u -U %u -m 128 -u memcached",
+                     MEMCACHED_BINARY, x, x + TEST_PORT_BASE, x + TEST_PORT_BASE);
+         }
+         else
+         {
+-          sprintf(buffer, "%s -d -P /tmp/%umemc.pid -t 1 -p %u -U %u",
++          sprintf(buffer, "%s -d -P /tmp/%umemc.pid -t 1 -p %u -U %u -u memcached",
+                     MEMCACHED_BINARY, x, x + TEST_PORT_BASE, x + TEST_PORT_BASE);
+         }
+         fprintf(stderr, "STARTING SERVER: %s\n", buffer);
diff --git a/dev-libs/libmemcached/libmemcached-0.39.ebuild b/dev-libs/libmemcached/libmemcached-0.39.ebuild
new file mode 100644
index 000000000000..6742a11069ea
--- /dev/null
+++ b/dev-libs/libmemcached/libmemcached-0.39.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcached/libmemcached-0.39.ebuild,v 1.1 2010/04/17 18:25:18 robbat2 Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="a C client library to the memcached server"
+HOMEPAGE="http://tangent.org/552/libmemcached.html"
+SRC_URI="http://download.tangent.org/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="debug hsieh"
+
+DEPEND="net-misc/memcached"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	EPATCH_OPTS="-F 40" epatch "${FILESDIR}/${PN}-0.39-runtestsasuser.patch"
+	sed -r -i \
+		-e 's,(context)(__attribute__),\1 \2,g' \
+		libhashkit/hsieh.c || die "Failed to fix upstream typo"
+}
+
+src_configure() {
+	econf \
+		$(use_with debug debug) \
+		$(use_enable hsieh hsieh_hash)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	# remove manpage to avoid collision, see bug #299330
+	rm -f "${D}"/usr/share/man/man1/memdump.* || die "Install failed"
+	newman docs/memdump.1 memcached_memdump.1
+}
+
+src_test() {
+	emake -j1 test-docs test-mem test-hash test-plus || die "Tests failed"
+}