3 files changed, 5 insertions, 148 deletions
diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog
index a9ec6cb8899c..a8a8217a754a 100644
--- a/dev-db/couchdb/ChangeLog
+++ b/dev-db/couchdb/ChangeLog
@@ -1,6 +1,10 @@
 # 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.88 2014/02/02 10:31:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.89 2014/02/08 21:03:27 djc Exp $
+
+  08 Feb 2014; Dirkjan Ochtman <djc@gentoo.org> -couchdb-1.3.0-r1.ebuild,
+  -couchdb-1.3.1.ebuild:
+  Clean up old versions.
 
   02 Feb 2014; Sven Vermeulen <swift@gentoo.org> couchdb-1.4.0.ebuild,
   couchdb-1.5.0.ebuild:
diff --git a/dev-db/couchdb/couchdb-1.3.0-r1.ebuild b/dev-db/couchdb/couchdb-1.3.0-r1.ebuild
deleted file mode 100644
index 581aec2b24b8..000000000000
--- a/dev-db/couchdb/couchdb-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.3.0-r1.ebuild,v 1.5 2013/06/25 13:01:30 ago 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="test"
-
-RDEPEND=">=dev-libs/icu-4.3.1
-		<dev-lang/erlang-16[ssl]
-		>=dev-libs/openssl-0.9.8j:0
-		>=net-misc/curl-7.18.2
-		<dev-lang/spidermonkey-1.8.7"
-
-DEPEND="${RDEPEND}"
-
-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 check
-}
-
-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.3.1.ebuild b/dev-db/couchdb/couchdb-1.3.1.ebuild
deleted file mode 100644
index 5d61f5dfaaba..000000000000
--- a/dev-db/couchdb/couchdb-1.3.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.3.1.ebuild,v 1.4 2013/09/14 10:04:44 ago 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="test"
-
-RDEPEND=">=dev-libs/icu-4.3.1
-		<dev-lang/erlang-16[ssl]
-		>=dev-libs/openssl-0.9.8j:0
-		>=net-misc/curl-7.18.2
-		<dev-lang/spidermonkey-1.8.7"
-
-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"
-}