Version bump.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 89 insertions, 3 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index 4f7f16b8bf07..0a26b8988006 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/memcached
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.118 2011/12/31 20:36:19 idl0r Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.119 2012/01/17 08:13:01 robbat2 Exp $
+
+*memcached-1.4.11 (17 Jan 2012)
+
+  17 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> +memcached-1.4.11.ebuild:
+  Version bump.
 
 *memcached-1.4.10-r1 (31 Dec 2011)
 *memcached-1.4.8-r1 (31 Dec 2011)
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index e32a1ddaa753..5e1570ea0b03 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -27,6 +27,7 @@ DIST memcached-1.3.3.tar.gz 260203 RMD160 c9ac975da30b3c005336b15c90216ce4e7e4bc
 DIST memcached-1.4.0.tar.gz 267420 RMD160 0bf281c694ba24672c4285c5f65137b2fbb3f484 SHA1 84881977cc34a1039ce619227ff2910d8e1e3e5b SHA256 b2648fb514fb36fa22cdeb468b8e8a8d49fef86a2cfbc7738f630e09b4977d35
 DIST memcached-1.4.1.tar.gz 277221 RMD160 18f2ef91a1f282e37316e107a90647cf246d98d9 SHA1 6acf8941c494edb4f19efc402b844a494608b679 SHA256 6bb6e52290bbe987990e83d57856f762402c9a625e9c4f8da785dc7f53acbd83
 DIST memcached-1.4.10.tar.gz 311926 RMD160 67f4677ba644b1b15151a6865a8377966fe19706 SHA1 0ae300f858b767abf812009d53ed58647ceb498a SHA256 2cc3de341b561464da29fc5d5e2a4facc0f6aafc151f0e1d94228705e0758fdf
+DIST memcached-1.4.11.tar.gz 319642 RMD160 9f59c76a08132f16d784e9677d1a46770a84b3d7 SHA1 30ac7cf87d1714803c265ea543312a702e09eb99 SHA256 e3dcc4ff29d2b3f3c66f2b5b95a1bcef0163a65b588d6ba92a56cd6c8d73e83e
 DIST memcached-1.4.2.tar.gz 283071 RMD160 bc1b8d8317e375565ea829a77cdf38d1359bf344 SHA1 28bceaa24c4bc6d7dc9c700e143ee4b2ff09f760 SHA256 d44b611341b7dcf2e87c0f60ecc78e95fc61acb801fdd9853940b039027066aa
 DIST memcached-1.4.4.tar.gz 297920 RMD160 9d10ce383684bf94f4c169471e1ca49d271653ad SHA1 32a4f2cee9e1c0f4d7a247844714756e3affe96a SHA256 6bbca41460ded17c6d56c76d96309cd3dee518603fa093938e252262935f8bac
 DIST memcached-1.4.5.tar.gz 302516 RMD160 c1f534fbc585a1ea033bbd12d6fc94c77a085032 SHA1 c7d6517764b82d23ae2de76b56c2494343c53f02 SHA256 9571b4b85484e46b3b10f07ccba77a1fa97d60660b32859f990effefb3005f91
@@ -48,10 +49,11 @@ EBUILD memcached-1.4.0-r2.ebuild 1828 RMD160 6a0d49102ad2779207722ac133699e55fa9
 EBUILD memcached-1.4.0-r3.ebuild 2239 RMD160 65b8d688b4233f0ac7eb41c5b383fd70c9f9b12c SHA1 683ec9f7164526592e20ac126f857c9f7e6cf5c1 SHA256 7dfb71056e7f166a98aca923993acf3a940292eca63fa830a5b77e5524734abf
 EBUILD memcached-1.4.1-r1.ebuild 2230 RMD160 f8d17fd734576d854e11cfa62fac8645b9f493da SHA1 3b5dd756d0e33d59c831e1cdfde40dfca27898eb SHA256 c2ad7e3d4e30897f81dea30ea0e64197b0a3f3407d0f734fbff5e461b65c8b24
 EBUILD memcached-1.4.10-r1.ebuild 2603 RMD160 8b9ecab36e04886ac25e016d0d92cb98aac07019 SHA1 9840a3c588223a81e6f6828e495083ff8a853dd5 SHA256 cac6fe2b37f1920329c3c0dda8a58385c392c87c99b66758251b100464c9b264
