10 files changed, 160 insertions, 55 deletions
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 903affc299ff..cbee3cb4d5e6 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/bnc/Manifest b/net-irc/bnc/Manifest
index ab3cc634b6af..55120a843276 100644
--- a/net-irc/bnc/Manifest
+++ b/net-irc/bnc/Manifest
@@ -1,5 +1,5 @@
 AUX bnc-2.9.3-64bit.patch 402 BLAKE2B 1221f1dfef7f1c8d5c1815ec61c859882bba466cba1e9f4a3a30dda3d22024105c5a25bf9ea9ec0d46d46abfe0549082316c17b2ab55dd876d4e27fbf9abe870 SHA512 e257416b88fa147ab532389893ecbf3ee5c47a3680bf8c3c54fb03408fb97b04ffd01222ce8e6c0a1257f9618c18dd95f3eb1799ae3a83922617a630b557604f
 AUX respect-cflags-ldflags.patch 2766 BLAKE2B dff6f29ca5bce13a033c261375463c3b5081f58b0724f48dc1400ea5845ed3d477f2fb6ad025b68f7f98aafd266e8eb5a60921880738c5e99dd80230c7233c96 SHA512 2b865f67d1999cc7c5ab85c828b8d442906306df23f48fdff17ffb7e7f4f5279a5f0aed0acce3708b558b4cd2e7d7885a585b0cae06b2a78425430ee786362ed
 DIST bnc2.9.4.tar.gz 76896 BLAKE2B fcb09e8c75986d51f69fa4b75458c95419da90789a81b5dbb2504f876d610ed72eb6a15aaae5b18eee03b77a7e374f4f88dc73b67e0daf20cb59d48a5a2dc77a SHA512 131c25624c2a72494f900c6247e5569df48700223664487944ac42b0d892ea62f7d0e67a9ba4609cd936718365075c428e756074e349e1e041186c43cd16da23
-EBUILD bnc-2.9.4-r1.ebuild 969 BLAKE2B 6329328f7723218c85dd9a5d1b30c630325ce0532d0d3ba9c1ac1a33416ae5883dca0311c5c761deaaafb2ca98d23d20d629a2ea2ddaff96a9b3bccf28f1bc40 SHA512 72b8f54014329394dabd78e2dc791e38143eeb37e7212cabab3338b1ed3d02ecfa761b9bbdb68fa8ef09f792c643e0d216b32f34c5994bc245e762c4d12288fc
+EBUILD bnc-2.9.4-r1.ebuild 968 BLAKE2B 68904952eefeb612f32ae08a3dcc60c724bb0158f62008b4e1490a11b674b5a3f456577d56ac1319037eec1f0c4486d67bf902b7fc44c44dae843f7abd348584 SHA512 351563cf687dbdea81222e808be0ab392fccfc46d43f0006ab6be41ee695e775082d2c8da03787d381dfceadf90af662eb7cf5188bc5d1398c82c67b8fec7ad8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/bnc/bnc-2.9.4-r1.ebuild b/net-irc/bnc/bnc-2.9.4-r1.ebuild
index 73bbb522e5cd..6d62da1735a2 100644
--- a/net-irc/bnc/bnc-2.9.4-r1.ebuild
+++ b/net-irc/bnc/bnc-2.9.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ppc ppc64 ~s390 sparc x86"
 IUSE="ssl"
 
-DEPEND="ssl? ( dev-libs/openssl:0 )"
+DEPEND="ssl? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -35,7 +35,7 @@ src_configure() {
 
 src_install() {
 	default
-	mv "${D}"/usr/bin/{,bnc}mkpasswd \
+	mv "${ED}"/usr/bin/{,bnc}mkpasswd \
 		|| die 'failed to rename the mkpasswd executable'
 	dodoc example.conf motd
 }
