Bump for #354031, remove old

(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)

6 files changed, 13 insertions, 197 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/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() {