Bump, fixes #368867

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

4 files changed, 114 insertions, 2 deletions

diff --git a/dev-db/kyotocabinet/ChangeLog b/dev-db/kyotocabinet/ChangeLog
index 864621a910da..6185cfb69307 100644
--- a/dev-db/kyotocabinet/ChangeLog
+++ b/dev-db/kyotocabinet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/kyotocabinet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/ChangeLog,v 1.10 2011/03/19 16:27:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/ChangeLog,v 1.11 2011/06/18 17:17:45 patrick Exp $
+
+*kyotocabinet-1.2.62 (18 Jun 2011)
+
+  18 Jun 2011; Patrick Lauer <patrick@gentoo.org> +kyotocabinet-1.2.62.ebuild,
+  +files/fix_configure-1.2.62.patch:
+  Bump, fixes #368867
 
 *kyotocabinet-1.2.50 (19 Mar 2011)
 
diff --git a/dev-db/kyotocabinet/Manifest b/dev-db/kyotocabinet/Manifest
index 1308ed9bbd71..e4bfad41821d 100644
--- a/dev-db/kyotocabinet/Manifest
+++ b/dev-db/kyotocabinet/Manifest
@@ -1,3 +1,4 @@
+AUX fix_configure-1.2.62.patch 1675 RMD160 bc7c9ad77bdf7baba9b0926e9f4bad6cdfcd7db3 SHA1 a0a73729dbc9c8beb3a5cdacd288944157cfecb5 SHA256 5448c415cf78a6a121d4e830cf43808c6e609ac0de1594cab451a55ace9811b2
 AUX fix_rpath-1.2.4.patch 2226 RMD160 e06dfc664e673a04546b73a4ed768add68d1c4c2 SHA1 91e78ba2f66a9aa325d19cb8ec645ea22b17cb39 SHA256 e919bc427ef1f8f637d601da2a9be7f1643ce0d88d51d9ec775073ec2be2f77d
 AUX fix_rpath.patch 2234 RMD160 119d3d5f13ed8639552ee04a1b94a43544a3837c SHA1 bc1eecf387d599cd0794cf06fe8ab642bc22a6bd SHA256 a7618f47f3fd158be0fcd62bdd444e8f93e193ba3cf4e73f51caff4f9892e105
 AUX remove_docinst-1.2.29.patch 491 RMD160 22e2f588f1a272d5b0f5b710b95dd7dc9bda444a SHA1 328a43bb2764743497c798b97a52f4f2bff8d4da SHA256 3540376fca462c509bd8502b5a41c836e4e4e1740ef443cbfa9623b8add71eb6
@@ -7,7 +8,9 @@ AUX remove_ldconfig-1.2.4.patch 479 RMD160 329991a76fc0973d19b1cc85e5518b3a4e1a8
 AUX remove_ldconfig.patch 438 RMD160 0bedbdfc94af933740cd238403fdecfc1e994bcb SHA1 9f6ebed13398a1f4f582a666428c93ee1c00b968 SHA256 0fce669530b179f8607b2d384fe4b1783941aa061e27c7b74c5612d907ac45a0
 DIST kyotocabinet-1.2.43.tar.gz 785555 RMD160 defa8814f87ebd2924b8b609da42f1c4826a79e9 SHA1 44b627bf6d2e47f2f64205705c3f526ea5f8af1a SHA256 9ff273832e743481d743a1833400a2b5e9fd148f1d72c55338f2a2a0b6b7eeb3
 DIST kyotocabinet-1.2.50.tar.gz 833545 RMD160 cf23bfd2620e92a47548bfbf7f82b36434fa082d SHA1 868eedf924e0b2f3b02c097cc21446403d039fb9 SHA256 93b41f383251820d645e683e9d753b3cf0b890d1a91bb9c30ad760ab7c377848
+DIST kyotocabinet-1.2.62.tar.gz 866225 RMD160 c9acf41325542aeb3e51aaa8d60ee16a922e7c0d SHA1 71fe69e9cb96a8509b5c8693258b432aac96e86d SHA256 c6b9937b3e416e21532c98769c60a0902b46535959bda635bbcb784e37a772da
 EBUILD kyotocabinet-1.2.43.ebuild 1185 RMD160 7686008291fc8fda07dbe27e5047342955f4fcb4 SHA1 1a2d1199959cd129e7222f8f9291b8467f0a06e9 SHA256 49f67010de4723f65ce8e0ae1260cebf2337ba6d1828c6c35c1783f3b480ca33
 EBUILD kyotocabinet-1.2.50.ebuild 1141 RMD160 31a12eb1b8eacb07198b9bf9f9cfc70ce45f726b SHA1 a0bceda892c518f4c5a4c8e8187f6db3ab6c62e9 SHA256 5d572a1e028ed843446026cf44d4522df67a9d46568e3a4f5b26c43ca85aa9aa
