Version bump.

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

3 files changed, 77 insertions, 22 deletions

diff --git a/dev-libs/libmemcached/ChangeLog b/dev-libs/libmemcached/ChangeLog
index 2c77dafb36bb..20ea79b81e3a 100644
--- a/dev-libs/libmemcached/ChangeLog
+++ b/dev-libs/libmemcached/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libmemcached
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcached/ChangeLog,v 1.41 2012/01/14 17:26:47 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcached/ChangeLog,v 1.42 2012/02/21 08:43:28 robbat2 Exp $
+
+*libmemcached-1.0.4 (21 Feb 2012)
+
+  21 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> +libmemcached-1.0.4.ebuild:
+  Version bump.
 
   14 Jan 2012; Kacper Kowalik <xarthisius@gentoo.org> metadata.xml:
   tcmalloc is now global
diff --git a/dev-libs/libmemcached/Manifest b/dev-libs/libmemcached/Manifest
index dec3d64bdcaf..fe18a80ffee9 100644
--- a/dev-libs/libmemcached/Manifest
+++ b/dev-libs/libmemcached/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX libmemcached-0.28-removebogustest.patch 268 RMD160 e3033773981198a137925da75c3b9dbe70479864 SHA1 d46c2ea1dfe5616d3b4cf9ca7410fce8344fe110 SHA256 d264fc534d7fab8ccc542ff5e11d852a47395f47465d1570a772673ecae82da0
 AUX libmemcached-0.28-runtestsasuser.patch 770 RMD160 17671451e0a55c5a24bbcb914e9a318af01b9e75 SHA1 9943bf2ccbeabe3571614911404d8e69d4707069 SHA256 166f4877208b5a2f9e948101ecdd5d3dcefc8dd419bf02c6fa3aab9502b862af
 AUX libmemcached-0.39-runtestsasuser.patch 906 RMD160 71608de45313d13f8e6d591bd2a6826779c3ee1f SHA1 3345c0061e8d75ac7e0481f48723c2c3bfa2715b SHA256 51c22d96ad9a6c571ac5b89dd4002a6b854bce76472b3b8b3dcb4f73efc7018e
@@ -16,6 +13,7 @@ DIST libmemcached-0.37.tar.gz 661959 RMD160 d46d11ee6098cc339687a797c6ca4cfd6781
 DIST libmemcached-0.38.tar.gz 665073 RMD160 fb2ca140311b02c04e1a3246b2af306e46aa74cb SHA1 d231ba7cd390d889b7d66451a8014b028bbfc9eb SHA256 2c1ae3c05a70d518815c0220d3f0c3cf751371a32c95a2d36caf1a78ee63807a
 DIST libmemcached-0.39.tar.gz 680742 RMD160 d882799c30a55635cc1adf502261aa6ec6e07292 SHA1 3107725bae233019bddfad3929269dbc1e899858 SHA256 e604ba18d73817c6d449ac4834c223d0aec3f640e9a7efef72e2368a09c4497c
 DIST libmemcached-0.50.tar.gz 884272 RMD160 4091a07ed46b998edce3d5f1351b445182ba3d6d SHA1 cc963a84b57289288681f25ccae5362ed5620e6d SHA256 d3ed82f9c5cdfa816047ed6b7475b5708f9040b5cf3d9e2aed55de235e8b2f9a
+DIST libmemcached-1.0.4.tar.gz 951310 RMD160 2a9c71cd7894ed1c55d2557fd71fc75b5bc54ceb SHA1 a74644a368b14954c80623879bd722ebf552f857 SHA256 1dd0a9fb5823aa6f8337a3beaeb287bb92041005c136622b4d82622a9428e20c
 EBUILD libmemcached-0.22.ebuild 763 RMD160 e89a12fd38de91d9ae062e983220b4786ce0ea77 SHA1 8ca8176fbdca255995585bbfbb4906192b269257 SHA256 59b09491281fdb25444988f87699daa29608935e3028d2fda08befb828796a07
 EBUILD libmemcached-0.25.ebuild 764 RMD160 5a9b70680aa67425ee79fabb9b0956d015c84ac3 SHA1 b5dee2a45bf0071f83b7401a6b57027d5a684189 SHA256 9abefa81b917ebdaef66f2db166911d9c4f280be7d741ac0c8fc898dcd83090e
 EBUILD libmemcached-0.26.ebuild 793 RMD160 baa2f8a34e2e361a40f7d87b47be36ccc92f15be SHA1 5ab328e122852f12a9d59867989e1d056a61c898 SHA256 9b6e3877cfbf7e7da99495fc27e20c2f9494c24bf4fab2601be74ad4337334b8
@@ -29,22 +27,6 @@ EBUILD libmemcached-0.37.ebuild 993 RMD160 c626a06f0bb11bd15f72c498469ac74f4f14c
 EBUILD libmemcached-0.38.ebuild 1287 RMD160 e3f90988ecee5e5039485cad6dbf555a9a72c2f8 SHA1 ba15ecb371d5e9de02a36110ad7325afb6803c3a SHA256 a0936c5332cc064b00ed65d9c3eb3c81e3c08183950b857d0a25af0902e6a1bb
 EBUILD libmemcached-0.39.ebuild 1323 RMD160 778b7b9c7883f00027fbda564519e840708ab100 SHA1 de0b9ec6dc1ca3ef18e46c347c9f5723ef397d8f SHA256 1bb824022fa9fc02387260f657ccd2ca1a602cafa1af86b60e0119d59fd7ce6c
 EBUILD libmemcached-0.50.ebuild 1821 RMD160 2058dfb232a3faf666afd5c61c8d5bd23ceb8ece SHA1 d117fb1dd4548e2b23ee673337a1b5c083ac39cb SHA256 4274ce443ddcdf1f5518834cf2ef5ebd02447368f546230f886d0a88938830c7
