Bump for #354031, remove old

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

7 files changed, 16 insertions, 208 deletions

diff --git a/dev-db/kyotocabinet/ChangeLog b/dev-db/kyotocabinet/ChangeLog
index e082493ba19f..e2bcafffc00f 100644
--- a/dev-db/kyotocabinet/ChangeLog
+++ b/dev-db/kyotocabinet/ChangeLog
@@ -1,6 +1,14 @@
 # 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.7 2011/01/31 12:51:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/ChangeLog,v 1.8 2011/02/09 11:21:08 patrick Exp $
+
+*kyotocabinet-1.2.41 (09 Feb 2011)
+
+  09 Feb 2011; Patrick Lauer <patrick@gentoo.org> -kyotocabinet-1.0.2.ebuild,
+  -kyotocabinet-1.0.4.ebuild, -kyotocabinet-1.2.25.ebuild,
+  -kyotocabinet-1.2.29.ebuild, -kyotocabinet-1.2.38.ebuild,
+  +kyotocabinet-1.2.41.ebuild:
+  Bump for #354031, remove old
 
 *kyotocabinet-1.2.38 (31 Jan 2011)
 
diff --git a/dev-db/kyotocabinet/Manifest b/dev-db/kyotocabinet/Manifest
index 7296603f967d..dd544e2f5dc4 100644
--- a/dev-db/kyotocabinet/Manifest
+++ b/dev-db/kyotocabinet/Manifest
@@ -5,19 +5,11 @@ AUX remove_docinst.patch 450 RMD160 98820831be6bc9815d6bc4e7ef8a27121fda3e2b SHA
 AUX remove_ldconfig-1.0.4.patch 468 RMD160 189edb66b38a9066538ea8a78fb3a8a22e1dbdd1 SHA1 c50cc7267a15d5ab2fba3420788fc8b5c818595e SHA256 7c36dbf81d7bcb905c0e7fef4f5e1db78a5f772021d2174c7dcf51bf275c141a
 AUX remove_ldconfig-1.2.4.patch 479 RMD160 329991a76fc0973d19b1cc85e5518b3a4e1a8d0b SHA1 8435d8b943c2587fc0ceca8530ac55c9fde3c85e SHA256 7977ec223346b601e4062d048e70618edff70b1c24978b52b3df44a61ee64866
 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
-DIST kyotocabinet-1.2.25.tar.gz 753597 RMD160 96a8fdffe0a5574dc46b998d83330a6f51b3bcf4 SHA1 abdf45abce04c335eab5a7518f1a8afb3932b394 SHA256 c9c7fc97677a4d55e0e60c24d913321498e9e15dcae08c84efbd4b9f6b7e5c8b
-DIST kyotocabinet-1.2.29.tar.gz 754920 RMD160 654ab5605590ab341be0cbcc3c9562814050cc3e SHA1 3a7e5d7ea73a2081be75b80d2f7308c5f261eb60 SHA256 86c0174240ea136e7cc2eb643eca1c901d8ac3ad6e8bd3deaa7739c197037b32
 DIST kyotocabinet-1.2.30.tar.gz 755079 RMD160 140cb81309bf6d1eb619b57eb825c19a93494238 SHA1 cdce21e50d0b50229eab0726e4144ab3829af181 SHA256 1744f85edd9787d2ad446afec432a6d3e828b85ca780022f057117f80d3dca49
 DIST kyotocabinet-1.2.34.tar.gz 772436 RMD160 c375eb66bcddbaefa3911d073dc1408a528e74da SHA1 f0bf87c99926e7593724555ba923caa856a51997 SHA256 f53856d6cf3797aaa3369354372ca453c295072fc8beeb77ee35862b2d7bac60
-DIST kyotocabinet-1.2.38.tar.gz 784005 RMD160 5e4cfb4963ea84e09d9742cfdeb2edeb925a7098 SHA1 d80f45d7c95542984b42513fbf51577c176a69b3 SHA256 64f4658fae195d379f968846c265c0cc0c3bf5307a7ef7c1ed0220dafad4f621
-EBUILD kyotocabinet-1.0.2.ebuild 1150 RMD160 06692f60b27a979c2bcb45b19530ef8726d058ef SHA1 4c9c83d07babe69d39474673903bd37ea8840e60 SHA256 041dd571ecd130e58a9886843d9e759f991f1e7e0e1da0ba591113dc4e301ef6
-EBUILD kyotocabinet-1.0.4.ebuild 1156 RMD160 55ba5e340a4b45155074bb2e9a5fe77abfdb6197 SHA1 94819d56ca78dea8cbfb1548e47dd3c00c171d26 SHA256 fde996d3debca004706235e9c03eda4d6d5b25fb820f2212148a52be1ca1e0f2
-EBUILD kyotocabinet-1.2.25.ebuild 1180 RMD160 4e761432abe3d1002441730a2d156bf55db59c49 SHA1 77712d17f7465057641247a2bc12a6b21bb569ff SHA256 4b4ad635bfd437ea92766ed115cb41839c38850d749c2e285b3c232b1d77939a
-EBUILD kyotocabinet-1.2.29.ebuild 1186 RMD160 609bcde57137ee2d0b74d4d2dcdf0525be1d15c0 SHA1 4b7f8508d0715b643724b11d9029a87a965421f6 SHA256 4dfc1714630c32952151642e50013c5d58d71898c02f1eb75ee2ac6c1dbcb997
+DIST kyotocabinet-1.2.41.tar.gz 784577 RMD160 ed165c23af5666ffbefef43d931da1aca8322baa SHA1 be9161bdff17780ee2052729e26ee6fd8730a6b3 SHA256 08e71320789751e86a61e784432deec4e401f0da95fc7ea48eca163a63a6a57a
 EBUILD kyotocabinet-1.2.30.ebuild 1187 RMD160 b89f0878fc1c74da60d56da93c8e2360ff2b0a7a SHA1 17fa2be1ca86fe40e48070feaa7b93be92c41c53 SHA256 4500e44acdc475ba782b83938e331b32d1c139352a446eb782716b0df706c49c
 EBUILD kyotocabinet-1.2.34.ebuild 1187 RMD160 261acac8fed6986b531e9f9a9f073c98deaa5184 SHA1 d85b8dc7a05d15fbf00d17b86d2b25bfc7c10354 SHA256 f1f76069243d793678303067747cc49d4d99f11202266301f67f2d557287398b
