Version bump.

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

3 files changed, 88 insertions, 2 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index fa71e8d651f2..2e0281b6c3b9 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.116 2011/10/04 09:10:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.117 2011/11/16 08:52:31 robbat2 Exp $
+
+*memcached-1.4.10 (16 Nov 2011)
+
+  16 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +memcached-1.4.10.ebuild:
+  Version bump.
 
 *memcached-1.4.8 (04 Oct 2011)
 
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 005970925477..85b276d1d332 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -28,6 +28,7 @@ DIST memcached-1.3.0.tar.gz 234701 RMD160 226255b960ed67cf3d87d31d54431ea5597f0b
 DIST memcached-1.3.3.tar.gz 260203 RMD160 c9ac975da30b3c005336b15c90216ce4e7e4bc47 SHA1 5f29c4b9af4e77643b0dceafbbd5db9811d349dd SHA256 3728c714c3c0194a429f754d739067bea193d66359a03a63437428bf4a2cce84
 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.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.3.3.ebuild 1714 RMD160 70359cf49548ad62315ed217c56f0987eb71c4
 EBUILD memcached-1.4.0-r1.ebuild 2241 RMD160 13e61e663cd021d434c8942a655a5d8f785ea61f SHA1 765640ecf3f77a7f498fd119b7af3f2f1092c1f8 SHA256 b26e28ddfeacb8163a85de77e5b3a1cda087e5b3ec57648da1ea4de7a30dc5a6
 EBUILD memcached-1.4.0.ebuild 1827 RMD160 2fee4f19753cb8760ce69a59a1534551f573b440 SHA1 4ae001c1b7616326255bbf8eb7af14771474f7cc SHA256 6f999dc74e4c98995da76bea11a305654dc34e77a1697c4e43e195736b7e2f44
 EBUILD memcached-1.4.1.ebuild 2229 RMD160 b9ddaa79b0d94841bc4a95a5ca83327eafc71cc6 SHA1 ea541cdcef71baca83ceba984fdd7c87a54d8e0e SHA256 1db27147362a96209fb653a0c4e1b66008ecdd888ab9d45fcbbc09c21ee589e3
+EBUILD memcached-1.4.10.ebuild 2602 RMD160 a4eb4cde279b353c093c2f184d6013d0267aa9ab SHA1 3339e8a636b01609b4e1ae6458a2668c886cbdcc SHA256 ca4a1f186bdcb32e319fa990f5ac9e54b7c3e983965c1274574c4931ab3305e0
 EBUILD memcached-1.4.2.ebuild 2418 RMD160 3c5125a46925c0ad9cac9c84dc71de7e2815f1a2 SHA1 5a699f07e96c8ca57c8719ea3a87d70744f3a82d SHA256 bb538d36c687f0fb31fa093fb74a1dbd6c14a6513defcab76331c880a2316213
 EBUILD memcached-1.4.4.ebuild 2599 RMD160 d91d7f3a4ab6b6d51f767bf9924376e3b2f7d4f2 SHA1 9e742e8275a5da1e486e66b07293adb62ff5c6a3 SHA256 7716eccb290d304d1ec9882981603f9ade32c7457ff42cafdf66b6562e8c9c07
 EBUILD memcached-1.4.5.ebuild 2590 RMD160 3590a434178c00e3ddf3d5156f5c6849f6716076 SHA1 4e9774b5f42c6b6353dce5c9f934fc56c09987f1 SHA256 eb945f48f9dc0ebe67f8405bea20c1acbce06091193ca02efcc211a7d23fcdec
 EBUILD memcached-1.4.7.ebuild 2601 RMD160 d9bba19b6c7b51f562aa0b4571760acb3cd91a01 SHA1 f13a3a9531fcf278e27f1115fa0e483c00ece249 SHA256 e4fd1cc0e578bac857b4fe1e3d6aec031f9db39e8c0d59f98613557dd61c57e6
 EBUILD memcached-1.4.8.ebuild 2601 RMD160 b2abd8d0da618e4d3046b742663c648c5a8faba4 SHA1 363a1cee564078c6198b8020dfe9e9fc3148103c SHA256 62ab3f9342d9b07086cd3812a4fb395f7b7b979af1b722787d5e65367ab654c4
-MISC ChangeLog 19157 RMD160 0518efbdb8bf905f58c0b37c419139315b5f4c10 SHA1 51a2c4788729d20aeb1a48785cdf9f81958ec55b SHA256 6da982ab9bf83204a2bf17d3b657fdaba4e400728438edfcaa4a90cc42b8624f
+MISC ChangeLog 19286 RMD160 3ff06bbc17ab97cadd40148ad24499db1aa55421 SHA1 766231d72e83b42eecd97fb863493d64b00f74ec SHA256 93f9f6e8dc69b9d29b25da038b1a4f027e93f62c1b068b4f9461ae521ad05945
 MISC metadata.xml 945 RMD160 236fa2698012cf40d7f5afb7421314c0292127f6 SHA1 13c240d34e1d80da54cce5f96e22e1929e7a5ba6 SHA256 643e8b688c25a04137d9e1a2818a8668fc6700c96d09b00c0321302a0ad77c28
diff --git a/net-misc/memcached/memcached-1.4.10.ebuild b/net-misc/memcached/memcached-1.4.10.ebuild
new file mode 100644
index 000000000000..4dc052d8ddfc
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.10.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.10.ebuild,v 1.1 2011/11/16 08:52:31 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"
+}