Respect AR, CFLAGS (bug #482188). Fix building on HPPA. Remove obsolete files.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

12 files changed, 119 insertions, 252 deletions

diff --git a/dev-db/kyotocabinet/ChangeLog b/dev-db/kyotocabinet/ChangeLog
index 5f4afc6d3b50..fa781c394a11 100644
--- a/dev-db/kyotocabinet/ChangeLog
+++ b/dev-db/kyotocabinet/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-db/kyotocabinet
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/ChangeLog,v 1.22 2014/05/15 13:27:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/ChangeLog,v 1.23 2014/05/15 21:46:42 jer Exp $
+
+*kyotocabinet-1.2.76-r1 (15 May 2014)
+
+  15 May 2014; Jeroen Roovers <jer@gentoo.org> -kyotocabinet-1.2.74.ebuild,
+  -kyotocabinet-1.2.75.ebuild, +kyotocabinet-1.2.76-r1.ebuild,
+  -files/remove_ldconfig-1.0.4.patch, -files/fix_rpath-1.2.4.patch,
+  -files/remove_ldconfig-1.2.4.patch, -files/remove_docinst-1.2.29.patch,
+  +files/kyotocabinet-1.2.76-configure-8-byte-atomics.patch,
+  +files/kyotocabinet-1.2.76-flags.patch, -files/fix_rpath.patch,
+  -files/remove_docinst.patch, -files/remove_ldconfig.patch:
+  Respect AR, CFLAGS (bug #482188). Fix building on HPPA. Remove obsolete
+  files.
 
   15 May 2014; Jeroen Roovers <jer@gentoo.org> kyotocabinet-1.2.74.ebuild,
   kyotocabinet-1.2.75.ebuild, kyotocabinet-1.2.76.ebuild:
diff --git a/dev-db/kyotocabinet/files/fix_rpath-1.2.4.patch b/dev-db/kyotocabinet/files/fix_rpath-1.2.4.patch
deleted file mode 100644
index ac3c8f840d04..000000000000
--- a/dev-db/kyotocabinet/files/fix_rpath-1.2.4.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 4ac046d..c757dfa 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -53,8 +53,8 @@ CXXFLAGS = @MYCXXFLAGS@
- LDFLAGS = @MYLDFLAGS@
- CMDLDFLAGS = @MYCMDLDFLAGS@
- LIBS = @LIBS@
--LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
--RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
-+LDENV = 
-+RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR)
- POSTCMD = @MYPOSTCMD@
- 
- 
-diff --git a/configure.in b/configure.in
-index ad63005..f0448d6 100644
---- a/configure.in
-+++ b/configure.in
-@@ -34,27 +34,17 @@ MYDOCUMENTFILES="COPYING ChangeLog doc kyotocabinet.idl"
- MYPCFILES="kyotocabinet.pc"
- 
- # Building flags
--MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -O2"
-+MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char"
- MYCXXFLAGS="-Wall -fPIC -fsigned-char -O2"
--MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include"
-+MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
- MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1"
- MYCPPFLAGS="$MYCPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D__EXTENSIONS__"
--MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
-+MYLDFLAGS="-L. -L\$(LIBDIR)"
- MYCMDLDFLAGS=""
- MYRUNPATH="\$(LIBDIR)"
- MYLDLIBPATHENV="LD_LIBRARY_PATH"
- MYPOSTCMD="true"
- 
--# Building paths
--PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
--PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"
--CPATH="$HOME/include:/usr/local/include:$CPATH"
--LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
--LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
--PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
--export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
--
--
- 
- #================================================================
- # Options
-diff --git a/kyotocabinet.pc.in b/kyotocabinet.pc.in
-index f21c87b..718f2d8 100644
---- a/kyotocabinet.pc.in
-+++ b/kyotocabinet.pc.in
-@@ -10,5 +10,5 @@ datadir=@datadir@
- Name: Kyoto Cabinet
- Description: another modern implementation of DBM
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lkyotocabinet @LIBS@
-+Libs: -L${libdir} -lkyotocabinet
- Cflags: -I${includedir}
diff --git a/dev-db/kyotocabinet/files/fix_rpath.patch b/dev-db/kyotocabinet/files/fix_rpath.patch
deleted file mode 100644
index a6a79384e437..000000000000
--- a/dev-db/kyotocabinet/files/fix_rpath.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index d2601ec..64c76c7 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -53,8 +53,8 @@ CXXFLAGS = @MYCXXFLAGS@
- LDFLAGS = @MYLDFLAGS@
- CMDLDFLAGS = @MYCMDLDFLAGS@
- LIBS = @LIBS@
--LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
--RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
-+LDENV =
-+RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR)
- POSTCMD = @MYPOSTCMD@
- 
- 
-diff --git a/configure.in b/configure.in
-index 3ce09c1..ae00c62 100644
---- a/configure.in
-+++ b/configure.in
-@@ -32,27 +32,17 @@ MYDOCUMENTFILES="COPYING ChangeLog THANKS doc kyotocabinet.idl"
- MYPCFILES="kyotocabinet.pc"
- 
- # Building flags
--MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -O2"
-+MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char"
- MYCXXFLAGS="-Wall -fPIC -fsigned-char -O2"
--MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include"
-+MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
- MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1"
- MYCPPFLAGS="$MYCPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D__EXTENSIONS__"
--MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
-+MYLDFLAGS="-L. -L\$(LIBDIR)"
- MYCMDLDFLAGS=""
- MYRUNPATH="\$(LIBDIR)"
- MYLDLIBPATHENV="LD_LIBRARY_PATH"
- MYPOSTCMD="true"
- 
--# Building paths
--PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
--PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"
--CPATH="$HOME/include:/usr/local/include:$CPATH"
--LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
--LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
--PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
--export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
--
--
- 
- #================================================================
- # Options
-diff --git a/kyotocabinet.pc.in b/kyotocabinet.pc.in
-index d9b67f1..8ede1a9 100644
---- a/kyotocabinet.pc.in
-+++ b/kyotocabinet.pc.in
-@@ -10,5 +10,5 @@ datadir=@datadir@
- Name: Kyoto Cabinet
- Description: another modern implementation of DBM
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -ltokyocabinet @LIBS@
-+Libs: -L${libdir} -ltokyocabinet
- Cflags: -I${includedir}
diff --git a/dev-db/kyotocabinet/files/kyotocabinet-1.2.76-configure-8-byte-atomics.patch b/dev-db/kyotocabinet/files/kyotocabinet-1.2.76-configure-8-byte-atomics.patch
new file mode 100644
index 000000000000..729efc083ba5
--- /dev/null
+++ b/dev-db/kyotocabinet/files/kyotocabinet-1.2.76-configure-8-byte-atomics.patch
@@ -0,0 +1,44 @@
+From: Shawn Landden <shawnlandden@gmail.com>
+Date: Thu, 21 Jun 2012 20:34:28 -0700
+Subject: configure: 8 byte atomics
+
+fix up configure test to handle lack of 8 byte atomics correctly
+
+as is the case with all ARM targets currently
+---
+ configure    |   29 +++++++++++++----------------
+ configure.in |   19 ++++++++++++++++---
+ 2 files changed, 29 insertions(+), 19 deletions(-)
+
+index a07063d..bfc6df0 100755
+--- a/configure.in
++++ b/configure.in
+@@ -238,9 +238,22 @@ fi
+ # Atomic operations
+ if test "$enable_atomic" != "no"
+ then
+-  printf 'checking for atomic operations... '
+-  AC_TRY_COMPILE([], [__sync_fetch_and_add], [MYGCCATOMIC=yes], [MYGCCATOMIC=no])
+-  if test "$MYGCCATOMIC" = "yes"
++  printf 'checking for 8 byte atomic operations... '
++  if printf '
++/* Some targets support 4 byte atomics, but not 8 byte atomics,
++ * and will fail at link time if they are used.
++ *
++ * http://gcc.gnu.org/onlinedocs/gcc-4.6.3/gcc/Atomic-Builtins.html
++ * http://gcc.gnu.org/wiki/Atomic
++ */
++#include <stdint.h>
++int
++main ()
++{
++uint64_t n = 0xdeadbeaf;
++__sync_bool_compare_and_swap(&n, 0xdeadbeaf, 0);
++return n;
++}' | $CC -xc -o config.tmp - >/dev/null 2>&1
+   then
+     MYCPPFLAGS="$MYCPPFLAGS -D_MYGCCATOMIC"
+     printf 'yes\n'
+-- 
+1.7.9.5
+
diff --git a/dev-db/kyotocabinet/files/kyotocabinet-1.2.76-flags.patch b/dev-db/kyotocabinet/files/kyotocabinet-1.2.76-flags.patch
new file mode 100644
index 000000000000..77a6fb37791c
--- /dev/null
+++ b/dev-db/kyotocabinet/files/kyotocabinet-1.2.76-flags.patch
@@ -0,0 +1,42 @@
+--- a/configure.in
++++ b/configure.in
+@@ -35,8 +35,8 @@
+ MYPCFILES="kyotocabinet.pc"
+ 
+ # Building flags
+-MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0"
+-MYCXXFLAGS="-Wall -fPIC -fsigned-char -g0"
++MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char"
++MYCXXFLAGS="-Wall -fPIC -fsigned-char"
+ MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
+ MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1"
+ MYCPPFLAGS="$MYCPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D__EXTENSIONS__"
+@@ -193,28 +193,6 @@
+ # Byte order
+ AC_C_BIGENDIAN(MYCPPFLAGS="$MYCPPFLAGS -D_MYBIGEND")
+ 
+-# System-depending optimization
+-printf 'checking for 64-bit availability... '
+-if printf 'main() {}' | $CC -xc -m64 -o config.tmp - >config.tmp 2>&1
+-then
+-  MYCFLAGS="-m64 $MYCFLAGS"
+-  MYCXXFLAGS="-m64 $MYCXXFLAGS"
+-  printf 'yes\n'
+-else
+-  printf 'no\n'
+-fi
+-if test "$enable_opt" != "no"
+-then
+-  printf 'checking for CPU optimization availability... '
+-  if printf 'main() {}' | $CC -xc -march=native -o config.tmp - >config.tmp 2>&1
+-  then
+-    MYCFLAGS="-march=native $MYCFLAGS"
+-    MYCXXFLAGS="-march=native $MYCXXFLAGS"
+-    printf 'yes\n'
+-  else
+-    printf 'no\n'
+-  fi
+-fi
+ printf 'checking for useless warnings... '
+ if printf 'main() {}' | $CC -xc \
+   -Wno-unused-but-set-variable -Wno-unused-but-set-parameter -o config.tmp - >config.tmp 2>&1
diff --git a/dev-db/kyotocabinet/files/remove_docinst-1.2.29.patch b/dev-db/kyotocabinet/files/remove_docinst-1.2.29.patch
deleted file mode 100644
index 9ad7934def6d..000000000000
--- a/dev-db/kyotocabinet/files/remove_docinst-1.2.29.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 1bf1946..f229fe6 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -121,8 +121,6 @@ install :
- 	cp -Rf $(COMMANDFILES) $(DESTDIR)$(BINDIR)
- 	mkdir -p $(DESTDIR)$(MAN1DIR)
- 	cd man && cp -Rf $(MAN1FILES) $(DESTDIR)$(MAN1DIR)
--	mkdir -p $(DESTDIR)$(DOCDIR)
--	cp -Rf $(DOCUMENTFILES) $(DESTDIR)$(DOCDIR)
- 	mkdir -p $(DESTDIR)$(PCDIR)
- 	cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR)
- 	-[ "$$UID" = 0 ] && PATH=/sbin:/usr/sbin:$(PATH) ldconfig 2>/dev/null || true
diff --git a/dev-db/kyotocabinet/files/remove_docinst.patch b/dev-db/kyotocabinet/files/remove_docinst.patch
deleted file mode 100644
index d04c7b362a33..000000000000
--- a/dev-db/kyotocabinet/files/remove_docinst.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index a813215..eefa4eb 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -117,8 +117,6 @@ install :
- 	cp -Rf $(LIBRARYFILES) $(DESTDIR)$(LIBDIR)
- 	mkdir -p $(DESTDIR)$(BINDIR)
- 	cp -Rf $(COMMANDFILES) $(DESTDIR)$(BINDIR)
--	mkdir -p $(DESTDIR)$(DATADIR)
--	cp -Rf $(DOCUMENTFILES) $(DESTDIR)$(DATADIR)
- 	mkdir -p $(DESTDIR)$(MAN1DIR)
- 	cd man && cp -Rf $(MAN1FILES) $(DESTDIR)$(MAN1DIR)
- 	mkdir -p $(DESTDIR)$(PCDIR)
diff --git a/dev-db/kyotocabinet/files/remove_ldconfig-1.0.4.patch b/dev-db/kyotocabinet/files/remove_ldconfig-1.0.4.patch
deleted file mode 100644
index 8bd7a8645290..000000000000
--- a/dev-db/kyotocabinet/files/remove_ldconfig-1.0.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 59e71a0..bd42c67 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -123,7 +123,6 @@ install :
- 	cd man && cp -Rf $(MAN1FILES) $(DESTDIR)$(MAN1DIR)
- 	mkdir -p $(DESTDIR)$(PCDIR)
- 	cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR)
--	-[ "$$UID" = 0 ] && PATH=/sbin:/usr/sbin:$(PATH) ldconfig || true
- 	@printf '\n'
- 	@printf '#================================================================\n'
- 	@printf '# Thanks for using Kyoto Cabinet.\n'
diff --git a/dev-db/kyotocabinet/files/remove_ldconfig-1.2.4.patch b/dev-db/kyotocabinet/files/remove_ldconfig-1.2.4.patch
deleted file mode 100644
index 8436a2648fbc..000000000000
--- a/dev-db/kyotocabinet/files/remove_ldconfig-1.2.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 6754032..b1f9055 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -123,7 +123,6 @@ install :
- 	cd man && cp -Rf $(MAN1FILES) $(DESTDIR)$(MAN1DIR)
- 	mkdir -p $(DESTDIR)$(PCDIR)
- 	cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR)
--	-[ "$$UID" = 0 ] && PATH=/sbin:/usr/sbin:$(PATH) ldconfig 2>/dev/null || true
- 	@printf '\n'
- 	@printf '#================================================================\n'
- 	@printf '# Thanks for using Kyoto Cabinet.\n'
\ No newline at end of file
diff --git a/dev-db/kyotocabinet/files/remove_ldconfig.patch b/dev-db/kyotocabinet/files/remove_ldconfig.patch
deleted file mode 100644
index f454c4729b59..000000000000
--- a/dev-db/kyotocabinet/files/remove_ldconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 64c76c7..a813215 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -123,7 +123,6 @@ install :
- 	cd man && cp -Rf $(MAN1FILES) $(DESTDIR)$(MAN1DIR)
- 	mkdir -p $(DESTDIR)$(PCDIR)
- 	cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR)
--	[ "$$UID" = 0 ] && ldconfig || true
- 	@printf '\n'
- 	@printf '#================================================================\n'
- 	@printf '# Thanks for using Kyoto Cabinet.\n'
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.75.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.75.ebuild
deleted file mode 100644
index 5c11286d64cb..000000000000
--- a/dev-db/kyotocabinet/kyotocabinet-1.2.75.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/kyotocabinet-1.2.75.ebuild,v 1.2 2014/05/15 13:27:56 jer Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="A straightforward implementation of DBM"
-HOMEPAGE="http://fallabs.com/kyotocabinet/"
-SRC_URI="${HOMEPAGE}pkg/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="debug doc examples static-libs"
-
-DEPEND="sys-libs/zlib
-	app-arch/xz-utils"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/fix_configure-1.2.62.patch"
-	sed -ie "/ldconfig/d" Makefile.in
-	sed -ie "/DOCDIR/d" Makefile.in
-}
-
-src_configure() {
-	econf $(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable !static-libs shared) \
-		--enable-lzma --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	use static-libs || find "${D}" \( -name '*.a' -or -name '*.la' \) -delete
-
-	if use examples; then
-		insinto /usr/share/${PF}/example
-		doins example/* || die "Install failed"
-	fi
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/* || die "Install failed"
-	fi
-}
-
-src_test() {
-	emake -j1 check || die "Tests failed"
-}
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.74.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild
index 95b3e3831472..8dbd817dec69 100644
--- a/dev-db/kyotocabinet/kyotocabinet-1.2.74.ebuild
+++ b/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/kyotocabinet-1.2.74.ebuild,v 1.2 2014/05/15 13:27:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild,v 1.1 2014/05/15 21:46:42 jer Exp $
 
-EAPI="2"
+EAPI=5
 
-inherit eutils
+inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="A straightforward implementation of DBM"
 HOMEPAGE="http://fallabs.com/kyotocabinet/"
@@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}pkg/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="debug doc examples static-libs"
 
 DEPEND="sys-libs/zlib
@@ -20,9 +20,13 @@ DEPEND="sys-libs/zlib
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/fix_configure-1.2.62.patch"
-	sed -ie "/ldconfig/d" Makefile.in
-	sed -ie "/DOCDIR/d" Makefile.in
+	epatch "${FILESDIR}"/fix_configure-1.2.62.patch
+	epatch "${FILESDIR}"/${PN}-1.2.76-configure-8-byte-atomics.patch
+	epatch "${FILESDIR}"/${PN}-1.2.76-flags.patch
+	sed -i -e "/DOCDIR/d" Makefile.in || die
+	tc-export AR
+
+	eautoreconf
 }
 
 src_configure() {
@@ -32,21 +36,22 @@ src_configure() {
 		--enable-lzma --docdir=/usr/share/doc/${PF}
 }
 
+src_test() {
+	emake -j1 check
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	use static-libs || find "${D}" \( -name '*.a' -or -name '*.la' \) -delete
+	emake DESTDIR="${D}" install
+
+	prune_libtool_files
 
 	if use examples; then
 		insinto /usr/share/${PF}/example
-		doins example/* || die "Install failed"
+		doins example/*
 	fi
 
 	if use doc; then
 		insinto /usr/share/doc/${PF}
-		doins -r doc/* || die "Install failed"
+		doins -r doc/*
 	fi
 }
-
-src_test() {
-	emake -j1 check || die "Tests failed"
-}