Bump for #327671, thanks to Johan Bergstroem

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 71 insertions, 2 deletions

diff --git a/dev-db/kyotocabinet/ChangeLog b/dev-db/kyotocabinet/ChangeLog
index d7e128ac2176..baa1da63c4e0 100644
--- a/dev-db/kyotocabinet/ChangeLog
+++ b/dev-db/kyotocabinet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/kyotocabinet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/ChangeLog,v 1.1 2010/06/17 17:32:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/ChangeLog,v 1.2 2010/07/11 11:27:52 patrick Exp $
+
+*kyotocabinet-1.0.4 (11 Jul 2010)
+
+  11 Jul 2010; Patrick Lauer <patrick@gentoo.org>
+  +kyotocabinet-1.0.4.ebuild, +files/remove_ldconfig-1.0.4.patch:
+  Bump for #327671, thanks to Johan Bergstroem
 
 *kyotocabinet-1.0.2 (17 Jun 2010)
 
diff --git a/dev-db/kyotocabinet/Manifest b/dev-db/kyotocabinet/Manifest
index 79dba54528b2..8f4d327a93f7 100644
--- a/dev-db/kyotocabinet/Manifest
+++ b/dev-db/kyotocabinet/Manifest
@@ -1,7 +1,10 @@
 AUX fix_rpath.patch 2234 RMD160 119d3d5f13ed8639552ee04a1b94a43544a3837c SHA1 bc1eecf387d599cd0794cf06fe8ab642bc22a6bd SHA256 a7618f47f3fd158be0fcd62bdd444e8f93e193ba3cf4e73f51caff4f9892e105
 AUX remove_docinst.patch 450 RMD160 98820831be6bc9815d6bc4e7ef8a27121fda3e2b SHA1 de47b28413f45b66fd80e41b9299afee249ad727 SHA256 d6cdc082721ab43f67405149abc9ec20a12495feb203e74c642c3580382cbd71
+AUX remove_ldconfig-1.0.4.patch 468 RMD160 189edb66b38a9066538ea8a78fb3a8a22e1dbdd1 SHA1 c50cc7267a15d5ab2fba3420788fc8b5c818595e SHA256 7c36dbf81d7bcb905c0e7fef4f5e1db78a5f772021d2174c7dcf51bf275c141a
 AUX remove_ldconfig.patch 438 RMD160 0bedbdfc94af933740cd238403fdecfc1e994bcb SHA1 9f6ebed13398a1f4f582a666428c93ee1c00b968 SHA256 0fce669530b179f8607b2d384fe4b1783941aa061e27c7b74c5612d907ac45a0
 DIST kyotocabinet-1.0.2.tar.gz 634815 RMD160 444152bc2ab5e67ee2c4d6fe2ead3bdbc1d00aa7 SHA1 ab1dd5231c72da9ad9e3f7febc681d184f56f1df SHA256 83de441b7acbe8d3984efe5f08623e21a4f99d70fd679290765d56821039adce
+DIST kyotocabinet-1.0.4.tar.gz 637706 RMD160 b2cba155a2a3932385dd13b446102308838eea2f SHA1 c5883aa49fc3512e6da7d67a4d1ab14b8f2bd551 SHA256 8daa99a3630b8940841a0f2ea555c5538b5df8ce19a80a1f5d185a782e55763b
 EBUILD kyotocabinet-1.0.2.ebuild 1150 RMD160 06692f60b27a979c2bcb45b19530ef8726d058ef SHA1 4c9c83d07babe69d39474673903bd37ea8840e60 SHA256 041dd571ecd130e58a9886843d9e759f991f1e7e0e1da0ba591113dc4e301ef6
-MISC ChangeLog 469 RMD160 ac10495bf78e81341d8cca5192e75cc54ba14721 SHA1 00d4d86cd41699767684a9d586d89ada4f5d3b06 SHA256 6594c91eb8c70279158dc2ccff98b3b3c56472318fc7e656733d088a06852c1e
+EBUILD kyotocabinet-1.0.4.ebuild 1156 RMD160 55ba5e340a4b45155074bb2e9a5fe77abfdb6197 SHA1 94819d56ca78dea8cbfb1548e47dd3c00c171d26 SHA256 fde996d3debca004706235e9c03eda4d6d5b25fb820f2212148a52be1ca1e0f2
+MISC ChangeLog 668 RMD160 d5c43bae43a5a1a9a4c2443af596a1223b3e02c5 SHA1 3a9da757904cb1dee69a50f65707f87dea6c7dee SHA256 b68f5dd59f5d7f2f5859e52dcd15638b9cef714a51d8b75442f0228b1a61527c
 MISC metadata.xml 352 RMD160 220825d8696420a59363c0336a7538ac06f7200a SHA1 a4317dfcce9cc96d73f864c8fb8bed43a7653a5b SHA256 efd7908dd5c15210fd78f1692adbe19d062a0a7e6ef7e18ce6a56be907805dd0
diff --git a/dev-db/kyotocabinet/files/remove_ldconfig-1.0.4.patch b/dev-db/kyotocabinet/files/remove_ldconfig-1.0.4.patch
new file mode 100644
index 000000000000..8bd7a8645290
--- /dev/null
+++ b/dev-db/kyotocabinet/files/remove_ldconfig-1.0.4.patch
@@ -0,0 +1,12 @@
+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/kyotocabinet-1.0.4.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.0.4.ebuild
new file mode 100644
index 000000000000..fdd717270267
--- /dev/null
+++ b/dev-db/kyotocabinet/kyotocabinet-1.0.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/kyotocabinet-1.0.4.ebuild,v 1.1 2010/07/11 11:27:52 patrick Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="A straightforward implementation of DBM"
+HOMEPAGE="http://1978th.net/kyotocabinet/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+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"
+
+DEPEND="sys-libs/zlib
+	app-arch/bzip2"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/fix_rpath.patch"
+	epatch "${FILESDIR}/remove_ldconfig-${PV}.patch"
+	epatch "${FILESDIR}/remove_docinst.patch"
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+
+	if use examples; then
+		insinto /usr/share/doc/${P}/example
+		doins example/* || die "Install failed"
+	fi
+
+	if use doc; then
+		insinto /usr/share/doc/${P}
+		doins -r doc/* || die "Install failed"
+	fi
+}
+
+src_test() {
+	emake -j1 check || die "Tests failed"
+}