Merge updates from master

45 files changed, 22 insertions, 26 deletions

diff --git a/app-admin/rsyslog/rsyslog-8.1904.0.ebuild b/app-admin/rsyslog/rsyslog-8.1904.0-r1.ebuild
index 53c2faa29103..53c2faa29103 100644
--- a/app-admin/rsyslog/rsyslog-8.1904.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1904.0-r1.ebuild
diff --git a/app-admin/rsyslog/rsyslog-8.1907.0.ebuild b/app-admin/rsyslog/rsyslog-8.1907.0-r1.ebuild
index 3ba9c5d75708..3ba9c5d75708 100644
--- a/app-admin/rsyslog/rsyslog-8.1907.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1907.0-r1.ebuild
diff --git a/app-benchmarks/sysbench/sysbench-1.0.15.ebuild b/app-benchmarks/sysbench/sysbench-1.0.15-r1.ebuild
index bfd38a45f437..4bb727c50313 100644
--- a/app-benchmarks/sysbench/sysbench-1.0.15.ebuild
+++ b/app-benchmarks/sysbench/sysbench-1.0.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-benchmarks/sysbench/sysbench-1.0.16.ebuild b/app-benchmarks/sysbench/sysbench-1.0.16-r1.ebuild
index 7dc1fbf8fd10..7dc1fbf8fd10 100644
--- a/app-benchmarks/sysbench/sysbench-1.0.16.ebuild
+++ b/app-benchmarks/sysbench/sysbench-1.0.16-r1.ebuild
diff --git a/app-benchmarks/sysbench/sysbench-1.0.17.ebuild b/app-benchmarks/sysbench/sysbench-1.0.17-r1.ebuild
index 9bfef687b507..9bfef687b507 100644
--- a/app-benchmarks/sysbench/sysbench-1.0.17.ebuild
+++ b/app-benchmarks/sysbench/sysbench-1.0.17-r1.ebuild
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r4.ebuild
index 89645ad03b59..89645ad03b59 100644
--- a/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r4.ebuild
diff --git a/app-metrics/collectd/collectd-5.8.1.ebuild b/app-metrics/collectd/collectd-5.8.1-r1.ebuild
index ce224b6f9195..ce224b6f9195 100644
--- a/app-metrics/collectd/collectd-5.8.1.ebuild
+++ b/app-metrics/collectd/collectd-5.8.1-r1.ebuild
diff --git a/app-metrics/collectd/collectd-5.9.1-r1.ebuild b/app-metrics/collectd/collectd-5.9.1-r2.ebuild
index af1f3432adc8..af1f3432adc8 100644
--- a/app-metrics/collectd/collectd-5.9.1-r1.ebuild
+++ b/app-metrics/collectd/collectd-5.9.1-r2.ebuild
diff --git a/dev-db/clickhouse/clickhouse-18.10.3.ebuild b/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
index ff3db2a3a66b..ff3db2a3a66b 100644
--- a/dev-db/clickhouse/clickhouse-18.10.3.ebuild
+++ b/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
diff --git a/dev-db/clickhouse/clickhouse-18.12.17.ebuild b/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
index b8a7337618a9..b8a7337618a9 100644
--- a/dev-db/clickhouse/clickhouse-18.12.17.ebuild
+++ b/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
diff --git a/dev-db/clickhouse/clickhouse-18.6.0.ebuild b/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild
index e419edfa1571..e419edfa1571 100644
--- a/dev-db/clickhouse/clickhouse-18.6.0.ebuild
+++ b/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild
diff --git a/dev-db/clickhouse/clickhouse-19.13.1.11.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
index 799746e089be..799746e089be 100644
--- a/dev-db/clickhouse/clickhouse-19.13.1.11.ebuild
+++ b/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
diff --git a/dev-db/clickhouse/clickhouse-19.13.1.11-r1.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild
index 6525cf8d8cf5..6525cf8d8cf5 100644
--- a/dev-db/clickhouse/clickhouse-19.13.1.11-r1.ebuild
+++ b/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild
diff --git a/dev-db/clickhouse/clickhouse-19.5.3.8.ebuild b/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
index 7892e4667f5d..7892e4667f5d 100644
--- a/dev-db/clickhouse/clickhouse-19.5.3.8.ebuild
+++ b/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
diff --git a/dev-db/clickhouse/clickhouse-19.9.5.36.ebuild b/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild
index 7892e4667f5d..7892e4667f5d 100644
--- a/dev-db/clickhouse/clickhouse-19.9.5.36.ebuild
+++ b/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild
diff --git a/dev-db/myodbc/myodbc-5.3.10-r2.ebuild b/dev-db/myodbc/myodbc-5.3.10-r3.ebuild
index ffae941ae9e1..ffae941ae9e1 100644
--- a/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.10-r3.ebuild
diff --git a/dev-db/mysql++/mysql++-3.2.3.ebuild b/dev-db/mysql++/mysql++-3.2.3-r1.ebuild
index 28038bb90723..28038bb90723 100644
--- a/dev-db/mysql++/mysql++-3.2.3.ebuild
+++ b/dev-db/mysql++/mysql++-3.2.3-r1.ebuild
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11-r1.ebuild
index 812af80237d4..812af80237d4 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11-r1.ebuild
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
index d1f8176a8bd3..d1f8176a8bd3 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9-r1.ebuild
index 3f908d77fd3b..3f908d77fd3b 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9-r1.ebuild
diff --git a/dev-lang/php/php-5.6.40-r5.ebuild b/dev-lang/php/php-5.6.40-r6.ebuild
index 9a3ebaa2a5f1..9a3ebaa2a5f1 100644
--- a/dev-lang/php/php-5.6.40-r5.ebuild
+++ b/dev-lang/php/php-5.6.40-r6.ebuild
diff --git a/dev-libs/libpreludedb/libpreludedb-3.0.0.ebuild b/dev-libs/libpreludedb/libpreludedb-3.0.0-r1.ebuild
index 4e7679606af1..4e7679606af1 100644
--- a/dev-libs/libpreludedb/libpreludedb-3.0.0.ebuild
+++ b/dev-libs/libpreludedb/libpreludedb-3.0.0-r1.ebuild
diff --git a/dev-libs/libpreludedb/libpreludedb-3.1.0.ebuild b/dev-libs/libpreludedb/libpreludedb-3.1.0-r1.ebuild
index 2fedf289e705..2fedf289e705 100644
--- a/dev-libs/libpreludedb/libpreludedb-3.1.0.ebuild
+++ b/dev-libs/libpreludedb/libpreludedb-3.1.0-r1.ebuild
diff --git a/dev-libs/libpreludedb/libpreludedb-4.0.0.ebuild b/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild
index 54bb58c0faac..54bb58c0faac 100644
--- a/dev-libs/libpreludedb/libpreludedb-4.0.0.ebuild
+++ b/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild
diff --git a/dev-libs/libpreludedb/libpreludedb-4.1.0.ebuild b/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild
index 3c44652a69d1..3c44652a69d1 100644
--- a/dev-libs/libpreludedb/libpreludedb-4.1.0.ebuild
+++ b/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.44.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r1.ebuild
index cf2f57bc40ae..cf2f57bc40ae 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.44.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r1.ebuild
diff --git a/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild b/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
index a22fbdcd7a29..db127e8a3933 100644
--- a/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 # Tests require a live MySQL database but should all pass.
 RUBY_FAKEGEM_TASK_TEST=""
