From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 76F1913881C for ; Thu, 24 Sep 2015 06:10:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3F2A21C005; Thu, 24 Sep 2015 06:10:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5676121C005 for ; Thu, 24 Sep 2015 06:10:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF733340A66 for ; Thu, 24 Sep 2015 06:10:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D739E1F5 for ; Thu, 24 Sep 2015 06:10:39 +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: <1443074993.f1e3aa13062e9b59ef383e8078c7e4f61f140604.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-r1.ebuild dev-db/couchdb/files/1.6.1-erlang-18.patch X-VCS-Directories: dev-db/couchdb/ dev-db/couchdb/files/ X-VCS-Committer: djc X-VCS-Committer-Name: Dirkjan Ochtman X-VCS-Revision: f1e3aa13062e9b59ef383e8078c7e4f61f140604 X-VCS-Branch: master Date: Thu, 24 Sep 2015 06:10:39 +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: 012c69e7-597e-467d-8227-4f87a2df4117 X-Archives-Hash: 5b40cb519c650c81e19e99aa566ae863 commit: f1e3aa13062e9b59ef383e8078c7e4f61f140604 Author: Dirkjan Ochtman gentoo org> AuthorDate: Thu Sep 24 06:09:53 2015 +0000 Commit: Dirkjan Ochtman gentoo org> CommitDate: Thu Sep 24 06:09:53 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1e3aa13 dev-db/couchdb: allow erlang-18 (fixes bug 554210) Package-Manager: portage-2.2.20.1 dev-db/couchdb/couchdb-1.6.1-r1.ebuild | 76 +++++++++++++++++++++++ dev-db/couchdb/files/1.6.1-erlang-18.patch | 99 ++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+) diff --git a/dev-db/couchdb/couchdb-1.6.1-r1.ebuild b/dev-db/couchdb/couchdb-1.6.1-r1.ebuild new file mode 100644 index 0000000..aca6394 --- /dev/null +++ b/dev-db/couchdb/couchdb-1.6.1-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 + +Date: Fri, 26 Jun 2015 10:31:27 +0200 +Subject: [PATCH] build: support OTP-18.0 + +--- + INSTALL.Unix | 2 +- + INSTALL.Windows | 2 +- + configure.ac | 8 ++++---- + share/doc/src/install/unix.rst | 2 +- + share/doc/src/install/windows.rst | 2 +- + 5 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/INSTALL.Unix b/INSTALL.Unix +index f66f98c..4c63bc8 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 103f029..bf9ffc4 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 =< 17 (erts-6.0)" ++erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 18 (erts-7.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 6; then ++if test $major_version -lt 5 -o $major_version -gt 7; 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)")]) ++ [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18)")]) + AM_CONDITIONAL([USE_EJSON_COMPARE_NIF], +- [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)")]) ++ [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18)")]) + + has_crypto=`\ + ${ERL} -eval "\ +diff --git a/share/doc/src/install/unix.rst b/share/doc/src/install/unix.rst +index 76fe922..904c128 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 b7b66af..494ef65 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) `_