diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2009-07-10 15:56:53 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2009-07-10 15:56:53 +0000 |
| commit | 5797abbf95992a0a13805cadd75233cdb75bf019 (patch) | |
| tree | 5790a11606c4c258bccf50a1626426773867182d /dev-db/couchdb | |
| parent | add 1.10.10-r2 ebuild with disabled avc plugin, bug 272848 (diff) | |
| download | gentoo-2-5797abbf95992a0a13805cadd75233cdb75bf019.tar.gz gentoo-2-5797abbf95992a0a13805cadd75233cdb75bf019.tar.bz2 gentoo-2-5797abbf95992a0a13805cadd75233cdb75bf019.zip | |
conf.d file fix for 268222
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'dev-db/couchdb')
| -rw-r--r-- | dev-db/couchdb/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/couchdb/couchdb-0.9.0.ebuild | 6 | ||||
| -rw-r--r-- | dev-db/couchdb/files/couchdb.conf-0.9 | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog index f6c28ee66629..7f8cdd6a408d 100644 --- a/dev-db/couchdb/ChangeLog +++ b/dev-db/couchdb/ChangeLog @@ -1,6 +1,10 @@ # 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.3 2009/06/21 15:39:34 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.4 2009/07/10 15:56:53 caleb Exp $ + + 10 Jul 2009; Caleb Tennis <caleb@gentoo.org> files/couchdb.conf-0.9, + couchdb-0.9.0.ebuild: + conf.d file fix for 268222 21 Jun 2009; Caleb Tennis <caleb@gentoo.org> files/couchdb.conf-0.9, files/couchdb.init-0.9: diff --git a/dev-db/couchdb/couchdb-0.9.0.ebuild b/dev-db/couchdb/couchdb-0.9.0.ebuild index a712a096682d..c030f47a3df9 100644 --- a/dev-db/couchdb/couchdb-0.9.0.ebuild +++ b/dev-db/couchdb/couchdb-0.9.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-0.9.0.ebuild,v 1.1 2009/04/01 11:08:07 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-0.9.0.ebuild,v 1.2 2009/07/10 15:56:53 caleb Exp $ -inherit eutils distutils +inherit eutils distutils multilib DESCRIPTION="Apache CouchDB is a distributed, fault-tolerant and schema-free document-oriented database." HOMEPAGE="http://couchdb.apache.org/" @@ -48,4 +48,6 @@ src_install() { newinitd "${FILESDIR}/couchdb.init-0.9" couchdb || die newconfd "${FILESDIR}/couchdb.conf-0.9" couchdb || die + + sed -i -e "s:LIBDIR:$(get_libdir):" "${D}/etc/conf.d/couchdb" } diff --git a/dev-db/couchdb/files/couchdb.conf-0.9 b/dev-db/couchdb/files/couchdb.conf-0.9 index 5388e1a39c0f..573b5e1eb48e 100644 --- a/dev-db/couchdb/files/couchdb.conf-0.9 +++ b/dev-db/couchdb/files/couchdb.conf-0.9 @@ -8,9 +8,8 @@ COUCHDB_STDERR_FILE="/dev/null" #COUCHDB_RESPAWN_TIMEOUT= #COUCHDB_OPTIONS= -if [ -e /usr/lib*/erlang/erts-*/bin/beam.smp ]; then +if [ -e /usr/LIBDIR/erlang/erts-*/bin/beam.smp ]; then COUCHDB_BEAM="beam.smp" else COUCHDB_BEAM="beam" fi - |