-MISC ChangeLog 2129 RMD160 8570c08327292b6bafceccf5a92f2d5be9fbdd3d SHA1 be9a955f44386ae6bcc5dc394c63e3404e10a447 SHA256 cfe8841e538b2039c09cce680266d450e4e6cae8a32e41668dd4ae64c7549330
+EBUILD kyotocabinet-1.2.62.ebuild 1354 RMD160 70361b6b632ab2e8ae1a85dbe070ad10cf732f4d SHA1 8863f4a263f1d3551a0f73654e7abe6b65205d91 SHA256 fcb0df5b4beae6484117691df416f3ed999402222162799e51bc5ebbd2f49e4b
+MISC ChangeLog 2304 RMD160 6207998bd1f9f6a74ea29d9c342879f986d1cf8e SHA1 9f18d16619b435837b7dc478113c4f58bcff250f SHA256 9159c38f63760c985f8f1ea8f1b13ccf7b0edd9d4e673ab968cf0f62a39a600c
 MISC metadata.xml 352 RMD160 220825d8696420a59363c0336a7538ac06f7200a SHA1 a4317dfcce9cc96d73f864c8fb8bed43a7653a5b SHA256 efd7908dd5c15210fd78f1692adbe19d062a0a7e6ef7e18ce6a56be907805dd0
diff --git a/dev-db/kyotocabinet/files/fix_configure-1.2.62.patch b/dev-db/kyotocabinet/files/fix_configure-1.2.62.patch
new file mode 100644
index 000000000000..97789627e0b8
--- /dev/null
+++ b/dev-db/kyotocabinet/files/fix_configure-1.2.62.patch
@@ -0,0 +1,51 @@
+diff --git a/configure.in b/configure.in
+index 94e9d29..6999615 100644
+--- a/configure.in
++++ b/configure.in
+@@ -35,27 +35,18 @@ MYDOCUMENTFILES="COPYING FOSSEXCEPTION ChangeLog doc kyotocabinet.idl"
+ MYPCFILES="kyotocabinet.pc"
+ 
+ # Building flags
+-MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0 -O2"
+-MYCXXFLAGS="-Wall -fPIC -fsigned-char -g0 -O2"
+-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I/usr/local/include"
++MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0"
++MYCXXFLAGS="-Wall -fPIC -fsigned-char -g0"
++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/usr/local/lib"
++MYLDFLAGS="-L. -L\$(LIBDIR)"
+ MYCMDLDFLAGS=""
+ MYCMDLIBS=""
+ MYLDLIBPATH=""
+ MYLDLIBPATHENV="LD_LIBRARY_PATH"
+ MYPOSTCMD="true"
+ 
+-# Building paths
+-PATH=".:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:$PATH"
+-CPATH=".:/usr/local/include:$CPATH"
+-LIBRARY_PATH=".:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH=".:/usr/local/lib:$LD_LIBRARY_PATH"
+-PKG_CONFIG_PATH=".:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
+-
+-
+ 
+ #================================================================
+ # Options
+@@ -285,14 +276,6 @@ then
+   MYCMDLIBS="$MYCMDLIBS $LIBS"
+ fi
+ 
+-# As-needed linking
+-if uname | grep Linux >config.tmp
+-then
+-  MYLDFLAGS="$MYLDFLAGS -Wl,-rpath-link,.:/usr/local/lib:$MYLDLIBPATH"
+-  MYLDFLAGS="$MYLDFLAGS -Wl,--as-needed"
+-else
+-  MYCMDLIBS="$MYCMDLIBS $LIBS"
+-fi
+ 
+ # Shared libraries
+ if test "$enable_shared" != "no" && test "$enable_profile" != "yes"
\ No newline at end of file
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.62.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.62.ebuild
new file mode 100644
index 000000000000..ae158f2cb2ad
--- /dev/null
+++ b/dev-db/kyotocabinet/kyotocabinet-1.2.62.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/kyotocabinet-1.2.62.ebuild,v 1.1 2011/06/18 17:17:45 patrick 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 ~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
+	app-arch/xz-utils"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/fix_configure-${PV}.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"
+}
\ No newline at end of file