6 files changed, 0 insertions, 755 deletions
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index ac320c313dc9..a09b66c24a74 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -1,4 +1 @@
-DIST hexchat-2.12.4.tar.xz 1451468 BLAKE2B 91db1486b421f9707f9dddfe8aba812aa283d5e3cc3c12815faa7e515d00b803bde0bbf30e1ca5c0b69fe954dd30a6f69e5094dabe1dc641ae4f0742ad1965b4 SHA512 48d30c23973a19efc7a8e6d00a3e9675e8556a6fa9da046175b3d87bdab0bebbc6caf58970d654e270421d0d49c2cd9f498b425b7e3a49dd81670dc4825fca40
-DIST hexchat-2.14.1.tar.xz 1281872 BLAKE2B e450fe7391b8b51a7aebeaeacdb5f1fb6c00184f668813920d98ed6a00dd4c0308863657467b7608987feb0739ac85256d93ca9ef8a220e6c7a5545d8386f25d SHA512 2728d6f084530c1a65ddb7960db6574fef2bca77e726a2155c8b5724256f37b47421e990b1bf7c9fad7987027b2f6de4534a8df28a98cb3d28da726e16ac32dd
-DIST hexchat-2.14.2.tar.xz 1288732 BLAKE2B 93001bf48516e0326c4df16945ff8a157e7a410ca202d1231657c9fb439ddd4a7515aacea0b0fff92365d477aa24c90d37aa61466495354dcdf5578d7accfa65 SHA512 488799700e439a137ad469f618cb1abf75d1f1ebf223c750d658004ef7b2c728543a5a9ae4e6317d6447428dc59e12dded619346a5d8bba12c92dab653512fca
 DIST hexchat-2.14.3.tar.xz 1292072 BLAKE2B 22bc8a0857b3ec26452843dd85c046cde055e719ce7dc23e4ec5ae33eb16251379ed84856c1812dc855a1e8d5d422c01e9352e2259f075a538226e1fcd79edd7 SHA512 c265921f2cb02c5d273bcdbb20a44a5c9f38b0f8cbba4fd56b177b676fc5d1dfd05bf80fcfa3706c7981f712f2f6c9aaaf80bccf3be0f6d96068dd393f3a7cb5
