gentoo resync : 20.11.2017

4 files changed, 2 insertions, 162 deletions

diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index 11090d663a43..29783a981160 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -2,11 +2,8 @@ AUX 1.6.1-erlang-18.patch 4121 SHA256 2b8cccf4d6b42f4cbc1d6809f4ce183aec751eeece
 AUX 1.6.1-erlang-19.patch 4270 SHA256 659484e060929bd51e6fc305cb83bef1c2e5d1860f3f078a14f4fbb0a7be89c9 SHA512 abc3e0162ca80e2f1784e47d15c23bd134efcf4b8e1ebf01d7c853215971ce03dfab86597671142c05c44a4fd6748ab9daa29a11fff23435831a89cbebb82099 WHIRLPOOL 1d33d182a6c60d94ada6a6f19e5d0fd6e850a32521186253010b1597ba673a3c4ac1e1e6b54b096db71af0c71a83998bb3d9fb6698167347c56f4c8de575379e
 AUX couchdb.conf-2 234 SHA256 056042951c9314feab924d707bf347b2ef265f10e90bec847315d9c0156f700a SHA512 5c40927957362a7431be6980be3a239e4ee0ca47d28f1b4d4fb3014b307e459eb429f5b50e0c8aa58b3e9f2285371616a58f06207e272feae1bed33f8c32d836 WHIRLPOOL 694a6ad4d948a56903ea8c628506325bcac181b827c8000aad1032014668da19d571ecee6f37bc1ecaec06c7783ea2918685aa107ff3786f5909cfbf3356fd5c
 AUX couchdb.init-4 439 SHA256 ae1b5551ce432ca85a99e3a93355204936b4dff99dc0cdba5e19d44b87946f76 SHA512 a1e0a9403082e1c336454584d78d15e5d76861b3b3d0e56fcfb25ab50c0dbbdcf658e251e25f22e2a58dc72f38ec16ce82759bf9c7b5330a569ffb5fab912999 WHIRLPOOL 8ebe4af5892ea2b8ef4e00d273ce3a0612de281907327a2b3191a30822077fb0470b6a0af39cea6806d59da25d19b517db678aaead514ad9b46a22c8d2110922
-DIST apache-couchdb-1.6.1.tar.gz 12085350 SHA256 5a601b173733ce3ed31b654805c793aa907131cd70b06d03825f169aa48c8627 SHA512 70630a27dec7281fa5bdca0601796baa28fba1d7c9975d8f38b9623bbeedd62b26081118357886c7be00b7769360238b2c99695234e13cecb15a210eb986eadc WHIRLPOOL 5776fe139db54e5ec285ef9882f5164a42a499bab312d66c0edd5314dd1915827a7cf7df02cd5df85c437bf3f70096cb101748956d639e8e80ffd0bb0b79197a
 DIST apache-couchdb-1.7.1.tar.gz 9963069 SHA256 91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad SHA512 cd7417ef4b1eaeb1fe4251b559d904238fd25881c542f1498e6e9f1c4a55a79e34e06e711f90ce39e5e65fcac8be9c611943b8ed57d4a7465859b5811ac0a21f WHIRLPOOL b4cbed19cbb9f5025215638b11c4990c26d831504f46009bba436bd66b3f4ae93588b65d3f3984486e5c20b451a5bd148f16a71a02b01f454d64f859c53a425b
