Version bump couchdb to 1.1.1.

(Portage version: 2.1.10.32/cvs/Linux x86_64)

3 files changed, 116 insertions, 1 deletions

diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog
index 831b015a0690..a8098e225623 100644
--- a/dev-db/couchdb/ChangeLog
+++ b/dev-db/couchdb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/couchdb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.49 2011/06/06 13:02:13 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.50 2011/10/31 14:29:42 djc Exp $
+
+*couchdb-1.1.1 (31 Oct 2011)
+
+  31 Oct 2011; Dirkjan Ochtman <djc@gentoo.org> +couchdb-1.1.1.ebuild,
+  +files/couchdb.init-2:
+  Version bump to 1.1.1.
 
   06 Jun 2011; Dirkjan Ochtman <djc@gentoo.org> -couchdb-1.0.1.ebuild,
   -couchdb-1.0.1-r2.ebuild:
diff --git a/dev-db/couchdb/couchdb-1.1.1.ebuild b/dev-db/couchdb/couchdb-1.1.1.ebuild
new file mode 100644
index 000000000000..b9885b5bdc1b
--- /dev/null
+++ b/dev-db/couchdb/couchdb-1.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.1.1.ebuild,v 1.1 2011/10/31 14:29:42 djc Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Apache CouchDB is a distributed, fault-tolerant and schema-free document-oriented database."
+HOMEPAGE="http://couchdb.apache.org/"
+SRC_URI="mirror://apache/couchdb/${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[ssl]
+		>=dev-libs/openssl-0.9.8j
+		>=net-misc/curl-7.18.2
+		dev-lang/spidermonkey"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/apache-${P}"
+
+pkg_setup() {
+	enewgroup couchdb
+	enewuser couchdb -1 -1 /var/lib/couchdb couchdb
+}
+
+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_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	insinto /var/run/couchdb
+
+	fowners couchdb:couchdb \
+		/var/run/couchdb \
+		/var/lib/couchdb \
+		/var/log/couchdb
+
+	for f in /etc/couchdb/*.ini ; do
+		fowners root:couchdb ${f#"${D}"}
+		fperms 660 ${f#"${D}"}
+	done
+	fperms 664 /etc/couchdb/default.ini
+
+	newinitd "${FILESDIR}/couchdb.init-2" couchdb || die
+	newconfd "${FILESDIR}/couchdb.conf-0.10" couchdb || die
+
+	sed -i -e "s:LIBDIR:$(get_libdir):" "${D}/etc/conf.d/couchdb"
+}
diff --git a/dev-db/couchdb/files/couchdb.init-2 b/dev-db/couchdb/files/couchdb.init-2
new file mode 100644
index 000000000000..29d454f20ad4
--- /dev/null
+++ b/dev-db/couchdb/files/couchdb.init-2
@@ -0,0 +1,47 @@
+#!/sbin/runscript
+# Copyright 2008-2011 Dirkjan Ochtman
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+
+	args="-b"
+	if test -n "$COUCHDB_STDOUT_FILE"; then
+		args="$args -o $COUCHDB_STDOUT_FILE"
+	fi
+	if test -n "$COUCHDB_STDERR_FILE"; then
+		args="$args -e $COUCHDB_STDERR_FILE"
+	fi
+	if test -n "$COUCHDB_RESPAWN_TIMEOUT"; then
+		args="$args -r $COUCHDB_RESPAWN_TIMEOUT"
+	fi
+	if test -n "$COUCHDB_OPTIONS"; then
+		args="$args $COUCHDB_OPTIONS"
+	fi
+	if test -n "$COUCHDB_PID_FILE"; then
+	    args="$args -p $COUCHDB_PID_FILE"
+    else
+        echo "* ERROR: COUCHDB_PID_FILE must be set"
+        return -1
+    fi
+	if test -z "$COUCHDB_USER"; then
+        echo "* ERROR: COUCHDB_USER must be set"
+        return -1
+	fi
+
+	start-stop-daemon --start --exec ${EXEC} --name ${COUCHDB_BEAM} \
+		--user ${COUCHDB_USER} --pidfile ${COUCHDB_PID_FILE} -- $args
+
+	eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --exec ${EXEC} --name ${COUCHDB_BEAM} \
+		--pidfile ${COUCHDB_PID_FILE}
+	eend $? "Failed to stop ${SVCNAME}"
+}