gentoo resync : 15.12.2017

3 files changed, 0 insertions, 206 deletions

diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index ee0eca5c6966..399fa09eb6e0 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -1,5 +1,3 @@
-AUX 1.6.1-erlang-18.patch 4121 BLAKE2B 28c0d5c49672dd9f1a279b4a7104606b2b1e604cfddd0cbf30ba736861e9f2ad543193b8300d6c9152f574bd10d980d7d1cdafd38adccda5fdbbf8e927a14cfd SHA512 fef596e46b729f69caac56b11e77b577e7985eed2f60c48011cc68726622d70bbb27a84f4d6874682327f47a85b63c1090e534907b944ed172fda6d4d4364b73
-AUX 1.6.1-erlang-19.patch 4270 BLAKE2B e00c8bcb48136cb01ea945d10b413a257114e543c2c0cb6227a831eb4c945934122f5c6efcecc695a739665bdc03b093849fa7b296a7d67dadd8cbf5a3ec0807 SHA512 abc3e0162ca80e2f1784e47d15c23bd134efcf4b8e1ebf01d7c853215971ce03dfab86597671142c05c44a4fd6748ab9daa29a11fff23435831a89cbebb82099
 AUX couchdb.conf-2 234 BLAKE2B ced08a5fc870703da6ab1e743cb421e7f1d5e8831923dc9115e708c728b27955650e69e323567bf6ad0041eca968f6cf152e097b962d496450ac90fd3d4f6d38 SHA512 5c40927957362a7431be6980be3a239e4ee0ca47d28f1b4d4fb3014b307e459eb429f5b50e0c8aa58b3e9f2285371616a58f06207e272feae1bed33f8c32d836
 AUX couchdb.init-4 439 BLAKE2B 4b334d42238616a1bfef41f915e7e42038457b6e52b713af698aa625dcf8364008d2e0763b1b5c90bd01121778447a86646730836bacc4cafe3477bec99b77f7 SHA512 a1e0a9403082e1c336454584d78d15e5d76861b3b3d0e56fcfb25ab50c0dbbdcf658e251e25f22e2a58dc72f38ec16ce82759bf9c7b5330a569ffb5fab912999
 DIST apache-couchdb-1.7.1.tar.gz 9963069 BLAKE2B 69a3f835f6a7b5752e4707b02edfa726cfdb76813e36e570566641b999eea556ff788b0ca8ce1e66beb819119d90e387beab3bba8618e3b7a606870794307fef SHA512 cd7417ef4b1eaeb1fe4251b559d904238fd25881c542f1498e6e9f1c4a55a79e34e06e711f90ce39e5e65fcac8be9c611943b8ed57d4a7465859b5811ac0a21f
diff --git a/dev-db/couchdb/files/1.6.1-erlang-18.patch b/dev-db/couchdb/files/1.6.1-erlang-18.patch
deleted file mode 100644
index a0ffea8b12fd..000000000000
--- a/dev-db/couchdb/files/1.6.1-erlang-18.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 95cb436be30305efa091809813b64ef31af968c8 Mon Sep 17 00:00:00 2001
-From: Dave Cottlehuber <dch@apache.org>
-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, =<R17) (http://erlang.org/)
-+ * Erlang OTP (>=R14B01, =<R18) (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 29c69b0..1ca04fd 100644
---- a/INSTALL.Windows
-+++ b/INSTALL.Windows
-@@ -29,7 +29,7 @@ Dependencies
- 
- You will need the following installed:
- 
-- * Erlang OTP (>=14B01, <R17)    (http://erlang.org/)
-+ * Erlang OTP (>=14B01, <R18)    (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 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, =<R17) <http://erlang.org/>`_
-+* `Erlang OTP (>=R14B01, =<R18) <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 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, <R17)    <http://erlang.org/>`_
-+* `Erlang OTP (>=14B01, <R18)    <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/dev-db/couchdb/files/1.6.1-erlang-19.patch b/dev-db/couchdb/files/1.6.1-erlang-19.patch
deleted file mode 100644
index 6ffb5a4e9536..000000000000
--- a/dev-db/couchdb/files/1.6.1-erlang-19.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 41304b83946f029f9712714cc89e9f630442d668 Mon Sep 17 00:00:00 2001
-From: Eugene Pirogov <iamexile@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/>`_