-EBUILD couchdb-1.6.1-r2.ebuild 1876 SHA256 c5edae443bb4025460844b845ab3aac1b70be4b2a4c1ad294c69f2f0d64798e2 SHA512 32ca749588b62e0cdb954e6fcf8753558ea754429b6cc330c8d2503d15f829cfa5d78922981447eb665335edb90bef6bffccf2f740ff7bfb438001abea63499d WHIRLPOOL 263970ac0b11cdc953ce249fe7ea75ff6e17777da5f8ed1d42a9d9c45d13b99736fe3373c62feabfccb7f235c91d292e51e5005b90dc50a47650196a6740efa1
-EBUILD couchdb-1.6.1-r3.ebuild 1920 SHA256 2278b40da7545b22c5bc1316844a72f23df40d7542cb36f6a36f34db063a73f1 SHA512 741b364f8d0d4cc5d80be5169fbbb0230fcc39a9d15392459d884f248e955d9df702168997e172a42049adb6a37d834cd13c9536377dcef719ef5356044a1737 WHIRLPOOL b5f36ea8b8432a0411d848dbfb13d3baa6eca2cc48849267850b6f27a4ff69b6bc0289880a862d786d9d9db3494c9a51c231aadbd5bbae428506118c65e0ede7
-EBUILD couchdb-1.7.1.ebuild 1833 SHA256 3baa8ceb321b161b550770cebb7fe2b6f99ee72dd95da8e3f15b857be8e0f798 SHA512 6865840a88f05df7932986aa3849c87ce306c711f84feaf358ebf35214efea83aec66e9ebe2a403a03ce19a7b2a89c5126208741d3b817596a58e8d21f8d85d9 WHIRLPOOL 5643ad35360c6ba217a5a7639f4f70680f559d0dd792e188488896367c3de339ac9f26d090bdf388671efd0a8d3f733c340a2a003875d62d2004b71eac165781
+EBUILD couchdb-1.7.1.ebuild 1833 SHA256 1cfb8b61868e096ae451647825401e6bea6aad7455e1b2fcd505ab9babceaf3c SHA512 48561428b5da0cf6afc118c782e9d627dc82208e7bc9825cdf186e51c746d0bca6040dac52586b56d42f4ecb01d08fb7b12c431641a23de47cd814a2648372f0 WHIRLPOOL 0d8ac073b8d6f731ca7267f11c4ae10a848affeb7cb9c28b623aba6adee3d325976961ae0a0b292e79c7cc1698cdaf780a40cc7b2f463068e871068c484bde79
 MISC ChangeLog 3689 SHA256 9695fbf0257c000cfb6b875048d6b5f7b61cd2a1d15da22017114675b293a5f3 SHA512 25cd2bbf8512952af2ffa3f6fd8fd14ec09497088eaea9b660f54e1c10752118b387e10b113218b1a36fdbedc9b7d03d18fb79814cc297484dfafad7234c6e51 WHIRLPOOL 3efe4e412eef4ca434bdf53ac0b81e8f882a7db4285b291730e4669d9bd68e267a6957ba783dc656774faa9c014e355593d0efc00554a978359ca0ddfa71028f
 MISC ChangeLog-2015 14103 SHA256 3a06cdf5f2fb5900395c9ceb77aa1e355811eb9412e6126f48dab7c07de136e3 SHA512 a90e09a5a6e33ec0f1eddec1a2b651a201b90dc797525616034330006e263f12cf1e338d456269a48a406557d649c6cc1bf3ced63545cda5055961f35adf088a WHIRLPOOL 1585d163b62ca0835f429d6d81b8d8572bc9dff8d477315649cb48aebf7364c81bec11dc4835b694d5c790e4fc50f54b39c8313c31d7f9fc7ab9bd2d69a953ac
 MISC metadata.xml 212 SHA256 061538b4837ab7b95b652299476a75942b769652dbd569225713fdf1166b1d37 SHA512 e4f4b6dbbf6bf039ff5c19bb6a209ad4e0b1286f8cf7cc0cbafcc04fcf93fb92766c8cae06ff19f980a069c7fe9a1686437ab215f84ce10e301275ae107d00bd WHIRLPOOL bb35c86572b2ad56bf93b52f6eca6bea0f5591c1a9ebd608833dea63c89d4bd36cd402a8ffc2d5fdc1d7e1d5466782d1e37dfcac14fae0bbb181029799728fa5
