Version bump. Also fix bug #288833 for --as-needed.

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

4 files changed, 121 insertions, 2 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index 33697a95a6b9..653db43c8774 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.104 2009/10/12 19:42:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.105 2009/11/27 23:24:52 robbat2 Exp $
+
+*memcached-1.4.4 (27 Nov 2009)
+
+  27 Nov 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +memcached-1.4.4.ebuild, +files/memcached-1.4.4-as-needed.patch:
+  Version bump. Also fix bug #288833 for --as-needed.
 
   12 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> memcached-1.4.2.ebuild:
   Disable doc building as it wants a bunch of stuff that Gentoo doesn't
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index c6bfdde52dd1..b925d7d15fe6 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -16,6 +16,7 @@ AUX memcached-1.2.2-fbsd.patch 328 RMD160 669542854d9cbca5495db2ac2fe280502dbe96
 AUX memcached-1.2.2-p-threads.patch 869 RMD160 1b1673479b543515b67a284bfd38876f235e5fba SHA1 6345377ac93ef302386abae8e7ab9c273a4e3a98 SHA256 be6066ca09d2c871d6f0691cc101684512bf7a16c5e823412ed8a98213048e61
 AUX memcached-1.3.3-gcc4-slab-fixup.patch 1051 RMD160 846caa1cbb5aeb4cb8f976b260d3c8cebf489715 SHA1 bcf25452ab529440a61334be14c8271343c48f87 SHA256 a812ac8711230764408eab9c3379811b7143d799d787d6f1642a45c82967c62d
 AUX memcached-1.4.0-fix-as-needed-linking.patch 1557 RMD160 5178d0f784a72beea18772f15fc2419d475f943b SHA1 84ac2385fee3ad8239a4e3a679d309e760a3bb6e SHA256 bfedf767ee68f83e1e31d78d551d16f644cbfc8d385c991968d6cfdd22946cb8
+AUX memcached-1.4.4-as-needed.patch 1135 RMD160 2c4c4e4f24d42b241b2e065807b0e3213a936ae6 SHA1 73ab97a39d382e59ba693767625c79831a22041a SHA256 4b08e69c7a3f97e6add4fb337b095b7b0aba55c3d62ed793858cbf1dad036421
 DIST memcached-1.1.12.tar.gz 114103 RMD160 4a1914d157cdd0d73102733f32dd835a494585c4 SHA1 431bfc095c777948073e38436c6cf176acb6b5de SHA256 6a8e63b02d8576a937dc154232357dbb9c236890be53e9ce0d44e2dba21ca79a
 DIST memcached-1.1.13.tar.gz 133734 RMD160 57b6da75e45af66f5d2a0c4a7a2a22a256cfb209 SHA1 e646da415434721b124baea10e09c62ce2ba3a56 SHA256 cb46911afde64f627af277b46b879b4a66d0653c22b9e6ccd31392a9a4ebbe5f
 DIST memcached-1.2.1.tar.gz 148755 RMD160 0b275591af74440f3de22946fb7ccc658f6578af SHA1 07ce5441874c052d28484070438822eedd7cc8ec SHA256 d489c1e8f9b149d7cde2bb1cb2c509ca6acedc32baed4e9b5f9e17d722c78c86
@@ -28,6 +29,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.2.tar.gz 283071 RMD160 bc1b8d8317e375565ea829a77cdf38d1359bf344 SHA1 28bceaa24c4bc6d7dc9c700e143ee4b2ff09f760 SHA256 d44b611341b7dcf2e87c0f60ecc78e95fc61acb801fdd9853940b039027066aa
+DIST memcached-1.4.4.tar.gz 297920 RMD160 9d10ce383684bf94f4c169471e1ca49d271653ad SHA1 32a4f2cee9e1c0f4d7a247844714756e3affe96a SHA256 6bbca41460ded17c6d56c76d96309cd3dee518603fa093938e252262935f8bac
 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
