Version bump.

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

3 files changed, 78 insertions, 2 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index c631b01d2333..f8948045eec5 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/memcached
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.95 2009/07/28 01:07:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.96 2009/08/30 08:05:04 robbat2 Exp $
+
+*memcached-1.4.1 (30 Aug 2009)
+
+  30 Aug 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +memcached-1.4.1.ebuild:
+  Version bump.
 
 *memcached-1.4.0-r1 (28 Jul 2009)
 
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index a5827028fed2..759ee6c21efd 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -26,6 +26,7 @@ DIST memcached-1.2.8.tar.gz 221285 RMD160 8866865f57b6914fca98f3cf5ae0942f7e94ba
 DIST memcached-1.3.0.tar.gz 234701 RMD160 226255b960ed67cf3d87d31d54431ea5597f0b05 SHA1 abacffa7391e2d1ce07473dfb50f954434eb6d5d SHA256 1ee7fba9a38ce2fe87246e2d62fff519009af384bf10e35c59a0dc7e309dccb3
 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
 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
@@ -40,5 +41,6 @@ EBUILD memcached-1.3.3-r2.ebuild 1819 RMD160 01630571e76e9d79e8ec06ddd7cd6ad1b6a
 EBUILD memcached-1.3.3.ebuild 1714 RMD160 70359cf49548ad62315ed217c56f0987eb71c48c SHA1 eb8a43677aee0bf9623b997362e436ad2e1005e8 SHA256 e1d10d1c532cb9833248dd8fea30f029025092da83896b9d20298b333f22dd62
 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
-MISC ChangeLog 16539 RMD160 fa6a35323e6087dba71997ec4c8d5b8b02669c8c SHA1 14beb360698982d0eda86e7b019a8f204223a584 SHA256 c8b482ad8eac2a69c0dda2ffb869cac9818fdb5c5add4f12f659e94a395f3d3b
+EBUILD memcached-1.4.1.ebuild 2238 RMD160 d88eac68c9a4ba63d97f0190db1800de154185b1 SHA1 32fe538b478d945ae71c41a0477ca2f8325572bc SHA256 b4fb3766fe0f741a285c64404176c468bc91ced674643075836d0a1f492ff2f4
+MISC ChangeLog 16668 RMD160 974dfca729258fd1e94c5de8639b3f62887849ee SHA1 65fdae3983443b263f9bba5f340bf6bd8e9907ac SHA256 325f83303d54af6abeb93b12352d490b3a5af20f6d3284b811e3d7577a385a0d
 MISC metadata.xml 966 RMD160 9da6a32f068f21da2b93ad45b4bba6147644e20a SHA1 a7080fc08dde81c21554beeb89b201d16efe08c1 SHA256 ce8186d4b0926cdc2ac0dcc49a737359b3f08a13396b5dc2cf05bf4a366b242b
diff --git a/net-misc/memcached/memcached-1.4.1.ebuild b/net-misc/memcached/memcached-1.4.1.ebuild
new file mode 100644
index 000000000000..5b1989f5f7bf
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.1.ebuild
@@ -0,0 +1,68 @@
+# 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.4.1.ebuild,v 1.1 2009/08/30 08:05:04 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"
+IUSE="test slabs-reassign debug"
+
+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_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+}
+
+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 TODO 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"
+}