diff --git a/net-irc/hexchat/files/hexchat-2.12.4-configure.ac.patch b/net-irc/hexchat/files/hexchat-2.12.4-configure.ac.patch
deleted file mode 100644
index c4288d2761d2..000000000000
--- a/net-irc/hexchat/files/hexchat-2.12.4-configure.ac.patch
+++ /dev/null
@@ -1,319 +0,0 @@
---- hexchat-2.12.4/data/pkgconfig/Makefile.am
-+++ hexchat-2.12.4/data/pkgconfig/Makefile.am
-@@ -1,4 +1,7 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- pkgcfgdir = $(pkgconfigdir)
- pkgcfg_DATA = hexchat-plugin.pc
- 
- EXTRA_DIST = hexchat-plugin.pc.in
---- hexchat-2.12.4/data/Makefile.am
-+++ hexchat-2.12.4/data/Makefile.am
-@@ -1,5 +1,8 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- SUBDIRS =
- 
- if DO_PLUGIN
- SUBDIRS += pkgconfig
- endif
---- hexchat-2.12.4/data/misc/Makefile.am
-+++ hexchat-2.12.4/data/misc/Makefile.am
-@@ -1,5 +1,7 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
- 
- appdatadir = $(datadir)/appdata
- appdata_in_files =
- 
- if DO_GTK
---- hexchat-2.12.4/data/icons/Makefile.am
-+++ hexchat-2.12.4/data/icons/Makefile.am
-@@ -1,5 +1,8 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- icon_DATA = hexchat.png
- icondir = $(datadir)/icons/hicolor/48x48/apps
- 
- hicolor_DATA = hexchat.svg
- hicolordir = $(datadir)/icons/hicolor/scalable/apps
---- hexchat-2.12.4/data/man/Makefile.am
-+++ hexchat-2.12.4/data/man/Makefile.am
-@@ -1,3 +1,6 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- man_MANS = hexchat.1
- 
- EXTRA_DIST = hexchat.1.in
---- hexchat-2.12.4/Makefile.am
-+++ hexchat-2.12.4/Makefile.am
-@@ -1,6 +1,8 @@
- ## Process this file with automake to produce Makefile.in
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
- 
- ACLOCAL_AMFLAGS = -I m4
- 
- SUBDIRS = po src plugins data
- 
---- hexchat-2.12.4/configure.ac
-+++ hexchat-2.12.4/configure.ac
-@@ -621,23 +621,23 @@ AX_APPEND_COMPILE_FLAGS([\
- 	-Werror=declaration-after-statement \
- 	-Werror=missing-include-dirs \
- 	-Werror=date-time \
- 	-Werror=implicit-function-declaration \
- 	-Werror=pointer-arith \
--])
-+], hexchat_def_CFLAGS)
- 
- AS_IF([test "$stack_protector" = "yes"], [
- 	AX_APPEND_COMPILE_FLAGS([ \
- 		-fstack-protector-strong \
--	])
-+	], [hexchat_def_CFLAGS])
- ])
- 
- AX_APPEND_LINK_FLAGS([ \
- 	-pie \
- 	-Wl,-z,relro \
- 	-Wl,-z,now \
--])
-+], [hexchat_def_LDFLAGS])
- 
- dnl *********************************************************************
- dnl ** FUNCTIONS/LIBS/CFLAGS ********************************************
- dnl *********************************************************************
- 
-@@ -687,10 +687,12 @@ dnl freebsd needs this
- LIBS="$LIBS $INTLLIBS"
- 
- GUI_LIBS="$GUI_LIBS $COMMON_LIBS"
- 
- dnl make these visible to all Makefiles
-+AC_SUBST(hexchat_def_CFLAGS)
-+AC_SUBST(hexchat_def_LDFLAGS)
- AC_SUBST(GUI_LIBS)
- AC_SUBST(GUI_CFLAGS)
- AC_SUBST(COMMON_LIBS)
- AC_SUBST(COMMON_CFLAGS)
- AC_SUBST(PERL_CFLAGS)
---- hexchat-2.12.4/src/common/Makefile.am
-+++ hexchat-2.12.4/src/common/Makefile.am
-@@ -1,6 +1,8 @@
- ## Process this file with automake to produce Makefile.in
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
- 
- include $(top_srcdir)/m4/clang-analyze.am
- 
- noinst_LIBRARIES = libhexchatcommon.a
- 
-@@ -62,11 +64,11 @@ noinst_PROGRAMS = make-te
- 
- libhexchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c hexchat.c \
- 	history.c ignore.c inbound.c marshal.c modes.c network.c notify.c \
- 	outbound.c plugin.c plugin-identd.c plugin-timer.c proto-irc.c server.c servlist.c \
- 	$(ssl_c) text.c tree.c url.c userlist.c util.c
--libhexchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS)
-+libhexchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS) $(hexchat_def_CFLAGS)
- 
- textenums.h: textevents.h
- 
- textevents.h: $(srcdir)/textevents.in make-te
- 	$(AM_V_GEN) ./make-te < $< > $@ 2> textenums.h
---- hexchat-2.12.4/src/common/dbus/Makefile.am
-+++ hexchat-2.12.4/src/common/dbus/Makefile.am
-@@ -1,5 +1,8 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- noinst_LIBRARIES = libhexchatdbus.a
- libhexchatdbus_a_SOURCES =			\
- 	dbus-plugin.c				\
- 	dbus-plugin.h				\
- 	dbus-client.c				\
---- hexchat-2.12.4/src/Makefile.am
-+++ hexchat-2.12.4/src/Makefile.am
-@@ -1,6 +1,8 @@
- ## Process this file with automake to produce Makefile.in
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
- 
- EXTRA_DIST = version-script
- 
- if DO_TEXT
- text_fe = fe-text
---- hexchat-2.12.4/src/fe-text/Makefile.am
-+++ hexchat-2.12.4/src/fe-text/Makefile.am
-@@ -1,5 +1,8 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- localedir = $(datadir)/locale
- 
- bin_PROGRAMS = hexchat-text
- 
- AM_CPPFLAGS = $(COMMON_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
---- hexchat-2.12.4/src/fe-gtk/Makefile.am
-+++ hexchat-2.12.4/src/fe-gtk/Makefile.am
-@@ -1,5 +1,7 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
- 
- include $(top_srcdir)/m4/clang-analyze.am
- 
- localedir = $(datadir)/locale
- 
-@@ -31,11 +33,11 @@ endif
- if USE_LIBNOTIFY
- notify_c = notifications/notification-libnotify.c
- else
- if HAVE_GTK_MAC
- notify_c = notifications/notification-osx.m
--hexchat_LDFLAGS = -framework Foundation
-+hexchat_LDFLAGS = -framework Foundation @hexchat_def_LDFLAGS@
- else
- notify_c = notifications/notification-dummy.c
- endif
- endif
- 
---- hexchat-2.12.4/src/htm/Makefile.am
-+++ hexchat-2.12.4/src/htm/Makefile.am
-@@ -1,5 +1,8 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- theme_SCRIPTS = thememan.exe thememan
- themedir = $(bindir)
- 
- mdtool_verbose = $(mdtool_verbose_$(V))
- mdtool_verbose_ = $(mdtool_verbose_$(AM_DEFAULT_VERBOSITY))
---- hexchat-2.12.4/plugins/fishlim/Makefile.am
-+++ hexchat-2.12.4/plugins/fishlim/Makefile.am
-@@ -1,10 +1,13 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- EXTRA_DIST = LICENSE fish.h irc.h keystore.h plugin_hexchat.h dh1080.h
- 
- libdir = $(hexchatlibdir)
- 
- lib_LTLIBRARIES = fishlim.la
- fishlim_la_SOURCES = fish.c irc.c keystore.c plugin_hexchat.c dh1080.c
--fishlim_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
-+fishlim_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module @hexchat_def_LDFLAGS@
- fishlim_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
- fishlim_la_CPPFLAGS = -I$(top_srcdir)/src/common
--fishlim_la_CFLAGS = $(GLIB_CFLAGS) $(OPENSSL_CFLAGS)
-+fishlim_la_CFLAGS = $(GLIB_CFLAGS) $(OPENSSL_CFLAGS) @hexchat_def_CFLAGS@
---- hexchat-2.12.4/plugins/Makefile.am
-+++ hexchat-2.12.4/plugins/Makefile.am
-@@ -1,5 +1,8 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- if DO_LUA
- lua = lua
- endif
- 
- if DO_PYTHON
---- hexchat-2.12.4/plugins/lua/Makefile.am
-+++ hexchat-2.12.4/plugins/lua/Makefile.am
-@@ -1,9 +1,12 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- libdir = $(hexchatlibdir)
- 
- lib_LTLIBRARIES = lua.la
- lua_la_SOURCES = lua.c
--lua_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
-+lua_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module @hexchat_def_LDFLAGS@
- lua_la_LIBADD = $(LUA_LIBS) $(GLIB_LIBS)
- lua_la_CPPFLAGS = -I$(top_srcdir)/src/common
--lua_la_CFLAGS = $(GLIB_CFLAGS) $(LUA_CFLAGS)
-+lua_la_CFLAGS = $(GLIB_CFLAGS) $(LUA_CFLAGS) @hexchat_def_CFLAGS@
- 
---- hexchat-2.12.4/plugins/sysinfo/Makefile.am
-+++ hexchat-2.12.4/plugins/sysinfo/Makefile.am
-@@ -1,5 +1,8 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- libdir = $(hexchatlibdir)
- 
- sources = sysinfo.c format.c shared/df.c
- 
- if PLATFORM_OSX
-@@ -10,8 +13,8 @@ endif
- 
- EXTRA_DIST = osx unix win32 shared format.h sysinfo.h sysinfo-backend.h
- 
- lib_LTLIBRARIES = sysinfo.la
- sysinfo_la_SOURCES = $(sources)
--sysinfo_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
-+sysinfo_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module @hexchat_def_LDFLAGS@
- sysinfo_la_LIBADD = $(LIBPCI_LIBS) $(GLIB_LIBS)
- AM_CPPFLAGS = -I$(top_srcdir)/src/common -I$(srcdir)/shared $(LIBPCI_CFLAGS) $(GLIB_CFLAGS)
---- hexchat-2.12.4/plugins/python/Makefile.am
-+++ hexchat-2.12.4/plugins/python/Makefile.am
-@@ -1,9 +1,12 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- libdir = $(hexchatlibdir)
- 
- lib_LTLIBRARIES = python.la
- python_la_SOURCES = python.c
- python_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
--python_la_LIBADD = $(PYTHON_LIBS) $(GLIB_LIBS)
-+python_la_LIBADD = $(PYTHON_LIBS) $(GLIB_LIBS) @hexchat_def_LDFLAGS@
- python_la_CPPFLAGS = -I$(top_srcdir)/src/common $(PYTHON_CPPFLAGS)
--python_la_CFLAGS = $(GLIB_CFLAGS)
-+python_la_CFLAGS = $(GLIB_CFLAGS) @hexchat_def_CFLAGS@
- 
---- hexchat-2.12.4/plugins/checksum/Makefile.am
-+++ hexchat-2.12.4/plugins/checksum/Makefile.am
-@@ -1,8 +1,11 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- libdir = $(hexchatlibdir)
- 
- lib_LTLIBRARIES = checksum.la
- checksum_la_SOURCES = checksum.c
--checksum_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
-+checksum_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module @hexchat_def_LDFLAGS@
- checksum_la_LIBADD = $(GLIB_LIBS)
- checksum_la_CPPFLAGS = -I$(top_srcdir)/src/common
--checksum_la_CFLAGS = $(GLIB_CFLAGS)
-+checksum_la_CFLAGS = $(GLIB_CFLAGS) @hexchat_def_CFLAGS@
---- hexchat-2.12.4/plugins/perl/Makefile.am
-+++ hexchat-2.12.4/plugins/perl/Makefile.am
-@@ -1,17 +1,19 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
- 
- EXTRA_DIST=generate_header lib/HexChat.pm lib/Xchat.pm lib/HexChat/Embed.pm lib/HexChat/List/Network.pm \
- 	lib/HexChat/List/Network/Entry.pm lib/HexChat/List/Network/AutoJoin.pm lib/IRC.pm
- 
- libdir = $(hexchatlibdir)
- 
- lib_LTLIBRARIES = perl.la
- perl_la_SOURCES = perl.c
--perl_la_LDFLAGS = $(PERL_LDFLAGS) $(PLUGIN_LDFLAGS) -module
-+perl_la_LDFLAGS = $(PERL_LDFLAGS) $(PLUGIN_LDFLAGS) -module @hexchat_def_LDFLAGS@
- perl_la_LIBADD = $(GLIB_LIBS)
- perl_la_CPPFLAGS = -I$(top_srcdir)/src/common
--perl_la_CFLAGS = $(PERL_CFLAGS) $(GLIB_CFLAGS)
-+perl_la_CFLAGS = $(PERL_CFLAGS) $(GLIB_CFLAGS) @hexchat_def_CFLAGS@
- 
- BUILT_SOURCES = hexchat.pm.h irc.pm.h
- CLEANFILES = $(BUILT_SOURCES)
- 
- hexchat.pm.h irc.pm.h: lib/HexChat.pm lib/Xchat.pm lib/HexChat/Embed.pm \
diff --git a/net-irc/hexchat/files/hexchat-2.12.4-libressl.patch b/net-irc/hexchat/files/hexchat-2.12.4-libressl.patch
deleted file mode 100644
index 3b3adc09dd55..000000000000
--- a/net-irc/hexchat/files/hexchat-2.12.4-libressl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# diff -pU5 hexchat-2.12.4/src/common/ssl.c.old hexchat-2.12.4/src/common/ssl.c
---- hexchat-2.12.4/src/common/ssl.c
-+++ hexchat-2.12.4/src/common/ssl.c
-@@ -174,11 +174,11 @@ _SSL_get_cert_info (struct cert_info *ce
- 	key = X509_get_X509_PUBKEY(peer_cert);
- 	if (!X509_PUBKEY_get0_param(NULL, NULL, 0, &algor, key))
- 		return 1;
- 
- 	alg = OBJ_obj2nid (algor->algorithm);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
- 	sign_alg = OBJ_obj2nid (peer_cert->sig_alg->algorithm);
- #else
- 	sign_alg = X509_get_signature_nid (peer_cert);
- #endif
- 	ASN1_TIME_snprintf (notBefore, sizeof (notBefore),
-@@ -304,11 +304,11 @@ _SSL_socket (SSL_CTX *ctx, int sd)
- 		/* FATAL */
- 		__SSL_critical_error ("SSL_new");
- 
- 	SSL_set_fd (ssl, sd);
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
- 	method = ctx->method;
- #else
- 	method = SSL_CTX_get_ssl_method (ctx);
- #endif
- 	if (method == SSLv23_client_method())
diff --git a/net-irc/hexchat/hexchat-2.12.4-r2.ebuild b/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
deleted file mode 100644
index 320995e2d59a..000000000000
--- a/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit autotools fdo-mime flag-o-matic gnome2-utils python-single-r1
-
-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 ~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 nls perl plugin-checksum plugin-fishlim plugin-sysinfo python spell ssl"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="dev-libs/glib:2
-	dbus? ( sys-apps/dbus )
-	gtk? ( x11-libs/gtk+:2 )
-	libcanberra? ( media-libs/libcanberra )
-	libproxy? ( net-libs/libproxy )
-	libnotify? ( x11-libs/libnotify )
-	lua? ( dev-lang/lua:= )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	plugin-sysinfo? ( sys-apps/pciutils )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/iso-codes )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	spell? ( app-text/enchant:0 )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/autoconf-archive"
-
-PATCHES=(
-	"${FILESDIR}/hexchat-2.12.4-configure.ac.patch"
-	"${FILESDIR}/hexchat-2.12.4-libressl.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	append-cflags \
-		$(test-flags-CC -Wno-error=format-security) \
-		$(test-flags-CC -Wno-error=init-self) \
-		$(test-flags-CC -Wno-error=declaration-after-statement) \
-		$(test-flags-CC -Wno-error=missing-include-dirs) \
-		$(test-flags-CC -Wno-error=date-time) \
-		$(test-flags-CC -Wno-error=implicit-function-declaration) \
-		$(test-flags-CC -Wno-error=pointer-arith)
-
-	econf \
-		--enable-plugin \
-		$(use_enable nls) \
-		$(use_enable ssl openssl) \
-		$(use_enable gtk gtkfe) \
-		$(use_enable !gtk textfe) \
-		$(use_enable python python "${EPYTHON}") \
-		$(use_enable perl) \
-		$(use_enable plugin-checksum checksum) \
-		$(use_enable plugin-fishlim fishlim) \
-		$(use_enable plugin-sysinfo sysinfo) \
-		$(use_enable dbus) \
-		$(use_enable lua) \
-		$(use_enable libnotify) \
-		$(use_enable libcanberra) \
-		$(use_enable libproxy) \
-		$(use_enable spell isocodes) \
-		$(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		UPDATE_ICON_CACHE=true \
-		UPDATE_MIME_DATABASE=true \
-		UPDATE_DESKTOP_DATABASE=true \
-		install
-	dodoc readme.md
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	if use gtk ; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gtk ; then
-		gnome2_icon_cache_update
-	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
-
-	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
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/net-irc/hexchat/hexchat-2.14.1.ebuild b/net-irc/hexchat/hexchat-2.14.1.ebuild
deleted file mode 100644
index fff912b65a12..000000000000
--- a/net-irc/hexchat/hexchat-2.14.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit gnome2-utils meson mono-env python-single-r1 xdg-utils
-
-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 ~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} )"
-
-COMMON_DEPEND="
-	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? ( dev-lang/lua:= )
-	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]
-		)
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/xz-utils
-	app-text/iso-codes
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-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 lua false)"
-		-Dwith-perl="$(usex perl true false)"
-		-Dwith-python="$(usex python "${EPYTHON/.*}" false)"
-		-Dwith-sysinfo="$(usex plugin-sysinfo true false)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	dodoc readme.md
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	if use gtk ; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gtk ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	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
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/net-irc/hexchat/hexchat-2.14.2.ebuild b/net-irc/hexchat/hexchat-2.14.2.ebuild
deleted file mode 100644
index 468d7e687778..000000000000
--- a/net-irc/hexchat/hexchat-2.14.2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit gnome2-utils meson mono-env python-single-r1 xdg-utils
-
-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 ~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} )"
-
-COMMON_DEPEND="
-	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? ( dev-lang/lua:= )
-	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]
-		)
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/glib-utils
-	app-arch/xz-utils
-	app-text/iso-codes
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-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 lua 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
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gtk ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	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
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}