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 | 0cb29467ad42af3c813f8c4b4b454c7df5be3ef2 (patch) | |
| tree | d3320fe083df35ead18dd6304b3192b2583c5a9b /dev-db/couchdb | |
| parent | add 1.10.10-r2 ebuild with disabled avc plugin, bug 272848 (diff) | |
| download | historical-0cb29467ad42af3c813f8c4b4b454c7df5be3ef2.tar.gz historical-0cb29467ad42af3c813f8c4b4b454c7df5be3ef2.tar.bz2 historical-0cb29467ad42af3c813f8c4b4b454c7df5be3ef2.zip | |
conf.d file fix for 268222
Package-Manager: portage-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/Manifest | 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 |
4 files changed, 13 insertions, 8 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/Manifest b/dev-db/couchdb/Manifest index 403a67f3d93c..d6deb7a84a62 100644 --- a/dev-db/couchdb/Manifest +++ b/dev-db/couchdb/Manifest @@ -1,10 +1,10 @@ AUX couchdb.conf-0.8.1 226 RMD160 5b0c035716ada61be076a132949c486c7cfc764a SHA1 e31e6da885eabb2964a17d04f1c23dac1e9e9c77 SHA256 9a2bbe0ae0ff08d0637cfde1b18a72a690638119d496a29c67b6cacd1c0760f7 -AUX couchdb.conf-0.9 337 RMD160 af458292e8f95e106d9fa45e901dc2d18c201d16 SHA1 67f0f61f9bcf3598e841eee528166e95befc9b22 SHA256 b5acdd30c92fcc7061ef6896cc4c8cb89df109eed225df3d12da3b225ba2fe15 +AUX couchdb.conf-0.9 338 RMD160 6c30117e43d3ac4e3749079d860ab0ef3565f12f SHA1 c1ef3459b572c9101c63ea94099aafa36e054be6 SHA256 4fa2dafadedb5eb6c6afbca5e8aca04f75a954e35491ddece3daebc496a534b8 AUX couchdb.init-0.8.1 1149 RMD160 9dc1b0150cdf61cd9cdc13ceeae439a298de6161 SHA1 25aac84db56b251c0a36deae2eb0158579ebf843 SHA256 39a29143df691daa1c791b6e1a0b4e197f258e9ebcaae98cf0b7c30eada4c4a1 AUX couchdb.init-0.9 1171 RMD160 9fde8951adc9098d8e842227565d1a5b118a4401 SHA1 2699fd798a432e7434ce899291e74b5acd1e432d SHA256 f4e65387c2155938a0e74051eac1e4c610229dc79e3f83f18bee082afcde2680 DIST apache-couchdb-0.8.1-incubating.tar.gz 562627 RMD160 2928eeb3e3816d5a3ae43b548cde96de289dddd5 SHA1 1bbe4776a125577d89ae7b2622f406e59be9d119 SHA256 647f1506979ee53d4887a2b3a5fcf1004be64c9457c8d358a8fed5720f9da970 DIST apache-couchdb-0.9.0.tar.gz 737185 RMD160 4f6a1b960718eec2af1604907bbe4659500db742 SHA1 d8202b387e8b976dc882df8b5b5243ee9cb89e69 SHA256 8e18416179860f893dc31e81948869195a07cbd69a81966bb9631a0d3ab9f99c EBUILD couchdb-0.8.1.ebuild 1321 RMD160 61e1de4e5f2cb4565b52baa4a0ea54d1ff2ffa11 SHA1 7d9f3ea4a27ff053482d763de508945ebd8b1aa9 SHA256 af4e99683078efd7249f89e229b81f5e2e1534cc25a7997b25973520b4b3c8db -EBUILD couchdb-0.9.0.ebuild 1274 RMD160 503194ecaf0f0fef7a220a2c89a81d97439c0e5d SHA1 0cf1b799616a0fba6fde325e369e0c6b0a53b736 SHA256 45c2f9a3f3407a43ddddcd83aa1867667e3ff5e459e8095cb6a179be38aff1f1 -MISC ChangeLog 824 RMD160 4e093365d96a563f6e6304baa5dc0baf6064347c SHA1 f8389b5f25742ba06c9b7a57981fc60c9697aba0 SHA256 3e338fbc62027e856cc8dd915d0d22a3b0de6ff5a56fdda7637130e7b379df3e +EBUILD couchdb-0.9.0.ebuild 1347 RMD160 1a258a3cc29a47070f490de7153c8894a8e52735 SHA1 a9b7845255d67b44644857b8732b13b32e07324a SHA256 f4f38b44928c17666803d0ec18d72c1687bf3dc2006ce923cd0c8f74a8d3d733 +MISC ChangeLog 949 RMD160 d33b75e2ac5324e47915b7687112dd0dfa77ae5d SHA1 3a1227fa5da061bde545a7fb80befb099be20766 SHA256 c9f15679fce2318765cbcc8ac5b74bfb28359f2f6b6eff8e7398d73bcc74d46e MISC metadata.xml 222 RMD160 20c3bc00edda57700158f97389dab6d6fefd6b35 SHA1 6c628868ba2507f2f0358c5ee4a1da75d02c5885 SHA256 fd87e5a303dc63cda86babd5b93a27b434399eb161683249809cdcca7cd8c5e2 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 - |