Version bump couchdb to 1.2.0.

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

3 files changed, 74 insertions, 5 deletions

diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog
index 9352e8dc3f63..22c25d09b195 100644
--- a/dev-db/couchdb/ChangeLog
+++ b/dev-db/couchdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/couchdb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.53 2012/02/24 14:24:07 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.54 2012/04/09 08:10:00 djc Exp $
+
+*couchdb-1.2.0 (09 Apr 2012)
+
+  09 Apr 2012; Dirkjan Ochtman <djc@gentoo.org> +couchdb-1.2.0.ebuild:
+  Version bump to 1.2.0.
 
   24 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> couchdb-1.1.1.ebuild:
   x86 stable wrt bug #404087
diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index 82bbc4779c4e..93e2d14972ee 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -7,15 +7,17 @@ AUX couchdb.init-2 1152 RMD160 ff4ef2cc8428a1e82ff480d2fefa5c3e43553655 SHA1 7f1
 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
+DIST apache-couchdb-1.2.0.tar.gz 1326925 RMD160 c96da6e285201f001431c57ee84cc04e2e244115 SHA1 da17af99cf3b1f9a89f0051b7d9de0cbd6fe81b6 SHA256 0f254ddea2471dbc4d3c6cd1fa61e4782c75475fb325024e10f68bf1aa8d5c37
 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
 EBUILD couchdb-1.1.1.ebuild 1572 RMD160 0dcbba43b907d41c88fe54ed3d253d124787ce7b SHA1 97fe4c12472beeb0476a33e841814f69f191f1af SHA256 ebadc6912f5e7509da952de86d85fa95e1db05095954e2dc13e884f50cd076b4
-MISC ChangeLog 6757 RMD160 60faf6fd85ac9c697bfcb10b56d7eba0218b1d65 SHA1 b2007d1cfb810b0cc36cc05d59d13d549fc3a544 SHA256 88c9947f645de81a9e7c96d27ff352cdfd5dfaccc69e0b9899e834917c081f83
+EBUILD couchdb-1.2.0.ebuild 1577 RMD160 8c308b9506e2e57b839448727f52bd267d8354ef SHA1 9196c835451acbb9f6bd0bea049133d1112fee87 SHA256 80c97c6a335ab299d9a9370691f5944e48e2f9e6d92ebe4f706ac56caef813a5
+MISC ChangeLog 6877 RMD160 ea40ae4362daa6f474bfb5e85a058882e1a18fcf SHA1 08643819070fb887e8309e1c2ddb00f1c24d5809 SHA256 5a1b9a761a1659825a8b7cbd581a2bc81e36b5244bbbefe91f02cb38f4f29259
 MISC metadata.xml 198 RMD160 5645cfd815a46263c9d6ad188ff022cf7ce712ea SHA1 6d170e9ab2db5611fb3e623e1dee8dd4c9d2524b SHA256 5caca51bb42a27d79fe99901fc0331653e71cb0a40baa1c387b9d3fc99e007a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk9HnY0ACgkQuUQtlDBCeQI8eQCfby9wLyZMPN27SJ06xjKDqX9M
-qUAAn3tNre+unbkbej0yIPCUhFmAhhDb
-=cOh2
+iEYEAREKAAYFAk+CmWIACgkQxeMuLWsGW/tv2wCfUwsMO3TuxNLv7G786yifHUBO
+odUAoKFRVb6zQyCxqtvsKK34N3N8r5Ai
+=unQt
 -----END PGP SIGNATURE-----
diff --git a/dev-db/couchdb/couchdb-1.2.0.ebuild b/dev-db/couchdb/couchdb-1.2.0.ebuild
new file mode 100644
index 000000000000..ab12c53f2756
--- /dev/null
+++ b/dev-db/couchdb/couchdb-1.2.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.2.0.ebuild,v 1.1 2012/04/09 08:10:00 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/releases/${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"
+}