-MISC ChangeLog 6622 RMD160 f1e8c74c7f72955ecae091c66e10d474ac6e7280 SHA1 b97b01c1deb4e4806da4e65f63d30999bb86514f SHA256 47fbac079de20da127f34ce9ce5670effddb4cd545f232e36e6440e8a74149a7
+EBUILD libmemcached-1.0.4.ebuild 1838 RMD160 e40ae88f652d413e39fd974fcb9dcb85c0f347f1 SHA1 b9c4d79185a702e75602551137aa20ca974f7f9d SHA256 8babf35a0d4a1aaa0b2aa7678217883704af2b67196b3336f359f9db5c442479
+MISC ChangeLog 6752 RMD160 2b7d34a9e97dc8108ca0f9f3859a3ec8b1d61181 SHA1 d9dd37b8d47c3d55b6420e0862c5aa40413ae4c6 SHA256 991757cc7c35a0bc526d81ae617c9706110c3bf9d3af36e50d826d8b10ca225a
 MISC metadata.xml 637 RMD160 e44957fd4a65e8ce574238fc3e2b8466e6259f05 SHA1 e50a36a2a913981d2fe180675f9435f79f56cf39 SHA256 880aab090522ef4c1d0b3f5ac3c3a44faa483c3ac87d44d636f184bbbf7a5e4b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBCAAGBQJPEbrdAAoJEF0huFKJUZL5YsMP/0YBhphY9rCexn3MLrGraUSq
-j9vFJ+B74b9ygzFm1gZp8xUy1lZcg7ZBgfP5cBxq5QIaj3hVYOOSoMnwuGx71sYr
-3VdfC24G7PtF/bhD2skd8t2S+mldea9nKwfFqnHuUvVaV4cc3CtylE6EXnnlB0wc
-3gWk+ytkgQ/g5eDg0RYPuw4GP7G3kEPUnwOlIdvBEeoBzkl8azjMo5PjWEP82IAd
-i74KNgZHO/HXEjPWoJe8vMrD8OWpjZvcbeD+jOmoTRKz2sWoxYxJo7pzUa4X/P+B
-Y+/Pa1FOrvGURe4aE+/9PEvQx8LqeNPi9nL7d+r5BVC3bzYgWNZDpp95SSRoN/Qc
-/I7Czy4Ml66dcArGw+658eY48jbKWhLwrSj1xwpoebenRV4pfGUcdqA3QZF3ZhBE
-TSlNfXw43MgTX9jb8+1hIqXXjN16AuY/EAymO9Fka++PAC9ORAqejJKhiB4UPeWg
-OUBK95yOyS91FB7VT0BPS4TpyxtQ3lWcLf99mxTtMoNv80iw69o+7xiVYIs0z4do
-Y545uxz1LbbJt94KqOGTzyPagdkY/5qb5QxbltMAl9CnQFrEkh0W+2hrdwkaj6Al
-WL0cyAg8X2LLoHBsJ6LUqZkf5XokVMkKQNBbinPNOpKCc65VK4y3aEzeIPgVY0E0
-cVToxs2NtxUXInymZs/n
-=ZK+l
------END PGP SIGNATURE-----
diff --git a/dev-libs/libmemcached/libmemcached-1.0.4.ebuild b/dev-libs/libmemcached/libmemcached-1.0.4.ebuild
new file mode 100644
index 000000000000..7a7406efe7d1
--- /dev/null
+++ b/dev-libs/libmemcached/libmemcached-1.0.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcached/libmemcached-1.0.4.ebuild,v 1.1 2012/02/21 08:43:28 robbat2 Exp $
+
+EAPI="3"
+
+inherit eutils multilib
+
+DESCRIPTION="a C client library to the memcached server"
+HOMEPAGE="http://tangent.org/552/libmemcached.html"
+SRC_URI="http://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="debug doc hsieh +libevent sasl static-libs tcmalloc"
+
+DEPEND="net-misc/memcached
+		virtual/perl-PodParser
+		doc? ( dev-python/sphinx )
+		libevent? ( dev-libs/libevent )
+		tcmalloc? ( dev-util/google-perftools )
+		sasl? ( virtual/gsasl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# These tests freezes for me
+	sed -i \
+		-e "/connectionpool/d" \
+		-e "/lp:583031/d" \
+		tests/${P%.*}/mem_functions.cc || die
+}
+
+src_configure() {
+	econf \
+		--disable-dtrace \
+		--disable-libinnodb \
+		$(use_enable debug assert) \
+		$(use_with debug debug) \
+		$(use_enable hsieh hsieh_hash) \
+		$(use_enable libevent libevent) \
+		$(use_enable tcmalloc tcmalloc) \
+		$(use_with sasl libsasl-prefix) \
+		$(use_with sasl libsasl2-prefix) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake || die
+
+	if use doc; then
+		emake html-local || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
+
+	dodoc AUTHORS ChangeLog README THANKS TODO
+	# remove manpage to avoid collision, see bug #299330
+	rm -f "${D}"/usr/share/man/man1/memdump.* || die "Install failed"
+	newman docs/man/memdump.1 memcached_memdump.1
+	if use doc; then
+		dohtml -r docs/html/* || die
+	fi
+}