@@ -19,23 +19,13 @@ HOMEPAGE="https://github.com/brianmario/mysql2"
 LICENSE="MIT"
 SLOT="0.4"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="mysql mariadb"
-REQUIRED_USE="^^ ( mariadb mysql )"
+IUSE=""
 
-MDEPEND="mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= )"
-DEPEND="${DEPEND} ${MDEPEND}"
-RDEPEND="${RDEPEND} ${MDEPEND}"
+DEPEND="${DEPEND} dev-db/mysql-connector-c"
+RDEPEND="${RDEPEND} dev-db/mysql-connector-c:="
 
 each_ruby_configure() {
-	local config
-	if use mysql ; then
-		config="${EPREFIX}/usr/bin/mysql_config"
-	fi
-	if use mariadb ; then
-		config="${EPREFIX}/usr/bin/mariadb_config"
-	fi
-
-	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config=${config} || die
+	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
 }
 
 each_ruby_compile() {
diff --git a/dev-ruby/mysql2/mysql2-0.4.10.ebuild b/dev-ruby/mysql2/mysql2-0.4.10-r3.ebuild
index db127e8a3933..a22fbdcd7a29 100644
--- a/dev-ruby/mysql2/mysql2-0.4.10.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.4.10-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 # Tests require a live MySQL database but should all pass.
 RUBY_FAKEGEM_TASK_TEST=""
@@ -19,13 +19,23 @@ HOMEPAGE="https://github.com/brianmario/mysql2"
 LICENSE="MIT"
 SLOT="0.4"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
+IUSE="mysql mariadb"
+REQUIRED_USE="^^ ( mariadb mysql )"
 
-DEPEND="${DEPEND} dev-db/mysql-connector-c"
-RDEPEND="${RDEPEND} dev-db/mysql-connector-c:="
+MDEPEND="mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= )"
+DEPEND="${DEPEND} ${MDEPEND}"
+RDEPEND="${RDEPEND} ${MDEPEND}"
 
 each_ruby_configure() {
-	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
+	local config
+	if use mysql ; then
+		config="${EPREFIX}/usr/bin/mysql_config"
+	fi
+	if use mariadb ; then
+		config="${EPREFIX}/usr/bin/mariadb_config"
+	fi
+
+	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config=${config} || die
 }
 
 each_ruby_compile() {
diff --git a/dev-ruby/mysql2/mysql2-0.5.1.ebuild b/dev-ruby/mysql2/mysql2-0.5.1-r1.ebuild
index c9ce68fd9891..c9ce68fd9891 100644
--- a/dev-ruby/mysql2/mysql2-0.5.1.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.5.1-r1.ebuild
diff --git a/dev-ruby/mysql2/mysql2-0.5.2.ebuild b/dev-ruby/mysql2/mysql2-0.5.2-r2.ebuild
index 93e6a4196626..93e6a4196626 100644
--- a/dev-ruby/mysql2/mysql2-0.5.2.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.5.2-r2.ebuild
diff --git a/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild b/dev-ruby/mysql2/mysql2-0.5.2-r3.ebuild
index c54019a08f5b..c54019a08f5b 100644
--- a/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.5.2-r3.ebuild
diff --git a/gnustep-libs/sope/sope-3.2.10.ebuild b/gnustep-libs/sope/sope-3.2.10-r1.ebuild
index 7e1b88530cab..7e1b88530cab 100644
--- a/gnustep-libs/sope/sope-3.2.10.ebuild
+++ b/gnustep-libs/sope/sope-3.2.10-r1.ebuild
diff --git a/gnustep-libs/sope/sope-3.2.9.ebuild b/gnustep-libs/sope/sope-3.2.9-r1.ebuild
index 7e1b88530cab..7e1b88530cab 100644
--- a/gnustep-libs/sope/sope-3.2.9.ebuild
+++ b/gnustep-libs/sope/sope-3.2.9-r1.ebuild
diff --git a/gnustep-libs/sope/sope-4.0.7.ebuild b/gnustep-libs/sope/sope-4.0.7-r1.ebuild
index cbe33b68f8f9..cbe33b68f8f9 100644
--- a/gnustep-libs/sope/sope-4.0.7.ebuild
+++ b/gnustep-libs/sope/sope-4.0.7-r1.ebuild
diff --git a/mail-mta/exim/exim-4.92.ebuild b/mail-mta/exim/exim-4.92-r3.ebuild
index 90a6e8765fab..90a6e8765fab 100644
--- a/mail-mta/exim/exim-4.92.ebuild
+++ b/mail-mta/exim/exim-4.92-r3.ebuild
diff --git a/mail-mta/exim/exim-4.92-r2.ebuild b/mail-mta/exim/exim-4.92-r4.ebuild
index e63e0643c3e1..e63e0643c3e1 100644
--- a/mail-mta/exim/exim-4.92-r2.ebuild
+++ b/mail-mta/exim/exim-4.92-r4.ebuild
diff --git a/mail-mta/exim/exim-4.92.1.ebuild b/mail-mta/exim/exim-4.92.1-r1.ebuild
index 34e7b79bd72b..34e7b79bd72b 100644
--- a/mail-mta/exim/exim-4.92.1.ebuild
+++ b/mail-mta/exim/exim-4.92.1-r1.ebuild
diff --git a/net-analyzer/ntopng/ntopng-2.4.ebuild b/net-analyzer/ntopng/ntopng-2.4-r1.ebuild
index 1e888605a06b..1e888605a06b 100644
--- a/net-analyzer/ntopng/ntopng-2.4.ebuild
+++ b/net-analyzer/ntopng/ntopng-2.4-r1.ebuild
diff --git a/net-analyzer/ntopng/ntopng-3.0-r3.ebuild b/net-analyzer/ntopng/ntopng-3.0-r4.ebuild
index 5670739bea2d..5670739bea2d 100644
--- a/net-analyzer/ntopng/ntopng-3.0-r3.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.0-r4.ebuild
diff --git a/net-analyzer/ntopng/ntopng-3.8.ebuild b/net-analyzer/ntopng/ntopng-3.8.ebuild
index d494609c7f09..132b23563ef3 100644
--- a/net-analyzer/ntopng/ntopng-3.8.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.8.ebuild
@@ -39,7 +39,7 @@ PATCHES=(
 
 src_prepare() {
 	default
-	sed -e "s/@VERSION@/${PV}/g" -e "s/@SHORT_VERSION@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" > configure.ac
+	sed -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" -e "s/@SHORT_VERSION@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" > configure.ac
 	eapply_user
 	eautoreconf
 }
diff --git a/net-analyzer/zabbix/zabbix-2.2.16.ebuild b/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
index 6449f4cd9d50..6449f4cd9d50 100644
--- a/net-analyzer/zabbix/zabbix-2.2.16.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
diff --git a/net-analyzer/zabbix/zabbix-2.2.21.ebuild b/net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild
index 5cf012564554..5cf012564554 100644
--- a/net-analyzer/zabbix/zabbix-2.2.21.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild
diff --git a/net-analyzer/zabbix/zabbix-2.2.23.ebuild b/net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild
index 5cf012564554..5cf012564554 100644
--- a/net-analyzer/zabbix/zabbix-2.2.23.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild
diff --git a/net-analyzer/zabbix/zabbix-3.2.11.ebuild b/net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild
index 39902958a7e2..39902958a7e2 100644
--- a/net-analyzer/zabbix/zabbix-3.2.11.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild
diff --git a/profiles/package.mask b/profiles/package.mask
index 5727cb64e94d..e211fc004fde 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -321,10 +321,6 @@ dev-python/pgmagick
 # Removal in 30 days.
 virtual/python-dnspython
 
-# Thomas Deutschmann <whissi@gentoo.org> (2019-07-29)
-# Broken config parser
->=app-metrics/collectd-5.9.0
-
 # Mart Raudsepp <leio@gentoo.org> (2019-07-28)
 # GNOME 3.33 development release packages
 >=dev-libs/vala-common-0.45