diff --git a/dev-db/couchdb/couchdb-1.6.1-r2.ebuild b/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
deleted file mode 100644
index ae88d2259b31..000000000000
--- a/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib pax-utils user
-
-DESCRIPTION="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="libressl selinux test"
-
-RDEPEND=">=dev-libs/icu-4.3.1:=
-		<dev-lang/erlang-19.0[ssl]
-		!libressl? ( >=dev-libs/openssl-0.9.8j:0 )
-		libressl? ( dev-libs/libressl )
-		>=net-misc/curl-7.18.2
-		<dev-lang/spidermonkey-1.8.7
-		selinux? ( sec-policy/selinux-couchdb )"
-
-DEPEND="${RDEPEND}
-		sys-devel/autoconf-archive"
-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'
-	epatch "${FILESDIR}/${PV}-erlang-18.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-erlang="${EPREFIX}"/usr/$(get_libdir)/erlang/usr/include \
-		--localstatedir="${EPREFIX}"/var \
-		--with-js-lib="${EPREFIX}"/usr/$(get_libdir)
-	# bug 296609, upstream bug #COUCHDB-621
-	sed -e "s#localdocdir = /usr/share/doc/couchdb#localdocdir = "${EPREFIX}"/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 "${ED}"/etc/couchdb/*.ini ; do
-		fowners root:couchdb "${f#${ED}}"
-		fperms 660 "${f#${ED}}"
-	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):" "${ED}/etc/conf.d/couchdb"
-}
diff --git a/dev-db/couchdb/couchdb-1.6.1-r3.ebuild b/dev-db/couchdb/couchdb-1.6.1-r3.ebuild
deleted file mode 100644
index 176891afcd2d..000000000000
--- a/dev-db/couchdb/couchdb-1.6.1-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib pax-utils user
-
-DESCRIPTION="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="libressl selinux test"
-
-RDEPEND=">=dev-libs/icu-4.3.1:=
-		<dev-lang/erlang-20.0[ssl]
-		!libressl? ( >=dev-libs/openssl-0.9.8j:0 )
-		libressl? ( dev-libs/libressl )
-		>=net-misc/curl-7.18.2
-		<dev-lang/spidermonkey-1.8.7
-		selinux? ( sec-policy/selinux-couchdb )"
-
-DEPEND="${RDEPEND}
-		sys-devel/autoconf-archive"
-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'
-	epatch "${FILESDIR}/${PV}-erlang-18.patch"
-	epatch "${FILESDIR}/${PV}-erlang-19.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-erlang="${EPREFIX}"/usr/$(get_libdir)/erlang/usr/include \
-		--localstatedir="${EPREFIX}"/var \
-		--with-js-lib="${EPREFIX}"/usr/$(get_libdir)
-	# bug 296609, upstream bug #COUCHDB-621
-	sed -e "s#localdocdir = /usr/share/doc/couchdb#localdocdir = "${EPREFIX}"/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 "${ED}"/etc/couchdb/*.ini ; do
-		fowners root:couchdb "${f#${ED}}"
-		fperms 660 "${f#${ED}}"
-	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):" "${ED}/etc/conf.d/couchdb"
-}
diff --git a/dev-db/couchdb/couchdb-1.7.1.ebuild b/dev-db/couchdb/couchdb-1.7.1.ebuild
index 3d797e33d490..a86f1de84856 100644
--- a/dev-db/couchdb/couchdb-1.7.1.ebuild
+++ b/dev-db/couchdb/couchdb-1.7.1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ppc x86"
 IUSE="libressl selinux test"
 
 RDEPEND=">=dev-libs/icu-4.3.1:=
-		<dev-lang/erlang-20.0[ssl]
+		<dev-lang/erlang-21.0[ssl]
 		!libressl? ( >=dev-libs/openssl-0.9.8j:0 )
 		libressl? ( dev-libs/libressl )
 		>=net-misc/curl-7.18.2