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

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

13 files changed, 126 insertions, 267 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/Manifest b/dev-db/kyotocabinet/Manifest
index 09fd7c8770f1..beed45f40cfd 100644
--- a/dev-db/kyotocabinet/Manifest
+++ b/dev-db/kyotocabinet/Manifest
@@ -2,25 +2,17 @@
 Hash: SHA256
 
 AUX fix_configure-1.2.62.patch 1675 SHA256 5448c415cf78a6a121d4e830cf43808c6e609ac0de1594cab451a55ace9811b2 SHA512 d64eccb7820ab14af610616a1335df7bb88c79940ea866651f2ad60b9dedd7bfc8b3fb116c1e1d421882c307ed48a35e02fc86596c4545bd00edf3f701e10d68 WHIRLPOOL d05bbab80853988d51e09ba18e928125df459a6fd2026c3adaf079312f95476a99907169702e38988c37497ccbb669a63f85fc7df78d006cc24414150e2b695b
-AUX fix_rpath-1.2.4.patch 2226 SHA256 e919bc427ef1f8f637d601da2a9be7f1643ce0d88d51d9ec775073ec2be2f77d SHA512 f3a9bfbee689681694cd883c6482070ab733d9711ffed2d00aca63ffe128687cceff6af76a4c7d7801a960b323f30df9abdc0d29a4c45cf509b5086e80ed36de WHIRLPOOL 3e47db9b01bf704c52e5a2254652710aa2d669043ea64955a3b4dedb6d92024c8e893e1b6c72b43c578212dbd3e469cf5e523759fa75e76502ed43c34d6630c5
-AUX fix_rpath.patch 2234 SHA256 a7618f47f3fd158be0fcd62bdd444e8f93e193ba3cf4e73f51caff4f9892e105 SHA512 bc05d6c67fdbe0f28395d2880752381af44709f97cd69abd45f6ca5692d9243b0067849811b5a9ff12ca9ce8965e2d90f51bbb67ad439df585f7456e8ef33b13 WHIRLPOOL c26506d58296b96a2acb7bffc3eec9de2bcf0f4a7a0b05dd366fea7b082455240b02effb6a57f6750ad20ce1a3f1551df31f4385969d54d50c4295c52ad1492b
-AUX remove_docinst-1.2.29.patch 491 SHA256 3540376fca462c509bd8502b5a41c836e4e4e1740ef443cbfa9623b8add71eb6 SHA512 9e574ad1ef0388b542cb5d1ae189f4a843f7e3fcb066071a96026a5dc3f2044503e2ddc7dba1ece06d8b66b43d024f179256c41632aa0f95c302c8aec00f288e WHIRLPOOL d900f382f1e90ec44dffbd90eeda4d1517b211222e1e31e6a8d67f44d27cea034c7217b9618fcafe53a41ae02fa1d923e0386edc05324c640914bec0cd88a923
-AUX remove_docinst.patch 450 SHA256 d6cdc082721ab43f67405149abc9ec20a12495feb203e74c642c3580382cbd71 SHA512 930270b5426733115a3d5d56c691a8179f5b7a8e8b80309a68a40a8343c1ce8d50e027a669f5b3af5c54711275d74da71d1b1c73f725ccd6a88e171193a7184d WHIRLPOOL e76d339ac82fab252dc521ef53169d8c853f9c8e39308efa7e3285077c51883a125d8de91e81647202a06e4617c67b68455dc99696d988c418a3423eea5dd20d
-AUX remove_ldconfig-1.0.4.patch 468 SHA256 7c36dbf81d7bcb905c0e7fef4f5e1db78a5f772021d2174c7dcf51bf275c141a SHA512 db77b9c5e5f390945c750ff93de302e35b5be074944cc2d7947108b54fa02f7c494e8aa959cc7ecf664efc9e612ca33692299a4bffe84a971da1cd70002e4593 WHIRLPOOL 5a11c2d87c3599cffa46607cea01215fe635c526cacb7e9a8a4d2523244fcade66bf02d24424346b60b906db2055b4c324e938280220b7eb73185698765c1773
-AUX remove_ldconfig-1.2.4.patch 479 SHA256 7977ec223346b601e4062d048e70618edff70b1c24978b52b3df44a61ee64866 SHA512 d79271eb818839ebaf91f2258b3718f1507c5e6a5edf91d88b9d31a6434232f310076ba65d46eb45d08f382e155b62fad827244deef449764b48bf5123a17e9a WHIRLPOOL e774b0cd543a408abf766fab4fbcf5c80912a32eee23b9a8771dba4bdc58c6392570709dba07c50658e24aece7c6963e3062e5d1e73118c6c5881b0b5d573962
-AUX remove_ldconfig.patch 438 SHA256 0fce669530b179f8607b2d384fe4b1783941aa061e27c7b74c5612d907ac45a0 SHA512 d8d845e9ba449dc476a877475be6dff86882f92f382861909a3c8f0118bfdb90067d4264b0066a5a0aff6753b4ec8365ea111d0a9bd71376945ffaf67e3a5bfd WHIRLPOOL 53300e35d85179cdaf1d8690b194aeaa7cc90c77da7926b85492a2358e677ce1da04516741cd74c1d4fb173b68ad946fca12bda5d18c35940d2f94126da1dfed
-DIST kyotocabinet-1.2.74.tar.gz 930521 SHA256 0ab711731584c3703920947f231b7b6455c3901ae66ce2548b2df9c08a305f23 SHA512 08781d8b8ad99fb09d0f7169c0a939727efca45ba4c08b853ba30d5e06bab08273cf01e074eea8f39550e18500e72522d2296a847c40c70c5254b4fc7da7d35d WHIRLPOOL 4ee19da88c59c267ed8285415b024928644819b49db5d474faef6bcdc336238223619a0892addc42d1de4860aa80e58357131a9230f1efdb2848be9c30df7efb
-DIST kyotocabinet-1.2.75.tar.gz 949259 SHA256 66c2d8c2b3ba269b4c33114974226de114047121d67cc4f749307e210e89597b SHA512 d7a1383772c33dc26bdee1658e5f827bb153d29b066fc254cc5da03b548da2b8c590f815eb7a64e4d297fcd88c0a2301c11dc9187b16d67c7bfc9fa516e38501 WHIRLPOOL a87f258b76069a2cc4f7abdc58a2788bc14fbb3d12333651357df41d307808f3a7fc23e781156b1ae5fe3ae0c1b3763d71e84053a2f8022db17940095dde3cce
+AUX kyotocabinet-1.2.76-configure-8-byte-atomics.patch 1250 SHA256 9a71b33b33e953ee40210d31f73b30cfd0d39909cd03f7066d8e22960b63f8fc SHA512 4833cecd6c67515e0c59d7161be6891df290ae816593de1bf35718e9c9d8691db221bec5078c5dc7cf56e55b0086d61c415e148a7ee63b2a47ac4885f6d0960e WHIRLPOOL f94d74398140aeea7e1237ddb2f06986a9eac7d599c85cbf7f2ef1bff0e10edce58efbd241cb31559feec1462696469b1ee766d9cd0b612f06fdbe2cae33c783
+AUX kyotocabinet-1.2.76-flags.patch 1322 SHA256 a24693ac4c6dcfe3cdee3b79652586a5a5c7ac0cfef00a0585a55e39f57bbf7c SHA512 2ad731157e43f1651ef192c8eb1e38c5785171d9ace067b0239e2a4976cfa05ad509188804136319c2c9b682e52eb009741ac46c05f7035188c861a96963e706 WHIRLPOOL 2df3a139b95747b03d629da558267da52b84d0188060adef5a953916ec5eaf7c4c4835d0dcb9c1d51e69b8b7a43bd85dc3f5d7c1f50499e03375c7b405bdd6cd
 DIST kyotocabinet-1.2.76.tar.gz 951930 SHA256 812a2d3f29c351db4c6f1ff29d94d7135f9e601d7cc1872ec1d7eed381d0d23c SHA512 278db7b327eb4c21bf0137d9aa14fb67d74d5ce7ed1cb29fc9120d157a60de165ec0cf842903eb7952e8f998045ae585b958977fa973ba0e0773381de71d9f6a WHIRLPOOL db984a6dcef0e3f313e56e5398a0fe75d1014e02dce04c4837d0aa01c0e97eb04eac728f4e9b600acec22a098a1f19ba33d8abb2ee50a8a60ba64afcd6d9c873
