Remove old, vulnerable versions (bug 506354)

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x30380381

8 files changed, 20 insertions, 300 deletions

diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog
index 6769e195fc23..400cf024ca67 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.98 2014/06/08 10:55:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.99 2014/06/08 13:00:42 djc Exp $
+
+  08 Jun 2014; Dirkjan Ochtman <djc@gentoo.org> -couchdb-1.4.0.ebuild,
+  -couchdb-1.5.0.ebuild, -files/couchdb.conf-0.10, -files/couchdb.init-0.10,
+  -files/couchdb.init-2, -files/couchdb.init-3:
+  Remove old, vulnerable versions (bug 506354)
 
   08 Jun 2014; Agostino Sarubbo <ago@gentoo.org> couchdb-1.5.1.ebuild:
   Stable for x86, wrt bug #506354
diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index 0f5b486c692e..e6e670a47eb9 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -1,34 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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 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.4.0.tar.gz 3422107 SHA256 bdbb9c35c2738ae0fe63280bd818a50443253f3db2184f8b9c386e5615ae02b5 SHA512 558009ec11befbb8b18541f19d3e31b1321e4c6413b66c7142bf67cd40feea33a3c32347a91ab3bf30cdd455931831794c6dd21085fff9370e3317780279c877 WHIRLPOOL 517fe6d14b1fd8e83c9b9e75b3c85c1730defe03f51f5ce6edb0138460f02bd6002509209d1cc0186d021f2c8b307b320814dbe82965e7271a472cce4671ed7c
-DIST apache-couchdb-1.5.0.tar.gz 11594978 SHA256 abbdb2a6433124a4a4b902856f6a8a070d53bf7a55faa7aa8b6feb7127638fef SHA512 557f712cf927b8713285e716a9dce624960316af0c481c98553c12b310fc228d30b585d25bf2c3e3debde5b25fc3d94dbbedaf79a7ae480e92a847abff73c2de WHIRLPOOL cecc476c7266623a823d4b2aa1641f9b15c43ac012859483fc97f0aae6ec7afcd716baa27aac455d0eafbe80b042ce0329327a72e3df90af1eb920e70e870d86
 DIST apache-couchdb-1.5.1.tar.gz 11601057 SHA256 d9d5dcc1c16633cef45f94d3f04ae72eb08390c75c2bc95f8be2c09fc46d4d47 SHA512 0837bc95da6b0cd6784915133c07d1dc1c965bf23f5e768794e7a46ae70d0947b9fc008b03c48a79893dfb7b0de0ea5e580f59617399c623618ceac6b1106da6 WHIRLPOOL 025058bcc3b08fd1b318b4a6952394a7334313ce6ba2d9a285a2a27129638103d2dc1c03d7be4e2b0a7f848b210eb7172257196c3613c1ff430a59e2d3b0d63b
-EBUILD couchdb-1.4.0.ebuild 1772 SHA256 ad1d8e32b872cd8cce019c04ba3310f0376a9c035fb5177d9b888813f927ce83 SHA512 77a977a203af130a4f5ae5021a82ee480da4d6989d1a9eadf65a99469cc5c8ca6395861890c1d0aa12bf7d9aebf84621ce5a2eeaf98deb524077fe28f19f927d WHIRLPOOL 0af45204f0cb8f5ae34c2a09f60d86e170dbdbedd71592f44471230a9dae9b8e647987ef0ba3e4af98e52028242bc4758f4b56ec758641dbfde41cf5f9064509
-EBUILD couchdb-1.5.0.ebuild 1776 SHA256 ca9630a021b6a4945abbcbab0b2b1b33d99ca9246df097adff3b82f119d060ab SHA512 5f8122387b714bb571b5a4c8d9dc1e188c06d128686300e2f01e3626213b6aadec18ca3a58515b6ab09ae6782b43fff5ef2e7ea77db61e465413f6c6de7eb60e WHIRLPOOL 26254b551216764fd602165f5b9b34412f0cc79b588ad71dc83630da242f40b0d8fc5b65d4acec090172546f5aa3b90930b850dd04823a6074dd5d0d12a460ec
 EBUILD couchdb-1.5.1.ebuild 1776 SHA256 15045654a3055702865f234bcdd9b6f9cba5cf58eb2481cd38892cb557218e22 SHA512 e16a679d0cdc0e264a9b557f41418f916b9765239d70bb3a95dd11bbe10b508d1d8aeb344b5b258fdfb22955c012f7bf756a4fbc937c6e46717037ad24df343f WHIRLPOOL 44e0d55e01e29194d77d37acac87773f79c28963226c2af455bbfeddabf147d8550f968542ad1ff19dc604d02a59430251ddc0cbac29ba3610e608b391e07ae3