diff --git a/net-irc/ii/Manifest b/net-irc/ii/Manifest
index 8246e171ee1e..18818f7433ec 100644
--- a/net-irc/ii/Manifest
+++ b/net-irc/ii/Manifest
@@ -1,6 +1,4 @@
-DIST ii-1.7.tar.gz 10174 BLAKE2B 93af2dc182d77dbfca65cbee6c40aedabe9166be7abcb03c87e80e74273dea1e4dd875d86cf0e1dd04b4a10bfcd825ea9a8c109badb72cc877a484bdaea705d9 SHA512 1fa744bc9b4291b5c6c56e023d982aad59001137db6c7682284a2d63e649a32d558adbb85ae3407e312ae5436852b4278c2c522d4ef03f47cf54ea3a1f13ca90
 DIST ii-1.8.tar.gz 12326 BLAKE2B 7ae90d788aaec0a359ce46370f27c0ce62c6f77e8cda61d9d168d0ebd7de927a478b42a591631f2c193f3816b2a1b39cf79607326b073bcbeefe4291e0fb95f6 SHA512 2b41a0611ac76612c9333e8490709ee22d17506f0c5d7e680a0d8f3f8b511bd5b279555cf609c1543aba71948819369a3c306b1168086890aa49c145b7860e17
-EBUILD ii-1.7-r1.ebuild 740 BLAKE2B 2792190b5c90b7cefb8eaa1625c82ab68f5b66545e2a372337fa364c94d16d7a49557e5b0843c1ddba571d5822ec6ec33b2ab11b18d7b4415a2970531a9940c4 SHA512 a4ebf245df4485a7fc9ae75ebfa726b84d924640054a55f6fe79ee5f9224d06ff765033bd89bd4e248242b1afaab0a268f66547f78b9816b54b2cb1df5bb24df
 EBUILD ii-1.8.ebuild 683 BLAKE2B 4abf1f5f7258cb2593f68610684dcaca05c06e0e5f329fe2b51ca064f08c90adb7a293c5933660195861acff22e4122e4532478e899e73bf79de538fd13cb9dc SHA512 647c5cc8808374c1eb56fa0bc6c5a1721987cae9544ef8696b3b2e6ca94fe2cf0cf1d08d24d9f4e86fde95d7eb0ec9677cfb8fe6c19e2db8fa2d86dfa44b514e
 EBUILD ii-9999.ebuild 653 BLAKE2B bcefb912baa5b9f4484e9ae25db6561e141a7ce10d80cb673d655cfaaa637d90ec087a82943df8040115a9b7b2984bbbbd6a937df8ac89118c7cf8501441ebe4 SHA512 877ad3c2c18a1cf6a3b5c2bb82241ac52fb4a1aaa42e78b3b0167023f3a2c5171fc6a753e1fed7ecac8cac02f9821233c3e97db17391bf87763ba82be8156d84
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/ii/ii-1.7-r1.ebuild b/net-irc/ii/ii-1.7-r1.ebuild
deleted file mode 100644
index 4a1fce5af761..000000000000
--- a/net-irc/ii/ii-1.7-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit fixheadtails toolchain-funcs
-
-DESCRIPTION="A minimalist FIFO and filesystem-based IRC client"
-HOMEPAGE="https://tools.suckless.org/ii/"
-SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
-		-e '/^CC/d' \
-		-e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
-		config.mk || die
-	sed -i \
-		-e 's|@${CC}|$(CC)|g' \
-		Makefile || die
-
-	ht_fix_file query.sh
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ii
-	newbin query.sh ii-query
-	dodoc CHANGES FAQ README
-	doman *.1
-}
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 9342a6b75011..10ae24e87c9e 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -2,4 +2,4 @@ AUX kvirc-5.2_pre20190628041642-python-3.patch 2036 BLAKE2B 71de965fcd6d3ff6ec74
 DIST kvirc-5.2_pre20190628041642.tar.gz 5967194 BLAKE2B b1a2e2775056e2db058f82656ac90e43828d497019e9c6ae0431a1092423425558c6eb91a3a8301616cc4cdc7ef1acbab3729702484d703e00dc8e09f7cf243f SHA512 5f532739d9837f357a36fa1df67db0fbf8d8eddb990e686224e53c5678d26ba18c6c7c60422cef4e08ee587156638b278f534b1be1d49251fdeea19858227a5f
 EBUILD kvirc-5.2_pre20190628041642.ebuild 4322 BLAKE2B 1ffc73c27abbcb7a101829cf4a8197713e48d5bb3bdba3584beee23ba57c5f4c8cde9df6da004b7885b617929d88cc04aa72e7ed94474ef691eea74a582741da SHA512 cbb66d43ce0c829f82edecd611f7fcdfa27863a67d89d053a53f4529985c3b822c663eb93df023ae59feab7339bdf71926f94a4c2fdf5b9a51a56fbc789d7340
 EBUILD kvirc-9999.ebuild 4261 BLAKE2B 796cbac383831084f9b9677d7888b02a394b9ab1d9d5720b3660193d9f3accb2a6c44d850ee4f1756fb75640cc85f08bec8d237da8c1901c0fce3fefb893f4cf SHA512 6136cbaf6f4dd7d1c4effb3fabe341d69a2cee6e802e44f46d3ad400c920860e631d1a12b6ca1a5c900a220334ab182a096d3f20a0d8195c7bb9e23f2e132918
