summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-irc')
-rw-r--r--net-irc/anope/Manifest1
-rw-r--r--net-irc/anope/anope-2.0.9.ebuild152
-rw-r--r--net-irc/ii/ii-1.8.ebuild2
-rw-r--r--net-irc/irc-server/Manifest1
-rw-r--r--net-irc/irc-server/files/2.10.3_p3-gentoo.patch11
-rw-r--r--net-irc/irc-server/files/ircd.confd10
-rw-r--r--net-irc/irc-server/files/ircd.rc30
-rw-r--r--net-irc/irc-server/irc-server-2.11.1_p1-r4.ebuild110
-rw-r--r--net-irc/irc-server/metadata.xml5
-rw-r--r--net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch38
-rw-r--r--net-irc/irssi/irssi-1.2.2-r1.ebuild67
-rw-r--r--net-irc/konversation/Manifest1
-rw-r--r--net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch347
-rw-r--r--net-irc/konversation/konversation-1.7.5-r2.ebuild3
-rw-r--r--net-irc/konversation/konversation-1.7.7.ebuild81
-rw-r--r--net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild10
-rw-r--r--net-irc/kvirc/kvirc-9999.ebuild10
-rw-r--r--net-irc/nebula/Manifest1
-rw-r--r--net-irc/nebula/metadata.xml17
-rw-r--r--net-irc/nebula/nebula-0.5.ebuild18
-rw-r--r--net-irc/ptlink-ircd/Manifest1
-rw-r--r--net-irc/ptlink-ircd/files/ptlink-ircd.confd5
-rw-r--r--net-irc/ptlink-ircd/files/ptlink-ircd.initd23
-rw-r--r--net-irc/ptlink-ircd/metadata.xml5
-rw-r--r--net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r3.ebuild94
-rw-r--r--net-irc/ptlink-opm/Manifest1
-rw-r--r--net-irc/ptlink-opm/files/ptlink-opm-1.3.1-fno-common.patch17
-rw-r--r--net-irc/ptlink-opm/files/ptlink-opm.conf.d5
-rw-r--r--net-irc/ptlink-opm/files/ptlink-opm.init.d21
-rw-r--r--net-irc/ptlink-opm/metadata.xml5
-rw-r--r--net-irc/ptlink-opm/ptlink-opm-1.3.1-r1.ebuild48
-rw-r--r--net-irc/ptlink-opm/ptlink-opm-1.3.1-r2.ebuild48
-rw-r--r--net-irc/quasselgrep/Manifest2
-rw-r--r--net-irc/quasselgrep/metadata.xml9
-rw-r--r--net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild (renamed from net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild)17
-rw-r--r--net-irc/unrealircd/Manifest1
-rw-r--r--net-irc/unrealircd/unrealircd-5.0.7-r1.ebuild173
-rw-r--r--net-irc/unrealircd/unrealircd-5.0.7.ebuild173
-rw-r--r--net-irc/xaric/Manifest1
-rw-r--r--net-irc/xaric/files/xaric-0.13.6-tinfo.patch16
-rw-r--r--net-irc/xaric/metadata.xml5
-rw-r--r--net-irc/xaric/xaric-0.13.6.ebuild29
-rw-r--r--net-irc/znc-palaver/znc-palaver-1.2.1.ebuild2
43 files changed, 1060 insertions, 556 deletions
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index 335593c6ec61..1e406ccf6b6b 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -1 +1,2 @@
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
diff --git a/net-irc/anope/anope-2.0.9.ebuild b/net-irc/anope/anope-2.0.9.ebuild
new file mode 100644
index 000000000000..d7c7c0caf699
--- /dev/null
+++ b/net-irc/anope/anope-2.0.9.ebuild
@@ -0,0 +1,152 @@
+# 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/archive/${PV}.tar.gz -> ${P}.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"
+)
+
+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/ii/ii-1.8.ebuild b/net-irc/ii/ii-1.8.ebuild
index 77abe790e335..2bb1b227445e 100644
--- a/net-irc/ii/ii-1.8.ebuild
+++ b/net-irc/ii/ii-1.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 arm ~ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
src_prepare() {
default
diff --git a/net-irc/irc-server/Manifest b/net-irc/irc-server/Manifest
deleted file mode 100644
index 5523a820b826..000000000000
--- a/net-irc/irc-server/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST irc2.11.1p1.tgz 770458 BLAKE2B a70b2123bfd82c66c5b699985e4b553b3601d129849a76ca100b61933c1ef53b31dc76fe2d8c91fb1e7403a31162223b4092a7d454f62a777eb147e4b4ca1458 SHA512 cc398ddd0129a044bb681504986f3d4d6f6e9b9b703495d62ec237c2e26a81250986336ae6076236eec7576eb0939ad931b45f09779e852cf69d101569c31c2c
diff --git a/net-irc/irc-server/files/2.10.3_p3-gentoo.patch b/net-irc/irc-server/files/2.10.3_p3-gentoo.patch
deleted file mode 100644
index 36f558a70470..000000000000
--- a/net-irc/irc-server/files/2.10.3_p3-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur irc2.10.3p3.orig/contrib/tkserv/tkserv.c irc2.10.3p3/contrib/tkserv/tkserv.c
---- irc2.10.3p3.orig/contrib/tkserv/tkserv.c 2001-03-09 07:55:38.000000000 -0600
-+++ irc2.10.3p3/contrib/tkserv/tkserv.c 2004-06-08 00:14:33.648900488 -0500
-@@ -549,6 +549,7 @@
- case -1:
- sendto_user("You are not allowed to tkline \"%s\".", host); break;
- default:
-+ break;
- }
-
- retv = retv < 0 ? 0 : retv; /* errors do not allow authorization */
diff --git a/net-irc/irc-server/files/ircd.confd b/net-irc/irc-server/files/ircd.confd
deleted file mode 100644
index 19766668e76c..000000000000
--- a/net-irc/irc-server/files/ircd.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# /etc/conf.d/ircd: configuration for /etc/init.d/ircd
-
-# User account to run ircd as.
-
-#IRCD_USER="ircd"
-
-# Put any additional options for ircd here.
-# See ircd(8) for more information.
-
-#IRCD_OPTS=""
diff --git a/net-irc/irc-server/files/ircd.rc b/net-irc/irc-server/files/ircd.rc
deleted file mode 100644
index 0e3a05d5728f..000000000000
--- a/net-irc/irc-server/files/ircd.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- use net
-}
-
-IRCD_USER=${IRCD_USER:-ircd}
-
-checkconfig() {
- if [ ! -e /etc/ircd/ircd.conf ] ; then
- eerror "You need to create /etc/ircd/ircd.conf first."
- eerror "An example can be found in /etc/ircd/ircd.conf.example"
- return 1
- fi
-}
-
-start() {
- checkconfig || return $?
- ebegin "Starting ircd"
- start-stop-daemon --start --quiet --chuid "${IRCD_USER}" --exec /usr/sbin/ircd -- ${IRCD_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ircd"
- start-stop-daemon --stop --quiet --pidfile /var/run/ircd/ircd.pid
- eend $?
-}
diff --git a/net-irc/irc-server/irc-server-2.11.1_p1-r4.ebuild b/net-irc/irc-server/irc-server-2.11.1_p1-r4.ebuild
deleted file mode 100644
index a92ca4280fc5..000000000000
--- a/net-irc/irc-server/irc-server-2.11.1_p1-r4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator user
-
-MY_P="irc${PV/_/}"
-
-DESCRIPTION="RFC compliant IRC server"
-HOMEPAGE="http://www.irc.org/"
-SRC_URI="ftp://ftp.irc.org/irc/server/${MY_P}.tgz
- ftp://ftp.irc.org/irc/server/Old/irc$(get_version_component_range 1-2)/${MY_P}.tgz"
-
-# GPL-2 is for the init script, bug 426038.
-LICENSE="GPL-1 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="zlib ipv6"
-
-RDEPEND="sys-libs/ncurses:0
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- sys-apps/sed
- sys-apps/grep"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/2.10.3_p3-gentoo.patch )
-
-pkg_setup() {
- enewgroup ircd
- enewuser ircd -1 -1 -1 ircd
-}
-
-src_configure() {
- sed -i \
- -e "s/^#undef\tOPER_KILL$/#define\tOPER_KILL/" \
- -e "s/^#undef\tOPER_RESTART$/#define\tOPER_RESTART/" \
- -e "s/^#undef TIMEDKLINES$/#define\tTIMEDKLINES\t60/" \
- -e "s/^#undef\tR_LINES$/#define\tR_LINES/" \
- -e "s/^#undef\tCRYPT_OPER_PASSWORD$/#define\tCRYPT_OPER_PASSWORD/" \
- -e "s/^#undef\tCRYPT_LINK_PASSWORD$/#define\tCRYPT_LINK_PASSWORD/" \
- -e "s/^#undef\tIRC_UID$/#define\tIRC_UID\t$IRCUID/" \
- -e "s/^#undef\tIRC_GID$/#define\tIRC_GID\t$IRCGID/" \
- -e "s/^#undef USE_SERVICES$/#define\tUSE_SERVICES/" \
- "${S}"/support/config.h.dist \
- || die "failed to sed definitions in config.h.dist"
-
- if use zlib ; then
- sed -i -e "s/^#undef\tZIP_LINKS$/#define\tZIP_LINKS/" \
- "${S}"/support/config.h.dist \
- || die "failed to sed ZIP_LINKS definition in config.h.dist"
- fi
-
- # The --mandir has single quotes around it, the $prefix is NOT
- # interpolated into the string.
- econf \
- --sysconfdir=/etc/ircd \
- --localstatedir=/var/run/ircd \
- --with-logdir=/var/log/ircd \
- --with-rundir=/var/run/ircd \
- --mandir='${prefix}/share/man' \
- $(use_with zlib) \
- $(use_enable ipv6 ip6)
-}
-
-src_compile() {
- cd $(support/config.guess) \
- || die "failed to change into the source directory in src_compile"
- emake ircd iauth chkconf ircd-mkpasswd ircdwatch tkserv
-}
-
-src_install() {
- cd $(support/config.guess) \
- || die "failed to change into the source directory in src_install"
-
- emake \
- prefix="${D}"/usr \
- ircd_conf_dir="${D}"/etc/ircd \
- ircd_var_dir="${D}"/var/run/ircd \
- ircd_log_dir="${D}"/var/log/ircd \
- install-server \
- install-tkserv
-
- fowners ircd:ircd /var/run/ircd
- fowners ircd:ircd /var/log/ircd
-
- cd ../doc || die "failed to change into the doc directory in src_install"
-
- dodoc \
- *-New alt-irc-faq Authors BUGS ChangeLog Etiquette \
- iauth-internals.txt INSTALL.appendix INSTALL.* \
- m4macros README RELEASE* rfc* SERVICE*
-
- docinto Juped
- dodoc Juped/Advertisement Juped/ChangeLog.* Juped/INSTALL
-
- docinto Juped/US-Admin
- dodoc Juped/US-Admin/Networking
-
- docinto Nets
- dodoc Nets/IRCNet
-
- docinto Nets/Europe
- dodoc Nets/Europe/*
-
- newinitd "${FILESDIR}"/ircd.rc ircd
- newconfd "${FILESDIR}"/ircd.confd ircd
-}
diff --git a/net-irc/irc-server/metadata.xml b/net-irc/irc-server/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-irc/irc-server/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch b/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch
new file mode 100644
index 000000000000..63d26958b7bf
--- /dev/null
+++ b/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch
@@ -0,0 +1,38 @@
+From a0544571a80196e5b7705f56e6e2cbcdf7b4d80e Mon Sep 17 00:00:00 2001
+From: ailin-nemui <ailin-nemui@users.noreply.github.com>
+Date: Thu, 23 Apr 2020 21:45:15 +0200
+Subject: [PATCH] manually handle NUL unicode in g_utf8_get_next_char_validated
+
+A change in GLib 2.63 broke some assumptions in Irssi that the null-byte
+NUL / U+0000 is a valid Unicode character. This would occur when the
+user types Ctrl+Space. As a result, the input loop never manages to
+process the NUL-byte (and any other user input that follows, ever).
+
+This patch adds a manual check that properly advances the input loop if
+GLib returns -2 (incomplete character) despite the length being positive
+and a NUL is in first position.
+
+Fixes #1180
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/967
+https://gitlab.gnome.org/GNOME/glib/-/issues/2093
+---
+ src/fe-text/term-terminfo.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
+index 5235f72d2..78496a64f 100644
+--- a/src/fe-text/term-terminfo.c
++++ b/src/fe-text/term-terminfo.c
+@@ -672,7 +672,11 @@ void term_stop(void)
+
+ static int input_utf8(const unsigned char *buffer, int size, unichar *result)
+ {
+- unichar c = g_utf8_get_char_validated((char *)buffer, size);
++ unichar c = g_utf8_get_char_validated((char *) buffer, size);
++
++ /* GLib >= 2.63 do not accept Unicode NUL anymore */
++ if (c == (unichar) -2 && *buffer == 0 && size > 0)
++ c = 0;
+
+ switch (c) {
+ case (unichar)-1:
diff --git a/net-irc/irssi/irssi-1.2.2-r1.ebuild b/net-irc/irssi/irssi-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..ed231dbb3fa3
--- /dev/null
+++ b/net-irc/irssi/irssi-1.2.2-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit perl-module
+
+# Keep for _rc compability
+MY_P="${P/_/-}"
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="https://irssi.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="otr +perl selinux socks5 +proxy libressl"
+
+COMMON_DEPEND="
+ sys-libs/ncurses:0=
+ >=dev-libs/glib-2.6.0
+ !libressl? ( dev-libs/openssl:= )
+ libressl? ( >=dev-libs/libressl-2.7.4:= )
+ otr? ( >=dev-libs/libgcrypt-1.2.0:0=
+ >=net-libs/libotr-4.1.0 )
+ perl? ( dev-lang/perl:= )
+ socks5? ( >=net-proxy/dante-1.1.18 )"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ virtual/pkgconfig"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ selinux? ( sec-policy/selinux-irc )"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.2.2-glib-2.63_NUL_unicode_fix.patch" #746704
+)
+
+src_configure() {
+ # Disable automagic dependency on dev-libs/libutf8proc (bug #677804)
+ export ac_cv_lib_utf8proc_utf8proc_version=no
+
+ local myeconfargs=(
+ --with-perl-lib=vendor
+ --enable-true-color
+ $(use_with otr)
+ $(use_with proxy)
+ $(use_with perl)
+ $(use_with socks5 socks)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ use perl && perl_delete_localpod
+ rm -f "${ED}"/usr/$(get_libdir)/irssi/modules/*.{a,la} || die
+}
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 616a869958e3..da6b166acadc 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1 +1,2 @@
DIST konversation-1.7.5.tar.xz 3739392 BLAKE2B 92a068d57f19f3cf8822d1dbc219949ae34388eaa00f4542aaee28b1c78cdc68e80c2c032e54efd842c1925a689a1ee2f05458322d106a677829a623dd61432a SHA512 001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504
+DIST konversation-1.7.7.tar.xz 3357584 BLAKE2B 9f6817a1e01674f383879eeaafc65a50825aa7554fedcf7fbe7affc43da16f7198761ca12b510d9980df5a5f41819a5415043ec91de55f1cb4d86e62e8e23ea0 SHA512 99026007af7fa00b82240c1f0e46a8d3db6c3434948aff7d0b01c2f99bccdd227a2a705bd83bce1ca2e47be13866d5d0a981c8b4ff8dec472612d6ee40f9ed2c
diff --git a/net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch b/net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch
new file mode 100644
index 000000000000..f631a9493483
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch
@@ -0,0 +1,347 @@
+From 2104a776203d32b49512b303506f94085e0e4d89 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sat, 19 Sep 2020 22:50:48 +0200
+Subject: [PATCH] Port away from KIconthemes
+
+Use appropriate QIcon/QStyle API instead
+
+Incorporates:
+
+commit 5cd6c690e005a040e5fd3ccfca7ae23593c6dfe6
+Author: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sat Sep 19 22:50:48 2020 +0200
+Subject: Remove unneeded system tray icon update
+
+ The system tray icon is specified by name.
+ We don't need to do anything when the theme changes.
+
+commit d1bce09605c255f7b96fa677ece363b3053d085e
+Author: Peter Simonsson <peter.simonsson@gmail.com>
+Date: Tue Oct 22 21:35:25 2019 +0200
+Subject: Don't use deprecated SmallIcon
+
+---
+ CMakeLists.txt | 1 -
+ src/CMakeLists.txt | 1 -
+ src/dcc/recipientdialog.cpp | 5 ++---
+ src/dcc/transferlistmodel.cpp | 25 ++++---------------------
+ src/dcc/transferlistmodel.h | 3 +--
+ src/irc/channel.cpp | 4 ++--
+ src/irc/nicksonline.cpp | 1 -
+ src/irc/query.cpp | 4 ++--
+ src/mainwindow.cpp | 2 --
+ src/statusbar.cpp | 4 ++--
+ src/viewer/ircview.cpp | 5 ++---
+ src/viewer/ircviewbox.cpp | 1 -
+ src/viewer/topiclabel.cpp | 6 ++----
+ src/viewer/viewcontainer.cpp | 4 +---
+ 14 files changed, 18 insertions(+), 48 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f0cd4b4f..3a1f5274 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,7 +37,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+ DBusAddons
+ Notifications
+ WindowSystem
+- IconThemes
+ ItemViews
+ )
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 04f28971..36de36b0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -238,7 +238,6 @@ target_link_libraries(konversation
+ KF5::CoreAddons
+ KF5::Notifications
+ KF5::WindowSystem
+- KF5::IconThemes
+ KF5::ItemViews
+ Phonon::phonon4qt5)
+
+diff --git a/src/dcc/recipientdialog.cpp b/src/dcc/recipientdialog.cpp
+index 3e6eeae7..e81e91ea 100644
+--- a/src/dcc/recipientdialog.cpp
++++ b/src/dcc/recipientdialog.cpp
+@@ -28,7 +28,6 @@
+ #include <KLineEdit>
+ #include <KSharedConfig>
+ #include <KWindowConfig>
+-#include <KIconLoader>
+
+ namespace Konversation
+ {
+@@ -64,12 +63,12 @@ namespace Konversation
+ dialogLayout->addWidget(buttonBox);
+ QPushButton* button = buttonBox->addButton(QDialogButtonBox::Ok);
+ button->setToolTip(i18n("Select nickname and close the window"));
+- button->setIcon(SmallIcon("dialog-ok"));
++ button->setIcon(QIcon::fromTheme("dialog-ok"));
+ button->setShortcut(Qt::CTRL | Qt::Key_Return);
+ button->setDefault(true);
+ button = buttonBox->addButton(QDialogButtonBox::Cancel);
+ button->setToolTip(i18n("Close the window without changes"));
+- button->setIcon(SmallIcon("dialog-cancel"));
++ button->setIcon(QIcon::fromTheme("dialog-cancel"));
+
+ KWindowConfig::restoreWindowSize(windowHandle(), KConfigGroup(KSharedConfig::openConfig(), "DCCRecipientDialog"));
+
+diff --git a/src/dcc/transferlistmodel.cpp b/src/dcc/transferlistmodel.cpp
+index cc1763f9..2a7e3b15 100644
+--- a/src/dcc/transferlistmodel.cpp
++++ b/src/dcc/transferlistmodel.cpp
+@@ -21,7 +21,6 @@
+ #include <KCategorizedSortFilterProxyModel>
+ #include <KLocalizedString>
+ #include <KCategoryDrawer>
+-#include <KIconLoader>
+
+ namespace Konversation
+ {
+@@ -313,15 +312,11 @@ namespace Konversation
+ {
+ case TransferHeaderData::Status:
+ {
+- QVariant decoration(QVariant::Pixmap);
+- decoration.setValue<QPixmap>(getStatusIcon(transfer->getStatus()));
+- return decoration;
++ return getStatusIcon(transfer->getStatus());
+ }
+ case TransferHeaderData::TypeIcon:
+ {
+- QVariant decoration(QVariant::Pixmap);
+- decoration.setValue<QPixmap>(getTypeIcon(transfer->getType()));
+- return decoration;
++ return transfer->getType() == Transfer::Send ? QIcon::fromTheme("arrow-up") : QIcon::fromTheme("arrow-down");
+ }
+ default:
+ return QVariant();
+@@ -384,19 +379,7 @@ namespace Konversation
+ }
+ }
+
+- QPixmap TransferListModel::getTypeIcon(Transfer::Type type) const
+- {
+- if (type == Transfer::Send)
+- {
+- return KIconLoader::global()->loadIcon("arrow-up", KIconLoader::Small);
+- }
+- else
+- {
+- return KIconLoader::global()->loadIcon("arrow-down", KIconLoader::Small);
+- }
+- }
+-
+- QPixmap TransferListModel::getStatusIcon(Transfer::Status status) const
++ QIcon TransferListModel::getStatusIcon(Transfer::Status status) const
+ {
+ QString icon;
+ switch (status)
+@@ -422,7 +405,7 @@ namespace Konversation
+ default:
+ break;
+ }
+- return KIconLoader::global()->loadIcon(icon, KIconLoader::Small);
++ return QIcon::fromTheme(icon);
+ }
+
+ QString TransferListModel::getSpeedPrettyText (transferspeed_t speed)
+diff --git a/src/dcc/transferlistmodel.h b/src/dcc/transferlistmodel.h
+index 3a8a945c..b8bc0d25 100644
+--- a/src/dcc/transferlistmodel.h
++++ b/src/dcc/transferlistmodel.h
+@@ -164,8 +164,7 @@ namespace Konversation
+ inline QString getPositionPrettyText(KIO::fileoffset_t position,
+ KIO::filesize_t filesize) const;
+ inline QString getSenderAddressPrettyText(Transfer *transfer) const;
+- inline QPixmap getStatusIcon(Transfer::Status status) const;
+- inline QPixmap getTypeIcon(Transfer::Type type) const;
++ inline QIcon getStatusIcon(Transfer::Status status) const;
+ inline QString getStatusDescription(Transfer::Status status, Transfer::Type type, const QString& errorMessage = QString()) const;
+
+ QList<TransferItemData> m_transferList;
+diff --git a/src/irc/channel.cpp b/src/irc/channel.cpp
+index 6488a0c1..595d0adc 100644
+--- a/src/irc/channel.cpp
++++ b/src/irc/channel.cpp
+@@ -38,7 +38,6 @@
+ #include <KLineEdit>
+ #include <KPasswordDialog>
+ #include <KMessageBox>
+-#include <KIconLoader>
+ #include <KComboBox>
+
+ #define DELAYED_SORT_TRIGGER 10
+@@ -237,7 +236,8 @@ Channel::Channel(QWidget* parent, const QString& _name) : ChatWindow(parent)
+ awayLabel->hide();
+ cipherLabel = new QLabel(commandLineBox);
+ cipherLabel->hide();
+- cipherLabel->setPixmap(KIconLoader::global()->loadIcon(QStringLiteral("document-encrypt"), KIconLoader::Toolbar));
++ const int toolBarIconSize = cipherLabel->style()->pixelMetric(QStyle::PixelMetric::PM_ToolBarIconSize);
++ cipherLabel->setPixmap(QIcon::fromTheme(QStringLiteral("document-encrypt")).pixmap(toolBarIconSize));
+ m_inputBar = new IRCInput(commandLineBox);
+
+ commandLineLayout->addWidget(nicknameCombobox);
+diff --git a/src/irc/nicksonline.cpp b/src/irc/nicksonline.cpp
+index e23deab4..bb4cf00e 100644
+--- a/src/irc/nicksonline.cpp
++++ b/src/irc/nicksonline.cpp
+@@ -31,7 +31,6 @@
+ #include <QToolTip>
+ #include <QTreeWidget>
+
+-#include <KIconLoader>
+ #include <KToolBar>
+
+
+diff --git a/src/irc/query.cpp b/src/irc/query.cpp
+index 8c1845e6..56310642 100644
+--- a/src/irc/query.cpp
++++ b/src/irc/query.cpp
+@@ -25,7 +25,6 @@
+
+ #include <QSplitter>
+
+-#include <KIconLoader>
+ #include <KMessageBox>
+ #include <KSqueezedTextLabel>
+
+@@ -75,7 +74,8 @@ Query::Query(QWidget* parent, const QString& _name) : ChatWindow(parent)
+ blowfishLabel = new QLabel(inputBox);
+ inputBoxLayout->addWidget(blowfishLabel);
+ blowfishLabel->hide();
+- blowfishLabel->setPixmap(KIconLoader::global()->loadIcon(QStringLiteral("document-encrypt"), KIconLoader::Toolbar));
++ const int toolBarIconSize = blowfishLabel->style()->pixelMetric(QStyle::PixelMetric::PM_ToolBarIconSize);
++ blowfishLabel->setPixmap(QIcon::fromTheme(QStringLiteral("document-encrypt")).pixmap(toolBarIconSize));
+ m_inputBar=new IRCInput(inputBox);
+ inputBoxLayout->addWidget(m_inputBar);
+
+diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
+index 40423d29..a876de30 100644
+--- a/src/mainwindow.cpp
++++ b/src/mainwindow.cpp
+@@ -49,7 +49,6 @@
+ #include <KActionMenu>
+ #include <KNotifyConfigWidget>
+ #include <KGlobalAccel>
+-#include <KIconLoader>
+
+ MainWindow::MainWindow() : KXmlGuiWindow(0)
+ {
+@@ -743,7 +742,6 @@ void MainWindow::updateTrayIcon()
+ // set up system tray
+ m_trayIcon = new Konversation::TrayIcon(this);
+ connect(this, SIGNAL(endNotification()), m_trayIcon, SLOT(endNotification()));
+- connect(KIconLoader::global(), SIGNAL(iconChanged(int)), m_trayIcon, SLOT(updateAppearance()));
+ QMenu *trayMenu = qobject_cast<QMenu*>(m_trayIcon->contextMenu());
+ trayMenu->addAction(actionCollection()->action(QLatin1String(KStandardAction::name(KStandardAction::Preferences))));
+ trayMenu->addAction(actionCollection()->action(QLatin1String(KStandardAction::name(KStandardAction::ConfigureNotifications))));
+diff --git a/src/statusbar.cpp b/src/statusbar.cpp
+index 07a22fc6..e0efb02f 100644
+--- a/src/statusbar.cpp
++++ b/src/statusbar.cpp
+@@ -19,7 +19,6 @@
+ #include <KLocalizedString>
+ #include <QStatusBar>
+ #include <KSqueezedTextLabel>
+-#include <KIconLoader>
+
+ namespace Konversation
+ {
+@@ -52,7 +51,8 @@ namespace Konversation
+
+ m_sslLabel = new SSLLabel(m_window->statusBar());
+ m_sslLabel->setObjectName(QStringLiteral("sslLabel"));
+- m_sslLabel->setPixmap(SmallIcon(QStringLiteral("security-high")));
++ const int smallIconSize = m_sslLabel->style()->pixelMetric(QStyle::PixelMetric::PM_SmallIconSize);
++ m_sslLabel->setPixmap(QIcon::fromTheme(QStringLiteral("security-high")).pixmap(smallIconSize));
+ m_sslLabel->hide();
+ m_sslLabel->setWhatsThis(i18n("All communication with the server is encrypted. This makes it harder for someone to listen in on your communications."));
+
+diff --git a/src/viewer/ircview.cpp b/src/viewer/ircview.cpp
+index 73f5305f..86bbc3ae 100644
+--- a/src/viewer/ircview.cpp
++++ b/src/viewer/ircview.cpp
+@@ -30,9 +30,7 @@
+ #include <QTextDocumentFragment>
+ #include <QMimeData>
+
+-#include <KIconLoader>
+ #include <KStandardShortcut>
+-#include <kio/pixmaploader.h>
+ #include <KUrlMimeData>
+ #include <QLocale>
+
+@@ -2000,7 +1998,8 @@ void IRCView::mouseMoveEvent(QMouseEvent* ev)
+
+ drag->setMimeData(mimeData);
+
+- QPixmap pixmap = KIO::pixmapForUrl(url, 0, KIconLoader::Desktop, KIconLoader::SizeMedium);
++ const QString iconName = KIO::iconNameForUrl(url);
++ const QPixmap pixmap = QIcon::fromTheme(iconName).pixmap(32);
+ drag->setPixmap(pixmap);
+
+ drag->exec();
+diff --git a/src/viewer/ircviewbox.cpp b/src/viewer/ircviewbox.cpp
+index 463c9fd3..6c10d976 100644
+--- a/src/viewer/ircviewbox.cpp
++++ b/src/viewer/ircviewbox.cpp
+@@ -14,7 +14,6 @@
+ #include "ircview.h"
+ #include "searchbar.h"
+
+-#include <KIconLoader>
+ #include <QPixmap>
+ #include <QVBoxLayout>
+
+diff --git a/src/viewer/topiclabel.cpp b/src/viewer/topiclabel.cpp
+index 6a8b4331..c96edc6e 100644
+--- a/src/viewer/topiclabel.cpp
++++ b/src/viewer/topiclabel.cpp
+@@ -20,9 +20,6 @@
+ #include <QTextDocument>
+ #include <QMimeData>
+
+-#include <KIconLoader>
+-#include <kio/pixmaploader.h>
+-
+ namespace Konversation
+ {
+ TopicLabel::TopicLabel(QWidget *parent, const char *name)
+@@ -181,7 +178,8 @@ namespace Konversation
+
+ drag->setMimeData(mimeData);
+
+- QPixmap pixmap = KIO::pixmapForUrl(url, 0, KIconLoader::Desktop, KIconLoader::SizeMedium);
++ const QString iconName = KIO::iconNameForUrl(url);
++ const QPixmap pixmap = QIcon::fromTheme(iconName).pixmap(32);
+ drag->setPixmap(pixmap);
+
+ drag->exec();
+diff --git a/src/viewer/viewcontainer.cpp b/src/viewer/viewcontainer.cpp
+index 94d498ea..fd7be5bc 100644
+--- a/src/viewer/viewcontainer.cpp
++++ b/src/viewer/viewcontainer.cpp
+@@ -52,8 +52,6 @@
+ #include <KToggleAction>
+ #include <KSelectAction>
+ #include <KWindowSystem>
+-#include <KIconLoader>
+-
+
+ using namespace Konversation;
+
+@@ -241,7 +239,7 @@ void ViewContainer::setupTabWidget()
+ m_vbox->hide();
+
+ QToolButton* closeBtn = new QToolButton(m_tabWidget);
+- closeBtn->setIcon(SmallIcon("tab-close"));
++ closeBtn->setIcon(QIcon::fromTheme("tab-close"));
+ closeBtn->adjustSize();
+ m_tabWidget->setCornerWidget(closeBtn, Qt::BottomRightCorner);
+ connect(closeBtn, SIGNAL(clicked()), this, SLOT(closeCurrentView()));
+--
+2.28.0
+
diff --git a/net-irc/konversation/konversation-1.7.5-r2.ebuild b/net-irc/konversation/konversation-1.7.5-r2.ebuild
index 925f72f30810..7e956aad47ad 100644
--- a/net-irc/konversation/konversation-1.7.5-r2.ebuild
+++ b/net-irc/konversation/konversation-1.7.5-r2.ebuild
@@ -9,8 +9,7 @@ QTMIN=5.12.3
inherit ecm kde.org
DESCRIPTION="User friendly IRC Client"
-HOMEPAGE="https://konversation.kde.org
-https://kde.org/applications/internet/org.kde.konversation"
+HOMEPAGE="https://konversation.kde.org https://apps.kde.org/en/konversation"
SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
LICENSE="GPL-2"
diff --git a/net-irc/konversation/konversation-1.7.7.ebuild b/net-irc/konversation/konversation-1.7.7.ebuild
new file mode 100644
index 000000000000..c12dae0e30ec
--- /dev/null
+++ b/net-irc/konversation/konversation-1.7.7.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.74.0
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="User friendly IRC Client"
+HOMEPAGE="https://konversation.kde.org https://apps.kde.org/en/konversation"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="+crypt"
+
+BDEPEND="sys-devel/gettext"
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kidletime-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=media-libs/phonon-4.11.0
+ crypt? ( >=app-crypt/qca-2.3.0:2 )
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qtsvg-${QTMIN}:5
+ crypt? ( >=app-crypt/qca-2.3.0:2[ssl] )
+"
+
+PATCHES=(
+ # git master
+ "${FILESDIR}"/${PN}-1.7.5-unused-kemoticons.patch
+ "${FILESDIR}"/${PN}-1.7.6-no-kiconthemes.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package crypt Qca-qt5)
+ )
+
+ ecm_src_configure
+}
+
+src_install() {
+ ecm_src_install
+
+ # Bug 616162
+ insinto /etc/xdg
+ doins "${FILESDIR}"/konversationrc
+}
diff --git a/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild b/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild
index 50ee9d0c832f..f73ede8d1ee5 100644
--- a/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild
+++ b/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
inherit cmake flag-o-matic python-single-r1 xdg-utils
@@ -67,8 +67,8 @@ DEPEND="dev-qt/qtcore:5
python? ( ${PYTHON_DEPS} )
spell? ( app-text/enchant:0= )
ssl? (
- !libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
+ !libressl? ( dev-libs/openssl:0= )
)
theora? (
media-libs/libogg
@@ -141,11 +141,9 @@ src_configure() {
-DWANT_QTSVG=OFF
)
if use python; then
- local PYTHON_INCLUDEDIR PYTHON_LIBPATH
- python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
mycmakeargs+=(
- -DPython3_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
- -DPython3_LIBRARY="${PYTHON_LIBPATH}"
+ -DPython3_INCLUDE_DIR="$(python_get_includedir)"
+ -DPython3_LIBRARY="$(python_get_library_path)"
)
fi
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index c7a673bfd4ad..5e4569dadd03 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
inherit cmake flag-o-matic python-single-r1 xdg-utils
@@ -67,8 +67,8 @@ DEPEND="dev-qt/qtcore:5
python? ( ${PYTHON_DEPS} )
spell? ( app-text/enchant:0= )
ssl? (
- !libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
+ !libressl? ( dev-libs/openssl:0= )
)
theora? (
media-libs/libogg
@@ -141,11 +141,9 @@ src_configure() {
-DWANT_QTSVG=OFF
)
if use python; then
- local PYTHON_INCLUDEDIR PYTHON_LIBPATH
- python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
mycmakeargs+=(
- -DPython3_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
- -DPython3_LIBRARY="${PYTHON_LIBPATH}"
+ -DPython3_INCLUDE_DIR="$(python_get_includedir)"
+ -DPython3_LIBRARY="$(python_get_library_path)"
)
fi
diff --git a/net-irc/nebula/Manifest b/net-irc/nebula/Manifest
deleted file mode 100644
index 480f3020994f..000000000000
--- a/net-irc/nebula/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nebula-0.5.tar.gz 115950 BLAKE2B f2765ecfaaad726b9535f1d7d1caab0f3c4c7a825747ddde408e93f83f041797904120499ebd78d7ed45ba962448bf7406896656fc128cea68e6af008b92a054 SHA512 ae97aae4e878b6a20343ac3b8be235367cbce990e2858a59220f477cd8f57b4aad28527454c6dca1f509675b4a48b5f8ace06c3f867b1e0458126f418911ef83
diff --git a/net-irc/nebula/metadata.xml b/net-irc/nebula/metadata.xml
deleted file mode 100644
index 93de494624ab..000000000000
--- a/net-irc/nebula/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <longdescription>
-Nebula aims to be a graphical IRC client, aimed at the unix and compatible platforms and using the motif/openmotif or the lesstif ToolKit.
-The goals are
-- portability to various unix systems (planned are already Linux, *BSD, Solaris, Irix and AIX)
-- small footprint and low system resource usage
-- speed
-- clear, non intrusive GUI
-- security
-</longdescription>
- <upstream>
- <remote-id type="sourceforge">nebula-irc</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-irc/nebula/nebula-0.5.ebuild b/net-irc/nebula/nebula-0.5.ebuild
deleted file mode 100644
index 94f2f3fc71f4..000000000000
--- a/net-irc/nebula/nebula-0.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="An IRC client for X11 and Motif"
-HOMEPAGE="http://nebula-irc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-irc/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=x11-libs/motif-2.3:0"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
diff --git a/net-irc/ptlink-ircd/Manifest b/net-irc/ptlink-ircd/Manifest
deleted file mode 100644
index 9b7f8cb97d6b..000000000000
--- a/net-irc/ptlink-ircd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PTlink6.19.6.tar.gz 799388 BLAKE2B 709f07f8af79aeb844609556de2f81d38c8e56df0ec5d8a9d568f162ae6347d914677fc3fa3cee7bb27b14e14d284111dd88e320fb31891042adbe65ddd8d4f6 SHA512 5036efc429d8c5dbb5076cc690221b9409990bfe71a710bf6f8ce60e8779ff8f55e695c1fc1ca56435928d416bc1907c91105cf533538dafeea4344cd038d4d5
diff --git a/net-irc/ptlink-ircd/files/ptlink-ircd.confd b/net-irc/ptlink-ircd/files/ptlink-ircd.confd
deleted file mode 100644
index a14466cc412b..000000000000
--- a/net-irc/ptlink-ircd/files/ptlink-ircd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# User to run ptlink-ircd as
-PTLINKIRCD_USER="ptlink-ircd"
diff --git a/net-irc/ptlink-ircd/files/ptlink-ircd.initd b/net-irc/ptlink-ircd/files/ptlink-ircd.initd
deleted file mode 100644
index 5b7c1f441d7e..000000000000
--- a/net-irc/ptlink-ircd/files/ptlink-ircd.initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net
- use dns
- provide ircd
-}
-
-start() {
- ebegin "Starting ptlink-ircd"
- start-stop-daemon --start --quiet --exec /usr/bin/ptlink-ircd \
- --chuid ${PTLINKIRCD_USER} -- -l /var/lib/ptlink-ircd \
- -e /etc/ptlink-ircd >/dev/null
- eend $?
-}
-
-stop() {
- ebegin "Shutting down ptlink-ircd"
- start-stop-daemon --stop --pidfile /var/lib/ptlink-ircd/ircd.pid
- eend $?
-}
diff --git a/net-irc/ptlink-ircd/metadata.xml b/net-irc/ptlink-ircd/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-irc/ptlink-ircd/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r3.ebuild b/net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r3.ebuild
deleted file mode 100644
index b608a84138e2..000000000000
--- a/net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ssl-cert user vcs-clean
-
-MY_P="PTlink${PV}"
-
-DESCRIPTION="Secure IRC daemon with many advanced features"
-HOMEPAGE="http://www.ptlink.net/"
-SRC_URI="ftp://ftp.sunsite.dk/projects/ptlink/ircd/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86"
-IUSE="ssl"
-
-DEPEND="
- sys-libs/zlib
- ssl? ( dev-libs/openssl:0= )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- ecvs_clean
-
- default
-}
-
-src_configure() {
- econf \
- --disable-ipv6 \
- $(use_with ssl ssl openssl)
-}
-
-src_compile() {
- emake CFLAGS="${CFLAGS}"
-}
-
-src_install() {
- newbin src/ircd ptlink-ircd
- newbin tools/fixklines ptlink-ircd-fixklines
- newbin tools/mkpasswd ptlink-ircd-mkpasswd
-
- insinto /etc/ptlink-ircd
- fperms 700 /etc/ptlink-ircd
- doins samples/{kline.conf,{opers,ptlink}.motd,help.{admin,oper,user}}
- newins samples/example.conf.short ircd.conf
- newins samples/example.conf.trillian ircd.conf.trillian
- newins samples/main.dconf.sample main.dconf
- newins samples/network.dconf.sample network.dconf
-
- insinto /usr/share/ptlink-ircd/codepage
- doins src/codepage/*.enc
- dosym /usr/share/ptlink-ircd/codepage /etc/ptlink-ircd/codepage
-
- rm -rf doc/old
- dodoc doc/* doc_hybrid6/* ircdcron/* CHANGES README
-
- keepdir /var/log/ptlink-ircd /var/lib/ptlink-ircd
- dosym /var/log/ptlink-ircd /var/lib/ptlink-ircd/log
-
- newinitd "${FILESDIR}/ptlink-ircd.initd" ptlink-ircd
- newconfd "${FILESDIR}/ptlink-ircd.confd" ptlink-ircd
-}
-
-pkg_postinst() {
- # Move docert from src_install() to install_cert for bug #201678
- use ssl && (
- if [[ ! -f "${ROOT}"/etc/ptlink-ircd/server.key.pem ]]; then
- install_cert /etc/ptlink-ircd/server || die "install_cert failed"
- mv "${ROOT}"/etc/ptlink-ircd/server.{crt,cert.pem}
- mv "${ROOT}"/etc/ptlink-ircd/server.{csr,req.pem}
- mv "${ROOT}"/etc/ptlink-ircd/server.key{,.pem}
- fi
- )
-
- enewuser ptlink-ircd
-
- chown ptlink-ircd \
- "${ROOT}"/{etc,var/{log,lib}}/ptlink-ircd \
- "${ROOT}"/etc/ptlink-ircd/server.key.pem
-
- echo
- elog "PTlink IRCd will run without configuration, although this is strongly"
- elog "advised against."
- echo
- elog "You can find example cron script ircd.cron here:"
- elog " /usr/share/doc/${PF}"
- echo
- elog "You can also use /etc/init.d/ptlink-ircd to start at boot"
- echo
-}
diff --git a/net-irc/ptlink-opm/Manifest b/net-irc/ptlink-opm/Manifest
deleted file mode 100644
index 5deaed6cbb5a..000000000000
--- a/net-irc/ptlink-opm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PTlink.OPM1.3.1.tar.gz 156068 BLAKE2B 2b74391e5dc45ef3a9e37b4390b0a39e61c8f041bfcb549cf9951cb216975e6b398b31a9fe1d8932bac732ad70c65595d6154157c010d330e3a7d77f2d2a50e6 SHA512 1a8955486db8c1a318dda1b7bfdaf1be9f55d68a5acafde37a5f15e80e21b8d45c51138efb9d5ca1d1fad9f46d0ccdc4b91cf9128ba2ca7086f1c0925a36a141
diff --git a/net-irc/ptlink-opm/files/ptlink-opm-1.3.1-fno-common.patch b/net-irc/ptlink-opm/files/ptlink-opm-1.3.1-fno-common.patch
deleted file mode 100644
index 6d4aaacb8a38..000000000000
--- a/net-irc/ptlink-opm/files/ptlink-opm-1.3.1-fno-common.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Three of these are not like the others
-
---- a/include/dconf_vars.h
-+++ b/include/dconf_vars.h
-@@ -42,9 +42,9 @@
- E char* DNSBLZoneMsg;
-
- /* PT */
--char *PT_Nick;
--char *PT_Mask;
--char *PT_Info;
-+E char *PT_Nick;
-+E char *PT_Mask;
-+E char *PT_Info;
- #undef E
-
- #endif /* conf_vars_h_ */
diff --git a/net-irc/ptlink-opm/files/ptlink-opm.conf.d b/net-irc/ptlink-opm/files/ptlink-opm.conf.d
deleted file mode 100644
index 939c3cb518e6..000000000000
--- a/net-irc/ptlink-opm/files/ptlink-opm.conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# User to run ptlink-opm as
-PTLINKOPM_USER="ptlink-opm"
diff --git a/net-irc/ptlink-opm/files/ptlink-opm.init.d b/net-irc/ptlink-opm/files/ptlink-opm.init.d
deleted file mode 100644
index 70e0f0970c14..000000000000
--- a/net-irc/ptlink-opm/files/ptlink-opm.init.d
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net
- use dns ircd
-}
-
-start() {
- ebegin "Starting ptlink-opm"
- start-stop-daemon --start --quiet --exec /usr/bin/ptlink-opm \
- --chuid ${PTLINKOPM_USER} >/dev/null
- eend $?
-}
-
-stop() {
- ebegin "Shutting down ptlink-opm"
- start-stop-daemon --stop --exec /usr/bin/ptlink-opm
- eend $?
-}
diff --git a/net-irc/ptlink-opm/metadata.xml b/net-irc/ptlink-opm/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-irc/ptlink-opm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-irc/ptlink-opm/ptlink-opm-1.3.1-r1.ebuild b/net-irc/ptlink-opm/ptlink-opm-1.3.1-r1.ebuild
deleted file mode 100644
index 7ad9abad1cc4..000000000000
--- a/net-irc/ptlink-opm/ptlink-opm-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user
-
-MY_P="PTlink.OPM${PV}"
-
-DESCRIPTION="PTlink Open Proxy Monitor"
-HOMEPAGE="http://www.ptlink.net/"
-SRC_URI="ftp://ftp.sunsite.dk/projects/ptlink/ptopm/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=sys-apps/sed-4"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- econf \
- --sysconfdir=/etc/ptlink-opm \
- --localstatedir=/var/lib/ptlink-opm
-}
-
-src_install() {
- newbin src/ptopm ptlink-opm
-
- insinto /etc/ptlink-opm
- newins samples/ptopm.dconf.sample ptopm.dconf
- doins samples/scan_rules.dconf
-
- keepdir /var/{lib,log}/ptlink-opm
- dosym /var/log/ptlink-opm /var/lib/ptlink-opm/log
-
- dodoc CHANGES README
-
- newinitd "${FILESDIR}"/ptlink-opm.init.d ptlink-opm
- newconfd "${FILESDIR}"/ptlink-opm.conf.d ptlink-opm
-}
-
-pkg_postinst() {
- enewuser ptlink-opm
- chown ptlink-opm "${ROOT}"/var/{log,lib}/ptlink-opm
-}
diff --git a/net-irc/ptlink-opm/ptlink-opm-1.3.1-r2.ebuild b/net-irc/ptlink-opm/ptlink-opm-1.3.1-r2.ebuild
deleted file mode 100644
index b23d0aa8942e..000000000000
--- a/net-irc/ptlink-opm/ptlink-opm-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit user
-
-MY_P="PTlink.OPM${PV}"
-
-DESCRIPTION="PTlink Open Proxy Monitor"
-HOMEPAGE="http://www.ptlink.net/"
-SRC_URI="ftp://ftp.sunsite.dk/projects/ptlink/ptopm/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-
-DEPEND=">=sys-apps/sed-4"
-
-S=${WORKDIR}/${MY_P}
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.1-fno-common.patch
-)
-
-src_configure() {
- econf \
- --sysconfdir=/etc/ptlink-opm \
- --localstatedir=/var/lib/ptlink-opm
-}
-
-src_install() {
- newbin src/ptopm ptlink-opm
-
- insinto /etc/ptlink-opm
- newins samples/ptopm.dconf.sample ptopm.dconf
- doins samples/scan_rules.dconf
-
- keepdir /var/{lib,log}/ptlink-opm
- dosym ../../log/ptlink-opm /var/lib/ptlink-opm/log
-
- dodoc CHANGES README
-
- newinitd "${FILESDIR}"/ptlink-opm.init.d ptlink-opm
- newconfd "${FILESDIR}"/ptlink-opm.conf.d ptlink-opm
-}
-
-pkg_postinst() {
- enewuser ptlink-opm
- chown ptlink-opm "${ROOT}"/var/{log,lib}/ptlink-opm
-}
diff --git a/net-irc/quasselgrep/Manifest b/net-irc/quasselgrep/Manifest
index 7f07601f6323..13616f833907 100644
--- a/net-irc/quasselgrep/Manifest
+++ b/net-irc/quasselgrep/Manifest
@@ -1 +1 @@
-DIST quasselgrep-0_p20190211.tar.gz 29954 BLAKE2B 33862b642d6a24bd7ab8cc4f3628e19cf332feb24e0dba17849f4ee85af4d1d17a641e6ccaef89bcb44c47f28a674ab620610b8b624f9de71b8460b197953e27 SHA512 0d2bfccb87b7463ba032b9515c4a089518a3ca57f9ef6cbb0f00db9c5d0404cc9fe128329b12e1dbe022cbddeb6a3db473564ee734ddc30be56d4c1da5036f56
+DIST quasselgrep-0_p20200830.tar.gz 29944 BLAKE2B 011633afee9d9519b0c343c5d0b1a9ba775c870802532515a42a7c22d39af5138a051707a82f2b6a19dda3523fe9f04d2b56b62a36c554ff873275c095e7dd94 SHA512 88f568852cc9e85e0019335d3362f192766a2ce3e94ff1947485ad6eaf43d49873d94396791165f74e95edb25601c078a947a7740b4ae2e40424b5bdfecc2a48
diff --git a/net-irc/quasselgrep/metadata.xml b/net-irc/quasselgrep/metadata.xml
index eb320bd71e29..8cdbffdc53bd 100644
--- a/net-irc/quasselgrep/metadata.xml
+++ b/net-irc/quasselgrep/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>jakov.smolic@sartura.hr</email>
+ <name>Jakov Smolic</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<bugs-to>https://github.com/fish-face/quasselgrep/issues</bugs-to>
<doc>https://github.com/fish-face/quasselgrep/blob/master/README.md</doc>
diff --git a/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild b/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild
index 0d8f12d972b9..4ade54031303 100644
--- a/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
+++ b/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild
@@ -3,24 +3,19 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
PYTHON_REQ_USE=( sqlite )
+DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1 optfeature
DESCRIPTION="Tool for searching quassel logs from the commandline"
HOMEPAGE="https://github.com/fish-face/quasselgrep"
-if [[ "${PV}" == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/65278/quasselgrep.git"
- inherit git-r3
- KEYWORDS=""
-else
- MY_COMMIT=9b6b0bc1252daa6e574363d87d04eebd981215a5
- SRC_URI="https://github.com/fish-face/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz"
- S="${WORKDIR}/fish-face-${PN}-${MY_COMMIT:0:7}"
- KEYWORDS="~amd64 ~x86"
-fi
+MY_COMMIT="9b6b0bc1252daa6e574363d87d04eebd981215a5"
+SRC_URI="https://github.com/fish-face/quasselgrep/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+KEYWORDS="~amd64 ~x86"
LICENSE="GPL-2"
SLOT="0"
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index e77178f4559d..fb6957efdf5f 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,2 +1,3 @@
DIST unrealircd-4.2.4.1.tar.gz 6090725 BLAKE2B 817a7c2a13a495944676d08ed90b36f6795fe43ee171efc6661980e6da9a8cc8d98c4fb0eb8221ac6af85ab1a9b5578a2e992d7b41696434430e58918bc30145 SHA512 752573c4af1f92a10739bb2b0cdaade1948207b46d28ae5177e1dfd6b0663044bc22dce5ffe8549882cd70325e3ef7e3296182fffbb84e08d59dbbdd6551a686
DIST unrealircd-5.0.6.tar.gz 4975195 BLAKE2B 3ba459e0ec932e9f240825ba9f1fa40e300fe7958f999de86d5653f2e6e4940be8b8da9c885c97bd738abefef601d61da6c4e6c7199c7052d29a74fcf5048828 SHA512 7532e9ab2e039f21796ae813881aec9d34b502ab64efc4323c938232c8901ce882dbcce497ad93df270e4b5fa2e9633c0971f2a6b3213ad458756aea92aa1612
+DIST unrealircd-5.0.7.tar.gz 4995220 BLAKE2B a2996f62b3fe943f9af2cd570866101a501d24f7966378d8e651cf84b9b9d0981fad441b785c6293f4a0668a914cdf191dec52cc6b1e86aac2a51640ca32dbfe SHA512 0b851af26da2ea5d3a04d2ef324d7bd3d3fc820f24d7dfd7e975d6bf1f3954884eb98dc348d291a118d98a214922d3ca1132800381e6f025264856aa06498779
diff --git a/net-irc/unrealircd/unrealircd-5.0.7-r1.ebuild b/net-irc/unrealircd/unrealircd-5.0.7-r1.ebuild
new file mode 100644
index 000000000000..4807b6d11438
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-5.0.7-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SSL_CERT_MANDATORY=1
+inherit ssl-cert systemd
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="https://www.unrealircd.org/"
+SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes"
+
+RDEPEND="
+ acct-group/unrealircd
+ acct-user/unrealircd
+ >=app-crypt/argon2-20171227-r1:=
+ dev-libs/libpcre2
+ >=net-dns/c-ares-1.7:=
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ curl? ( net-misc/curl[adns] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} )
+
+src_prepare() {
+ # QA check against bundled pkgs
+ rm -r extras || die
+
+ # building third-party modules (which we don't do) cause a sandbox violation
+ # bug 704444
+ echo "" > src/buildmod || die
+
+ sed -e 's/$(MODULEFLAGS)/$(LDFLAGS) &/' -i src/modules/{,*/}Makefile.in || die
+
+ if use class-nofakelag; then
+ sed -i -e 's:^//#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
+ fi
+
+ eapply_user
+}
+
+src_configure() {
+ # Default value for privatelibdir adds a build path to -Wl,-rpath.
+ econf \
+ --with-bindir="${EPREFIX}"/usr/bin \
+ --with-cachedir="${EPREFIX}"/var/lib/${PN} \
+ --with-confdir="${EPREFIX}"/etc/${PN} \
+ --with-datadir="${EPREFIX}"/var/lib/${PN} \
+ --with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --with-logdir="${EPREFIX}"/var/log/${PN} \
+ --with-modulesdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
+ --without-privatelibdir \
+ --with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
+ --with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
+ --with-maxconnections=1024 \
+ --with-nick-history=2000 \
+ --with-permissions=0640 \
+ --with-system-argon2 \
+ --with-system-cares \
+ --with-system-pcre2 \
+ --enable-dynamic-linking \
+ --enable-ssl="${EPREFIX}"/usr \
+ $(use_enable curl libcurl "${EPREFIX}"/usr) \
+ $(use_enable prefixaq) \
+ $(use_with showlistmodes) \
+ $(use_with !operoverride no-operoverride) \
+ $(use_with operoverride-verify)
+}
+
+src_install() {
+ keepdir /var/log/${PN}
+ keepdir /var/lib/${PN}/tmp
+
+ newbin src/ircd ${PN}
+
+ (
+ cd src/modules || die
+ for subdir in $(find . -type d -print); do
+ if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then
+ exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}"
+ doexe "${subdir}"/*.so
+ fi
+ done
+ )
+
+ insinto /etc/${PN}
+ # Purposefully omitting the examples/ and ssl/ subdirectories. ssl
+ # is redundant with app-misc/ca-certificates and examples will all
+ # be in docs anyway.
+ doins -r doc/conf/{aliases,help}
+ doins doc/conf/*.conf
+ newins doc/conf/examples/example.conf ${PN}.conf
+ keepdir /etc/${PN}/tls
+
+ einstalldocs
+
+ newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
+
+ # config should be read-only
+ fperms -R 0640 /etc/${PN}
+ fperms 0750 /etc/${PN}{,/aliases,/help}
+ fperms 0750 /etc/${PN}/tls
+ # state is editable but not owned by unrealircd directly
+ fperms 0770 /var/log/${PN}
+ fperms 0770 /var/lib/${PN}{,/tmp}
+ fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN}
+
+ # By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
+ # that to look for ca-certificates-provided file instead. %s is
+ # CONFDIR. #618066
+ dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt
+
+ insinto $(systemd_get_systemunitdir)
+ doins "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+ # Move docert call from src_install() to install_cert in pkg_postinst for
+ # bug #201682
+ if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then
+ if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then
+ ewarn "The location ${PN} looks for SSL certificates has changed"
+ ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls."
+ ewarn "Please move your existing certificates."
+ else
+ (
+ umask 0037
+ install_cert /etc/${PN}/tls/server.cert
+ chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.*
+ ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/server.key.pem
+ )
+ fi
+ fi
+
+ local unrealircd_conf="${EROOT}"/etc/${PN}/${PN}.conf
+ # Fix up the default cloak keys.
+ if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
+ ebegin "Generating cloak-keys"
+ local keys=(
+ $(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3")
+ )
+ [[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
+ eend $?
+
+ ebegin "Substituting cloak-keys into ${unrealircd_conf}"
+ sed -i \
+ -e '/cloak-keys/ {
+n
+s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
+n
+s/"and another one";/"'"${keys[1]}"'";/
+n
+s/"and another one";/"'"${keys[2]}"'";/
+}' \
+ "${unrealircd_conf}"
+ eend $?
+ fi
+
+ elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
+ elog
+ elog "You can also configure ${PN} start at boot with rc-update(1)."
+ elog "It is recommended to run unrealircd as an unprivileged user."
+ elog "The provided init.d script does this for you."
+}
diff --git a/net-irc/unrealircd/unrealircd-5.0.7.ebuild b/net-irc/unrealircd/unrealircd-5.0.7.ebuild
new file mode 100644
index 000000000000..438a6541a211
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-5.0.7.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SSL_CERT_MANDATORY=1
+inherit ssl-cert systemd
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="https://www.unrealircd.org/"
+SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes"
+
+RDEPEND="
+ acct-group/unrealircd
+ acct-user/unrealircd
+ >=app-crypt/argon2-20171227-r1:=
+ dev-libs/libpcre2
+ >=net-dns/c-ares-1.7:=
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ curl? ( net-misc/curl[adns] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} )
+
+src_prepare() {
+ # QA check against bundled pkgs
+ rm -r extras || die
+
+ # building third-party modules (which we don't do) cause a sandbox violation
+ # bug 704444
+ echo "" > src/buildmod || die
+
+ sed -e 's/$(MODULEFLAGS)/$(LDFLAGS) &/' -i src/modules/{,*/}Makefile.in || die
+
+ if use class-nofakelag; then
+ sed -i -e 's:#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
+ fi
+
+ eapply_user
+}
+
+src_configure() {
+ # Default value for privatelibdir adds a build path to -Wl,-rpath.
+ econf \
+ --with-bindir="${EPREFIX}"/usr/bin \
+ --with-cachedir="${EPREFIX}"/var/lib/${PN} \
+ --with-confdir="${EPREFIX}"/etc/${PN} \
+ --with-datadir="${EPREFIX}"/var/lib/${PN} \
+ --with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --with-logdir="${EPREFIX}"/var/log/${PN} \
+ --with-modulesdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
+ --without-privatelibdir \
+ --with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
+ --with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
+ --with-maxconnections=1024 \
+ --with-nick-history=2000 \
+ --with-permissions=0640 \
+ --with-system-argon2 \
+ --with-system-cares \
+ --with-system-pcre2 \
+ --enable-dynamic-linking \
+ --enable-ssl="${EPREFIX}"/usr \
+ $(use_enable curl libcurl "${EPREFIX}"/usr) \
+ $(use_enable prefixaq) \
+ $(use_with showlistmodes) \
+ $(use_with !operoverride no-operoverride) \
+ $(use_with operoverride-verify)
+}
+
+src_install() {
+ keepdir /var/log/${PN}
+ keepdir /var/lib/${PN}/tmp
+
+ newbin src/ircd ${PN}
+
+ (
+ cd src/modules || die
+ for subdir in $(find . -type d -print); do
+ if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then
+ exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}"
+ doexe "${subdir}"/*.so
+ fi
+ done
+ )
+
+ insinto /etc/${PN}
+ # Purposefully omitting the examples/ and ssl/ subdirectories. ssl
+ # is redundant with app-misc/ca-certificates and examples will all
+ # be in docs anyway.
+ doins -r doc/conf/{aliases,help}
+ doins doc/conf/*.conf
+ newins doc/conf/examples/example.conf ${PN}.conf
+ keepdir /etc/${PN}/tls
+
+ einstalldocs
+
+ newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
+
+ # config should be read-only
+ fperms -R 0640 /etc/${PN}
+ fperms 0750 /etc/${PN}{,/aliases,/help}
+ fperms 0750 /etc/${PN}/tls
+ # state is editable but not owned by unrealircd directly
+ fperms 0770 /var/log/${PN}
+ fperms 0770 /var/lib/${PN}{,/tmp}
+ fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN}
+
+ # By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
+ # that to look for ca-certificates-provided file instead. %s is
+ # CONFDIR. #618066
+ dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt
+
+ insinto $(systemd_get_systemunitdir)
+ doins "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+ # Move docert call from src_install() to install_cert in pkg_postinst for
+ # bug #201682
+ if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then
+ if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then
+ ewarn "The location ${PN} looks for SSL certificates has changed"
+ ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls."
+ ewarn "Please move your existing certificates."
+ else
+ (
+ umask 0037
+ install_cert /etc/${PN}/tls/server.cert
+ chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.*
+ ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/server.key.pem
+ )
+ fi
+ fi
+
+ local unrealircd_conf="${EROOT}"/etc/${PN}/${PN}.conf
+ # Fix up the default cloak keys.
+ if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
+ ebegin "Generating cloak-keys"
+ local keys=(
+ $(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3")
+ )
+ [[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
+ eend $?
+
+ ebegin "Substituting cloak-keys into ${unrealircd_conf}"
+ sed -i \
+ -e '/cloak-keys/ {
+n
+s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
+n
+s/"and another one";/"'"${keys[1]}"'";/
+n
+s/"and another one";/"'"${keys[2]}"'";/
+}' \
+ "${unrealircd_conf}"
+ eend $?
+ fi
+
+ elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
+ elog
+ elog "You can also configure ${PN} start at boot with rc-update(1)."
+ elog "It is recommended to run unrealircd as an unprivileged user."
+ elog "The provided init.d script does this for you."
+}
diff --git a/net-irc/xaric/Manifest b/net-irc/xaric/Manifest
deleted file mode 100644
index e4594a00386d..000000000000
--- a/net-irc/xaric/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xaric-0.13.6.tar.gz 479754 BLAKE2B f9fe9fd67b66f922a61be1e793b66af0d3b809f07fa48be6fd74b9f8cd59bb435df2545ef12ddbc36e3fbb57f3491ece4fb7ff939de738d8a87cdcb8cbb3a403 SHA512 1c52e30cfab49d82306cd0b4402175f68cfc411b7ef04156b2361fadeea01648476742015306a0c242c13f4ab29916e8ac48a59f481ecdb5475584ef6cdf028f
diff --git a/net-irc/xaric/files/xaric-0.13.6-tinfo.patch b/net-irc/xaric/files/xaric-0.13.6-tinfo.patch
deleted file mode 100644
index 0fcfe3aa1846..000000000000
--- a/net-irc/xaric/files/xaric-0.13.6-tinfo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -279,9 +279,10 @@
- olibs="$LIBS"
- AC_CHECK_LIB(termcap, tgetent, LIBS="-ltermcap $olibs",
- AC_CHECK_LIB(termlib, tgetent, LIBS="-ltermlib $olibs",
-- AC_CHECK_LIB(curses, tgetent, LIBS="-lcurses $olibs",
-- AC_CHECK_LIB(xtermcap, tgetent, LIBS="-lxtermcap $olibs",
-- AC_MSG_ERROR([i can not find tgetent. you need to help me])))))
-+ AC_CHECK_LIB(tinfo, tgetent, LIBS="-ltinfo $olibs",
-+ AC_CHECK_LIB(curses, tgetent, LIBS="-lcurses $olibs",
-+ AC_CHECK_LIB(xtermcap, tgetent, LIBS="-lxtermcap $olibs",
-+ AC_MSG_ERROR([i can not find tgetent. you need to help me]))))))
- fi
-
- dnl ----------------------------------------------------------
diff --git a/net-irc/xaric/metadata.xml b/net-irc/xaric/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-irc/xaric/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-irc/xaric/xaric-0.13.6.ebuild b/net-irc/xaric/xaric-0.13.6.ebuild
deleted file mode 100644
index 447c6e62ae29..000000000000
--- a/net-irc/xaric/xaric-0.13.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="An IRC client similar to ircII, BitchX, or ircII EPIC"
-HOMEPAGE="https://xaric.org/"
-SRC_URI="https://xaric.org/software/${PN}/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses
- dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-tinfo.patch
- eautoreconf
-}
-
-src_install() {
- default
- doicon xaric.xpm
-}
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
index 45c850d4f1f7..37383594fb1e 100644
--- a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
+++ b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cocodelabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="!test? ( test )"