-EBUILD kyotocabinet-1.2.74.ebuild 1346 SHA256 b7554b3870a483d518c4e292931743b5c9a6c7f22a58fe9fd68336c0e1d416e6 SHA512 bb60bf6c94943a66e43e90fd5dbca2982fe4a29ccd8dc8a00f9d010839ea75b5f236de15f4c120d44fb328f48400d658c444891ca4a1324288c8650772c1ed91 WHIRLPOOL db94808e975f092d7028041628afa73585d097a56e4a0d161ee1f172ca8966ab6dfcd758aa5e3b3222ba7533ff99d2e75751bc17474095c5686ace33632bbffe
-EBUILD kyotocabinet-1.2.75.ebuild 1346 SHA256 91737a890d4211d1cf3d97d0af45a56f566e318622e2702daf67d050260a900f SHA512 8b6c54476c07a62f450e48c63f259439ded372f6c4c421eec4b8b9fd6e7f308072cba1f8ec924de1f807a1b1a4229cd0fddb7d36d907de0e36388fa34d508a93 WHIRLPOOL 1222d3f5e8a0c1f20f22c4465efcb540b5ffe2704a0fe7f764e66b34080c801908fabf10f6562289ff274ccde9c75b7e3dbbbcf16bff57fe0c93ef8683c8ff0f
+EBUILD kyotocabinet-1.2.76-r1.ebuild 1347 SHA256 059d96a00f49e5f94c5189e041ceb424fe53b8f7f7a2bd726e148489a59c4a92 SHA512 c8dbe70a46bbf57ce3713a406d3d22aae230d1279650f33390f7c0c7206d313081b19cab21dbe912eba495da114b622cc513ab5f332ac0971acd4a9c37293832 WHIRLPOOL 92f7515e6fb19d82db7a9037874036e1f04617778d74d114d7d182b35a3e5dabe18c689ec0054dc747d695e937dd26374fad927bfd83a65c05f3abb609dff146
 EBUILD kyotocabinet-1.2.76.ebuild 1344 SHA256 57d789a68f85b117132c13fc8e5eee754f43aff3c4b4d2424f17e0653b72c8a0 SHA512 eff0e514a78d46d1587999ceab52b6a0e10e3c6fcc567dcd795509968dcca1faf5668226bb4e68bfe740be24b56287baa13fe8e099ca9deaf9b746184b1d1d3f WHIRLPOOL b97f1c5017313c95f06175bf673c52f92c5e2fab79351974af6375320f3fd8ae18d035d4fb00c4e96cb3744bada4a6cf19eb474ccff4ae4679b681a73760e50e