+EBUILD memcached-1.4.11.ebuild 2602 RMD160 44bc72785c1f9596002fe3bdb70de973a0e6eb55 SHA1 ad424938e466ce250c85d9fc9151cdef609b85d4 SHA256 12e4270bb6784425805f3e6f27a267c2433261620213590b078c924d724f4a1d
 EBUILD memcached-1.4.2-r1.ebuild 2417 RMD160 5ab6bb9041116d7f531b297de52df7b2516faaa4 SHA1 512bef664cabe2066460d4832a4e382e2aa6957c SHA256 78f491aa0855c3b4306b15493a1fc754a86fa8bcbbfd1844e848d3529b1112f5
 EBUILD memcached-1.4.4-r1.ebuild 2602 RMD160 abe7ef1f8b09c64f8d413830bf49f10cffe6742e SHA1 da269a5da6b9b9c8c2e51a535ed342fa80a5dbe0 SHA256 a28113c9355d915ef2fea228f81eeefdc53366da57587b3542bc7b4a3e5a57ae
 EBUILD memcached-1.4.5-r1.ebuild 2592 RMD160 0d7950af3aaad5e5e7cf5937487ab75bee8fc43c SHA1 d452affcc914e839006e1b4ffed1aae97103b3c2 SHA256 b14c4cca81bf950131b054fe1b5dec34f3f642de6d4f6e7e2c1915d72a3c26f0
 EBUILD memcached-1.4.7-r1.ebuild 2602 RMD160 95c06685003c4d5ba371c82cdb2d132703bd3f97 SHA1 f9376403145aae634a1a5cb441b7c70b0f71e029 SHA256 d56804f7648a2596649d0449cc28611693e7c1e911f8e54961fca7f8585c36a9
 EBUILD memcached-1.4.8-r1.ebuild 2602 RMD160 aa349ee2abe00350f781283adba58fec8d14a81d SHA1 ba04bb4675a0a32fbc318d593da5406c6ae2f606 SHA256 7638ab59ed091f0ff599041830331df3b0f0f251b3240f4d2c5157395e46d700
-MISC ChangeLog 21413 RMD160 bf01fdc11b4c0c65f0e911fd8c4ea3eac919c4f7 SHA1 7bac984af5572d4d5b340b049f81b839e6ffb4db SHA256 361f6dfc61a24fb78b27ba2a92f56760a0d57e9684d1c232f3bf8b4d4c2b8231
+MISC ChangeLog 21544 RMD160 d387aff7c6098434bc7741de367100c0edd6550c SHA1 55d5402f55823547b0ed4e03998200ab93ce9212 SHA256 2176a7e196cac2696f22157dc49ede0395e2273374e2f9b949f66ba2e92ee023
 MISC metadata.xml 945 RMD160 236fa2698012cf40d7f5afb7421314c0292127f6 SHA1 13c240d34e1d80da54cce5f96e22e1929e7a5ba6 SHA256 643e8b688c25a04137d9e1a2818a8668fc6700c96d09b00c0321302a0ad77c28
diff --git a/net-misc/memcached/memcached-1.4.11.ebuild b/net-misc/memcached/memcached-1.4.11.ebuild
new file mode 100644
index 000000000000..75793577d7cd
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.11.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.11.ebuild,v 1.1 2012/01/17 08:13:01 robbat2 Exp $
+
+EAPI=2
+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 ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test slabs-reassign debug sasl" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl
+		 sasl? ( dev-libs/cyrus-sasl )"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	# Handled different upstream
+	#epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG
+	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
+	filter-flags -UNDEBUG
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.3.3/conf memcached
+	newinitd "${FILESDIR}"/1.3.3/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 should 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"
+}