diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-10 20:21:39 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-10 20:21:39 +0000 |
commit | fc7631d1b0ac4b1652234d334d1e7d9ed6b079e4 (patch) | |
tree | 8e493c1ce47fb727c08d4aea6044380aa3c2b47f /dev-libs/libmemcache | |
parent | Use PYTHON_DEPEND instead of NEED_PYTHON. (diff) | |
download | historical-fc7631d1b0ac4b1652234d334d1e7d9ed6b079e4.tar.gz historical-fc7631d1b0ac4b1652234d334d1e7d9ed6b079e4.tar.bz2 historical-fc7631d1b0ac4b1652234d334d1e7d9ed6b079e4.zip |
Export required symbols wrt #276571 by Ryan Hill.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/libmemcache')
-rw-r--r-- | dev-libs/libmemcache/ChangeLog | 7 | ||||
-rw-r--r-- | dev-libs/libmemcache/Manifest | 15 | ||||
-rw-r--r-- | dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-inline.patch | 33 | ||||
-rw-r--r-- | dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild | 30 |
4 files changed, 54 insertions, 31 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/Manifest b/dev-libs/libmemcache/Manifest index 35f6138e4c8e..043f2b9753b5 100644 --- a/dev-libs/libmemcache/Manifest +++ b/dev-libs/libmemcache/Manifest @@ -1,19 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX libmemcache-1.4.0_rc2-inline.patch 2051 RMD160 9950d88554bde039561db0ca9866d37cfc8c2e21 SHA1 dac8b2a84cf3fcb2b26d00897ff2edab52c5a024 SHA256 7e02de6171d80776c191f481ba0b30383ddd8e02c4b5f8247f5ddd0af666ec3b DIST libmemcache-1.2.4.tar.bz2 40861 RMD160 2c21c3de0e18af34e2f100879e10d714db0a7c3b SHA1 e83f8fea9d4c2a1ef0da06a097033387d07056ff SHA256 c70f857753998106ac7d3542bd15014438270d261da4b3c24279e1db43f24dca DIST libmemcache-1.4.0.rc2.tar.bz2 301136 RMD160 b1e55c9ed7d487e3aafb3a85ba2e3386aa2b82f3 SHA1 7771a6477988cb5a8a9398839d63aaf491386130 SHA256 f496d41092c697384a7180720689da6a85d7c6ea2283eca69c8aaff2b58bebbf EBUILD libmemcache-1.2.4-r1.ebuild 1002 RMD160 a3e99fc8415b021cabb14cf461493883238343fd SHA1 bb8c370a17ee1a33dc9d15fda432b7018526f4d0 SHA256 0b240daf5d0100f8d90b7007ec1c03a56c11f14f643b7e4e5014d2fb824087d2 EBUILD libmemcache-1.2.4-r2.ebuild 968 RMD160 1363e7fb02978fa30384789891cd07852bdf1485 SHA1 f8ae7cc542213810db0c3e282132989285856bd9 SHA256 ea0f650e50e5ec4b474e7a6d9529bdbd1b5ed2e89ac884869cffecfcd5bff13f EBUILD libmemcache-1.2.4.ebuild 958 RMD160 9d93b1377ce72a4d0a2b1d51b6b58fd555023e13 SHA1 bcfbb9f37e0b30c200db46600771cc4e75912e6c SHA256 555911c4162819d05d3b0afd38a147a46fe450b2d18c9ce205419379a5d4294f -EBUILD libmemcache-1.4.0_rc2-r1.ebuild 1140 RMD160 ee303d36aac698f9b7a79bf49a6ca5c77a7339f1 SHA1 0bf88f43c125e5213985f335b96a0111478ae1df SHA256 4d9847264ab5ffb236c20a053a03d465c47280d3189575db60cdf500d6445ac9 +EBUILD libmemcache-1.4.0_rc2-r1.ebuild 1061 RMD160 50795d196c59ac48d7f631af697abd14ca084513 SHA1 fc72a8df9d6bdb85ea9f23681ac752dd66756081 SHA256 9723fd6e2ff9bbbaa77e6b9f3561377a7dde2508538e681b543c76a3a7603cb8 EBUILD libmemcache-1.4.0_rc2.ebuild 928 RMD160 cd89c96dc2a3058f0e776698170e8693cd1d48cd SHA1 1fcff8016c3544e849d652f0132d3901430fdfd7 SHA256 78b49c746833bca3a4e3aec97c9f5630a350aed1a5f91b37bf9c67da7266e3c1 -MISC ChangeLog 3431 RMD160 65956f744d4c5c09895b1293467d3e8163104508 SHA1 b1d19eae800d7b466a82ef9c92075da0f8f4bd62 SHA256 75071943aa09955e8b77f3246e0590f047ccb85f276904a7b5e8af7fefe69d58 +MISC ChangeLog 3622 RMD160 6a20af5e495b81aeed474c147bf42063851be4df SHA1 76c8bd34089344f84aa4b11a1c6b92367a3a574b SHA256 973d6e38483efac4bfcba3a3ee3b2feedf608ecbb8268938157b6432316be9f3 MISC metadata.xml 226 RMD160 648b1f4c4f30d91596a8bb5ee6713abbe558d1ee SHA1 454eb537623437bf8d58ae3cd0418e6a898bac61 SHA256 32bd7ea3d52eaade1cad03a261cd0f75ae3b0d10787fe646ece11c752b1cdfd2 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAktPjccACgkQNQqtfCuFneN37QCeIMydyZWKKtNoj1O4HQHStWcN -si8AnjKdC3EAtqMDmY4kxpL4AiNJQ3/c -=vxc6 ------END PGP SIGNATURE----- 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 } |