From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- net-irc/hexchat/Manifest | 9 +- .../hexchat/files/hexchat-2.14.3-python38.patch | 28 ----- net-irc/hexchat/hexchat-2.14.3-r101.ebuild | 139 --------------------- net-irc/hexchat/hexchat-2.16.1.ebuild | 2 +- net-irc/hexchat/metadata.xml | 1 - 5 files changed, 3 insertions(+), 176 deletions(-) delete mode 100644 net-irc/hexchat/files/hexchat-2.14.3-python38.patch delete mode 100644 net-irc/hexchat/hexchat-2.14.3-r101.ebuild (limited to 'net-irc/hexchat') diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest index 3d62de421a05..a000d5a9cabb 100644 --- a/net-irc/hexchat/Manifest +++ b/net-irc/hexchat/Manifest @@ -1,11 +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 DIST hexchat-2.16.0.tar.xz 1348320 BLAKE2B d5c6da74152e7ca08b629ee86cc45acb8232fbdad3d508cf56aba0c09d558b77644b704b5489e5f08a70133813f37c12e45b1529162e41b62acc9f61bca0b108 SHA512 4802f6efe0883f48d3d56ee949be1fc224b76a3c76956dcba3f913679e91424ba53c5c0d68bb4e0e790b16a08689111098958ead4c83c35cddf39855fe07c207 DIST hexchat-2.16.1.tar.xz 1349536 BLAKE2B 6e1d9f7c36affc94356e0124ea445f019d8f00b643896ec004af17059befadfcd8fc1b75ef9fba277542dcf8593e8e4683a709a4c4cbaaaf4f3122d8488dc6ce SHA512 9e6baa30ec8c3ce4fb56e2c82625da63295040eaf93a542aec8a4a18a6a3c95d69d1d4ffabc952bcdcd7b754afef234b348f296143991fafd0550342db95ce0e -DIST hexchat-add-libera-chat.patch 696 BLAKE2B cd5f0736abd7895d017e835335a6ff9a0f6301cba7e7b8c2a4e9da7047885aac2f8b7b25b0723966bd103118c99d833d3e99481865bf20d202b0f95c0a9131bb SHA512 e3cc7df3f114a2374c1653c4ab7262dad87191f74ca759c41beecd731472478e8bdc929b0a13475a1248ed045ee1faf93cd80a225b6ed670f449d4495d4ab2ae -DIST hexchat-default-network.patch 1423 BLAKE2B b11982d50abb4fb7d8aab4758195cbfea1691cd7c6487ca56f995e449ff0445e2427a68064c0d8ee4b4b4e7764e438bfd68bb5402a266624cb6cfb93fbfdb30b SHA512 2691786d360278b4334e9129912ca0abde7b98f0d72f5e530b34e109eaf624d8e7280e137490dab218bacfb5bed952b2d7827640777ad73da5585517de308f42 -EBUILD hexchat-2.14.3-r101.ebuild 3675 BLAKE2B 53d3fdffc0355e944a99479907390e6c9170f512ef8036366301fa9b5a2893c9ac953e6c322e08ab2c64a68718d8e4b101d4d6920c5712c289922c60af22dcf0 SHA512 c10dfd87b5668e713b6d108e9d36ed6dc244c6a69389bf6e294b1456b14a2375edd250f2e075884116e9b055935c9fd336760afb5e25845385794f8462d63bc9 EBUILD hexchat-2.16.0.ebuild 3061 BLAKE2B aacb1bf2dc9c6bc074c6fdcee811826345ed8698d87054c1c423bf3e41702121ffee87a374f27f7490c79d0430d82eb1bb9664f752db41d37d03680b96fd2ab1 SHA512 fb43071b567c2871e1f7c5a97734b08bb3fe948c596af4dceb300279c6eb7de5ffb5e027533f3adbb5af483c69f892c77debb5cb4fb38b24fffeb9b26da6bc24 -EBUILD hexchat-2.16.1.ebuild 3136 BLAKE2B 0ae9632e82b4e6a459abdb503b54df802855175e50319333b332184bd1e6cb3d24882411db79b2a2cc78a34298dca38832657dc8a85ca5b933c293420eaaf3dd SHA512 9f1c89249fd3cf0eb7a7f67b3ce8c824fb9afcb6c8cd9ceed3edf58e9e67a5ec82d31e871ab126e76f96dfc781bb5f4471a80c1c9c888cda5f657fecde0531eb +EBUILD hexchat-2.16.1.ebuild 3130 BLAKE2B 7bb6d15fcf3b2cc10dcf89d0b713251b245bdc7343fe41ad540902faf6344754b5fc53afd4279041b44e58a8b8b1ec2052d9679c12c5304313633c472c65e037 SHA512 fe359fbb33f0d6c696f5f7eb579b12a2e3f6d60f8cf75cbd81a15df477a1fec9bc0785915927cd7a5375a614dc409f3ff98ea223644fc5e35134de74a63e619c EBUILD hexchat-9999.ebuild 3136 BLAKE2B 0ae9632e82b4e6a459abdb503b54df802855175e50319333b332184bd1e6cb3d24882411db79b2a2cc78a34298dca38832657dc8a85ca5b933c293420eaaf3dd SHA512 9f1c89249fd3cf0eb7a7f67b3ce8c824fb9afcb6c8cd9ceed3edf58e9e67a5ec82d31e871ab126e76f96dfc781bb5f4471a80c1c9c888cda5f657fecde0531eb -MISC metadata.xml 1043 BLAKE2B dfeaaac78bd640c7298de4683f65b096233a92a2ea47f66fb94ac0dcc02087715299aa816deb51824de943c4832c8b3b37fdb493aea467118caa9fa52f4e53db SHA512 f68fed2523456624edad9c44f00fe16940cc10d44c97e523e5b159a7d31b0b74cf2dcc3c7e3eafff0c97c1cb2ce3aec8213b004ffc16a112b60320fbad0e192c +MISC metadata.xml 990 BLAKE2B 29353a2efa001a7cf04327064f9fa0908052c4bdebb9047a92a7d9578482a8783f320ca2e0482db508a6663e23ec7bfdc6ac7ae08b5464faca357cc77c932a5b SHA512 3218fdcb5dc9e4d45181606b27ca3bb24814ad77701c819edc4875751018e6e29be5eebc379d676ab6b2bc86e2c755f049da75aeb7217b36e857aa3b5befb4a4 diff --git a/net-irc/hexchat/files/hexchat-2.14.3-python38.patch b/net-irc/hexchat/files/hexchat-2.14.3-python38.patch deleted file mode 100644 index fdfc74f94344..000000000000 --- a/net-irc/hexchat/files/hexchat-2.14.3-python38.patch +++ /dev/null @@ -1,28 +0,0 @@ -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-r101.ebuild b/net-irc/hexchat/hexchat-2.14.3-r101.ebuild deleted file mode 100644 index 1cd245462e32..000000000000 --- a/net-irc/hexchat/hexchat-2.14.3-r101.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{7..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 - https://github.com/hexchat/hexchat/commit/a25f2381689d2c2279a0e43b33f6c0ec8305a096.patch -> ${PN}-add-libera-chat.patch - https://github.com/hexchat/hexchat/commit/d3545f37cd5f551ed8bc0ab7b20e5c8140adc0a6.patch -> ${PN}-default-network.patch" - 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 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? ( dev-libs/openssl: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 - "${DISTDIR}/${PN}-add-libera-chat.patch" - "${DISTDIR}/${PN}-default-network.patch" -) - -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 "${ED}" -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-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-2.16.1.ebuild b/net-irc/hexchat/hexchat-2.16.1.ebuild index 06de44ed5d3d..d8ed2d709d1e 100644 --- a/net-irc/hexchat/hexchat-2.16.1.ebuild +++ b/net-irc/hexchat/hexchat-2.16.1.ebuild @@ -18,7 +18,7 @@ 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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux" fi LICENSE="GPL-2 plugin-fishlim? ( MIT )" diff --git a/net-irc/hexchat/metadata.xml b/net-irc/hexchat/metadata.xml index 37c5ea55f06c..4151d1550643 100644 --- a/net-irc/hexchat/metadata.xml +++ b/net-irc/hexchat/metadata.xml @@ -8,7 +8,6 @@ Enable sound event support using media-libs/libcanberra - Enable proxy support. Build Checksum plugin (needs plugins) Build FiSHLiM plugin (needs plugins -- cgit v1.2.3