-MISC ChangeLog 12684 SHA256 0764de10dcc1dfc96bb69a55176e1b60f63afbea352aeb1e9405373cfb07ed32 SHA512 1ab8e6316c915ef37e012943be645079951adf7f0b27008f3526ceb33602be6ee8ab835c813421c31bebda81939434f1bcb0c80cfa79115cc9c50e121bfd1041 WHIRLPOOL f61a864eac8883b6c4b520be0f6eb3e83da7f9c1ede0cee4dbbd6db98a4fb367bb49eb08585e27e606a1224449591063071de24d308e63a6afdd17b2a46dccc4
+MISC ChangeLog 12928 SHA256 217b24381a21d764ec65b47d4a35c5ede374f32ada7645d8dcd04ff05c1cde43 SHA512 ea6d09823088ea62ea3d2f5af59cec6ef4811bf3896b3b6d16901b49507f5381f48356398fa4d5f0568b450c3dfdfa9ed7fd3be17dae136a2a836df252593fd0 WHIRLPOOL 6f1bed1f5af51fb25c37da689bcfc2ad33fe84289cf737ede2187d69babfa61d249c0e79c45827731e2653fb742e164c6c69a234d9ce8ea8b996c5143a462761
 MISC metadata.xml 198 SHA256 5caca51bb42a27d79fe99901fc0331653e71cb0a40baa1c387b9d3fc99e007a8 SHA512 ce42b56d5a9225aa9cbf7ddc4f92285df0ceb9eadf9befe0787837f40c6f86dce0b3a9de2b29e14a6c224ce25e6038d7e1bfe5e56ebedd2cb5be87fc9a216d89 WHIRLPOOL 9ce3e5ec80ac4302b609914f7a821fba1bbcead615d535c0d17b9b1e37892c4a9b2cbcbe6a46406e99bb3eb4f5b634277913b34f1f1b3b39d2d51e2c2dcda24e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTlEEiAAoJELp701BxlEWfpwQP/2wwr0TfTZszkBi6MKk9dWvH
-CWcXTMmDcm/WD8Ydp9WPnKvhrIwJT1b29XQAsddstzxUyMuKLd7PtgLY+IBQ9QbU
-HIt2U3aGKgeTkHGdpAt0snu5u6PFBvMBqoDU8Crk226f89ycMr7U0UcILc89JY//
-+LKmaDIlPx4vQHKvY6OAGerHGCzO4sPD/Szn9iyieWp+p359dqVv12apKTyeHBq3
-W2I1VmEvI6jS6x8y+Ws/OQmdF1LbG20gIE9WNv39UgD6JsXItXZdZ4I/Eh/XMpvk
-qaGEcVeTSKcHAH+U+0V2agJPod/VfAIKtbPfcfvQiYwFP2bGwKJYRvRZxprcpuF1
-5ANK/3dQSBkhRpX4NMX2DlL8MMAMCHfZWzfNLCFvanzKvg2WkKO/K4gyYXQYU0aZ
-m9u9q1ju+ivz9461pP4gA7VOByH90YPMEr/NtD6GsGvjN7n3NwSFerH7Z8A1PJTk
-Sq+9RHEl7iyORuicHtDEFT5HdGhajmkWOJsZwPO/CsX9bm+Rji6csmrrEkrjlzbM
-O6V7JG/aNEfcRYym7uxKY3EyeJDwOXAzOQd4e4Oe8RSUKAcVtkqccPHjhuLac5Wp
-8WB5LjPrZhQ7MqD+olWrx7YM0tO0xaeZtuwAs7UStkprBn8tLR19Z9dbtWP6O3Rl
-C+39axjs7sZWeRBGQLJv
-=tidX
+iQIcBAEBCAAGBQJTlF6EAAoJEJ+WuSkwOAOB6isQAIhpbquFoB9/9FUPkGfGSG9f
+PtZLD8YECgHCNL77AwtB1zthP37/a2KQfzHqy6M2qY9i66ULStBmr+2NI4R6KPNg
+6f1ofcLpUIWQMVy6hgpLqf8mzQRlitrph97x8eZQbU9ngxC4WJV0FreZve++DYDV
+MHODSvHsZFZGcJWJXmaFUekIWhrNbqPHmlBe61cnAtIszUubvWxX/HZlYF2Mssee
+C3cmkM9DCvw0gD0l4jadTHdUJ5FiE6h70zcOj4CJfeb6/ZBak5fWwnclVHjlWEad
+zMUlVnS9L37VsIi8Wzpqq6G0+bDURfzRJUcZDgq/AYSdo1CkTX8n86xrDV87VGFO
+Z8ol8F0VxdrLRTB/tlNUIJb4Hl3+0HhzyXIU+o9myxumR+uzvTfiBcyvqxTa0v5d
+/2gso5nJh1m0IkftZr8Govi73a1ME/wT1L75PG+iIjFZqRD3RsT6m3oExbkyKr9y
+XVsUemKloDFj8U7Y8VKZskBS/PJ8l8UzMrXilZHaxOTukjACK8Q7ueI9PJdVYM6q
+QiveqdFoRhcHHMYElZC+OTptgjxpdgMTgB35GJlc7Na+fnU1KOT8heWZddLcn/Kg
+JJlpYbpn8pv5XmV69VcqdK4kZcwQItwUyOX1KRzPlwmHRnFKtT7BfGw1YYzjNDNE
+iRsZVwa/2BvVS1lxPkxM
+=T4pM
 -----END PGP SIGNATURE-----
