summaryrefslogtreecommitdiff
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
commit943f8ba8b7ef23e47259fe3959000ded23036c20 (patch)
tree78adf9ed3cbe6c12039268f4cbc13cac46565656 /dev-db/couchdb
parentversion bump (diff)
downloadhistorical-943f8ba8b7ef23e47259fe3959000ded23036c20.tar.gz
historical-943f8ba8b7ef23e47259fe3959000ded23036c20.tar.bz2
historical-943f8ba8b7ef23e47259fe3959000ded23036c20.zip
Fix bugs 300010 and 296609 in dev-db/couchdb-0.10.1.
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'dev-db/couchdb')
-rw-r--r--dev-db/couchdb/ChangeLog7
-rw-r--r--dev-db/couchdb/Manifest4
-rw-r--r--dev-db/couchdb/couchdb-0.10.1.ebuild9
3 files changed, 13 insertions, 7 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/Manifest b/dev-db/couchdb/Manifest
index c3c91451c511..b322a14f2213 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -3,6 +3,6 @@ AUX couchdb.init-0.10 1171 RMD160 9fde8951adc9098d8e842227565d1a5b118a4401 SHA1
DIST apache-couchdb-0.10.0.tar.gz 850687 RMD160 500eb99ad72a2654cdb0e329da8bd026082471eb SHA1 efe59d4db58db40279327b8eb941376be05c1d69 SHA256 0a20c0f534ce605d7ce2bcc22322f88f7e1e132bd8af177103cca64dc164e0ed
DIST apache-couchdb-0.10.1.tar.gz 883259 RMD160 578ed3afab9cab9f55118bea42767d0e29850f4b SHA1 75ee59517e9b00ba6719b024d7e8aa627672128d SHA256 2c6af7216537d0e399674a83e4505dc04a02abe1bdd966f69074564c3521c66b
EBUILD couchdb-0.10.0.ebuild 1245 RMD160 331c5794f1c335dc8cc2406e96f57516cbff143b SHA1 4b168b1f72afeba93e051038e176a4c8185ac85d SHA256 afbb4eda1b6b4af58a1ca5acd8bf6121ff9a9e69b61b31adf90b78bf1d16b293
-EBUILD couchdb-0.10.1.ebuild 1244 RMD160 663077329c088423e7b15e7efe49ef17c3e5c701 SHA1 4cc2f97f02d024dd2db5167c7a8a9ca596466b3c SHA256 98819b005cbead260f326bb6f5932046f586ea53dce8fcbc57053f81e7c71d22
-MISC ChangeLog 2256 RMD160 bf6539d139ce28a839172013be92d401f23a6a82 SHA1 471ee6db61f3b3b175f73f0b3a766e0dc588fe5f SHA256 6c2dd7153a715f5eb6917c2a0ecd803a4d178224094ac67a9b4a12bbf813c2a4
+EBUILD couchdb-0.10.1.ebuild 1438 RMD160 ffc25db8a9e6e8853c2da21b4417fc02581b3cf5 SHA1 e0ca0ffe3d54f6ca7b4b6e43d8533ad540fdc2d5 SHA256 afc10e2377b0fab159facb4d530770293a0669e331fda14765ae905c3dcf7002
+MISC ChangeLog 2358 RMD160 6b2f6903319b55df8c43a0bac339a9b1b69633eb SHA1 2d482fcf7efabd27b6c5b903ead7fd30027a83de SHA256 149fe826488fed82638805892189d3fd9afab333fb16b368e7099fe68cc18876
MISC metadata.xml 281 RMD160 7304480305abc4ebc06b7830580f19e94ad9c0ba SHA1 87753154b0a5bee4cc95e7f01cdee14b7a2ad006 SHA256 f602bc3aedf3d0938b3dcbecbfb97fff8e6fd6cc52e86bf589c04ae328ce1735
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() {