Bug 268938: Support the optional slab reassignment feature as described at http://code.google.com/p/memcached/wiki/MemcachedSlabAllocator.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 77 insertions, 5 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index 747da61e41d5..9f8e0b1b8133 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/memcached
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.82 2009/04/13 02:28:41 robbat2 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.83 2009/05/14 23:14:17 robbat2 Exp $
+
+*memcached-1.3.3-r1 (14 May 2009)
+
+  14 May 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +memcached-1.3.3-r1.ebuild, metadata.xml:
+  Bug 268938: Support the optional slab reassignment feature as described at
+  http://code.google.com/p/memcached/wiki/MemcachedSlabAllocator.
 
   13 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> memcached-1.2.8.ebuild,
   memcached-1.3.3.ebuild:
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index f4bc56b28eaf..a19b3112a23f 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -30,7 +30,7 @@ EBUILD memcached-1.2.5.ebuild 1616 RMD160 8929b79853d4516fa46d5c501c5cc384ff7c15
 EBUILD memcached-1.2.6.ebuild 1615 RMD160 6f27c376b744894cbc7e45469840c182d4e8b479 SHA1 2af5edbcf50d06b1145da8e988b2f8befb752078 SHA256 c11c2ed113f0dc403ffb4e0cac72dad7f07dc1f9d2210deb540345f1d791dcd6
 EBUILD memcached-1.2.8.ebuild 1714 RMD160 9b8acae6b66b89f2e6e7360c959bd4ff951a5565 SHA1 17f502f2b3133be369eaada8f89b61ab6c5c0fa2 SHA256 6cc8ce18ec6cf69c2577647ffadcdab626d1260879cf4ba60461cedaeb65ff78
 EBUILD memcached-1.3.0.ebuild 1626 RMD160 58827e010e169540c96b81deacc37e5a0aab2043 SHA1 6b1cf11ad8c2b6f619ace2689e26f8ec0cff5ecb SHA256 fc15c447bf031d1acf246b28d98460ada9cf52b6d9d7b82e55391c19ad052f79
+EBUILD memcached-1.3.3-r1.ebuild 1805 RMD160 3e63ce48b95ca286d2970ed1b8a907dfa127d453 SHA1 b038d64d7dc6ef42b4b850467c9c125e97f60473 SHA256 53c100a5109299cfb8290adeb98a02117226c17ddacb7bc1e416298c04682f2e
 EBUILD memcached-1.3.3.ebuild 1714 RMD160 70359cf49548ad62315ed217c56f0987eb71c48c SHA1 eb8a43677aee0bf9623b997362e436ad2e1005e8 SHA256 e1d10d1c532cb9833248dd8fea30f029025092da83896b9d20298b333f22dd62
-MISC ChangeLog 14283 RMD160 3b6d6b627742f2ec95ade7fffbdb716c3b213a39 SHA1 7941497b6d56203ea1c4cb42c642fae605af3876 SHA256 ab7933759af79c6717cef5032935e2851478a6ddeb4d27e87f895685cc40c51b
-MISC memcached-1.2.8.ebuild.orig 1632 RMD160 26f29c860c0207663b3f5a12f92b0171456e5c4d SHA1 71c9ae9daf19fdc9b432d904bf678371dc49ec48 SHA256 8202fe61e8dc7e7d2b6d4849d8e465382619c2d9fad722a28b443e29d9e6975b
-MISC metadata.xml 841 RMD160 60a5beb49a85e92147066ead33afb1961bb00eec SHA1 11a620a9e2336f2dcee196b60c4d4e8127ca5c1e SHA256 6ecc5efcf267f183adeac1a372a306042849384a67f86d3543397dcaf62ff64e
+MISC ChangeLog 14559 RMD160 a842bff595cafdafe3492c72aad0d81b681c6531 SHA1 dc71477597007395c49b57160ec99f81a133638d SHA256 52bf2c123be32a9a130b07395cf81f07f4d166371a5414487320e62e41a3f77b
+MISC metadata.xml 966 RMD160 9da6a32f068f21da2b93ad45b4bba6147644e20a SHA1 a7080fc08dde81c21554beeb89b201d16efe08c1 SHA256 ce8186d4b0926cdc2ac0dcc49a737359b3f08a13396b5dc2cf05bf4a366b242b
diff --git a/net-misc/memcached/memcached-1.3.3-r1.ebuild b/net-misc/memcached/memcached-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..2d8dc631008e
--- /dev/null
+++ b/net-misc/memcached/memcached-1.3.3-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.3.3-r1.ebuild,v 1.1 2009/05/14 23:14:17 robbat2 Exp $
+
+inherit eutils autotools flag-o-matic 
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://code.google.com/p/memcached/"
+SRC_URI="http://memcached.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="nptl test slabs-reassign"
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+}
+
+src_compile() {
+	econf $(use_enable nptl threads)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.2.6/conf memcached
+	newinitd "${FILESDIR}"/1.2.6/init memcached
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you must create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test || die "Failed testing"
+}
diff --git a/net-misc/memcached/metadata.xml b/net-misc/memcached/metadata.xml
index 500bbbb53818..74f22cc035e5 100644
--- a/net-misc/memcached/metadata.xml
+++ b/net-misc/memcached/metadata.xml
@@ -16,4 +16,7 @@ memcached dropped the database load to almost nothing, yielding faster page load
 times for users, better resource utilization, and faster access to the databases
 on a memcache miss.
 </longdescription>
+<use>
+<flag name='slabs-reassign'>Allow manual reassignment of memory slabs at the cost of slab optimizations.</flag>
+</use>
 </pkgmetadata>