diff --git a/dev-db/couchdb/couchdb-1.4.0.ebuild b/dev-db/couchdb/couchdb-1.4.0.ebuild
deleted file mode 100644
index 1b0200055abf..000000000000
--- a/dev-db/couchdb/couchdb-1.4.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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.4.0.ebuild,v 1.5 2014/02/02 10:31:24 swift 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=/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_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 "${D}"/etc/couchdb/*.ini ; do
-		fowners root:couchdb "${f#${D}}"
-		fperms 660 "${f#${D}}"
-	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):" "${D}/etc/conf.d/couchdb"
-}
diff --git a/dev-db/couchdb/couchdb-1.5.0.ebuild b/dev-db/couchdb/couchdb-1.5.0.ebuild
deleted file mode 100644
index adda244ce21f..000000000000
--- a/dev-db/couchdb/couchdb-1.5.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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.5.0.ebuild,v 1.7 2014/06/07 19:50:48 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-17[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=/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_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 "${D}"/etc/couchdb/*.ini ; do
-		fowners root:couchdb "${f#${D}}"
-		fperms 660 "${f#${D}}"
-	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):" "${D}/etc/conf.d/couchdb"
-}
diff --git a/dev-db/couchdb/files/couchdb.conf-0.10 b/dev-db/couchdb/files/couchdb.conf-0.10
deleted file mode 100644
index 573b5e1eb48e..000000000000
--- a/dev-db/couchdb/files/couchdb.conf-0.10
+++ /dev/null
@@ -1,15 +0,0 @@
-# Options for CouchDB
-
-EXEC="/usr/bin/couchdb"
-COUCHDB_USER="couchdb"
-COUCHDB_PID_FILE="/var/run/couchdb/couchdb.pid"
-COUCHDB_STDOUT_FILE="/dev/null"
-COUCHDB_STDERR_FILE="/dev/null"
-#COUCHDB_RESPAWN_TIMEOUT=
-#COUCHDB_OPTIONS=
-
-if [ -e /usr/LIBDIR/erlang/erts-*/bin/beam.smp ]; then
-  COUCHDB_BEAM="beam.smp"
-else
-  COUCHDB_BEAM="beam"
-fi
diff --git a/dev-db/couchdb/files/couchdb.init-0.10 b/dev-db/couchdb/files/couchdb.init-0.10
deleted file mode 100644
index f2cd9e7ec660..000000000000
--- a/dev-db/couchdb/files/couchdb.init-0.10
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/runscript
-# Copyright 2008-2013 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} --chuid ${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}"
-}
diff --git a/dev-db/couchdb/files/couchdb.init-2 b/dev-db/couchdb/files/couchdb.init-2
deleted file mode 100644
index 94eb9e2e337b..000000000000
--- a/dev-db/couchdb/files/couchdb.init-2
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Dirkjan Ochtman
-# Distributed under the terms of the Apache License, Version 2.0
-
-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}"
-}
diff --git a/dev-db/couchdb/files/couchdb.init-3 b/dev-db/couchdb/files/couchdb.init-3
deleted file mode 100644
index ef9828af7bbd..000000000000
--- a/dev-db/couchdb/files/couchdb.init-3
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Dirkjan Ochtman
-# Distributed under the terms of the Apache License, Version 2.0
-
-pidfile=${COUCHDB_PID_FILE}
-command=${EXEC:-/usr/bin/couchdb}
-command_args="-b -o ${COUCHDB_STDOUT_FILE} -e ${COUCHDB_STDERR_FILE} -p ${pidfile} ${COUCHDB_OPTIONS}"
-
-user=${COUCHDB_USER}
-group=${COUCHDB_GROUP}
-
-depend() {
-	need net
-}
-
-start_pre() {
-	checkpath -q -d -m 0755 -o couchdb:couchdb /var/run/couchdb
-}