Export required symbols wrt #276571 by Ryan Hill.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 51 insertions, 19 deletions

diff --git a/dev-libs/libmemcache/ChangeLog b/dev-libs/libmemcache/ChangeLog
index 0a62a0fecc7c..1ac37e1aaea3 100644
--- a/dev-libs/libmemcache/ChangeLog
+++ b/dev-libs/libmemcache/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libmemcache
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcache/ChangeLog,v 1.26 2010/01/14 21:33:53 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcache/ChangeLog,v 1.27 2010/07/10 20:21:39 ssuominen Exp $
+
+  10 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  libmemcache-1.4.0_rc2-r1.ebuild,
+  +files/libmemcache-1.4.0_rc2-inline.patch:
+  Export required symbols wrt #276571 by Ryan Hill.
 
   14 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   libmemcache-1.4.0_rc2-r1.ebuild:
diff --git a/dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-inline.patch b/dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-inline.patch
new file mode 100644
index 000000000000..6eba5dffd135
--- /dev/null
+++ b/dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-inline.patch
@@ -0,0 +1,33 @@
+http://bugs.gentoo.org/276571
+
+--- include/memcache.h.in
++++ include/memcache.h.in
+@@ -923,7 +923,7 @@ int	mcMemGet(mcFreeFunc *freeFunc, mcMallocFunc *mallocFunc,
+ 		 mcMallocFunc *mallocAtomicFunc, mcReallocFunc *reallocFunc);
+ 
+ /* Returns a pointer to the global context. */
+-inline struct memcache_ctxt *mc_global_ctxt(void);
++struct memcache_ctxt *mc_global_ctxt(void);
+ 
+ /* The next two functions are used to setup an error handler. */
+ int	mcErrSetup(mcErrFunc errFunc);
+--- include/memcache/buffer.h
++++ include/memcache/buffer.h
+@@ -63,14 +63,14 @@ struct memcache_buf	*mcm_buf_find_replace(struct memcache_ctxt *, struct memcach
+ struct memcache_buf	*mcm_buf_find_replace2(struct memcache_ctxt *, struct memcache_buf *,
+ 						    const char *, struct memcache_buf *);
+ int	 mcm_buf_free(struct memcache_ctxt *, struct memcache_buf **);
+-inline u_int32_t	 mcm_buf_len(const struct memcache_ctxt *, const struct memcache_buf *);
++u_int32_t	 mcm_buf_len(const struct memcache_ctxt *, const struct memcache_buf *);
+ struct memcache_buf	*mcm_buf_new(struct memcache_ctxt *);
+ struct memcache_buf	*mcm_buf_new2(struct memcache_ctxt *, const char *, const u_int32_t);
+ struct memcache_buf	*mcm_buf_new3(struct memcache_ctxt *, const char *);
+ size_t	 mcm_buf_read(struct memcache_ctxt *, struct memcache_buf *, int);
+ int	 mcm_buf_realloc(struct memcache_ctxt *, struct memcache_buf *, const u_int32_t);
+-inline size_t	 mcm_buf_remain(const struct memcache_ctxt *, const struct memcache_buf *);
+-inline size_t	 mcm_buf_remain_off(const struct memcache_ctxt *, const struct memcache_buf *);
++size_t	 mcm_buf_remain(const struct memcache_ctxt *, const struct memcache_buf *);
++size_t	 mcm_buf_remain_off(const struct memcache_ctxt *, const struct memcache_buf *);
+ int	 mcm_buf_replace(struct memcache_ctxt *, struct memcache_buf *, const char *, const u_int32_t);
+ int	 mcm_buf_replace2(struct memcache_ctxt *, struct memcache_buf *, const char *);
+ int	 mcm_buf_replace_buf(struct memcache_ctxt *, struct memcache_buf *, struct memcache_buf *);
diff --git a/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild b/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild
index 9663b759299c..f687d0cfe97b 100644
--- a/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild
+++ b/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild,v 1.3 2010/01/14 21:33:53 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild,v 1.4 2010/07/10 20:21:39 ssuominen Exp $
 
-inherit toolchain-funcs autotools
+EAPI=3
+inherit autotools eutils toolchain-funcs
 
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
+MY_P=${PN}-${PV/_/.}
 
 DESCRIPTION="C API for memcached"
 HOMEPAGE="http://people.freebsd.org/~seanc/libmemcache/"
@@ -16,30 +16,24 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
-RDEPEND=""
+S=${WORKDIR}/${MY_P}
 
-S="${WORKDIR}/${MY_P}"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-inline.patch
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -rf test/unit
-	sed -i -e '/DIR/s,unit,,g' test/Makefile.am
+	rm -rf test/unit || die
+	sed -i -e '/DIR/s,unit,,g' test/Makefile.am || die
 	sed -i \
 		-e 's,test/unit/Makefile,,g' \
 		-e '/^CFLAGS=.*Wall.*pipe/s,-Wall,${CFLAGS} -Wall,g' \
 		-e '/^OPTIMIZE=/d' \
 		-e '/^PROFILE=/d' \
-		configure.ac
-	eautoreconf
-}
+		configure.ac || die
 
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
+	eautoreconf
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc ChangeLog
 }