[gentoo-commits] repo/gentoo:master commit in: profiles/, net-irc/hexchat/

[gentoo-commits] repo/gentoo:master commit in: profiles/, net-irc/hexchat/

[Marek Szuba]

commit:     05e7700d3d24a15e9cfb66174a3d1a04b3805c3b
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 21:47:08 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 21:50:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05e7700d

net-irc/hexchat: migrate to lua-single.eclass

Both the latest release and the live ebuild.

Uses Meson + allows the user to directly specify the name of the pkgconfig
module to use - in short, pretty much as easy as it gets. Builds and
installs fine even with 5.4, does officially support LuaJIT.

Closes: https://bugs.gentoo.org/752810
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../{hexchat-9999.ebuild => hexchat-2.14.3-r100.ebuild}     | 13 ++++++++-----
 net-irc/hexchat/hexchat-9999.ebuild                         | 13 ++++++++-----
 profiles/package.mask                                       |  1 +
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-2.14.3-r100.ebuild
similarity index 89%
copy from net-irc/hexchat/hexchat-9999.ebuild
copy to net-irc/hexchat/hexchat-2.14.3-r100.ebuild
index 0a64b4be026..850dd84f2ac 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-2.14.3-r100.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/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
index 0a64b4be026..850dd84f2ac 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/profiles/package.mask b/profiles/package.mask
index dd503e66e96..c73d7120655 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -537,6 +537,7 @@ kde-apps/kdebase-meta:5
 >=net-analyzer/suricata-6.0.1-r100
 >=net-im/prosody-0.11.7-r100
 >=net-im/swift-4.0.2-r100
+>=net-irc/hexchat-2.14.3-r100
 >=net-irc/weechat-3.0-r100
 >=net-libs/axtls-2.1.5-r100
 >=net-misc/asterisk-16.14.0-r100