Apply debian hack to fix build failure on ppc* wrt #365303. ppc/ppc64 stable wrt #327725

(Portage version: 2.2.0_alpha75/cvs/Linux x86_64)

3 files changed, 50 insertions, 3 deletions

diff --git a/dev-libs/libmemcache/ChangeLog b/dev-libs/libmemcache/ChangeLog
index e9d1a3f461f4..3d0059183546 100644
--- a/dev-libs/libmemcache/ChangeLog
+++ b/dev-libs/libmemcache/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libmemcache
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcache/ChangeLog,v 1.34 2011/04/16 18:25:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcache/ChangeLog,v 1.35 2011/11/20 09:39:09 xarthisius Exp $
+
+  20 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  libmemcache-1.4.0_rc2-r1.ebuild,
+  +files/libmemcache-1.4.0_rc2-ppc_ftbfs.patch:
+  Apply debian hack to fix build failure on ppc* wrt #365303. ppc/ppc64 stable
+  wrt #327725
 
   16 Apr 2011; Raúl Porcel <armin76@gentoo.org>
   libmemcache-1.4.0_rc2-r1.ebuild:
diff --git a/dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-ppc_ftbfs.patch b/dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-ppc_ftbfs.patch
new file mode 100644
index 000000000000..dbeee57b1c6b
--- /dev/null
+++ b/dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-ppc_ftbfs.patch
@@ -0,0 +1,40 @@
+Debian patch: 10_ftbfs_fix_powerpc.patch
+Fixing build on PowerPC
+https://bugs.gentoo.org/show_bug.cgi?id=365303
+
+--- a/include/memcache.h.in
++++ b/include/memcache.h.in
+@@ -61,6 +61,11 @@
+ #ifndef MEMCACHE_H
+ #define MEMCACHE_H
+ 
++/* fix FTBFS on powerpc for Debian libmemcache */
++#ifndef __USE_POSIX
++#define __USE_POSIX
++#endif
++
+ #include <netdb.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+--- a/src/memcache.c
++++ b/src/memcache.c
+@@ -39,12 +39,17 @@
+ #include <sysexits.h>
+ #include <errno.h>
+ #include <sys/types.h>
+-#ifdef __linux
++
++/* fix FTBFS on powerpc for Debian libmemcache.  I personally think this
++ * shouldnt be the case, as Debian Bug#345587 seems to show. */
++
++/* #ifdef __linux */
+ # ifndef __USE_POSIX
+ #  define __USE_POSIX
+ #warning "Working around busted-ass Linux header include problems: use FreeBSD instead"
+ #warning "http://www.FreeBSD.org/ - you won't regret it"
+-# endif
++/* #endif */
++
+ #endif
+ #include <sys/time.h>
+ #include <sys/socket.h>
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 f41d1f8feaf4..967432b67c17 100644
--- a/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild
+++ b/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.12 2011/04/16 18:25:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild,v 1.13 2011/11/20 09:39:09 xarthisius Exp $
 
 EAPI=3
 inherit autotools eutils toolchain-funcs
@@ -13,7 +13,7 @@ SRC_URI="http://people.freebsd.org/~seanc/libmemcache/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 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"
+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=""
 
 S=${WORKDIR}/${MY_P}
@@ -21,6 +21,7 @@ S=${WORKDIR}/${MY_P}
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-inline.patch
 	epatch "${FILESDIR}"/${P}-implicit_pointer.patch
+	[[ $(tc-arch) == ppc* ]] && epatch "${FILESDIR}"/${P}-ppc_ftbfs.patch
 
 	rm -rf test/unit || die
 	sed -i -e '/DIR/s,unit,,g' test/Makefile.am || die