-MISC metadata.xml 501 BLAKE2B f8d9ac4c9a0a596f619716b2df66a95367d6599b9651fdbc5fb9d933c986d0079903cf097ce824c6d43786937b8cd478380723c578f5f96af0931ed6604da561 SHA512 36053b960a07fdf5e1307ce1097d77620b8bc48864568244e011371f459dcd7fbf4e7fcc2cfc0331183fdd681765a1aa017d3a6c4fbc1259834ba88d2e44be03
+MISC metadata.xml 643 BLAKE2B 820a98f07a4cfb58e857d5c7b863ed7adc174497a7ea05e66245a2c40c328ee0bdb644b98ba1d923834ccf05f23f8128abfe462d433fe2136078225b152a633f SHA512 3dd50caac7ff50679cabad216d4ec28b60351febc419f5d32f60b785043eba6f2f379c06e5af28af26355845ebcfe8439bca9d141bc3b9d0401fb0ee0a0c704c
diff --git a/net-irc/kvirc/metadata.xml b/net-irc/kvirc/metadata.xml
index 3ef850bff6bd..2d32a6643ad3 100644
--- a/net-irc/kvirc/metadata.xml
+++ b/net-irc/kvirc/metadata.xml
@@ -5,6 +5,11 @@
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+		<description>Proxy</description>
+	</maintainer>
 	<use>
 		<flag name="dcc_video">Support video connections over DCC protocol</flag>
 		<flag name="phonon">Support Phonon for audio output</flag>
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index a9f6df87e3ce..4b1834bed273 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,4 +1,6 @@
 DIST weechat-2.5.tar.xz 2067180 BLAKE2B 5ef2a20d0f4e72958f8523c46eac4acf8223d70efbadc78a1a5623b0e63e11acbe1c8e5ec739f56764c6825393902626e234269646031971a0f58fbd314f8918 SHA512 af0135009b799d40790c09da5419c950a6c750264a556de418b0ba4f396ecbde2aadeae5cbea3f2e98fc9926f07439e28beac00cb0019dc6752c1a5640a9834e
+DIST weechat-2.6.tar.xz 2080092 BLAKE2B e54d8493de7783e18e0de3a7280088a27a70b270a2d7a504ad35c4091e03a0d3c2f3fd19260b700bb115e3804ab4d6d8963bea46faad1368f3dd0569c0595add SHA512 cf56692e12b2e034675d4c15a8822836b2fcf93d584948e338d263f5a7207edf4599cc72bfb940427146f5f75e7239207cf54f5ed07dd5b6119f68c445725a2d
 EBUILD weechat-2.5-r1.ebuild 3952 BLAKE2B 26b66730ee624a14b9e13b7573021cc1101128565c763320f2475400288dbba0492510644c315505f5c2334de780ce1476cec0f9332c98c8348d9552edec7ce3 SHA512 bae88576c77f741460eb394febcaea23163911d02c40111bd4b5d530ce48b86d6512d6f1358bd0316dcd91bd4876154e2b67bb5a46cfb7115fcfd75e7e7a41df
