summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorDirkjan Ochtman <djc@gentoo.org>2010-01-14 09:59:48 +0000
committerDirkjan Ochtman <djc@gentoo.org>2010-01-14 09:59:48 +0000
commit296daf4a884f95ddf91ae0423c9106324f970254 (patch)
tree269230173422335ceaaa5bcca6d55df8b133e6ee /dev-db
parentversion bump (diff)
downloadgentoo-2-296daf4a884f95ddf91ae0423c9106324f970254.tar.gz
gentoo-2-296daf4a884f95ddf91ae0423c9106324f970254.tar.bz2
gentoo-2-296daf4a884f95ddf91ae0423c9106324f970254.zip
Fix bugs 300010 and 296609 in dev-db/couchdb-0.10.1.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/couchdb/ChangeLog7
-rw-r--r--dev-db/couchdb/couchdb-0.10.1.ebuild9
2 files changed, 11 insertions, 5 deletions
diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog
index db9e66fa7862..64fee16661b3 100644
--- a/dev-db/couchdb/ChangeLog
+++ b/dev-db/couchdb/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-db/couchdb
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.15 2009/12/24 15:27:52 djc Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.16 2010/01/14 09:59:48 djc Exp $
+
+ 14 Jan 2010; Dirkjan Ochtman <djc@gentoo.org> couchdb-0.10.1.ebuild:
+ Fix bugs 300010 and 296609.
24 Dec 2009; Dirkjan Ochtman <djc@gentoo.org> -couchdb-0.9.0.ebuild,
-couchdb-0.9.1.ebuild:
diff --git a/dev-db/couchdb/couchdb-0.10.1.ebuild b/dev-db/couchdb/couchdb-0.10.1.ebuild
index 374bed215bc7..9b5867c6a2ff 100644
--- a/dev-db/couchdb/couchdb-0.10.1.ebuild
+++ b/dev-db/couchdb/couchdb-0.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-0.10.1.ebuild,v 1.1 2009/12/03 20:44:19 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-0.10.1.ebuild,v 1.2 2010/01/14 09:59:48 djc Exp $
EAPI="2"
@@ -33,7 +33,10 @@ pkg_setup() {
src_configure() {
econf \
--with-erlang=/usr/lib/erlang/usr/include \
- --localstatedir=/var
+ --localstatedir=/var \
+ --with-js-lib=/usr/lib
+ # bug 296609, upstream bug #COUCHDB-621
+ sed -e "s#localdocdir = /usr/share/doc/couchdb#localdocdir = /usr/share/doc/couchdb-0.10.1#" -i Makefile || die "sed failed"
}
src_install() {