Version bump couchdb to 1.6.1 (fix bug 501332, bug 529826, bug 520372)

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 30380381)

2 files changed, 81 insertions, 1 deletions

diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog
index c415e8691167..e9dabcd76966 100644
--- a/dev-db/couchdb/ChangeLog
+++ b/dev-db/couchdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/couchdb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.103 2014/11/02 08:12:10 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.104 2014/12/29 10:51:33 djc Exp $
+
+*couchdb-1.6.1 (29 Dec 2014)
+
+  29 Dec 2014; Dirkjan Ochtman <djc@gentoo.org> +couchdb-1.6.1.ebuild:
+  Version bump couchdb to 1.6.1 (fix bug 501332, bug 529826, bug 520372)
 
   02 Nov 2014; Sven Vermeulen <swift@gentoo.org> couchdb-1.5.1.ebuild,
   couchdb-1.6.0.ebuild:
diff --git a/dev-db/couchdb/couchdb-1.6.1.ebuild b/dev-db/couchdb/couchdb-1.6.1.ebuild
new file mode 100644
index 000000000000..e62d3eb66b8f
--- /dev/null
+++ b/dev-db/couchdb/couchdb-1.6.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.6.1.ebuild,v 1.1 2014/12/29 10:51:33 djc 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="selinux test"
+
+RDEPEND=">=dev-libs/icu-4.3.1:=
+		dev-lang/erlang[ssl]
+		>=dev-libs/openssl-0.9.8j:0
+		>=net-misc/curl-7.18.2
+		<dev-lang/spidermonkey-1.8.7
+		selinux? ( sec-policy/selinux-couchdb )"
+
+DEPEND="${RDEPEND}"
+RESTRICT=test
+
+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="${EPREFIX}"/usr/$(get_libdir)/erlang/usr/include \
+		--localstatedir="${EPREFIX}"/var \
+		--with-js-lib="${EPREFIX}"/usr/$(get_libdir)
+	# bug 296609, upstream bug #COUCHDB-621
+	sed -e "s#localdocdir = /usr/share/doc/couchdb#localdocdir = "${EPREFIX}"/usr/share/doc/${PF}#" -i Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake
+	# bug 442616
+	pax-mark mr src/couchdb/priv/couchjs
+}
+
+src_test() {
+	emake distcheck
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	fowners couchdb:couchdb \
+		/var/lib/couchdb \
+		/var/log/couchdb
+
+	for f in "${ED}"/etc/couchdb/*.ini ; do
+		fowners root:couchdb "${f#${ED}}"
+		fperms 660 "${f#${ED}}"
+	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):" "${ED}/etc/conf.d/couchdb"
+}