Merge branch 'next'

5 files changed, 20 insertions, 15 deletions

diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index c88a1c1bb49f..923af3c74096 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/bnc-2.9.4-r1 b/metadata/md5-cache/net-irc/bnc-2.9.4-r1
index 236e5cdaea3d..5dcf078d259c 100644
--- a/metadata/md5-cache/net-irc/bnc-2.9.4-r1
+++ b/metadata/md5-cache/net-irc/bnc-2.9.4-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=ssl? ( dev-libs/openssl:0 )
+DEPEND=ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=BNC (BouNCe) is used as a gateway to an IRC Server
 EAPI=6
 HOMEPAGE=http://gotbnc.com/
 IUSE=ssl
 KEYWORDS=alpha amd64 arm ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=ssl? ( dev-libs/openssl:0 )
+RDEPEND=ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://gotbnc.com/files/bnc2.9.4.tar.gz
-_md5_=8ccdf1f178ec8d2024d3ea378cd6f385
+_md5_=75fca2a851f0f9b04d936f1ed888482d
diff --git a/metadata/md5-cache/net-irc/ii-1.7-r1 b/metadata/md5-cache/net-irc/ii-1.7-r1
deleted file mode 100644
index 2289544fc07b..000000000000
--- a/metadata/md5-cache/net-irc/ii-1.7-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A minimalist FIFO and filesystem-based IRC client
-EAPI=6
-HOMEPAGE=https://tools.suckless.org/ii/
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://dl.suckless.org/tools/ii-1.7.tar.gz
-_eclasses_=fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=62df0deb30b1751c9bd9df12eba5060c
diff --git a/metadata/md5-cache/net-irc/weechat-2.6 b/metadata/md5-cache/net-irc/weechat-2.6
new file mode 100644
index 000000000000..267925200124
--- /dev/null
+++ b/metadata/md5-cache/net-irc/weechat-2.6
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
+DESCRIPTION=Portable and multi-interface IRC client
+EAPI=7
+HOMEPAGE=https://weechat.org/
+IUSE=doc man nls +ssl test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://weechat.org/files/src/weechat-2.6.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8787fdd76b7f653240ef436e36995d4a
diff --git a/metadata/md5-cache/net-irc/weechat-9999 b/metadata/md5-cache/net-irc/weechat-9999
index 4b119a0b4c2c..f81cb77b5343 100644
--- a/metadata/md5-cache/net-irc/weechat-9999
+++ b/metadata/md5-cache/net-irc/weechat-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=80f2619ffe728dd781c8741ebb038c7f
+_md5_=8787fdd76b7f653240ef436e36995d4a