-MISC ChangeLog 3934 SHA256 8b746b59335be83b3b1ac71558b6ff26acf8c80b18ef03a108e9ebec80d0d14a SHA512 05b07ffd6015e0f32e2be7c65aa16f5b633eeaddc28672e3b2e819223cf94881a837e15e0b72b8d618b086fbd62dbff044b92a79afe3cfbfe631a97852c62eb6 WHIRLPOOL 7e85d2aa298fed07aa161471ec9f2f0e77795e9361f1991f0e66a0c73c1def4cc841c2ac3dae0432eb0b6b3f7b5ec9078183f411d171b5f26e1ddff4bbd2a4ae
+MISC ChangeLog 4526 SHA256 69b147e45971962387028933439e7f51ca0e1c7e1f0b2024112843cf5f3c6b7c SHA512 6aa2c164c6725458a68329ad0e09c5a49d729d846d163ce3389297a5ccd9437d9e1f55483cbd3d3fae61dcaea81718deb7f137035e74012540b702438f54eb71 WHIRLPOOL f4cd4b53e5236b028352d7d687db7ce7ad8db76310a2d7478571c61c592e700e0211be9bcf597ec8de7fe323aaff5fc98eebf5b18b22b31cbfb2bcc037aa3f83
 MISC metadata.xml 362 SHA256 a43e7daae0461b53ee1c000c6e020f14a8492436ab0c6383fdf773c4a98af293 SHA512 0f0952b0e8a4720912054ee55980133b5ccd6939e7e1e922486bf1d702acbb0b958626d4615b6c3ff98a55247ca8ad4608b8cad5a6974ad08c77ff097e205bb4 WHIRLPOOL 0e46d290de6419e251a7010cff38d8a54b63157aa77a5c978246f77899ae3350b55dea6026c422084236724d0cf132882fa3ed7790e0a633a4269ed764491a37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlN0wN4ACgkQVWmRsqeSphMFfQCdHB/gVHUAcAkal9pXeVdC1Z7V
-mc8AnjanYgpZE4Hz8nXfx14/Y5rEo4O2
-=py9C
+iEYEAREIAAYFAlN1NcQACgkQVWmRsqeSphMOCACeMbcb7WQEawvLSgNOv/Z0kCD9
+qRwAniC6aUOjIm3485RZsvlD+pTkH7iI
+=/NeC
 -----END PGP SIGNATURE-----
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"
-}