commit: 8d3272eaa8a033cf492a139452416212fbec5c1b Author: Dirkjan Ochtman <djc <AT> gentoo <DOT> org> AuthorDate: Sun Apr 23 08:56:49 2017 +0000 Commit: Dirkjan Ochtman <djc <AT> gentoo <DOT> 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-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/files/1.6.1-erlang-19.patch b/dev-db/couchdb/files/1.6.1-erlang-19.patch new file mode 100644 index 00000000000..6ffb5a4e953 --- /dev/null +++ b/dev-db/couchdb/files/1.6.1-erlang-19.patch @@ -0,0 +1,105 @@ +From 41304b83946f029f9712714cc89e9f630442d668 Mon Sep 17 00:00:00 2001 +From: Eugene Pirogov <iamex...@gmail.com> +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, =<R18) (http://erlang.org/) ++ * Erlang OTP (>=R14B01, =<R19) (http://erlang.org/) + * ICU (http://icu-project.org/) + * OpenSSL (http://www.openssl.org/) + * Mozilla SpiderMonkey (1.8.5) (http://www.mozilla.org/js/spidermonkey/) +diff --git a/INSTALL.Windows b/INSTALL.Windows +index 1ca04fd..41fdcef 100644 +--- a/INSTALL.Windows ++++ b/INSTALL.Windows +@@ -29,7 +29,7 @@ Dependencies + + You will need the following installed: + +- * Erlang OTP (>=14B01, <R18) (http://erlang.org/) ++ * Erlang OTP (>=14B01, <R19) (http://erlang.org/) + * ICU (>=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, =<R18) <http://erlang.org/>`_ ++* `Erlang OTP (>=R14B01, =<R19) <http://erlang.org/>`_ + * `ICU <http://icu-project.org/>`_ + * `OpenSSL <http://www.openssl.org/>`_ + * `Mozilla SpiderMonkey (1.8.5) <http://www.mozilla.org/js/spidermonkey/>`_ +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, <R18) <http://erlang.org/>`_ ++* `Erlang OTP (>=14B01, <R19) <http://erlang.org/>`_ + * `ICU (>=4.*) <http://icu-project.org/>`_ + * `OpenSSL (>0.9.8r) <http://www.openssl.org/>`_ + * `Mozilla SpiderMonkey (=1.8.5) <http://www.mozilla.org/js/spidermonkey/>`_
