From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 37CFF139694 for ; Sun, 23 Apr 2017 08:57:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1252E0CB1; Sun, 23 Apr 2017 08:57:39 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7D45BE0CB1 for ; Sun, 23 Apr 2017 08:57:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EDD003415B7 for ; Sun, 23 Apr 2017 08:57:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71199742C for ; Sun, 23 Apr 2017 08:57:05 +0000 (UTC) From: "Dirkjan Ochtman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Dirkjan Ochtman" Message-ID: <1492937809.8d3272eaa8a033cf492a139452416212fbec5c1b.djc@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/couchdb/, dev-db/couchdb/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/couchdb/couchdb-1.6.1-r3.ebuild dev-db/couchdb/files/1.6.1-erlang-19.patch X-VCS-Directories: dev-db/couchdb/files/ dev-db/couchdb/ X-VCS-Committer: djc X-VCS-Committer-Name: Dirkjan Ochtman X-VCS-Revision: 8d3272eaa8a033cf492a139452416212fbec5c1b X-VCS-Branch: master Date: Sun, 23 Apr 2017 08:57:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6aead7f0-b135-46af-b6cc-5d89a8f68139 X-Archives-Hash: 0a4f0fb6870b0777ae71a241c67b142e commit: 8d3272eaa8a033cf492a139452416212fbec5c1b Author: Dirkjan Ochtman gentoo org> AuthorDate: Sun Apr 23 08:56:49 2017 +0000 Commit: Dirkjan Ochtman gentoo org> CommitDate: Sun Apr 23 08:56:49 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d3272ea dev-db/couchdb: revbump to allow erlang-19 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-db/couchdb/couchdb-1.6.1-r3.ebuild | 79 ++++++++++++++++++++++ dev-db/couchdb/files/1.6.1-erlang-19.patch | 105 +++++++++++++++++++++++++++++ 2 files changed, 184 insertions(+) diff --git a/dev-db/couchdb/couchdb-1.6.1-r3.ebuild b/dev-db/couchdb/couchdb-1.6.1-r3.ebuild new file mode 100644 index 00000000000..da41e04265f --- /dev/null +++ b/dev-db/couchdb/couchdb-1.6.1-r3.ebuild @@ -0,0 +1,79 @@ +# 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-libs/openssl-0.9.8j:0 ) + libressl? ( dev-libs/libressl ) + >=net-misc/curl-7.18.2 + +Date: Mon, 11 Jul 2016 00:38:11 +0300 +Subject: [PATCH] build: support OTP-19.0 + +- add travis support for newer OTP releases +- update docs +- update configure.ac + +closes #431 +--- + .travis.yml | 3 +++ + INSTALL.Unix | 2 +- + INSTALL.Windows | 2 +- + configure.ac | 8 ++++---- + share/doc/src/install/unix.rst | 2 +- + share/doc/src/install/windows.rst | 2 +- + 6 files changed, 11 insertions(+), 8 deletions(-) + +diff --git a/.travis.yml b/.travis.yml +index 1bddb6a..ef19231 100644 +--- a/INSTALL.Unix ++++ b/INSTALL.Unix +@@ -39,7 +39,7 @@ Dependencies + + You should have the following installed: + +- * Erlang OTP (>=R14B01, ==R14B01, ==14B01, =14B01, =4.*) (http://icu-project.org/) + * OpenSSL (>=0.9.8r) (http://www.openssl.org/) + * Mozilla SpiderMonkey (=1.8.5) (http://www.mozilla.org/js/spidermonkey/) +diff --git a/configure.ac b/configure.ac +index bf9ffc4..a6a667a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -411,7 +411,7 @@ esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5 + $as_echo_n "checking Erlang version compatibility... " >&6; } +-erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 18 (erts-7.0)" ++erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 19 (erts-8.0)" + + version="`${ERL} -version 2>&1 | ${SED} 's/[[^0-9]]/ /g'` 0 0 0" + major_version=`echo $version | ${AWK} "{print \\$1}"` +@@ -419,7 +419,7 @@ minor_version=`echo $version | ${AWK} "{print \\$2}"` + patch_version=`echo $version | ${AWK} "{print \\$3}"` + echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..." + +-if test $major_version -lt 5 -o $major_version -gt 7; then ++if test $major_version -lt 5 -o $major_version -gt 8; then + as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5 + fi + +@@ -438,9 +438,9 @@ otp_release="`\ + AC_SUBST(otp_release) + + AM_CONDITIONAL([USE_OTP_NIFS], +- [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18)")]) ++ [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18|19)")]) + AM_CONDITIONAL([USE_EJSON_COMPARE_NIF], +- [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18)")]) ++ [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18|19)")]) + + has_crypto=`\ + ${ERL} -eval "\ +diff --git a/share/doc/src/install/unix.rst b/share/doc/src/install/unix.rst +index 904c128..b4684fa 100644 +--- a/share/doc/src/install/unix.rst ++++ b/share/doc/src/install/unix.rst +@@ -52,7 +52,7 @@ Dependencies + + You should have the following installed: + +-* `Erlang OTP (>=R14B01, =`_ ++* `Erlang OTP (>=R14B01, =`_ + * `ICU `_ + * `OpenSSL `_ + * `Mozilla SpiderMonkey (1.8.5) `_ +diff --git a/share/doc/src/install/windows.rst b/share/doc/src/install/windows.rst +index 494ef65..0228550 100644 +--- a/share/doc/src/install/windows.rst ++++ b/share/doc/src/install/windows.rst +@@ -90,7 +90,7 @@ Dependencies + + You should have the following installed: + +-* `Erlang OTP (>=14B01, `_ ++* `Erlang OTP (>=14B01, `_ + * `ICU (>=4.*) `_ + * `OpenSSL (>0.9.8r) `_ + * `Mozilla SpiderMonkey (=1.8.5) `_