-EBUILD kyotocabinet-1.2.38.ebuild 1187 RMD160 2bd33a0fa9a547c1920cbe35c7303cddf738c226 SHA1 1153381106b697639be42cedb66911e2354f8ee8 SHA256 4d35c006260d6bbb57a850456324fa6e26453405d17efb1de1e7444b3e9b978c
-MISC ChangeLog 1483 RMD160 01999a333e3b75fa7ff6e59b18cfd4316b3bd4b4 SHA1 6cdd72b43a39149bde8e313563914014b5f5b066 SHA256 cb9039ca69df92bf7673405428128ad7efdc530ecd0a3cf983ca2ca6b17bbbf3
+EBUILD kyotocabinet-1.2.41.ebuild 1185 RMD160 14874daa72419ef9dded94b4759e40abae622fe7 SHA1 9d0032970276a5f26486d74d71b89e7d34a819d0 SHA256 5464fad05329d02d155833b8a3217c8ce9ff0b29bc6769624e911b208afe53fa
+MISC ChangeLog 1779 RMD160 2b39f6a9425a184ae5ee1c43ef618e2de0a9406b SHA1 4df23946d8655f1f7ab90900476fd516a67ca999 SHA256 1c8a5f76922765da606bf55729271f3b56a30a48a2c73aff11f6f025e793394c
 MISC metadata.xml 352 RMD160 220825d8696420a59363c0336a7538ac06f7200a SHA1 a4317dfcce9cc96d73f864c8fb8bed43a7653a5b SHA256 efd7908dd5c15210fd78f1692adbe19d062a0a7e6ef7e18ce6a56be907805dd0
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.0.2.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.0.2.ebuild
deleted file mode 100644
index 1c5ed6b15f78..000000000000
--- a/dev-db/kyotocabinet/kyotocabinet-1.0.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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.2.ebuild,v 1.1 2010/06/17 17:32:12 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.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"
-}
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.0.4.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.0.4.ebuild
deleted file mode 100644
index fdd717270267..000000000000
--- a/dev-db/kyotocabinet/kyotocabinet-1.0.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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"
-}
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.25.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.25.ebuild
deleted file mode 100644
index 2811c7f5d298..000000000000
--- a/dev-db/kyotocabinet/kyotocabinet-1.2.25.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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.2.25.ebuild,v 1.1 2010/11/24 15:08:15 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"
-
-DEPEND="sys-libs/zlib
-	app-arch/xz-utils"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/fix_rpath-1.2.4.patch"
-	epatch "${FILESDIR}/remove_ldconfig-1.2.4.patch"
-	epatch "${FILESDIR}/remove_docinst.patch"
-}
-
-src_configure() {
-	econf $(use_enable debug) --enable-lzma
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	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.29.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.29.ebuild
deleted file mode 100644
index ea10da8d0bec..000000000000
--- a/dev-db/kyotocabinet/kyotocabinet-1.2.29.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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.2.29.ebuild,v 1.1 2010/12/10 23:47:50 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"
-
-DEPEND="sys-libs/zlib
-	app-arch/xz-utils"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/fix_rpath-1.2.4.patch"
-	epatch "${FILESDIR}/remove_ldconfig-1.2.4.patch"
-	epatch "${FILESDIR}/remove_docinst-${PV}.patch"
-}
-
-src_configure() {
-	econf $(use_enable debug) --enable-lzma
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	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.38.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.41.ebuild
index 61e0291b489d..46dd7368b5d0 100644
--- a/dev-db/kyotocabinet/kyotocabinet-1.2.38.ebuild
+++ b/dev-db/kyotocabinet/kyotocabinet-1.2.41.ebuild
@@ -1,6 +1,6 @@
 # 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.38.ebuild,v 1.1 2011/01/31 12:51:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/kyotocabinet-1.2.41.ebuild,v 1.1 2011/02/09 11:21:08 patrick Exp $
 
 EAPI="2"
 
@@ -21,12 +21,12 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}/fix_rpath-1.2.4.patch"
-	epatch "${FILESDIR}/remove_ldconfig-1.2.4.patch"
-	epatch "${FILESDIR}/remove_docinst-1.2.29.patch"
+	sed -ie "/ldconfig/d" Makefile.in
+	sed -ie "/DOCDIR/d" Makefile.in
 }
 
 src_configure() {
-	econf $(use_enable debug) --enable-lzma
+	econf $(use_enable debug) --enable-lzma --docdir=/usr/share/doc/${PF}
 }
 
 src_install() {