Fix logic to allow initial install, not only upgrades #469262

(Portage version: 2.2.0_alpha175/cvs/Linux x86_64, unsigned Manifest commit)

2 files changed, 79 insertions, 1 deletions

diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog
index 91fde4c0a3e5..af0623d78289 100644
--- a/dev-db/couchdb/ChangeLog
+++ b/dev-db/couchdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/couchdb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.72 2013/05/03 13:23:59 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.73 2013/05/16 04:06:37 patrick Exp $
+
+*couchdb-1.3.0-r1 (16 May 2013)
+
+  16 May 2013; Patrick Lauer <patrick@gentoo.org> +couchdb-1.3.0-r1.ebuild:
+  Fix logic to allow initial install, not only upgrades #469262
 
   03 May 2013; Dirkjan Ochtman <djc@gentoo.org> couchdb-1.2.1.ebuild,
   couchdb-1.3.0.ebuild, files/couchdb.conf-0.10, files/couchdb.init-3,
diff --git a/dev-db/couchdb/couchdb-1.3.0-r1.ebuild b/dev-db/couchdb/couchdb-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..115070d62c70
--- /dev/null
+++ b/dev-db/couchdb/couchdb-1.3.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.3.0-r1.ebuild,v 1.1 2013/05/16 04:06:37 patrick Exp $
+
+EAPI=5
+
+inherit eutils multilib pax-utils user
+
+DESCRIPTION="Apache CouchDB is a distributed, fault-tolerant and schema-free document-oriented database."
+HOMEPAGE="http://couchdb.apache.org/"
+SRC_URI="mirror://apache/couchdb/source/${PV}/apache-${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-libs/icu-4.3.1
+		<dev-lang/erlang-16[ssl]
+		>=dev-libs/openssl-0.9.8j:0
+		>=net-misc/curl-7.18.2
+		>=dev-lang/spidermonkey-1.8.5"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/apache-${P}"
+
+pkg_setup() {
+	enewgroup couchdb
+	enewuser couchdb -1 -1 /var/lib/couchdb couchdb
+}
+
+src_prepare() {
+	sed -i ./src/couchdb/priv/Makefile.* -e 's|-Werror||g'
+}
+
+src_configure() {
+	econf \
+		--with-erlang=/usr/lib/erlang/usr/include \
+		--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/${PF}#" -i Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake
+	# bug 442616
+	pax-mark mr src/couchdb/priv/couchjs
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	fowners couchdb:couchdb \
+		/var/lib/couchdb \
+		/var/log/couchdb
+
+	for f in "${D}"/etc/couchdb/*.ini ; do
+		fowners root:couchdb "${f#${D}}"
+		fperms 660 "${f#${D}}"
+	done
+	fperms 664 /etc/couchdb/default.ini
+
+	newinitd "${FILESDIR}/couchdb.init-4" couchdb
+	newconfd "${FILESDIR}/couchdb.conf-2" couchdb
+
+	sed -i -e "s:LIBDIR:$(get_libdir):" "${D}/etc/conf.d/couchdb"
+}