@@ -44,5 +46,6 @@ EBUILD memcached-1.4.0-r1.ebuild 2241 RMD160 13e61e663cd021d434c8942a655a5d8f785
 EBUILD memcached-1.4.0.ebuild 1827 RMD160 2fee4f19753cb8760ce69a59a1534551f573b440 SHA1 4ae001c1b7616326255bbf8eb7af14771474f7cc SHA256 6f999dc74e4c98995da76bea11a305654dc34e77a1697c4e43e195736b7e2f44
 EBUILD memcached-1.4.1.ebuild 2229 RMD160 bd393227e9a4b9ca69a4c7e1b03e17ba4947af8e SHA1 d54fc1c785f8ae20add48a2a8a1c4ade2744049c SHA256 d6ca45939f07c17f5ab6a156cd4d0ac9fe952c4e146f224f95254c15c921f75b
 EBUILD memcached-1.4.2.ebuild 2418 RMD160 3c5125a46925c0ad9cac9c84dc71de7e2815f1a2 SHA1 5a699f07e96c8ca57c8719ea3a87d70744f3a82d SHA256 bb538d36c687f0fb31fa093fb74a1dbd6c14a6513defcab76331c880a2316213
-MISC ChangeLog 17664 RMD160 d9ffc9222c1e076b42752c5a1129d106f2b4cdbd SHA1 ac57323dfc2b272d2b4b42d7972001b98ec6a8f4 SHA256 f71d82af8b4caa97a33b2e53cf11e92c92b02d4c259324f11a495a18b9c4becf
+EBUILD memcached-1.4.4.ebuild 2531 RMD160 e32f488b99abbd47ec1327ef2c5ff64e6369b974 SHA1 c05b885db5a78d91e036aaecb23b3131bbe76b1c SHA256 890c7c67d4d610365214facbbef90cf64c8ffb741338229af067cda4b76c6f81
+MISC ChangeLog 17871 RMD160 f9c0681d58fea4ec218f23d20257eca26999fd5d SHA1 c9c5e601166c19eafc1a36debba28cee8cead88e SHA256 b1d7a3ae26376426f1bc627118eccb2022473192dd8d83d21ebd1cc3cf98f4e4
 MISC metadata.xml 966 RMD160 9da6a32f068f21da2b93ad45b4bba6147644e20a SHA1 a7080fc08dde81c21554beeb89b201d16efe08c1 SHA256 ce8186d4b0926cdc2ac0dcc49a737359b3f08a13396b5dc2cf05bf4a366b242b
diff --git a/net-misc/memcached/files/memcached-1.4.4-as-needed.patch b/net-misc/memcached/files/memcached-1.4.4-as-needed.patch
new file mode 100644
index 000000000000..f6e5cde11057
--- /dev/null
+++ b/net-misc/memcached/files/memcached-1.4.4-as-needed.patch
@@ -0,0 +1,31 @@
+diff -Nuar memcached-1.4.4.orig/configure.ac memcached-1.4.4/configure.ac
+--- memcached-1.4.4.orig/configure.ac	2009-11-24 16:40:29.000000000 -0800
++++ memcached-1.4.4/configure.ac	2009-11-27 15:20:38.000000000 -0800
+@@ -115,6 +115,14 @@
+ AC_SUBST(ENABLE_SASL)
+ AC_SUBST(PROFILER_LDFLAGS)
+ 
++dnl Check whether the user's system supports pthread before adding -pthread to CFLAGS
++dnl otherwise we won't get -l{threads} in LIBS
++dnl AFAIK -pthread should be added to LDFLAGS on BSD systems
++AC_SEARCH_LIBS(pthread_create, [pthread pthreads thread threads] )
++if test "x$ac_cv_search_pthread_create" == "xno"; then
++  AC_MSG_ERROR([Can't enable threads without the POSIX thread library.])
++fi
++
+ AC_ARG_ENABLE(coverage,
+   [AS_HELP_STRING([--disable-coverage],[Disable code coverage])])
+ 
+@@ -376,12 +384,6 @@
+ 
+ AC_C_HTONLL
+ 
+-dnl Check whether the user's system supports pthread
+-AC_SEARCH_LIBS(pthread_create, pthread)
+-if test "x$ac_cv_search_pthread_create" = "xno"; then
+-  AC_MSG_ERROR([Can't enable threads without the POSIX thread library.])
+-fi
+-
+ AC_CHECK_FUNCS(mlockall)
+ AC_CHECK_FUNCS(getpagesizes)
+ AC_CHECK_FUNCS(memcntl)
diff --git a/net-misc/memcached/memcached-1.4.4.ebuild b/net-misc/memcached/memcached-1.4.4.ebuild
new file mode 100644
index 000000000000..1164de123eda
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.4.ebuild
@@ -0,0 +1,79 @@
+# 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.4.ebuild,v 1.1 2009/11/27 23:24:52 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 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"
+}