summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-db/couchdb/ChangeLog8
-rw-r--r--dev-db/couchdb/Manifest16
-rw-r--r--dev-db/couchdb/couchdb-1.1.1.ebuild62
-rw-r--r--dev-db/couchdb/couchdb-1.2.0.ebuild62
-rw-r--r--dev-db/couchdb/files/couchdb.init-0.102
-rw-r--r--dev-db/couchdb/files/couchdb.init-22
6 files changed, 15 insertions, 137 deletions
diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog
index 828f3b863dc6..09da162b8c4d 100644
--- a/dev-db/couchdb/ChangeLog
+++ b/dev-db/couchdb/ChangeLog
@@ -1,6 +1,12 @@
# 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.69 2013/05/03 11:37:54 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.70 2013/05/03 11:39:28 djc Exp $
+
+ 03 May 2013; Dirkjan Ochtman <djc@gentoo.org> -couchdb-1.1.1.ebuild,
+ -couchdb-1.2.0.ebuild, couchdb-1.2.1.ebuild, files/couchdb.conf-0.10,
+ files/couchdb.init-0.10, files/couchdb.init-2, files/couchdb.init-3,
+ metadata.xml:
+ Remove old versions of couchdb.
03 May 2013; Dirkjan Ochtman <djc@gentoo.org> couchdb-1.3.0.ebuild:
Drop -Werror from couchjs build (bug 452530).
diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index 26a6289e16a7..fca3ec8562a8 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -3,24 +3,20 @@ Hash: SHA256
AUX couchdb.conf-0.10 338 SHA256 4fa2dafadedb5eb6c6afbca5e8aca04f75a954e35491ddece3daebc496a534b8 SHA512 55a22f63691ee7bc74ad1445cc052299fa915a9d4e95662ca9df4debb0a9d5b325274164913cafacbd19860a3051b6feaeec45c629effbaaa37c0b8efd6be64b WHIRLPOOL 33e5eece8fa8fb9c9000af1bfbdde36319cc43fbbc5ef83ae71fd0c06662c26a3f237dcfeae4c45757abfcb31d02ab5ac3d6f8d5bc661465731d6ca669696169
AUX couchdb.conf-2 234 SHA256 056042951c9314feab924d707bf347b2ef265f10e90bec847315d9c0156f700a SHA512 5c40927957362a7431be6980be3a239e4ee0ca47d28f1b4d4fb3014b307e459eb429f5b50e0c8aa58b3e9f2285371616a58f06207e272feae1bed33f8c32d836 WHIRLPOOL 694a6ad4d948a56903ea8c628506325bcac181b827c8000aad1032014668da19d571ecee6f37bc1ecaec06c7783ea2918685aa107ff3786f5909cfbf3356fd5c
-AUX couchdb.init-0.10 1171 SHA256 f4e65387c2155938a0e74051eac1e4c610229dc79e3f83f18bee082afcde2680 SHA512 3c7db845a0fff8457ddc59820a936a1d8e25b1a916971d9b4c14ee094d37727aa6aa3a42f521f35423a1a74975b2ed6b8e2409b4e813a3b267368f9de1873cce WHIRLPOOL 5bd9b47dcb270350dad6cec95cd5003574e36146018abd9e15134b58b346f9a7909189722e29075051419eecb34920708acd38c3e0c30b895f67c987e7f5bae6
-AUX couchdb.init-2 1150 SHA256 8749400f8e649e7afa9a0b399dec29a0a6f7168471125fc5896f301c43d64774 SHA512 357581fcb6497ff739c23271a2e7eda05c72916247aef3f06f2fcf1d458c8136420e7bf89855c60dd539a537a95c5b150de0c0c88bd77c8281fda29e91df8d90 WHIRLPOOL 69801226ef33c03a95572805abdd159d6446b7a5e3ce55f2fd7abd2e26ee9e0eacebb78dff4cc1c15944dbd1a8d9c400cd2813fc84173f352685706d6029ade6
+AUX couchdb.init-0.10 1176 SHA256 8e3dcdd68702927da09aec2f730ee7ce98a442095279ccf26bf3ef75febda824 SHA512 f96b0586f1414b7368523bc0c343839d89ed8b1b55e7e099b9e80584aad10595919405662757eab79940bcd3b3290aabdf9b0a0f46df9114ceedc45ecbf5681f WHIRLPOOL c9e00ee27bd2b12603eee49201ccc03a5f50c861157550fc030eb6f10373d32aeb4bb2239668842d2f671be10d3c941f4b6f864fcf7d582685f6ab97a8715a6b
+AUX couchdb.init-2 1150 SHA256 256731f0a077be54a7f89072673742bb3b7b56539e9e31c5efb91d076540f7bd SHA512 236f1e171776420797fbb74a1b8c8d8865de2638ddb901017d4ebc362d4c794f75a1a26bbbfc3ecf7253e7f834324403d99977a514ff9fea4a61d9c10bc92fe7 WHIRLPOOL c489daf7f94d614b13c2fed7cafc559a67a1af79cec06a117826ba58dd23f64697e8e1a6476cdeb3767421a4dcb9720ead78bac14e41f46b8336d69910c259cc
AUX couchdb.init-3 434 SHA256 41302b877863f8b32f68bdf55b43e6968a924fa7b6d02d97d39bc6edc56ef4fb SHA512 cbc200c2374acde0b2ddfdea19b6383f5467949f75a74aec02b7661cb7bf6ec966ee42e49b317fa5dfd6610f2cf9752fafeaa9d31aabeff2805f1cc4fbefba3c WHIRLPOOL 1ee6c3905913a8cad27ad839dd8026b81fc8541b6c08e714347faadeee65bebb140ce1cda4d869efe330fb83dffab9984409f51d8a43ad540478ddf9017796d3
AUX couchdb.init-4 438 SHA256 7f191b22d82b5e430b0c1d29a7e9e791a69a0867e96d2a643e2bf45e2f251060 SHA512 922ff66130819de9dac5d8df45b685f05287756f235a989e1b8179a4c54d8769f3e189b7797fbc03db5828b50c49f87ebd1a74cdf045027c5aed99a627753cb7 WHIRLPOOL 01528de2fa13e6eeb09465b4824cbb8c846e4fe67857b93501b15b4994c8db70eae539c7566a3c7380392f241906e60e02d0cab2a798852001cac93d5f765902
-DIST apache-couchdb-1.1.1.tar.gz 1070948 SHA256 9d6592aacd4bc139f8c1ccb0ed80f30021cee50eb7f8a1feddf46b6eb963891c SHA512 59419eb48df09ae9d7d22af71823c4ed7d99e594d7f4d9f437f5fcf53364e1028016d25eae140753bf8f954a068d37cd8b0a850f8704a4ae3bfe4115d9d45ecf WHIRLPOOL a229532220820f58cb99410125bf2c8d065b861218f493a4fbf2c9e8f0bc57b4f364a2ac037e00719aa8809a1abbb2224e3cb9ba6e601ab59b98d227be092f32
-DIST apache-couchdb-1.2.0.tar.gz 1326925 SHA256 0f254ddea2471dbc4d3c6cd1fa61e4782c75475fb325024e10f68bf1aa8d5c37 SHA512 414afda9b5603db55d613a138ff5b4cb876444c93d4a07dfac710ea03429fa74593f1228a533e8fdea737d14f88c9be74ce4ce6b694f13353816977e8b585c17 WHIRLPOOL 03220a78b6eab436c86865b15448ae6b5b8271bba410f82442ba514823c9d793b7c06c2fb851c5ff97a05a544e2726906323d85d488176f1e1880793d0d29d6e
DIST apache-couchdb-1.2.1.tar.gz 1372433 SHA256 b54e643f3ca5f046cfd2f329a001efeaae8a3094365fa6c1cb5dcf68c1b25ccd SHA512 f98ec79f67a26f9d745f4ef14f33830b0103dc41aeb00e237b69ca94691c5b2203b3cf33afe0de744cb74b127f3aff491b18e89602dd843b4a1cd111658f4f97 WHIRLPOOL f8d6492c8214861756c96d5f6841bbe77c04ad372044f7c4117e9bd1d1b3508ffc5dd2cb3c9c9bbce8d24f0df911a831d0212cb4d5df3d19b5dbbd9dbfc9a2af
DIST apache-couchdb-1.3.0.tar.gz 3420515 SHA256 591a2a5b92941cee1bba1e16e5a4978df8a81079a8b2efa766c36540b66a37f7 SHA512 8e44fd9e585abf50e3a0ddeb76a2f4045c881b3097114d0ed2356466d6b00ea78cd6fd57c5cf3ffb17ddeccdc53d0ab060047b442f4e9f9e1daece11372dd46f WHIRLPOOL 0c42a27e045a5b7fcb0b9217bf1ec5a1ee51f6b87663220deb015fb1047e9d67bda421bf5ffeb9c548225e29cf2512607b3dc2d39661d6da106f29c8e80800df
-EBUILD couchdb-1.1.1.ebuild 1595 SHA256 3bdd220cee633068cd5d8b4f4d83fefb289b92e55be7b5dc41ec2025891ab498 SHA512 2a29ab2daa61452c4106dce27953fc6429238ed59ac35c46c6c28b242199cf26e27b0390ce26534119ed0955732d31d045847b984cf38afd576ef386a03b3f72 WHIRLPOOL c928e7305ce0d807f3856a9dd358d162f984b8855cc9ef4c4d9c7846f131853fbca1af03c21a0bc8cf018f86176f952620cb9171fbc216357e2e7cb9789bbc22
-EBUILD couchdb-1.2.0.ebuild 1604 SHA256 2cb73372347c2cdf667168e1efb35d4bbc500da13aadae0e69a90a07ffeb4889 SHA512 c108a3ed38f3ae52ce4a491f2696d9654621c59ee2d3af9561b14ea6c3db94a35e2fb1254229bba166b5dc6da34cbc4a6f26360ca0c12a967dedbba409117152 WHIRLPOOL 75307a63822f5200b5b74af0351169136c850577d63ec43314e1909dd61ddfb8d6c885892c27731b835d8edfd7d0e5fe075296d3890b5dff787333ef5bbe3b4c
EBUILD couchdb-1.2.1.ebuild 1589 SHA256 b191b2c2b31e7f159da772476668ffef8e17abe957f99a8790136e126cfc3361 SHA512 e2d4e6ba68d932e6228344de488ef532cf578df971c0806aaca9cdd187bd345af6c2392b151982f94db9453cffa118f1c70b1c1918189f7bad8138c08eb52a78 WHIRLPOOL 31b5614d00f051c1abd0c1d7bae998bcf47908326ad1b3a336786b6cef8cb1293ece7f61eb8885dc5bb06dcf5d4418f3e10ea61d029910109e49f6a13223dfa5
EBUILD couchdb-1.3.0.ebuild 1747 SHA256 977541d570f1dd72d31405e32b943ecb5e221b52d985a37ba4b4b14d74e39784 SHA512 5eae39813ddbd008211944e043583fe3baaf0d3bc4bd274e4e0eadc5b0d7b4402f8e51486ebcd4b8412decf44535a425ec75137127713aae40a3bf91a9f747b4 WHIRLPOOL 9e6f8a82bee8c63892e2cd50ff95bae94156a4fa7071125444ddd7a67c19b8915edcdf15fd96a9c4a8e8db04c3a5b007518fd8edf998c2d733f8f4e0eed7f855
-MISC ChangeLog 8877 SHA256 855b1c74e59b44962f3add8f0b15e5a22c1a4c8d78e751d37248428b0f368763 SHA512 6bbcc012a27443adec2de3f129dc7bf61681383f82f71cb405db273588a540d5e81f01a7b45522c97c4c751718e8c0361595c19bb78ee0f3f053d849658d428b WHIRLPOOL 2b7aa4447e5a4e9c26d477572301f6beaf16fb0860f87a4d93adca138674a34ea758bdbfff651ac842467b065eac01a6bff1bdd283de5b2714c98cfaffc748e6
+MISC ChangeLog 9142 SHA256 c6fc6d5c2b41ed415893f379b19e009a088e64ecdfd56d85dee5cfb1d7926ae1 SHA512 19cb661617e8a5368c91ec2e73c32540ac3c1a359399b1dcf81d7d6032f8a6141fc16b33064fc7f12dfd08fae0b856bf64c05ab61aee05d5eccafb96db6f8a8f WHIRLPOOL 1806e0d5b7fdaca6c9776b4e652bcb169963d2bc3d5bbde5d03eaf1b3efb9e153419664c77d8d17155c0851c60dc340aaba107bc1c5d086c460a543e7651c686
MISC metadata.xml 198 SHA256 5caca51bb42a27d79fe99901fc0331653e71cb0a40baa1c387b9d3fc99e007a8 SHA512 ce42b56d5a9225aa9cbf7ddc4f92285df0ceb9eadf9befe0787837f40c6f86dce0b3a9de2b29e14a6c224ce25e6038d7e1bfe5e56ebedd2cb5be87fc9a216d89 WHIRLPOOL 9ce3e5ec80ac4302b609914f7a821fba1bbcead615d535c0d17b9b1e37892c4a9b2cbcbe6a46406e99bb3eb4f5b634277913b34f1f1b3b39d2d51e2c2dcda24e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlGDoZYACgkQxeMuLWsGW/vK6gCgvEy5i2baJUqufAwrkEVvKsNl
-7U4An2Cnh/q/hkGmAA8cAs0XRyFv/Fho
-=a7bt
+iEYEAREIAAYFAlGDok8ACgkQxeMuLWsGW/sPNwCgi1x5PuXNR9VXKOe3i2+n4BH8
+euUAn2DEkcR38uIKAZ5u57e5FCQ5QzPm
+=4hRe
-----END PGP SIGNATURE-----
diff --git a/dev-db/couchdb/couchdb-1.1.1.ebuild b/dev-db/couchdb/couchdb-1.1.1.ebuild
deleted file mode 100644
index e20c2b9850c0..000000000000
--- a/dev-db/couchdb/couchdb-1.1.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.1.1.ebuild,v 1.6 2012/10/19 09:15:55 ssuominen Exp $
-
-EAPI="2"
-
-inherit eutils multilib 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/${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: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_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/couchdb-1.2.0.ebuild b/dev-db/couchdb/couchdb-1.2.0.ebuild
deleted file mode 100644
index cd83b2d0632d..000000000000
--- a/dev-db/couchdb/couchdb-1.2.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.6 2012/10/19 09:15:55 ssuominen Exp $
-
-EAPI="2"
-
-inherit eutils multilib 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/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: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_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-0.10 b/dev-db/couchdb/files/couchdb.init-0.10
index d0017d791359..f2cd9e7ec660 100644
--- a/dev-db/couchdb/files/couchdb.init-0.10
+++ b/dev-db/couchdb/files/couchdb.init-0.10
@@ -1,5 +1,5 @@
#!/sbin/runscript
-# Copyright 2008 Dirkjan Ochtman
+# Copyright 2008-2013 Dirkjan Ochtman
# Distributed under the terms of the GNU General Public License v2
depend() {
diff --git a/dev-db/couchdb/files/couchdb.init-2 b/dev-db/couchdb/files/couchdb.init-2
index 0a31370fe8d5..94eb9e2e337b 100644
--- a/dev-db/couchdb/files/couchdb.init-2
+++ b/dev-db/couchdb/files/couchdb.init-2
@@ -1,5 +1,5 @@
#!/sbin/runscript
-# Copyright 1999-2012 Dirkjan Ochtman
+# Copyright 1999-2013 Dirkjan Ochtman
# Distributed under the terms of the Apache License, Version 2.0
depend() {