From 441d1370330332b7d78f238d2f5e13f7aed5e4e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 Dec 2020 23:06:25 +0000 Subject: gentoo christmass resync : 25.12.2020 --- net-irc/hexchat/Manifest | 4 +- .../hexchat/files/hexchat-2.14.3-python38.patch | 28 +++++ net-irc/hexchat/hexchat-2.14.3-r100.ebuild | 139 +++++++++++++++++++++ net-irc/hexchat/hexchat-9999.ebuild | 13 +- 4 files changed, 178 insertions(+), 6 deletions(-) create mode 100644 net-irc/hexchat/files/hexchat-2.14.3-python38.patch create mode 100644 net-irc/hexchat/hexchat-2.14.3-r100.ebuild (limited to 'net-irc/hexchat') 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 +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)" -- cgit v1.2.3