gentoo christmass resync : 25.12.2020

16 files changed, 382 insertions, 199 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 89dfcb6e58a5..bb5521e74475 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index 1854f6929314..37c70442e646 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -1,10 +1,7 @@
 AUX anope-2.0.6-example.conf-pid-path.patch 521 BLAKE2B 4fb40f4913c41a2fa1925707ebdc50cceeb129b01f2487beba97242366da8577fde882a7389477aa051e03f519d71dfe6f7332a91f68bd7747179eebfd26af38 SHA512 55690d4057bd3703dff0674a6b339bda659db88d242c4216aa1cf14f06e1a95af33b2fffafa18540d37b7fc5620359dcab895e2365713ad243fa99ed572a6f3f
 AUX anope-2.0.7-example.conf-user.patch 391 BLAKE2B 781e413ef79a7ca601710957b519fb3038bb71e45960cf000afa837a8a8a3f71458390bab1323ae85fc601f143725a45d3a0a7b9c9aca8b530805c459d70b39c SHA512 13f0eb0dfc5f18a4621e2812aad418cab1f5a0cb70ff2f915bd4df2ac896b441f24e64014e218d473c5be92d4be7a5f83e4804e92610c2ef35e46ded229bd6a4
-AUX anope-2.0.7-musl-libintl.patch 566 BLAKE2B 7deb854a68c259c9055a086fbb33a63d00544bacd1a9dd2bdd6793d93a8885be195336aa66054933a6bc9cfd1dabb5ff8eaea2529f4fd4841ff51364931fd320 SHA512 11e69a97bc0cca89719584e849577868c045a75ab531bc43c61140b29f640cf761f9f73165ebb70079d0d9e1dfeb335222c8954bf2b037f6b80b9f33da69bf87
 AUX anope-conf.d-v2 344 BLAKE2B 8817bba9938aa03abf79e61b86ddde537c6ec68b6584074e1f9bc50fe8334c5d0135ca17551390618f60b26d93f0209789b9337879dbecdcb4fced3d2bb88b3b SHA512 ae1851ccaa128404f3a721c92571ae3c4e0efd18c318485594f87da565b2de505ee9ace580b5d1c4ce4a7b53a4eba8338874195ca3a2cbc415ab6facdb3c9d7a
 AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f9352f2ada8ba5bc90fc1a8b5e4779bd132606d9297c19fd418db02d8a26b6629da675f6fc0d8c SHA512 e058ccfb4a44238cd1540704f130207236be71799d0a5f4678638d313d958b10dfc5de9cd515f18ccdd9faf41dc93eaf33b5f4013f534efec00adc401a2cb97c
-DIST anope-2.0.7-source.tar.gz 1817484 BLAKE2B 13a4628db8cb885d4636ab1897aab322f7846740e4a3fccd02a417d84a8eb3c942aebf5e0a51f8ca1108f455b44b4e280e7386b42e03f640c9b0e68943252814 SHA512 22a9f3e0d9fe7f68304062829a19b693a3414f94c90f8da601ab98995cbff7310dc22ca40749d50d6722dfb4649817d2f4b1dbe4afa3254b28980f03a491de65
 DIST anope-2.0.9.tar.gz 1808866 BLAKE2B db5755dbb88edb9fcc2f00c1dc324894f22b9e6bc97c9cf57b40d2296014341fe3ade8a8e1b64879b852aef6637e1bb89947deb7a41e009e25101a0a992515e7 SHA512 0ce2caa5ede2831215781a333d896f1169f90bbb515078912f32beaff1699b7957384974cca7c86f1d584d624cb43c76769299ce245ee1fb6836ce7f14ada3e0
-EBUILD anope-2.0.7.ebuild 4305 BLAKE2B 0bfc78a17737d333768066bb5182f2a426f62c5e4de7559226b76aa81a7d7bf6ed1e4ec7748832569d4725f6d0107d4dabfa8ce2110d263fcc4996c850683808 SHA512 d2134d165f68f718c1e60a0056a89dfb346c12e6c2ebb363cd688d50e792860c8292008b2e6020350cac769a3ac0cea51e22a5dffdcedf95a1e735b4857a038a
 EBUILD anope-2.0.9.ebuild 4208 BLAKE2B 2151b5481c62b9e5f82c77e3bbc43311822769dfc669a8486c94bc653b344bf6254d6be6121c39202d83de9743a406be26780b0a1406a1bc8c8bea8c93172aec SHA512 d2a54a36e19fe66a8e0d67a223822c7a40c85ec60f95563f6674d0a03b65ee394a9ca63c9d0301ba5c3481e363dcc49e206688af493fff9bedd951843ba68af2
 MISC metadata.xml 901 BLAKE2B 0051a2f196c30f3fddfaae55dc660140a77d8b636454230473107af38f9e54cc059fa012516b07b86d1667bcfaf6fdeec6005de95c48b1b832ebd22826c03210 SHA512 f8271f6ece0d7f9488f317d8f4f8bdc8813521d15a603ea81445e109792ed5720319529f5c5527a902ff323151f4a58fbf62a83110104ce270ae5d96ec154ef6
