Update no-rpath path not to add bogus includes either. Do not enable -fomg-extreme-performance flags. Marked ~ppc-macos and ~x64-solaris. Acked by patrick.

Package-Manager: portage-2.2.00.14700-prefix/cvs/Darwin powerpc

5 files changed, 19 insertions, 15 deletions

diff --git a/dev-db/tokyocabinet/ChangeLog b/dev-db/tokyocabinet/ChangeLog
index aa0b55cda01e..3d0d6fce8f5b 100644
--- a/dev-db/tokyocabinet/ChangeLog
+++ b/dev-db/tokyocabinet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/tokyocabinet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tokyocabinet/ChangeLog,v 1.3 2009/10/20 18:41:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tokyocabinet/ChangeLog,v 1.4 2009/10/21 19:19:29 grobian Exp $
+
+  21 Oct 2009; Fabian Groffen <grobian@gentoo.org>
+  tokyocabinet-1.4.34-r1.ebuild, tokyocabinet-1.4.35.ebuild,
+  files/fix_rpath.patch:
+  Update no-rpath path not to add bogus includes either. Do not enable
+  -fomg-extreme-performance flags. Marked ~ppc-macos and ~x64-solaris. Acked
+  by patrick.
 
 *tokyocabinet-1.4.35 (20 Oct 2009)
 
diff --git a/dev-db/tokyocabinet/Manifest b/dev-db/tokyocabinet/Manifest
index 4a4916384b58..eb4eff01da3b 100644
--- a/dev-db/tokyocabinet/Manifest
+++ b/dev-db/tokyocabinet/Manifest
@@ -1,7 +1,7 @@
-AUX fix_rpath.patch 2076 RMD160 393906feeb92bd848f981ca2221f00c361f51b98 SHA1 00c4401523d074b9437a529d4470079d42f31a31 SHA256 1ea7e9e30295ecf36f7ab262ed5862a0e0929aca456242c7a98ebf81099d46c3
+AUX fix_rpath.patch 2111 RMD160 ef1878e4519d3e056847b6bb98069d343987d737 SHA1 4bc2679a8fd544ae2275f1113f5096d540987ae9 SHA256 cba364650da90d9fcae3424a1e6ce400769db193c863e5cdbf29a4ced0292ce6
 DIST tokyocabinet-1.4.34.tar.gz 945623 RMD160 4a9f5d835fb6dffe980abdfe624d3c6cf540875f SHA1 ec1dc4644b522c49ec814d6ff488690e2cb19d51 SHA256 db2eb5a0d0907e0bcb26e419ea1f2e267ccf4fb5f91ffd9d8de4f74c3b63b061
 DIST tokyocabinet-1.4.35.tar.gz 953767 RMD160 6090852386c87da04d29a97d74fd0b87d8f030c7 SHA1 3c97e96d3b304121ec0d4eaf5000bf6cc6b727e6 SHA256 2d421381e34856cc2c71ca0bcbf8c325c3d7ea1c13186edde965e1f833e5f9bc
-EBUILD tokyocabinet-1.4.34-r1.ebuild 922 RMD160 fe7908fe2fdfb19f45267ba8e6fd4a20a3f66031 SHA1 ad8942f77e01c9d46f553543667f9121866ca957 SHA256 1f03d41ee0a78d210031b0595828f51771b29b34c4b747ef1ab290110c221d92
-EBUILD tokyocabinet-1.4.35.ebuild 917 RMD160 adc26b9d526e2f23fd5d6d516b562f8c19df863f SHA1 e6114e0e17cc04b9dc7ef6295da9e4054016d748 SHA256 a1676f0e8a8df0f9230a7daf4e810ecbcf2b4032e02eca7def480b73d2baeefe
-MISC ChangeLog 629 RMD160 28b924ef9324eeb8a050840f0d54b9f501050cc5 SHA1 ae9d380aebd7db37588193b187db1211ee3b130e SHA256 39d8ff4b46fe27bd3a3fc9fb471cdcefeed77a848cd77a37f068b631c16fbc62
+EBUILD tokyocabinet-1.4.34-r1.ebuild 895 RMD160 d82c502d7e6877f8d9b9185afb3895a3bddb25e1 SHA1 ee5099b72697f18464d69467f2bf8a88a5eee92a SHA256 0cb0724e773824975554bbf3ac07f1c362353874ac5f7362fbe62b8750280c27
+EBUILD tokyocabinet-1.4.35.ebuild 916 RMD160 24a80307227062e98e749514a7d9da99cc5cb5fa SHA1 5f860523acd7af39961a17a4e0cc9c1782304b5c SHA256 e09298583cf4e00a44a8b5f1d876f04ec35b33d6e39c76fbd08a7cbbd912681e
+MISC ChangeLog 929 RMD160 2dd96b2c6ae2d73f36854fceb0a54e67bbbbd9c7 SHA1 434397e891f3a23c70716c78b359e263bac952b6 SHA256 6410314718960e4d62583dbff978d2a1b6e05b44830284e77d2aa2df8aeff4ef
 MISC metadata.xml 255 RMD160 dbe77cd804a4411e8445c05f6e632fdc2f72d082 SHA1 94e7a8d2d43907279488b984c3dcd9fd1888ce25 SHA256 28c7b0445a5f2eb0d524ff3afcef712ecbf345592d26142f71a3ef9bca653d4b
diff --git a/dev-db/tokyocabinet/files/fix_rpath.patch b/dev-db/tokyocabinet/files/fix_rpath.patch
index 960d195987ed..e1cba0a0370f 100644
--- a/dev-db/tokyocabinet/files/fix_rpath.patch
+++ b/dev-db/tokyocabinet/files/fix_rpath.patch
@@ -21,7 +21,8 @@ diff -ur configure.in configure.in
  # Building flags
 -MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
 +MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char"
- MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include"
+-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include"
++MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
  MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__"
 -MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
 +MYLDFLAGS="-L. -L\$(LIBDIR)"
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.34-r1.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.34-r1.ebuild
index 0e006172a66a..28a6c4a5f2b2 100644
--- a/dev-db/tokyocabinet/tokyocabinet-1.4.34-r1.ebuild
+++ b/dev-db/tokyocabinet/tokyocabinet-1.4.34-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tokyocabinet/tokyocabinet-1.4.34-r1.ebuild,v 1.2 2009/10/10 18:39:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tokyocabinet/tokyocabinet-1.4.34-r1.ebuild,v 1.3 2009/10/21 19:19:29 grobian Exp $
 
 EAPI=2
 
@@ -24,9 +24,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--enable-fastest \
-		$(use_enable debug)
+	econf $(use_enable debug)
 }
 
 src_install() {
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.35.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.35.ebuild
index e0395e5330b4..5b355f86adbb 100644
--- a/dev-db/tokyocabinet/tokyocabinet-1.4.35.ebuild
+++ b/dev-db/tokyocabinet/tokyocabinet-1.4.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tokyocabinet/tokyocabinet-1.4.35.ebuild,v 1.1 2009/10/20 18:41:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tokyocabinet/tokyocabinet-1.4.35.ebuild,v 1.2 2009/10/21 19:19:29 grobian Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-solaris"
 IUSE="debug doc examples"
 
 DEPEND="sys-libs/zlib
@@ -24,9 +24,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--enable-fastest \
-		$(use_enable debug)
+	econf $(use_enable debug)
 }
 
 src_install() {