Version bump.

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

3 files changed, 88 insertions, 14 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index 64e143e4a463..fa71e8d651f2 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.115 2011/08/17 06:43:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.116 2011/10/04 09:10:43 robbat2 Exp $
+
+*memcached-1.4.8 (04 Oct 2011)
+
+  04 Oct 2011; Robin H. Johnson <robbat2@gentoo.org> +memcached-1.4.8.ebuild:
+  Version bump.
 
 *memcached-1.4.7 (17 Aug 2011)
 
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index e27510e43f8a..005970925477 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 1.1.12/conf 636 RMD160 4bae6b67ae0941e74f6f494568ae026949ebd6fa SHA1 5d78a2ff7709510c9b6920bd1bf7e044708063b4 SHA256 0a5b83267788e429c2be0c4af1ef6a30320e96becab78aaba5af8d7eb8ff3ee2
 AUX 1.1.12/init 1284 RMD160 c3456498f58e7d20e1eecd764b5b10000ab034f5 SHA1 bad69ee734ba9fd4243b1175a4bccb423cbcfe3a SHA256 3981a78a1a77297f882163cf3e8c8352eb96afaf0820797ff12a40b90e23eef7
 AUX 1.1.13/conf 639 RMD160 1ef3957a92d2e894c6ee533fde289b1b866d1387 SHA1 711cf870976c33b5bebb521abd46ca10b36be82c SHA256 883921447c65b5bb627df3ec330fe61f1ba93c96b63398990da953dc0da0114f
@@ -35,6 +32,7 @@ DIST memcached-1.4.2.tar.gz 283071 RMD160 bc1b8d8317e375565ea829a77cdf38d1359bf3
 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
 DIST memcached-1.4.7.tar.gz 307741 RMD160 95bad7c299721fd0d6ff7c0e4b36314a7a29c792 SHA1 09e6ba550ea9f55b3116cd084b23ea2b923f9b41 SHA256 925837a4cf440e3cb451e338413ed9ad1429fd0d80ba4d903955f5fed8da7be6
+DIST memcached-1.4.8.tar.gz 311398 RMD160 1f24abccce58375c0490302d7f539d105b012b39 SHA1 1a06a391b6baca6f70a58922d2daa29773b03e35 SHA256 9c640e99cc0ccfbea9483cfb8d41bb9f084d30d6f818cd235bf4ba4248b08512
 EBUILD memcached-1.1.12-r2.ebuild 1239 RMD160 33f5f859b1f29674e8670524a5ae08be025c3f52 SHA1 ffd0b62a858f89b82a9e955e5ed87c8ceca665d9 SHA256 70793be39fb3fd35516868e00d8406d2e721ff0a4f6af2f92b237eb328e64d99
 EBUILD memcached-1.1.13-r1.ebuild 1638 RMD160 dec94934ef333ce82957982a87efe822bf93f7b4 SHA1 0de155e965ab1d73acf1ecec2ec4d6a68b348093 SHA256 80e929b814fe3bdd8c1696726cbb73cc7f15fd454388bab2ddf06c8b227de332
 EBUILD memcached-1.1.13.ebuild 1629 RMD160 17d29a1b9339f5d7bef3495058e59b941cda057e SHA1 3b5ef6cb7f43ddbbcdf7c370548ce52b97920097 SHA256 45c959a62b927445416fd2abd4b37d0351cbd98f2f27a529eb4e95cf2b8f0513
@@ -54,14 +52,6 @@ EBUILD memcached-1.4.2.ebuild 2418 RMD160 3c5125a46925c0ad9cac9c84dc71de7e2815f1
 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
-MISC ChangeLog 19030 RMD160 627b098820a9c1e155e1f2b3fa96389895ec1ed3 SHA1 6919aee751e29c83d634d96743b7aa95cfb96bb1 SHA256 7dbf16c47018b368fc9b7daa60106c8cb3379ea2db2756e6aee73a7d51f762a6
+EBUILD memcached-1.4.8.ebuild 2601 RMD160 b2abd8d0da618e4d3046b742663c648c5a8faba4 SHA1 363a1cee564078c6198b8020dfe9e9fc3148103c SHA256 62ab3f9342d9b07086cd3812a4fb395f7b7b979af1b722787d5e65367ab654c4
+MISC ChangeLog 19157 RMD160 0518efbdb8bf905f58c0b37c419139315b5f4c10 SHA1 51a2c4788729d20aeb1a48785cdf9f81958ec55b SHA256 6da982ab9bf83204a2bf17d3b657fdaba4e400728438edfcaa4a90cc42b8624f
 MISC metadata.xml 945 RMD160 236fa2698012cf40d7f5afb7421314c0292127f6 SHA1 13c240d34e1d80da54cce5f96e22e1929e7a5ba6 SHA256 643e8b688c25a04137d9e1a2818a8668fc6700c96d09b00c0321302a0ad77c28
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59rQ0ACgkQfXuS5UK5QB2cJAP+Pa39x73N+UiOUYxzdEvOdWIt
-fJLXzwbThcQnUQ1gv6tjvcr8bfhnnx+thMvwS1SnMZmYNYN1gmKYZNAbRLUU6WpT
-vn9vxxoVbzJ0F8Gxxu8giNQrjUFHFC0JpOyfcwFxyM4Ip7303ev9zETySae9mLGq
-QEWKcdSjP2AvB//KOGA=
-=5Wjl
------END PGP SIGNATURE-----
diff --git a/net-misc/memcached/memcached-1.4.8.ebuild b/net-misc/memcached/memcached-1.4.8.ebuild
new file mode 100644
index 000000000000..1d6bec5d4208
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.8.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.8.ebuild,v 1.1 2011/10/04 09:10:43 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"
+}