diff --git a/net-irc/anope/anope-2.0.7.ebuild b/net-irc/anope/anope-2.0.7.ebuild
deleted file mode 100644
index f00b232f80bd..000000000000
--- a/net-irc/anope/anope-2.0.7.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Anope IRC Services"
-HOMEPAGE="https://anope.org/ https://github.com/anope/anope/"
-SRC_URI="https://github.com/anope/anope/releases/download/${PV}/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="gnutls ldap mysql pcre sql sqlite ssl tre"
-REQUIRED_USE="
-	sql? ( || ( mysql sqlite ) )
-"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
-	acct-group/anope
-	acct-user/anope
-	mysql? ( dev-db/mysql-connector-c:0= )
-	ssl? ( dev-libs/openssl:0= )
-	gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= )
-	ldap? ( net-nds/openldap )
-	pcre? ( dev-libs/libpcre )
-	sqlite? ( dev-db/sqlite:3 )
-	tre? ( dev-libs/tre )
-	virtual/libintl
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.6-example.conf-pid-path.patch"
-	"${FILESDIR}/${PN}-2.0.7-example.conf-user.patch"
-	"${FILESDIR}/${PN}-2.0.7-musl-libintl.patch"
-)
-
-S="${WORKDIR}/${P}-source"
-
-src_prepare() {
-	anope_enable_mod() {
-		local modulefile=${1}
-		ln -s "extra/${modulefile}" "modules/" || \
-			die "Failed to use ${modulefile}"
-	}
-
-	# These all require MySQL specifically
-	if use mysql ; then
-	   anope_enable_mod "m_mysql.cpp"
-	   anope_enable_mod "stats/irc2sql/irc2sql.cpp"
-	   anope_enable_mod "stats/irc2sql/irc2sql.h"
-	   anope_enable_mod "stats/irc2sql/tables.cpp"
-	   anope_enable_mod "stats/irc2sql/utils.cpp"
-	   anope_enable_mod "stats/m_chanstats.cpp"
-	   anope_enable_mod "stats/cs_fantasy_top.cpp"
-	   anope_enable_mod "stats/cs_fantasy_stats.cpp"
-	   anope_enable_mod "m_sql_log.cpp"
-	   anope_enable_mod "m_sql_oper.cpp"
-	fi
-
-	use sqlite && anope_enable_mod "m_sqlite.cpp"
-
-	# Any SQL implementation
-	if use sql ; then
-	   anope_enable_mod "m_sql_authentication.cpp"
-	fi
-
-	if use ldap ; then
-		anope_enable_mod "m_ldap.cpp"
-		anope_enable_mod "m_ldap_authentication.cpp"
-		anope_enable_mod "m_ldap_oper.cpp"
-	fi
-
-	use gnutls && anope_enable_mod "m_ssl_gnutls.cpp"
-	use pcre && anope_enable_mod "m_regex_pcre.cpp"
-	use ssl && anope_enable_mod "m_ssl_openssl.cpp"
-	use tre && anope_enable_mod "m_regex_tre.cpp"
-
-	# Unconditional modules
-	anope_enable_mod "m_regex_posix.cpp"
-
-	# Avoid a silly sandbox error - tries to delete /usr/lib/modules
-	sed -i '/install.*REMOVE_RECURSE.*/d' CMakeLists.txt || die
-
-	# Copy anope.conf for fixup to comply w/ prefix
-	cp "${FILESDIR}/anope-conf.d-v2" "${T}" || die
-
-	# Look in the right place for modules
-	sed -i "s~%LIBDIR%~${EPREFIX}/usr/$(get_libdir)/anope/~" \
-		"${T}/anope-conf.d-v2" || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBIN_DIR="libexec/anope"
-		-DDB_DIR="../var/lib/anope"
-		-DDOC_DIR="share/doc/${PF}"
-		-DLIB_DIR="$(get_libdir)/anope"
-		-DLOCALE_DIR="share/locale"
-		-DCONF_DIR="/etc/anope"
-		-DLOGS_DIR="../var/log/anope/"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newinitd "${FILESDIR}/anope-init.d" "${PN}"
-	newconfd "${T}/anope-conf.d-v2" "${PN}"
-
-	dosym ../libexec/anope/services /usr/bin/services
-	dosym ../libexec/anope/anopesmtp /usr/bin/anopesmtp
-
-	keepdir /var/log/anope /var/lib/anope/backups
-	fowners anope:anope /var/{lib,log}/anope /var/lib/anope/backups
-
-	dodoc -r docs/* data/example.conf
-
-	insinto /etc/anope
-	newins data/example.conf services.conf
-
-	fowners anope:anope /var/log/anope
-	fowners anope:anope /var/lib/anope/backups/
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		# Only tell them about this on a fresh install.
-		elog
-		ewarn "Anope won't run out of the box, you still have to configure it to match your IRCd's configuration."
-		ewarn "Edit /etc/anope/services.conf to configure Anope."
-		elog
-	else
-		# We're replacing some versions. Find out which.
-		local ver
-		for ver in ${REPLACING_VERSIONS} ; do
-			if ver_test ${ver} -lt 2.0.7 ; then
-				# In this version, we introduced correct FHS structure
-				# We need the users to make some changes to their services.conf
-				ewarn "Please modify your services.conf to include the following directive:"
-				ewarn "in options{}, please include user=\"anope\" and group=\"anope\""
-				ewarn "This is needed because Anope now starts as root and drops down."
-				ewarn "Reference: https://wiki.anope.org/index.php/2.0/Configuration#Services_Process_Options"
-			fi
-		done
-	fi
-}
diff --git a/net-irc/anope/files/anope-2.0.7-musl-libintl.patch b/net-irc/anope/files/anope-2.0.7-musl-libintl.patch
deleted file mode 100644
index f14e494e0c18..000000000000
--- a/net-irc/anope/files/anope-2.0.7-musl-libintl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/language.cpp b/src/language.cpp
-index 1915378..c1eeea5 100644
---- a/src/language.cpp
-+++ b/src/language.cpp
-@@ -75,7 +75,7 @@ const char *Language::Translate(const NickCore *nc, const char *string)
- 
- #if GETTEXT_FOUND
- 
--#ifdef __USE_GNU_GETTEXT
-+#if defined(__GLIBC__)
- extern "C" int _nl_msg_cat_cntr;
- #endif
- 
-@@ -87,7 +87,7 @@ const char *Language::Translate(const char *lang, const char *string)
- 	if (!lang || !*lang)
- 		lang = Config->DefLanguage.c_str();
- 
--#ifdef __USE_GNU_GETTEXT
-+#if defined(__GLIBC__)
- 	++_nl_msg_cat_cntr;
- #endif
- 
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index d32b386de42f..f192fd586821 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -1,4 +1,6 @@
+AUX hexchat-2.14.3-python38.patch 1005 BLAKE2B 150783fae40e10aa32fdbf42aa5d1f70eefa69c6ea0a5fc7a0fbb243c1ad65bbc8d3fa1bbfcef530e366cf23d1905e70a7692208d06fc6feb0d24228888b17c7 SHA512 877da47f35d5c743429fc8c84768e70135d04573e7aed72e9f6e09062d619a8d4ed717930801a524bd81848f1a393919c1d8ae041899b07d9337e3fd7426a003
 DIST hexchat-2.14.3.tar.xz 1292072 BLAKE2B 22bc8a0857b3ec26452843dd85c046cde055e719ce7dc23e4ec5ae33eb16251379ed84856c1812dc855a1e8d5d422c01e9352e2259f075a538226e1fcd79edd7 SHA512 c265921f2cb02c5d273bcdbb20a44a5c9f38b0f8cbba4fd56b177b676fc5d1dfd05bf80fcfa3706c7981f712f2f6c9aaaf80bccf3be0f6d96068dd393f3a7cb5
+EBUILD hexchat-2.14.3-r100.ebuild 3478 BLAKE2B bf6996b80d06679dd01ad1793f442a832f98a8846d51d3e627b9318764de39dd07bf4f3a3e4599d5857e265fddd92639be134af384088029b6562d11b23537b5 SHA512 7e7905e167b95a8b8bdd355fa5f582fed6049dca209bec83b31e1586926ab259c3387eaf37610b6b920e1dabd9b0fde0fb977f6906c093a0b78d0aab9aa633a4
 EBUILD hexchat-2.14.3.ebuild 3307 BLAKE2B 6e244e6ad21f70f3f4812f56f6f06ccaefd7a64a36804b02c684794525a9e995fee6e966865e65e0098ddd240f3b92c55a805acabe969b9b3ba358bd868c7984 SHA512 8427252de4ff905f19ed50421cfa70c9c9329f7be4557775d1998160c450f4929f412541be1978ab622d633e578048b55cbf2b4963aec825f78020826aff2458
-EBUILD hexchat-9999.ebuild 3306 BLAKE2B 82ca2d76d4ecef009e6610f1694a28ff4851c46e2d2038edc7b9a54dc20cb2159fe82b36afd2fd4a2526ac6dfdd6764c5cf147633cddd5690109d4c7911ea3f6 SHA512 d4299a5c060e46f818c6ffd6ba0c6b27321f378cf43f6de6b0997ba5bdc70e07e10563ceee04fa8c35fd133f454ed6f36e478764bfb40ef75460fcf2f2ede187
+EBUILD hexchat-9999.ebuild 3421 BLAKE2B cdd21f3e4817d28e08eb21ebb6f63c35fba21e6a2945fe213e61dfceeb7834928eed9bae02461aa39ecb040cad638f5bf2221d6aaf6043610a1e552fd28f4ee9 SHA512 765cbf04bb5fa04b9368c3df38d490f00093dee2f0634e4392d733c1ea26f925a4da8c3d16768e9378e68c575c4ba03ee51d0e84ee8487d762db6577d11c1324
 MISC metadata.xml 1042 BLAKE2B a8b2d37197b07fb76badeb4439d07f5b8acc0ab888f277050306ccf7b906de3bc4dc8b7a13af4b398494c350ea83eb373b107528055e6e502667b2a56e052133 SHA512 aac3a4017b0e64d98a71fcfffaec8a8245ccb7f691d40fc327599202831462e09eb7e382ed4230f5f3c584dfe0ebd9c0e3bd8f157103109cad037c9e597ef68d
diff --git a/net-irc/hexchat/files/hexchat-2.14.3-python38.patch b/net-irc/hexchat/files/hexchat-2.14.3-python38.patch
new file mode 100644
index 000000000000..fdfc74f94344
--- /dev/null
+++ b/net-irc/hexchat/files/hexchat-2.14.3-python38.patch
@@ -0,0 +1,28 @@
+From 5deb69591992d4fede9090b60d3dc847612a4d60 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <tingping@tingping.se>
+Date: Wed, 11 Mar 2020 11:07:56 -0700
+Subject: [PATCH] build: Better support building against python 3.8+
+
+Closes #2441
+---
+ plugins/python/meson.build | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/python/meson.build b/plugins/python/meson.build
+index 2ad5128e5..eb762134a 100644
+--- a/plugins/python/meson.build
++++ b/plugins/python/meson.build
+@@ -1,6 +1,12 @@
+ python_opt = get_option('with-python')
+ if python_opt.startswith('python3')
+-  python_dep = dependency(python_opt, version: '>= 3.3')
++  # Python 3.8 introduced a new -embed variant
++  if not python_opt.endswith('-embed')
++    python_dep = dependency(python_opt + '-embed', version: '>= 3.3', required: false)
++  endif
++  if not python_dep.found()
++    python_dep = dependency(python_opt, version: '>= 3.3')
++  endif
+ else
+   python_dep = dependency(python_opt, version: '>= 2.7')
+ endif
diff --git a/net-irc/hexchat/hexchat-2.14.3-r100.ebuild b/net-irc/hexchat/hexchat-2.14.3-r100.ebuild
new file mode 100644
index 000000000000..27f07d1dedaf
--- /dev/null
+++ b/net-irc/hexchat/hexchat-2.14.3-r100.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit lua-single meson mono-env python-single-r1 xdg
+
+DESCRIPTION="Graphical IRC client based on XChat"
+HOMEPAGE="https://hexchat.github.io/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+fi
+
+LICENSE="GPL-2 plugin-fishlim? ( MIT )"
+SLOT="0"
+IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dbus? ( dev-libs/dbus-glib )
+	gtk? (
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/pango
+	)
+	libcanberra? ( media-libs/libcanberra )
+	libproxy? ( net-libs/libproxy )
+	libnotify? ( x11-libs/libnotify )
+	lua? ( ${LUA_DEPS} )
+	perl? ( dev-lang/perl:= )
+	plugin-sysinfo? ( sys-apps/pciutils )
+	python? ( ${PYTHON_DEPS} )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	theme-manager? (
+		|| (
+			( dev-lang/mono[minimal] dev-dotnet/libgdiplus )
+			dev-lang/mono[-minimal]
+		)
+	)"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	app-arch/xz-utils
+	app-text/iso-codes
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-python38.patch" #758758
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+	if use theme-manager ; then
+		mono-env_pkg_setup
+		export XDG_CACHE_HOME="${T}/.cache"
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dwith-gtk="$(usex gtk true false)"
+		-Dwith-text="$(usex gtk false true)"
+		-Dwith-ssl="$(usex ssl true false)"
+		-Dwith-plugin=true
+		-Dwith-dbus="$(usex dbus true false)"
+		-Dwith-libproxy="$(usex libproxy true false)"
+		-Dwith-libnotify="$(usex libnotify true false)"
+		-Dwith-libcanberra="$(usex libcanberra true false)"
+		-Dwith-theme-manager="$(usex theme-manager true false)"
+		-Ddbus-service-use-appid=false
+		-Dwith-checksum="$(usex plugin-checksum true false)"
+		-Dwith-fishlim="$(usex plugin-fishlim true false)"
+		-Dwith-lua="$(usex lua "${ELUA}" false)"
+		-Dwith-perl="$(usex perl "${EPREFIX}"/usr/bin/perl false)"
+		-Dwith-python="$(usex python "${EPYTHON/.*}" false)"
+		-Dwith-sysinfo="$(usex plugin-sysinfo true false)"
+		-Dwith-appdata=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dodoc readme.md
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	if use gtk ; then
+		xdg_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	if use gtk ; then
+		xdg_pkg_postinst
+	else
+		elog "You have disabled the gtk USE flag. This means you don't have"
+		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
+	fi
+
+	if use theme-manager ; then
+		elog "Themes are available at:"
+		elog "  https://hexchat.github.io/themes.html"
+	fi
+
+	elog
+	elog "optional dependencies:"
+	elog "  media-sound/sox (sound playback if you don't have libcanberra"
+	elog "    enabled)"
+	elog "  x11-plugins/hexchat-javascript (javascript support)"
+	elog "  x11-themes/sound-theme-freedesktop (default BEEP sound,"
+	elog "    needs libcanberra enabled)"
+}
+
+pkg_postrm() {
+	if use gtk ; then
+		xdg_pkg_postrm
+	fi
+}
diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
index 0a64b4be026b..850dd84f2ac3 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=7
 
+LUA_COMPAT=( lua5-{1..4} luajit )
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit meson mono-env python-single-r1 xdg
+inherit lua-single meson mono-env python-single-r1 xdg
 
 DESCRIPTION="Graphical IRC client based on XChat"
 HOMEPAGE="https://hexchat.github.io/"
@@ -16,13 +17,14 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 else
 	SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 fi
 
 LICENSE="GPL-2 plugin-fishlim? ( MIT )"
 SLOT="0"
 IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	dev-libs/glib:2
@@ -36,7 +38,7 @@ RDEPEND="
 	libcanberra? ( media-libs/libcanberra )
 	libproxy? ( net-libs/libproxy )
 	libnotify? ( x11-libs/libnotify )
-	lua? ( dev-lang/lua:0= )
+	lua? ( ${LUA_DEPS} )
 	perl? ( dev-lang/perl:= )
 	plugin-sysinfo? ( sys-apps/pciutils )
 	python? ( ${PYTHON_DEPS} )
@@ -61,6 +63,7 @@ BDEPEND="
 "
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	use python && python-single-r1_pkg_setup
 	if use theme-manager ; then
 		mono-env_pkg_setup
@@ -82,7 +85,7 @@ src_configure() {
 		-Ddbus-service-use-appid=false
 		-Dwith-checksum="$(usex plugin-checksum true false)"
 		-Dwith-fishlim="$(usex plugin-fishlim true false)"
-		-Dwith-lua="$(usex lua lua false)"
+		-Dwith-lua="$(usex lua ${ELUA} false)"
 		-Dwith-perl="$(usex perl "${EPREFIX}"/usr/bin/perl false)"
 		-Dwith-python="$(usex python "${EPYTHON/.*}" false)"
 		-Dwith-sysinfo="$(usex plugin-sysinfo true false)"
diff --git a/net-irc/pisg/Manifest b/net-irc/pisg/Manifest
index 071099a95880..e91693173271 100644
--- a/net-irc/pisg/Manifest
+++ b/net-irc/pisg/Manifest
@@ -1,3 +1,3 @@
 DIST pisg-0.73.tar.gz 236539 BLAKE2B 148d73419f958f9c0c7ec2db522f7c5c198bd22f7df25064fcf1771d9bbef4177556faae5edb60060a3167c9b8a01e533c48a742fb795c371c680f8bce5114af SHA512 290656fc556090fa8a263eaf123bad8e12b0ac50a2c1eb4619c50faf70fd3ee8afc7a8d97dbc4ff6338dd0fa9f73f7b19c60ca996b6612def95f1c494b3ef91e
-EBUILD pisg-0.73-r1.ebuild 947 BLAKE2B 2e8301d288490af121b389a3c96a45674e0a7a3dd03ebb3dfd4f3f000e7b730c82615e4dce5ec8a66334165d9aab8b5bbc2d94ae589c20af19153db032ff5263 SHA512 586735f10a88ef09ca30384243fc42873614bce12838a6bc3f73bf59f402e27387c9e21283d5319c4cfd94409dabd5cfc7a4c07439bcec05e5e07aebb75b1ee5
+EBUILD pisg-0.73-r1.ebuild 944 BLAKE2B 20b069cd1345cb3379b2d2f2f97b40e7003fa0c9dd31c753a96b4878d79987e0b0a532de2723972045d7110037477eec62cdca3a9861b85dc0c0d812feb115d5 SHA512 f69cd3c303d560c94acd01141f955b4b966039dea6070af06401bae3ad7615553084739cfeb50a62dad131654e4e8b48eeaaae9f99aa098081dde2165aaf7afa
 MISC metadata.xml 241 BLAKE2B 7866f09039b1b4926d7e870b8292039c0ca87323de3966428a9d0846ffee64ed027510b9aad12007e12324956c3ae3fc915f1cf57dd02571e51447d580870165 SHA512 1fb73fbdd72b001e72b07c527a4b50a52fc0dd03645230521f018cf0f26cd3a31fef6d09099a8d5a991278404661e3654331999bb85b59d5fac94e78481d9493
diff --git a/net-irc/pisg/pisg-0.73-r1.ebuild b/net-irc/pisg/pisg-0.73-r1.ebuild
index 54dc6db49cb8..4a1954fff342 100644
--- a/net-irc/pisg/pisg-0.73-r1.ebuild
+++ b/net-irc/pisg/pisg-0.73-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 101a445c46d7..6232dab3be76 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -5,5 +5,5 @@ AUX quasselcore.init-r1 492 BLAKE2B 568e41c649875fc9e334b54f341dc9f95295e37d1c35
 AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
 DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd SHA512 4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c
 EBUILD quassel-0.13.1-r2.ebuild 4701 BLAKE2B 11e47ac3b8346b0fcc7521b642a1422dc3d69a162d9da95a746a9764c735fe18829e2ee481d02078c406773200f0f9b1a174f36fdd24a88e268959fd30f9acc1 SHA512 a02f17fbae75b52f2890ffaf87d282bdc43fd3d0396674db15eb902f68e4fdcf4391ca1fc743d7938f559001dce363be0dc8837357b6a84c1ce5b223ca83c928
-EBUILD quassel-9999.ebuild 4593 BLAKE2B cec8cb464d7f8f6796c136ba1cf80b28411e27e458385c847eae3258f58cafb44e9f27c8a26e0db9f04d2bf11b175e0370ea578d4bc21d9d3708565eda3acdbd SHA512 a047bffb683a604c1095306970e3f753aeea6301340b0cdbf54482823526e3b10492510ba7e6010b957a839d3d2d62c364265ae6cbb5ca89caf82d2ac9f48484
+EBUILD quassel-9999.ebuild 4583 BLAKE2B 59c518587b305ad28b40594af715e2aa54396feb6f596a9273b884b4280bed8152649bc7da6f662a7762d5d01b16d798160e1414d5e5649662d2b18c0bd9863d SHA512 c0de1abaa3fd51e64378c15d425371f9214ebfd0933f4cb64d8dbf4684fbcead6ce19049593ed1b7bbc6d60d6b661d8f0afd6e9e9600ad272c7432aa6bbe2d08
 MISC metadata.xml 1840 BLAKE2B ce192c0c4987d04d874967c26d9febfe2061391921e013ff8d16af93cad58a6d75475f32903f1ff7dc242547f11bd2ff9981c5b0fc24bc0dc3adc434d7d358f1 SHA512 9fe3bb49838a4b5c400f31934d00ddd15704f30137d35d7ea3d85d45679015e5fefa11d726f5a86dadbc2dc68c0ffd37867fb98ee69e7cd0f2d06624d52944e9
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index a8492974412d..68d94a9e3ea2 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://quassel-irc.org/"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server
-snorenotify +ssl syslog urlpreview X"
+snorenotify syslog urlpreview X"
 
 SERVER_DEPEND="
 	acct-group/quassel
@@ -58,9 +58,9 @@ GUI_DEPEND="
 	urlpreview? ( dev-qt/qtwebengine:5[widgets] )
 "
 
-DEPEND="
+RDEPEND="
 	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5[ssl?]
+	dev-qt/qtnetwork:5[ssl]
 	sys-libs/zlib
 	monolithic? (
 		${SERVER_DEPEND}
@@ -71,10 +71,12 @@ DEPEND="
 		X? ( ${GUI_DEPEND} )
 	)
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
 BDEPEND="
 	dev-qt/linguist-tools:5
-	kde-frameworks/extra-cmake-modules
+	kde-frameworks/extra-cmake-modules:5
 "
 
 DOCS=( AUTHORS ChangeLog README.md )
@@ -118,7 +120,7 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
-	if use server ; then
+	if use server; then
 		# needs PAX marking wrt bug#346255
 		pax-mark m "${ED}/usr/bin/quasselcore"
 
@@ -134,7 +136,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if use monolithic && use ssl ; then
+	if use monolithic; then
 		elog "Information on how to enable SSL support for client/core connections"
 		elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support."
 	fi
@@ -157,7 +159,7 @@ pkg_postrm() {
 }
 
 pkg_config() {
-	if use server && use ssl; then
+	if use server; then
 		# generate the pem file only when it does not already exist
 		QUASSEL_DIR=/var/lib/${PN}
 		if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 407ac0c0a846..b498e6cc78a8 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,6 +1,8 @@
+AUX weechat-3.0-cmake_lua_version.patch 272 BLAKE2B 3c88a0aad5d0ad9c5067062039fd147c9356923324089d74ebd5987e6f5a67bc1da785a12b863dffafc8e63af18b52b5ed6aba97cacec105b04f7b70ac0b3e5c SHA512 81a3143acfeb35ccd8e913efa0b881165459049bdbb3e7bf96b41c7f764fe37647349599d3bceadb966ae52f2156cba5170926ba7af7ed667f7664f8adb920aa
 DIST weechat-2.9.tar.xz 2206584 BLAKE2B 8089cd846ca192ec666a50e8071ed57e1c2518b2d5ea98733b8e3fa6c8c684e8ed14253d787b3f9995a8f481a7413444c3ba262dcb6c100283192bcafb502627 SHA512 c4a5723accb417c0496b5427ee58fbf5d3e842e6d79a7988f8680cd605534cfc9d30f6f4844afe45f5223458f28b8deff1284fff2fb5b7d04cb99a81cde4e13e
 DIST weechat-3.0.tar.xz 2215408 BLAKE2B ed43c16af2a9fea101b54714e21d5f28f2b18fed5734c5f6adde857500befd94089f6bd7be5e2ad2738fce4e1bd5b10ebef32d0d46039242efaa2dc7f664eb42 SHA512 d6a68f35dc7363b838af811ff0a0a8d9fff519a4231c66f963e896bdda8653a56608e46333dc866e7dee25c1eafd2f1bf99c443089dde5a268bba637a0dee8ca
 EBUILD weechat-2.9.ebuild 3868 BLAKE2B 7cb10514f4000d737a0748dd1c885deb877813fe4e7953c1547aa1b973e9eeb97c3ceacf0c4e1a5e5de94a762647aec4779badcab7b0ef7d83f30ef46d898cec SHA512 e5b27cf8d34ba432cc5d55e31cea0beb96076964e991efdbd842f20c82fc1667c04d107735e8295865351aaf7e453e3d08492701148736fb64fb9b4c39f19678
+EBUILD weechat-3.0-r100.ebuild 4189 BLAKE2B dd2b47e18560aa368222ff5ced136c3d58f5a0d05e958560095eb004f00fdd509457ce920ebbea9bf4162edc15155d47515814fe97d6236afc8b554ee24cccf6 SHA512 b6ad28286bf87e8081b7dab73a752f16d77b742622da0ac3205332f0e516a11ac3b61e2766ef35ed9ba799948177d85aef0555d537daac97559108f58dff22ea
 EBUILD weechat-3.0.ebuild 4029 BLAKE2B 5ba766edfd551f4dde7d04c923aea4657d7107e3e32a85701c68ec7b81700c6842fd36f6bbf4c1ea629db7759faed1e7ade0181e24f3290cdebc6684d53a7bdb SHA512 9ed9379cebedc21a72e13740d3325175181ae72da664dfd7cecd9a12a082d3d823d9a30dbde9aa8338c19d9d9d15540a8d6c23345a327ca6bd04e715c3777239
-EBUILD weechat-9999.ebuild 4029 BLAKE2B 5ba766edfd551f4dde7d04c923aea4657d7107e3e32a85701c68ec7b81700c6842fd36f6bbf4c1ea629db7759faed1e7ade0181e24f3290cdebc6684d53a7bdb SHA512 9ed9379cebedc21a72e13740d3325175181ae72da664dfd7cecd9a12a082d3d823d9a30dbde9aa8338c19d9d9d15540a8d6c23345a327ca6bd04e715c3777239
+EBUILD weechat-9999.ebuild 4189 BLAKE2B dd2b47e18560aa368222ff5ced136c3d58f5a0d05e958560095eb004f00fdd509457ce920ebbea9bf4162edc15155d47515814fe97d6236afc8b554ee24cccf6 SHA512 b6ad28286bf87e8081b7dab73a752f16d77b742622da0ac3205332f0e516a11ac3b61e2766ef35ed9ba799948177d85aef0555d537daac97559108f58dff22ea
 MISC metadata.xml 988 BLAKE2B 26997114f73adc3dc8758a9241009fe8fd84c9856bbccdc31fc0ad7e8d26b20656c27451cb4475fe60421069e1df43ed5f1bd39cdf493cc47622796f20d79487 SHA512 2463ed39fd434c3dac81c46525907c76a0cdba7d321029cf8b165ee62b003ab1e7153d714b4f71664ffd758572b89db4b0d7c30280f56acd7708668d54a17046
diff --git a/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch b/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch
new file mode 100644
index 000000000000..6ed16efbd064
--- /dev/null
+++ b/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch
@@ -0,0 +1,9 @@
+--- a/cmake/FindLua.cmake
++++ b/cmake/FindLua.cmake
+@@ -35,5 +35,5 @@
+ 
+ find_package(PkgConfig)
+ if(PKG_CONFIG_FOUND)
+-  pkg_search_module(LUA lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua)
++  pkg_search_module(LUA lua)
+ endif()
diff --git a/net-irc/weechat/weechat-3.0-r100.ebuild b/net-irc/weechat/weechat-3.0-r100.ebuild
new file mode 100644
index 000000000000..9612d0567f73
--- /dev/null
+++ b/net-irc/weechat/weechat-3.0-r100.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake lua-single 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 ~arm64 ~ppc ~ppc64 ~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 test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( nls )
+"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	net-libs/gnutls:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	net-misc/curl[ssl]
+	charset? ( virtual/libiconv )
+	guile? ( >=dev-scheme/guile-2.0 )
+	lua? ( ${LUA_DEPS} )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	php? ( >=dev-lang/php-7.0:*[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
+	spell? ( app-text/aspell )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+"
+
+DEPEND="${RDEPEND}
+	test? ( dev-util/cpputest )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
+	man? ( >=dev-ruby/asciidoctor-1.5.4 )
+	nls? ( >=sys-devel/gettext-0.15 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch
+)
+
+DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
+
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_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_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_src_configure
+}
+
+src_test() {
+	if $(locale -a | grep -iq "en_US\.utf.*8"); then
+		cmake_src_test -V
+	else
+		eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
+		die "required locale missing"
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index b33c433ae6d2..9612d0567f73 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=7
 
+LUA_COMPAT=( lua5-{1..4} )
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit cmake python-single-r1 xdg-utils
+inherit cmake lua-single python-single-r1 xdg-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
@@ -29,6 +30,7 @@ LANGS=" cs de es fr it ja pl ru"
 IUSE="doc man nls test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
 
 REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( nls )
 "
@@ -41,7 +43,7 @@ RDEPEND="
 	net-misc/curl[ssl]
 	charset? ( virtual/libiconv )
 	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( dev-lang/lua:0 )
+	lua? ( ${LUA_DEPS} )
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
 	php? ( >=dev-lang/php-7.0:*[embed] )
@@ -62,11 +64,16 @@ BDEPEND="
 	nls? ( >=sys-devel/gettext-0.15 )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch
+)
+
 DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
 
 RESTRICT="!test? ( test )"
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	use python && python-single-r1_pkg_setup
 }