Version bump couchdb to 1.1.1.

Package-Manager: portage-2.1.10.32/cvs/Linux x86_64

4 files changed, 125 insertions, 9 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/Manifest b/dev-db/couchdb/Manifest
index 75e19052b303..b83ad44714eb 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX couchdb.conf-0.10 338 RMD160 6c30117e43d3ac4e3749079d860ab0ef3565f12f SHA1 c1ef3459b572c9101c63ea94099aafa36e054be6 SHA256 4fa2dafadedb5eb6c6afbca5e8aca04f75a954e35491ddece3daebc496a534b8
 AUX couchdb.init-0.10 1171 RMD160 9fde8951adc9098d8e842227565d1a5b118a4401 SHA1 2699fd798a432e7434ce899291e74b5acd1e432d SHA256 f4e65387c2155938a0e74051eac1e4c610229dc79e3f83f18bee082afcde2680
+AUX couchdb.init-2 1152 RMD160 ff4ef2cc8428a1e82ff480d2fefa5c3e43553655 SHA1 7f155c232864e1e83144a6349a972d65a2524da9 SHA256 5fd87b71acac4246230d11901e29f2e6d23aee8ecccabedd5e3d2f96dc32379f
 DIST apache-couchdb-1.0.2.tar.gz 1031474 RMD160 9737a9ebfae7b97654f721c0ab2f42a0bf5d9905 SHA1 6352a2640ae7255a470f79a200cd5111aff017ea SHA256 6ef82a7ba0f132d55af7cc78b30658d5b3a4f7be3f449308c8d7fa2ad473677c
 DIST apache-couchdb-1.1.0.tar.gz 1088226 RMD160 4dcb5c520b0402366e82a1c195fc4404bc7bd37d SHA1 7cb6a12f3becaae4eeb8ee75b15fbe6395fa7a98 SHA256 08432165e72fa55e128e90d34b5b5e2d3b9af228fa2b30d3a3fa70a88a3c6498
+DIST apache-couchdb-1.1.1.tar.gz 1070948 RMD160 e61acf6649dbcfdd4834cc5f0920f38fd0d4ba76 SHA1 c901676663279338095642462bafa2d0667df98b SHA256 9d6592aacd4bc139f8c1ccb0ed80f30021cee50eb7f8a1feddf46b6eb963891c
 EBUILD couchdb-1.0.2.ebuild 1582 RMD160 a826e24941cad12170c950cdeac7c7d66912c265 SHA1 61d4a9cb6b7b56a348f442ed5daa635896b01297 SHA256 83fa677495703a039d6bd2487a9d53b4024447e74e62b26e82c1bb8cefc88a6b
 EBUILD couchdb-1.1.0.ebuild 1571 RMD160 8763d41d053e258f9363e7174331050aeb2bc636 SHA1 fa422b1eaae2bac648d879f0744a6108f40b8423 SHA256 d29d1be2b5cd2754ad22ca8c9411fe1f482536a14c25fb648abd201ec589f9d9
-MISC ChangeLog 6270 RMD160 f42c2c5cc6c6cdc5f33e8cb087b27d64b24148e6 SHA1 47ec35aa6c91a0b034725ff0a5144f6c57b9ea4c SHA256 af9d5b7afd34e7c60aee13a8931e67eac37095ce99d054afd2f3fca96dca70b5
+EBUILD couchdb-1.1.1.ebuild 1568 RMD160 dd543a48baa260e427fea93330823385b79cf76f SHA1 b84f538048eb65c92f11746784a15c29f1f6a725 SHA256 2b3ea9287275b39f8795967afa5e0c1d8133c00a788c62d5e6872fb2d699372d
+MISC ChangeLog 6422 RMD160 1e8d47d1225383060b95e8626b414531e94ccd72 SHA1 0ca62449201b8a2ae0bc0a8e55b2837cabae9da0 SHA256 f7b52a44ff4cb3b28f0724385a2497b2d5047fbdce08219a4c6bcbd7d397ba98
 MISC metadata.xml 198 RMD160 5645cfd815a46263c9d6ad188ff022cf7ce712ea SHA1 6d170e9ab2db5611fb3e623e1dee8dd4c9d2524b SHA256 5caca51bb42a27d79fe99901fc0331653e71cb0a40baa1c387b9d3fc99e007a8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59A9EACgkQfXuS5UK5QB3PmgP7BoCvt8DORTfrloGfZ92XcYDc
-M7Lo9KCYBPiCr/6cgVMXzA88ahX4vgsCaHeA+hX3L9n/KulmUn4dybYypRljSFCc
-Oh/BAu2nro3qrs7kaISh+RyoHRgUhSgN2A9tmFyZGkp1vYUSP+eXNMFKT8Eh1X51
-bRHmzZDUT/tAEp4GuUM=
-=XoFc
+iEYEAREKAAYFAk6usN8ACgkQxeMuLWsGW/vFCwCfR7Xf09sLEbICw59+sglSjMF1
+wlsAniJurhAEdMFguY5VDd0TyGjQmkZV
+=tIJY
 -----END PGP SIGNATURE-----
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}"
+}