-EBUILD weechat-9999.ebuild 3954 BLAKE2B 71baeb44920f8f18568c85833777c3e929a8a22926cb04cdcc247bd507fc14c039e453e364c7f7305db04bd68010d391032ff778cdf93cb676051c257b5b3e85 SHA512 c5bdab50fd43f20e21a2a6b78afba834604248f00b7439c4457ac0d21e71f633e2e135610900373fa9775eb7adb98c0dce50c52de1578be073bd11552898b83e
+EBUILD weechat-2.6.ebuild 3801 BLAKE2B db50a1a4273dc6b92332342e3cc9634683dafebe5ad4fc7740dd77f93a10985e13ac5dd85fee9bb26fc0101155d22452361246b697e9106f4c6b8f5bb242820b SHA512 f57d13e5c8a076db2e81abd8a61327bf0a0af95b8a47ee3bb07967702cbc46d62cd4b5c7736d1203345756089cf7ab0d9c35f5c20906e73031252c35b9a1375a
+EBUILD weechat-9999.ebuild 3801 BLAKE2B db50a1a4273dc6b92332342e3cc9634683dafebe5ad4fc7740dd77f93a10985e13ac5dd85fee9bb26fc0101155d22452361246b697e9106f4c6b8f5bb242820b SHA512 f57d13e5c8a076db2e81abd8a61327bf0a0af95b8a47ee3bb07967702cbc46d62cd4b5c7736d1203345756089cf7ab0d9c35f5c20906e73031252c35b9a1375a
 MISC metadata.xml 1069 BLAKE2B 4a71fbd264555e8439f6797370163ae05c3111e589d513ade407ebb5eb3b2c302d2afc46cd37d3707c85fc981ed26bfd23762b5f6f635b9f85b70d821919e2ed SHA512 dfb08a4660736e409b31088217bca60adc46c88b7e0b6e4a1b905de69262ae0cef172638f30b502e01fcb772a6d3cbb471805959ba8c6d78cb598b18640fe20f
diff --git a/net-irc/weechat/weechat-2.6.ebuild b/net-irc/weechat/weechat-2.6.ebuild
new file mode 100644
index 000000000000..024f0d1b0d09
--- /dev/null
+++ b/net-irc/weechat/weechat-2.6.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit cmake-utils python-single-r1 xdg-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="https://weechat.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+NETWORKS="+irc"
+PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer"
+# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
+SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
+LANGS=" cs de es fr it ja pl ru"
+IUSE="doc man nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+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_DEPS} )
+	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= )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cpputest )
+"
+
+BDEPEND="
+	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
+	man? ( >=dev-ruby/asciidoctor-1.5.4 )
+	nls? ( >=sys-devel/gettext-0.15 )
+"
+
+DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
+
+# tests need to be fixed to not use system plugins if weechat is already installed
+RESTRICT="test"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# install only required translations
+	local i
+	for i in ${LANGS} ; do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e "/${i}.po/d" \
+				po/CMakeLists.txt || die
+		fi
+	done
+
+	# install only required documentation ; en always
+	for i in $(grep add_subdirectory doc/CMakeLists.txt \
+			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e '/add_subdirectory('${i}')/d' \
+				doc/CMakeLists.txt || die
+		fi
+	done
+
+	# install docs in correct directory
+	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# fix linking error on Darwin
+		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
+			cmake/FindPython.cmake || die
+		# allow to find the plugins by default
+		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
+			src/core/wee-config.c || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBDIR=/usr/$(get_libdir)
+		-DENABLE_JAVASCRIPT=OFF
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_NCURSES=ON
+		-DENABLE_ALIAS=$(usex alias)
+		-DENABLE_BUFLIST=$(usex buflist)
+		-DENABLE_CHARSET=$(usex charset)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_EXEC=$(usex exec)
+		-DENABLE_FIFO=$(usex fifo)
+		-DENABLE_FSET=$(usex fset)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_GUILE=$(usex guile)
+		-DENABLE_IRC=$(usex irc)
+		-DENABLE_LOGGER=$(usex logger)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_MAN=$(usex man)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_PERL=$(usex perl)
+		-DENABLE_PHP=$(usex php)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_RELAY=$(usex relay)
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_SCRIPT=$(usex scripts)
+		-DENABLE_SCRIPTS=$(usex scripts)
+		-DENABLE_SPELL=$(usex spell)
+		-DENABLE_TCL=$(usex tcl)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRIGGER=$(usex trigger)
+		-DENABLE_XFER=$(usex xfer)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 9ff15b1d86c5..024f0d1b0d09 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -135,14 +135,6 @@ src_configure() {
 		-DENABLE_XFER=$(usex xfer)
 	)
 
-	if use python; then
-		python_export PYTHON_LIBPATH
-		mycmakeargs+=(
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
-		)
-	fi
-
 	cmake-utils_src_configure
 }