diff options
Diffstat (limited to 'net-irc')
241 files changed, 5657 insertions, 4463 deletions
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest index db202f75903b..f7f68281ee74 100644 --- a/net-irc/anope/Manifest +++ b/net-irc/anope/Manifest @@ -1 +1 @@ -DIST anope-2.0.9.tar.gz 1808866 BLAKE2B db5755dbb88edb9fcc2f00c1dc324894f22b9e6bc97c9cf57b40d2296014341fe3ade8a8e1b64879b852aef6637e1bb89947deb7a41e009e25101a0a992515e7 SHA512 0ce2caa5ede2831215781a333d896f1169f90bbb515078912f32beaff1699b7957384974cca7c86f1d584d624cb43c76769299ce245ee1fb6836ce7f14ada3e0 +DIST anope-2.0.14.tar.gz 1642605 BLAKE2B 0c741a0f214a3807dcfaa1a90f63d922549c92904cb632432129ca1f252f182037882b954d4ef3d8d1417d00ebd96de58528a3916aac24a556507872df326408 SHA512 0dfa71a8ecd164fb8bf2864ac13969610b8fcd0ec9dea2e65dabc2d8808fe392f966d08dfffce31410344ea5a1ab88d85e9083b4ce25003a699adf0f3649b08d diff --git a/net-irc/anope/anope-2.0.9.ebuild b/net-irc/anope/anope-2.0.14.ebuild index 1d6c41175cc7..88159b72e6e0 100644 --- a/net-irc/anope/anope-2.0.9.ebuild +++ b/net-irc/anope/anope-2.0.14.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -11,27 +11,27 @@ SRC_URI="https://github.com/anope/anope/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" +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= ) + mysql? ( dev-db/mysql-connector-c:= ) + ssl? ( dev-libs/openssl:= ) gnutls? ( - net-libs/gnutls:0= - dev-libs/libgcrypt:0= + net-libs/gnutls:= + dev-libs/libgcrypt:= ) - ldap? ( net-nds/openldap ) - pcre? ( dev-libs/libpcre ) + ldap? ( net-nds/openldap:= ) + pcre? ( dev-libs/libpcre2 ) sqlite? ( dev-db/sqlite:3 ) tre? ( dev-libs/tre ) virtual/libintl " RDEPEND="${DEPEND}" +BDEPEND="sys-devel/gettext" PATCHES=( "${FILESDIR}/${PN}-2.0.6-example.conf-pid-path.patch" @@ -73,7 +73,7 @@ src_prepare() { fi use gnutls && anope_enable_mod "m_ssl_gnutls.cpp" - use pcre && anope_enable_mod "m_regex_pcre.cpp" + use pcre && anope_enable_mod "m_regex_pcre2.cpp" use ssl && anope_enable_mod "m_ssl_openssl.cpp" use tre && anope_enable_mod "m_regex_tre.cpp" @@ -84,11 +84,11 @@ src_prepare() { 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 + 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 + "${T}"/anope-conf.d-v2 || die cmake_src_prepare } @@ -104,14 +104,18 @@ src_configure() { -DLOGS_DIR="../var/log/anope/" ) + # https://gitlab.kitware.com/cmake/cmake/-/issues/24237 + # https://bugs.anope.org/view.php?id=1753 + unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS + cmake_src_configure } src_install() { cmake_src_install - newinitd "${FILESDIR}/anope-init.d" "${PN}" - newconfd "${T}/anope-conf.d-v2" "${PN}" + 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 @@ -131,14 +135,12 @@ src_install() { 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 + 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 diff --git a/net-irc/anope/metadata.xml b/net-irc/anope/metadata.xml index 01ccc819ffe1..c3a25d9f7863 100644 --- a/net-irc/anope/metadata.xml +++ b/net-irc/anope/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sam@gentoo.org</email> diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest index ca89021adb40..d1485396f459 100644 --- a/net-irc/atheme-services/Manifest +++ b/net-irc/atheme-services/Manifest @@ -1 +1 @@ -DIST atheme-services-7.2.10_p2.tar.xz 21061364 BLAKE2B e02ea3b9b55c0a02bfd354da65ed45318c2f0a5d5d35cabe7984760cfe1683b9856cc779754f1de8861816b5b2d2323c898100697e8d365ffed039e90b42cde6 SHA512 c7e6654ddbf515b1565b77f0659cd9a77787d004fb532ecdee638189e823ec65afc283cbeafc6d7625ed6c210835e5546c5e33718e08ad0b280ccc7a2df7be48 +DIST atheme-services-7.2.12.tar.xz 1072992 BLAKE2B f9e1cb175c1e2f38b5d53eba8f3d391e421baaff7eb76f38b10ba02b258472ccf9b69a7a278ff05c4f620b6fe6e48362618c02d245ed5d9c5acd4bede91ac093 SHA512 0d276b9a0c96f72a739090c5b2c732ab6c000f801cbb86347b5670def56f36fb82d70fb4cb68a1d942b9765c054bc136a6b0cecc0573cf8f59076f8b91fc6bf6 diff --git a/net-irc/atheme-services/atheme-services-7.2.10_p2-r2.ebuild b/net-irc/atheme-services/atheme-services-7.2.12-r4.ebuild index 820dfd3bd2f6..335443e95737 100644 --- a/net-irc/atheme-services/atheme-services-7.2.10_p2-r2.ebuild +++ b/net-irc/atheme-services/atheme-services-7.2.12-r4.ebuild @@ -1,30 +1,28 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit flag-o-matic perl-functions - -MY_PN="atheme" -MY_PV="7.2.10-r2" +inherit perl-functions systemd DESCRIPTION="A portable and secure set of open-source and modular IRC services" HOMEPAGE="https://github.com/atheme/atheme" -SRC_URI="https://github.com/atheme/atheme/releases/download/v${MY_PV}/${MY_PN}-v${MY_PV}.tar.xz -> ${P}.tar.xz" +SRC_URI="https://github.com/atheme/atheme/releases/download/v${PV}/${PN}-v${PV}.tar.xz -> ${P}.tar.xz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64 ~arm ~arm64" IUSE="cracklib largenet ldap nls +pcre perl profile ssl" -S="${WORKDIR}/${MY_PN}-v${MY_PV}" +S="${WORKDIR}/${PN}-v${PV}" RDEPEND=" acct-group/atheme-services acct-user/atheme-services >=dev-libs/libmowgli-2.1.0:2 + virtual/libcrypt:= cracklib? ( sys-libs/cracklib ) - ldap? ( net-nds/openldap ) - perl? ( dev-lang/perl ) + ldap? ( net-nds/openldap:= ) + perl? ( dev-lang/perl:= ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl:0= )" DEPEND="${RDEPEND}" @@ -34,8 +32,7 @@ BDEPEND=" virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${P}-configure-logdir.patch - "${FILESDIR}"/${P}-fix-backtrace-compat-detection.patch) + "${FILESDIR}"/${PN}-7.2.10_p2-configure-logdir.patch) src_configure() { # perl scriping module support is also broken in 7.0.0. Yay for QA failures. @@ -80,6 +77,7 @@ src_install() { newinitd "${FILESDIR}"/${PN}.initd ${PN} mv "${ED}"/usr/bin/{,atheme-}dbverify || die + systemd_dounit "${FILESDIR}"/${PN}.service # contributed scripts and such: docinto contrib diff --git a/net-irc/atheme-services/files/atheme-services-7.2.10_p2-fix-backtrace-compat-detection.patch b/net-irc/atheme-services/files/atheme-services-7.2.10_p2-fix-backtrace-compat-detection.patch deleted file mode 100644 index b6f448163aac..000000000000 --- a/net-irc/atheme-services/files/atheme-services-7.2.10_p2-fix-backtrace-compat-detection.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/modules/contrib/backtrace.c b/modules/contrib/backtrace.c -index 8c4eeb2..064e88e 100644 ---- a/modules/contrib/backtrace.c -+++ b/modules/contrib/backtrace.c -@@ -1,6 +1,6 @@ - #include "atheme-compat.h" - --#if defined( __linux__) || defined(__Linux__) -+#if (defined( __linux__) || defined(__Linux__)) && defined(__GLIBC__) - #include <execinfo.h> - - DECLARE_MODULE_V1 diff --git a/net-irc/atheme-services/files/atheme-services.service b/net-irc/atheme-services/files/atheme-services.service new file mode 100644 index 000000000000..a552ead5b413 --- /dev/null +++ b/net-irc/atheme-services/files/atheme-services.service @@ -0,0 +1,15 @@ +[Unit] +Description=Atheme IRC services +After=network-online.target +Wants=network-online.target + +[Service] +RuntimeDirectory=atheme +ExecStart=/usr/bin/atheme-services +ExecReload=kill -HUP $MAINPID +Type=forking +PIDFile=/run/atheme/atheme.pid +User=atheme-services + +[Install] +WantedBy=multi-user.target diff --git a/net-irc/atheme-services/metadata.xml b/net-irc/atheme-services/metadata.xml index 1056f0f4fb25..854b8fb4bebc 100644 --- a/net-irc/atheme-services/metadata.xml +++ b/net-irc/atheme-services/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <use> <flag name="cracklib">Enable nickserv/cracklib module for enforcing strong account passwords</flag> @@ -7,12 +7,15 @@ <flag name="ldap">Enable ldap-backed authentication module</flag> <flag name="perl">Install a perl module which wraps around the services' XML-RPC interface</flag> </use> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>wadecline@hotmail.com</email> <name>Wade Cline</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="github">atheme/atheme</remote-id> + </upstream> </pkgmetadata> diff --git a/net-irc/bnc/bnc-2.9.4-r1.ebuild b/net-irc/bnc/bnc-2.9.4-r3.ebuild index c59d47de39eb..c13e65bd1123 100644 --- a/net-irc/bnc/bnc-2.9.4-r1.ebuild +++ b/net-irc/bnc/bnc-2.9.4-r3.ebuild @@ -1,23 +1,25 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit autotools flag-o-matic MY_P="${P/-/}" DESCRIPTION="BNC (BouNCe) is used as a gateway to an IRC Server" HOMEPAGE="http://gotbnc.com/" SRC_URI="http://gotbnc.com/files/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm ppc ppc64 ~s390 sparc x86" IUSE="ssl" -DEPEND="ssl? ( dev-libs/openssl:0= )" +DEPEND="virtual/libcrypt:= + ssl? ( dev-libs/openssl:0= )" RDEPEND="${DEPEND}" -S="${WORKDIR}/${MY_P}" - PATCHES=( "${FILESDIR}/respect-cflags-ldflags.patch" "${FILESDIR}/${PN}-2.9.3-64bit.patch" @@ -25,11 +27,19 @@ PATCHES=( src_prepare() { default + sed -i -e 's:./mkpasswd:/usr/bin/bncmkpasswd:' bncsetup \ || die 'failed to rename mkpasswd in bncsetup' + + # bug #900076 + eautoreconf } src_configure() { + # bug #861374 + append-flags -fno-strict-aliasing + filter-lto + econf $(use_with ssl) } diff --git a/net-irc/bnc/metadata.xml b/net-irc/bnc/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/net-irc/bnc/metadata.xml +++ b/net-irc/bnc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-irc/cgiirc/Manifest b/net-irc/cgiirc/Manifest deleted file mode 100644 index e4cb99b8f32d..000000000000 --- a/net-irc/cgiirc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST cgiirc-0.5.10.tar.gz 133827 BLAKE2B 39120abb8caaaab64f326239d3f557f6cf96d36d69bdc03d6631402e3bd69d03bc89bedf19929e3b9647dc21564c39a5a1f7e76409ab6e3f7f750763e4c146ee SHA512 57001051a31f8a1494e8b31b256b5f244ed7e1d23f38f27184374f1becf91e6ea3bd61621679e046ae0a11a2eb3e5909d9d284df2a896bf5aac38f5314c7ae55 diff --git a/net-irc/cgiirc/cgiirc-0.5.10.ebuild b/net-irc/cgiirc/cgiirc-0.5.10.ebuild deleted file mode 100644 index 72da20317ceb..000000000000 --- a/net-irc/cgiirc/cgiirc-0.5.10.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit webapp eutils vcs-clean - -DESCRIPTION="A perl/CGI program to use IRC from a web browser" -HOMEPAGE="http://cgiirc.org/" -SRC_URI="http://cgiirc.org/releases/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -need_httpd_cgi - -pkg_setup() { - webapp_pkg_setup - elog "Note that file locations have changed." - elog "CGI:IRC will be installed into cgi-bin/${P}" -} - -src_unpack() { - unpack ${A} - cd "${S}" - ecvs_clean -} - -src_install() { - webapp_src_preinst - - local docs="README cgiirc.config.full ipaccess.example" - - dodoc docs/{CHANGES,TODO} ${docs} - dohtml docs/help.html - rm -rf docs/ ${docs} - - insinto "${MY_CGIBINDIR}"/${P} - doins -r . - fperms +x "${MY_CGIBINDIR}"/${P}/irc.cgi - - webapp_configfile "${MY_CGIBINDIR}"/${P}/cgiirc.config - webapp_src_install -} diff --git a/net-irc/cgiirc/metadata.xml b/net-irc/cgiirc/metadata.xml deleted file mode 100644 index 2b9b44f73497..000000000000 --- a/net-irc/cgiirc/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>web-apps@gentoo.org</email> - <name>Gentoo Webapps</name> - </maintainer> -</pkgmetadata> diff --git a/net-irc/dccserver/dccserver-0.5-r1.ebuild b/net-irc/dccserver/dccserver-0.5-r1.ebuild index 995df89457bf..24c519f46e1a 100644 --- a/net-irc/dccserver/dccserver-0.5-r1.ebuild +++ b/net-irc/dccserver/dccserver-0.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/dccserver/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc ~riscv x86" src_prepare() { default diff --git a/net-irc/dccserver/dccserver-0.5-r2.ebuild b/net-irc/dccserver/dccserver-0.5-r2.ebuild new file mode 100644 index 000000000000..50cabc57cb28 --- /dev/null +++ b/net-irc/dccserver/dccserver-0.5-r2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Linux implementation of the mirc dccserver command" +HOMEPAGE="https://www.nih.at/dccserver/" +SRC_URI="https://www.nih.at/dccserver/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ppc ~riscv x86" + +RDEPEND="dev-libs/libbsd" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/${P}-include-bsd-string-header.patch" ) + +src_prepare() { + default + + # Respect AR + sed -i -e "s/AR = /AR ?= /" lib/Makefile.in || die +} + +src_compile() { + AR="$(tc-getAR)" default +} diff --git a/net-irc/dccserver/files/dccserver-0.5-include-bsd-string-header.patch b/net-irc/dccserver/files/dccserver-0.5-include-bsd-string-header.patch new file mode 100644 index 000000000000..16474b64b82a --- /dev/null +++ b/net-irc/dccserver/files/dccserver-0.5-include-bsd-string-header.patch @@ -0,0 +1,19 @@ +This uses strlcpy() from bsd/string.h. On non BSD system those headers are to find under +/usr/include/bsd/. See also man libbsd. + +Bug: https://bugs.gentoo.org/875026 +Bug: https://bugs.gentoo.org/861377 + +Pascal Jäger <pascal.jaeger@leimstift.de> (2022-11-29) + +--- a/lib/dcc.c ++++ b/lib/dcc.c +@@ -37,7 +37,7 @@ + #endif /* HAVE_ERR_H */ + #include <errno.h> + #include <stdlib.h> +-#include <string.h> ++#include <bsd/string.h> + + #include "dcc.h" + #include "io.h" diff --git a/net-irc/dccserver/metadata.xml b/net-irc/dccserver/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/net-irc/dccserver/metadata.xml +++ b/net-irc/dccserver/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest index e6a4928422b7..1b2df9b6fabd 100644 --- a/net-irc/eggdrop/Manifest +++ b/net-irc/eggdrop/Manifest @@ -1,2 +1,3 @@ -DIST eggdrop-1.8.3.tar.gz 1756536 BLAKE2B c2693bc383e1d857fe784d54f34479e73902064196021788ddf21f0bb2910977c643d820d2f6b640bb459b2acbfad8158fc0b29b4d76c588dfd76fee09a6fa25 SHA512 ad3b93d18aaa05d0eb00f1089b68d1f077f316042e64fff511ad1bbac06d35105adcb503490faaac4c9fe720dd45a9f350115b6c5d0f41fe198f228213a7a3a3 -DIST eggdrop-1.8.4.tar.gz 1784738 BLAKE2B a86cdc681ebd9c779b7da20f80ff312e4fc848e0cb0a0b9fa34941c91e1b89db1430126e3d0b94c7b4346c0bde099a6ddd343270943570744c46fc4ddd451540 SHA512 d08af09dc83045bf89eae957e7817591f16456f83ba3efe6b361fd421a3d4068348543275c26b27b006f09f06344c04cdf58ee4231f1aee0e7537ec39bc24b49 +DIST eggdrop-1.9.1.tar.gz 2271120 BLAKE2B 73fadeddcebeba5de42328f6f02c05e850e47c19812bc1a868da09f55fd1d297e3596c5a4b167806237554966e7dfbebadcee6215932c56a76b3e67a77d5ee47 SHA512 d8907d265f7e22f3bcd3e28b256c5788d5959ad11cc1425d59eb4411ebbc172fe8d90c31fd9f033369ab80cd29a36a5856f6bd32bc6c9cdfedea1d6509ea7f3b +DIST eggdrop-1.9.4.tar.gz 2065217 BLAKE2B f9d1e6c0491d6c7959e3b67e8186082d074d648497cd66f244dfb4c919a566d81fdce83d034f0cc1e5247bc924022faf56004cdd8a6cc174fe8d0f44af5e2a9a SHA512 ed3145411a1832d1a6d4f191c6ff30e64aa45f803df00585c1c69f6bbc8a16d07e9608c57e31fb723f7a9c66a24422e5080aab7746e562ac5b6a678a08c7b2a4 +DIST eggdrop-1.9.5.tar.gz 2109996 BLAKE2B 80d7b44356f0c5750c276f15412fdb847bc7583c7d1e990735ad4aec1b6bec9822124b089654dfb4dfbd393127804da1019d184d01b867b0dd84ba0342167d94 SHA512 863e6f94a92ac02e135c306000379ce516d9c9381eb5ca249e7656f4f0f504a159ddf1f658016d05e422d8036e808664101ab4f8944a42438c273f71b676189b diff --git a/net-irc/eggdrop/eggdrop-1.8.4.ebuild b/net-irc/eggdrop/eggdrop-1.9.1.ebuild index c629643aa509..c1c361570d65 100644 --- a/net-irc/eggdrop/eggdrop-1.8.4.ebuild +++ b/net-irc/eggdrop/eggdrop-1.9.1.ebuild @@ -1,15 +1,17 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit readme.gentoo-r1 +MY_P="${PN}-${PV/_rc/rc}" DESCRIPTION="An IRC bot extensible with C or TCL" HOMEPAGE="https://www.eggheads.org/" -SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${P}.tar.gz" +SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~riscv sparc x86" LICENSE="GPL-2+" SLOT="0" IUSE="debug doc ipv6 ssl static" diff --git a/net-irc/eggdrop/eggdrop-1.8.4-r1.ebuild b/net-irc/eggdrop/eggdrop-1.9.4.ebuild index 9ca61a7717c9..9d934a6cfd1e 100644 --- a/net-irc/eggdrop/eggdrop-1.8.4-r1.ebuild +++ b/net-irc/eggdrop/eggdrop-1.9.4.ebuild @@ -1,18 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit readme.gentoo-r1 +MY_P="${PN}-${PV/_rc/rc}" DESCRIPTION="An IRC bot extensible with C or TCL" HOMEPAGE="https://www.eggheads.org/" -SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${P}.tar.gz" +SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ~riscv sparc x86" LICENSE="GPL-2+" SLOT="0" -IUSE="debug doc ipv6 ssl static" +IUSE="debug doc ssl static" DEPEND=" dev-lang/tcl:0= @@ -23,18 +25,11 @@ RDEPEND=" ${DEPEND} " -PATCHES=( - # https://github.com/eggheads/eggdrop/pull/986 - "${FILESDIR}/${P}-respect-ldflags.patch" - # https://github.com/eggheads/eggdrop/pull/841 - "${FILESDIR}/${P}-fix-array-bounds-warning.patch" -) - DOCS=( AUTHORS FEATURES INSTALL NEWS README THANKS UPGRADING ) src_configure() { - econf $(use_enable ssl tls) \ - $(use_enable ipv6 ipv6) + econf --enable-ipv6 \ + $(use_enable ssl tls) emake config } diff --git a/net-irc/eggdrop/eggdrop-1.8.3.ebuild b/net-irc/eggdrop/eggdrop-1.9.5.ebuild index 89a942bbaebf..a174ad7aeb29 100644 --- a/net-irc/eggdrop/eggdrop-1.8.3.ebuild +++ b/net-irc/eggdrop/eggdrop-1.9.5.ebuild @@ -1,18 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit readme.gentoo-r1 +MY_P="${PN}-${PV/_rc/rc}" DESCRIPTION="An IRC bot extensible with C or TCL" HOMEPAGE="https://www.eggheads.org/" -SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${P}.tar.gz" +SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~riscv ~sparc ~x86" LICENSE="GPL-2+" SLOT="0" -IUSE="debug doc ipv6 ssl static" +IUSE="debug doc ssl static" DEPEND=" dev-lang/tcl:0= @@ -25,21 +27,11 @@ RDEPEND=" DOCS=( AUTHORS FEATURES INSTALL NEWS README THANKS UPGRADING ) -src_prepare() { - # https://bugs.gentoo.org/335230 - # https://github.com/eggheads/eggdrop/issues/526 - sed -i \ - -e '/\$(LD)/s/-o/$(CFLAGS) $(LDFLAGS) &/' \ - src/mod/*.mod/Makefile* src/Makefile.in || die - default -} - src_configure() { - econf $(use_enable ssl tls) \ - $(use_enable ipv6 ipv6) + econf --enable-ipv6 \ + $(use_enable ssl tls) - # https://github.com/eggheads/eggdrop/issues/527 - emake -j1 config + emake config } src_compile() { @@ -57,8 +49,7 @@ src_compile() { } src_install() { - # https://github.com/eggheads/eggdrop/issues/527 - emake -j1 DEST="${D}"/opt/eggdrop install + emake DEST="${D}"/opt/eggdrop install use doc && HTML_DOCS=( doc/html/. ) rm -r "${D}"/opt/eggdrop/doc/html || die diff --git a/net-irc/eggdrop/files/eggdrop-1.8.4-fix-array-bounds-warning.patch b/net-irc/eggdrop/files/eggdrop-1.8.4-fix-array-bounds-warning.patch deleted file mode 100644 index 7c6c2d6dae69..000000000000 --- a/net-irc/eggdrop/files/eggdrop-1.8.4-fix-array-bounds-warning.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/flags.c b/src/flags.c -index 8cecd2898..3f0a7ea32 100644 ---- a/src/flags.c -+++ b/src/flags.c -@@ -403,7 +403,10 @@ void break_down_flags(const char *string, struct flag_record *plus, - which = plus; - mode++; - if ((mode == 2) && !(flags & (FR_CHAN | FR_BOT))) -- string = ""; -+ goto breakout; /* string = ""; does not work here because we need to -+ break out of while() / nested switch(), see -+ "string++;" below and string = "\0"; is worse than -+ goto */ - else if (mode == 3) - mode = 1; - break; -@@ -447,6 +450,7 @@ void break_down_flags(const char *string, struct flag_record *plus, - } - string++; - } -+breakout: - for (which = plus; which; which = (which == plus ? minus : 0)) { - which->global &=USER_VALID; - diff --git a/net-irc/eggdrop/files/eggdrop-1.8.4-respect-ldflags.patch b/net-irc/eggdrop/files/eggdrop-1.8.4-respect-ldflags.patch deleted file mode 100644 index e41dbd664c51..000000000000 --- a/net-irc/eggdrop/files/eggdrop-1.8.4-respect-ldflags.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 36f2df10c6c39290f6896f9ad5eb9d1419a1abe3 Mon Sep 17 00:00:00 2001 -From: Michael Ortmann <41313082+michaelortmann@users.noreply.github.com> -Date: Tue, 26 May 2020 01:08:03 +0200 -Subject: [PATCH] Respect LDFLAGS - ---- - src/Makefile.in | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.in b/src/Makefile.in -index 6757bbc8c..c9605a049 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -16,6 +16,7 @@ LD = @CC@ - STRIP = @STRIP@ - CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @SSL_INCLUDES@ @DEFS@ $(CFLGS) - CPPFLAGS = @CPPFLAGS@ -+LDFLAGS = @LDFLAGS@ - - eggdrop_objs = bg.o botcmd.o botmsg.o botnet.o chanprog.o cmds.o dcc.o \ - dccutil.o dns.o flags.o language.o match.o main.o mem.o misc.o misc_file.o \ -@@ -41,7 +42,7 @@ linkstart: - touch mod/mod.xlibs - - link: -- $(LD) $(CFLAGS) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs` -+ $(LD) $(CFLAGS) $(LDFLAGS) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs` - - linkfinish: - @$(STRIP) ../$(EGGEXEC) && \ -@@ -63,7 +64,7 @@ clean: - main.o: - $(CC) $(CFLAGS) $(CPPFLAGS) \ - '-DCCFLAGS="$(CC) $(CFLAGS) $(CPPFLAGS)"' \ -- '-DLDFLAGS="$(LD)"' \ -+ '-DLDFLAGS="$(LD) $(LDFLAGS)"' \ - '-DSTRIPFLAGS="$(STRIP)"' -c $(srcdir)/main.c - - compatibility: diff --git a/net-irc/eggdrop/metadata.xml b/net-irc/eggdrop/metadata.xml index 8da35fce7e67..29d8e9852e34 100644 --- a/net-irc/eggdrop/metadata.xml +++ b/net-irc/eggdrop/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sbraz@gentoo.org</email> diff --git a/net-irc/emech/Manifest b/net-irc/emech/Manifest index d90afca08168..e553ba254bad 100644 --- a/net-irc/emech/Manifest +++ b/net-irc/emech/Manifest @@ -1 +1,2 @@ +DIST emech-3.0.99_p20221123.tar.gz 290464 BLAKE2B a5b5bb057478e720d7e9039b4f1039b88d31dcb6f07b5fcbe1dfe5d29760336313183763ff35b8b66aba6402316d800a48b5509318a98cf9ab2729da7862a787 SHA512 e69455de286f3666ea8c53b9035ee927d5aff240ecf424c10d9eda6e1e957d97cba476c1b65cc6581e118938785366d313a687a00004e3d5f589a671194db41e DIST emech-3.0.99p3.tar.gz 249209 BLAKE2B 8ff0806275f7b1c9e49bb2eeda2afa0ac94b894426a2f56508492f970070e4141f14f88ffb3c1c46855817c405d29454cf85ebba53c85b4038d7d9d079f4dff6 SHA512 8ce6f8889e060791ab3af6fa63623469a457c436b4e23c51dcd1833fd09e7692270a324ad1d15beb4ad390e9d481267a8ea60eb17c9fd3195b5ad0daf7341165 diff --git a/net-irc/emech/emech-3.0.99_p20221123.ebuild b/net-irc/emech/emech-3.0.99_p20221123.ebuild new file mode 100644 index 000000000000..ce1ff0ed233c --- /dev/null +++ b/net-irc/emech/emech-3.0.99_p20221123.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit readme.gentoo-r1 toolchain-funcs + +GIT_COMMIT="62b62c8388fac3b3715c5d6539e1d704b16fa2d6" + +DESCRIPTION="UNIX compatible IRC bot programmed in C" +HOMEPAGE="https://github.com/EnergyMech/energymech" +SRC_URI="https://github.com/EnergyMech/energymech/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/energymech-${GIT_COMMIT}" + +LICENSE="GPL-2" +SLOT="0" +IUSE="debug session tcl" +KEYWORDS="amd64 ~x86" + +RDEPEND="virtual/libcrypt:=" +DEPEND="${RDEPEND}" + +DOC_CONTENTS="You can find a compressed sample config file at /usr/share/doc/${PF}" + +PATCHES=( "${FILESDIR}/${P}-fix-Wreturn-type.patch" ) +src_prepare() { + default + + sed -i \ + -e 's:"help/":"/usr/share/energymech/help/":' \ + src/config.h.in || die + # Respect CFLAGS and LDFLAGS + sed -i \ + -e '/^LFLAGS/s/\$(PIPEFLAG)/\0 \$(OPTIMIZE) \$(LDFLAGS)/' \ + -e '/^GDBFLAG/d' \ + -e '/^PIPEFLAG/d' \ + src/Makefile.in || die +} + +src_configure() { + tc-export CC + myconf=( + --with-alias + --with-botnet + --with-bounce + --with-ctcp + --with-dccfile + --with-dynamode + --with-dyncmd + --with-greet + --with-ircd_ext + --with-md5 + --with-newbie + --with-note + --with-notify + --with-rawdns + --with-seen + --with-stats + --with-telnet + --with-toybox + --with-trivia + --without-uptime + --with-web + --with-wingate + --without-profiling + --without-redirect + $(use_with tcl) + $(use_with session) + $(use_with debug) + ) + # not econf because we don't use autotools + ./configure "${myconf[@]}" || die "Configure failed" +} + +src_compile() { + emake -C src CC="$(tc-getCC)" OPTIMIZE="${CFLAGS}" +} + +src_install() { + dobin src/energymech + + insinto /usr/share/energymech + doins -r help + + insinto /usr/share/energymech/messages + doins common/*.txt + + dodoc sample.* README* TODO VERSIONS CREDITS checkmech + readme.gentoo_create_doc +} diff --git a/net-irc/emech/emech-3.0.99_p3.ebuild b/net-irc/emech/emech-3.0.99_p3-r1.ebuild index 68daec2e5664..84c7d2084451 100644 --- a/net-irc/emech/emech-3.0.99_p3.ebuild +++ b/net-irc/emech/emech-3.0.99_p3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,13 +8,15 @@ inherit readme.gentoo-r1 toolchain-funcs DESCRIPTION="UNIX compatible IRC bot programmed in the C language" HOMEPAGE="http://www.energymech.net/" SRC_URI="http://www.energymech.net/files/${P/_/}.tar.gz" +S="${WORKDIR}/${P/_/}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86" - IUSE="debug session tcl" -S="${WORKDIR}/${P/_/}" +KEYWORDS="amd64 x86" + +RDEPEND="virtual/libcrypt:=" +DEPEND="${RDEPEND}" DOC_CONTENTS="You can find a compressed sample config file at /usr/share/doc/${PF}" diff --git a/net-irc/emech/files/emech-3.0.99_p20221123-fix-Wreturn-type.patch b/net-irc/emech/files/emech-3.0.99_p20221123-fix-Wreturn-type.patch new file mode 100644 index 000000000000..0413a61dcad8 --- /dev/null +++ b/net-irc/emech/files/emech-3.0.99_p20221123-fix-Wreturn-type.patch @@ -0,0 +1,34 @@ +QA warns about non-void functions returning no value. Both function are not used +anywhere in the code anyway. + +Pascal Jäger <pascal.jaeger@leimstift.de> (2022-11-23) + +--- a/src/spy.c ++++ b/src/spy.c +@@ -460,7 +460,7 @@ void end_redirect(void) + char *urlhost(const char *url) + { + char copy[strlen(url)]; +- const char *end,*beg,*dst; ++ char *end,*beg,*dst; + int n = 0; + + beg = end = url; +@@ -481,6 +481,7 @@ char *urlhost(const char *url) + end++; + } + stringcpy_n(copy,beg,(end-beg)); ++ return beg; + #ifdef DEBUG + debug("(urlhost) host = %s\n",copy); + #endif +--- a/src/toybox.c ++++ b/src/toybox.c +@@ -196,6 +196,7 @@ int read_bigcharset(char *fname) + int read_ascii(char *rest) + { + to_user_q(global_from,FMT_PLAIN,rest); ++ return (0); + } + + #ifdef TRIVIA diff --git a/net-irc/emech/metadata.xml b/net-irc/emech/metadata.xml index 1b2becffa26c..6c1ae3471731 100644 --- a/net-irc/emech/metadata.xml +++ b/net-irc/emech/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <upstream> + <remote-id type="github">EnergyMech/energymech</remote-id> + </upstream> </pkgmetadata> diff --git a/net-irc/epic5/epic5-2.0.1.ebuild b/net-irc/epic5/epic5-2.0.1-r2.ebuild index d38b780348b7..b00e4839c17d 100644 --- a/net-irc/epic5/epic5-2.0.1.ebuild +++ b/net-irc/epic5/epic5-2.0.1-r2.ebuild @@ -1,10 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -USE_RUBY="ruby24 ruby25 ruby26" - -inherit autotools ruby-single toolchain-funcs DESCRIPTION="Epic5 IRC Client" SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${P}.tar.xz" @@ -12,23 +9,23 @@ HOMEPAGE="http://epicsol.org/" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~ppc x86" +KEYWORDS="amd64 ~ppc ~riscv x86" # Fails to build without ipv6 -IUSE="archive perl tcl ruby socks5 valgrind" #ipv6 +IUSE="archive perl tcl socks5 valgrind" #ipv6 RDEPEND=" >=dev-libs/openssl-0.9.8e-r3:0= >=sys-libs/ncurses-5.6-r2:0= + virtual/libcrypt:= virtual/libiconv archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2:= ) tcl? ( dev-lang/tcl:0= ) socks5? ( net-proxy/dante ) - ruby? ( ${RUBY_DEPS} ) " DEPEND="${RDEPEND} - valgrind? ( dev-util/valgrind ) + valgrind? ( dev-debug/valgrind ) " S="${WORKDIR}/${P}" @@ -39,18 +36,15 @@ PATCHES=( ) src_configure() { - # Because of our REQUIRED_USE constraints above, we know that - # ruby_get_use_implementations will only ever return one ruby - # implementation. econf \ --libexecdir="${EPREFIX}"/usr/lib/misc \ --with-ipv6 \ + --without-ruby \ $(use_with archive libarchive) \ $(use_with perl) \ - $(use_with ruby) \ $(use_with socks5) \ $(use_with tcl tcl "${EPREFIX}"/usr/$(get_libdir)/tclConfig.sh) \ - $(use_with valgrind valgrind) + $(use_with valgrind) } src_compile() { diff --git a/net-irc/epic5/metadata.xml b/net-irc/epic5/metadata.xml index 45acb5c4092f..5d07a7dac25b 100644 --- a/net-irc/epic5/metadata.xml +++ b/net-irc/epic5/metadata.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <use> <flag name="archive">Use <pkg>app-arch/libarchive</pkg> to use zip and tar archives from scripts.</flag> - <flag name="valgrind">Compile against <pkg>dev-util/valgrind</pkg> headers to improve memory-leak checking when running epic5 under valgrind.</flag> </use> </pkgmetadata> diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest new file mode 100644 index 000000000000..927598cbc9ad --- /dev/null +++ b/net-irc/ergo/Manifest @@ -0,0 +1,2 @@ +DIST ergo-2.12.0.tar.gz 3461568 BLAKE2B 8710ebae2cf840f8ea730fc4c9910d738702dfc55e2f68433e6ffdd7d9647ba081cb5d47ee7fd1e76d8a06017cfd73c377ea10510f37817c6ca63bdc81a33832 SHA512 932179ec05b0c7e5868bb41ebbfa9cc57b8eb8f6e9a0aceaf12081b4b42c6cfa996142d1f9e52c39d2b674d92b409ef8d3792f164281e6bf3f3a5b97def1d3ac +DIST ergo-2.13.0.tar.gz 3668775 BLAKE2B 81f1f75e359a7796a434e1f556d563223ac892ac190e90b50b8d81367f6c1d2bf73139a8b29f974195d882dba7f569a963dde28a30bd10e55fe018ae524be70f SHA512 870e852e1d4a9bbeb9485de33bcf027bfbf92f7fffa125640cbb28798441e52c334a5e14b3a5ba009094eb8f31d24f664601394b1d22fe30828116c55da28826 diff --git a/net-irc/ergo/ergo-2.12.0.ebuild b/net-irc/ergo/ergo-2.12.0.ebuild new file mode 100644 index 000000000000..a75a5ad80b57 --- /dev/null +++ b/net-irc/ergo/ergo-2.12.0.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit go-module python-any-r1 systemd + +DESCRIPTION="A modern IRC server written in Go" +HOMEPAGE="https://ergo.chat/ https://github.com/ergochat/ergo" +SRC_URI="https://github.com/ergochat/ergo/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${P/_/-} + +LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0" +SLOT="0" +if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="amd64 ~arm ~arm64" +fi +IUSE="test" +RESTRICT="!test? ( test )" + +# We may even want to package irctest in future? +RDEPEND=" + acct-user/oragono + acct-group/oragono +" +BDEPEND="test? ( ${PYTHON_DEPS} )" + +DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md ) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + sed -i -e 's:ERGO_USERNAME="ergo":ERGO_USERNAME="oragono":' distrib/openrc/ergo.confd || die + + # Minor fiddling with paths + sed -i \ + -e 's:/home/ergo/ergo:/usr/bin/ergo:' \ + -e 's:/home/ergo:/var/lib/ergo:' \ + -e 's:/var/lib/ergo/ircd.yaml:/etc/ergo/ircd.yaml:' \ + -e 's:User=ergo:User=oragono:' \ + distrib/systemd/ergo.service || die +} + +src_compile() { + ego build . +} + +src_install() { + einstalldocs + + dobin ergo + + insinto /etc/ergo + doins default.yaml + + newinitd distrib/openrc/ergo.initd ergo + newconfd distrib/openrc/ergo.confd ergo + + keepdir /var/lib/ergo + fowners oragono:oragono /var/lib/ergo + + insinto /var/lib/ergo + doins -r languages/ + + systemd_dounit distrib/systemd/ergo.service +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + elog "Please copy the example config in ${EROOT}/etc/ergo:" + elog "e.g. cp ${EROOT}/etc/ergo/default.yaml ${EROOT}/etc/ergo/ircd.yaml" + fi +} diff --git a/net-irc/ergo/ergo-2.13.0.ebuild b/net-irc/ergo/ergo-2.13.0.ebuild new file mode 100644 index 000000000000..8364e9398e17 --- /dev/null +++ b/net-irc/ergo/ergo-2.13.0.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit go-module python-any-r1 systemd + +DESCRIPTION="A modern IRC server written in Go" +HOMEPAGE="https://ergo.chat/ https://github.com/ergochat/ergo" +SRC_URI="https://github.com/ergochat/ergo/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${P/_/-} + +LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0" +SLOT="0" +if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="amd64 ~arm ~arm64" +fi +IUSE="test" +RESTRICT="!test? ( test )" + +# We may even want to package irctest in future? +RDEPEND=" + acct-user/oragono + acct-group/oragono +" +BDEPEND="test? ( ${PYTHON_DEPS} )" + +DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md ) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + sed -i -e 's:ERGO_USERNAME="ergo":ERGO_USERNAME="oragono":' distrib/openrc/ergo.confd || die + + # Minor fiddling with paths + sed -i \ + -e 's:/home/ergo/ergo:/usr/bin/ergo:' \ + -e 's:/home/ergo:/var/lib/ergo:' \ + -e 's:/var/lib/ergo/ircd.yaml:/etc/ergo/ircd.yaml:' \ + -e 's:User=ergo:User=oragono:' \ + distrib/systemd/ergo.service || die +} + +src_compile() { + ego build . +} + +src_install() { + einstalldocs + + dobin ergo + + insinto /etc/ergo + doins default.yaml + + newinitd distrib/openrc/ergo.initd ergo + newconfd distrib/openrc/ergo.confd ergo + + keepdir /var/lib/ergo + fowners oragono:oragono /var/lib/ergo + + insinto /var/lib/ergo + doins -r languages/ + + systemd_dounit distrib/systemd/ergo.service +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + elog "Please copy the example config in ${EROOT}/etc/ergo:" + elog "e.g. cp ${EROOT}/etc/ergo/default.yaml ${EROOT}/etc/ergo/ircd.yaml" + fi +} diff --git a/net-irc/ergo/metadata.xml b/net-irc/ergo/metadata.xml new file mode 100644 index 000000000000..2e8df544a305 --- /dev/null +++ b/net-irc/ergo/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <upstream> + <remote-id type="github">ergochat/ergo</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest index a09b66c24a74..30dbde40883e 100644 --- a/net-irc/hexchat/Manifest +++ b/net-irc/hexchat/Manifest @@ -1 +1,2 @@ -DIST hexchat-2.14.3.tar.xz 1292072 BLAKE2B 22bc8a0857b3ec26452843dd85c046cde055e719ce7dc23e4ec5ae33eb16251379ed84856c1812dc855a1e8d5d422c01e9352e2259f075a538226e1fcd79edd7 SHA512 c265921f2cb02c5d273bcdbb20a44a5c9f38b0f8cbba4fd56b177b676fc5d1dfd05bf80fcfa3706c7981f712f2f6c9aaaf80bccf3be0f6d96068dd393f3a7cb5 +DIST hexchat-2.16.1.tar.xz 1349536 BLAKE2B 6e1d9f7c36affc94356e0124ea445f019d8f00b643896ec004af17059befadfcd8fc1b75ef9fba277542dcf8593e8e4683a709a4c4cbaaaf4f3122d8488dc6ce SHA512 9e6baa30ec8c3ce4fb56e2c82625da63295040eaf93a542aec8a4a18a6a3c95d69d1d4ffabc952bcdcd7b754afef234b348f296143991fafd0550342db95ce0e +DIST hexchat-2.16.2.tar.xz 1352304 BLAKE2B 4977e44733539f9f7f1bbd7c66d0f945bdd6696650ad75975a19f2de931377626124aaed8fc2f98f345de2a00787eda2077ed7a5364d811f07237d88a8cc88dc SHA512 2ceb4332328c4acf55a46bf5c45788a7f3a73fd2ffd676751c75cc08ca04ced5569c1e6406877e6f2972b8967e94bea2ad70a6966ade7cd811b5c4d700409ee2 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 <tingping@tingping.se> -Date: Wed, 11 Mar 2020 11:07:56 -0700 -Subject: [PATCH] build: Better support building against python 3.8+ - -Closes #2441 ---- - plugins/python/meson.build | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/plugins/python/meson.build b/plugins/python/meson.build -index 2ad5128e5..eb762134a 100644 ---- a/plugins/python/meson.build -+++ b/plugins/python/meson.build -@@ -1,6 +1,12 @@ - python_opt = get_option('with-python') - if python_opt.startswith('python3') -- python_dep = dependency(python_opt, version: '>= 3.3') -+ # Python 3.8 introduced a new -embed variant -+ if not python_opt.endswith('-embed') -+ python_dep = dependency(python_opt + '-embed', version: '>= 3.3', required: false) -+ endif -+ if not python_dep.found() -+ python_dep = dependency(python_opt, version: '>= 3.3') -+ endif - else - python_dep = dependency(python_opt, version: '>= 2.7') - endif diff --git a/net-irc/hexchat/hexchat-2.14.3-r100.ebuild b/net-irc/hexchat/hexchat-2.16.1-r1.ebuild index f88c4364569a..3b3589e74b69 100644 --- a/net-irc/hexchat/hexchat-2.14.3-r100.ebuild +++ b/net-irc/hexchat/hexchat-2.16.1-r1.ebuild @@ -1,29 +1,31 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 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} ) +PYTHON_COMPAT=( python3_{10..11} ) -inherit lua-single meson mono-env python-single-r1 xdg +inherit flag-o-matic 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 + # We need to empty SRC_URI or else mono-env breaks the live ebuild SRC_URI="" EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" else SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv 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" +IUSE="dbus debug +gtk libcanberra lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + plugin-fishlim? ( ssl ) python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" @@ -36,19 +38,22 @@ RDEPEND=" x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) - libproxy? ( net-libs/libproxy ) - libnotify? ( x11-libs/libnotify ) lua? ( ${LUA_DEPS} ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) - python? ( ${PYTHON_DEPS} ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/cffi[${PYTHON_USEDEP}] + ' 'python*') ) + ssl? ( dev-libs/openssl:0= ) theme-manager? ( || ( - ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) + ( + dev-lang/mono[minimal] + dev-dotnet/libgdiplus + ) dev-lang/mono[-minimal] ) )" @@ -62,10 +67,6 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( - "${FILESDIR}/${P}-python38.patch" #758758 -) - pkg_setup() { use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup @@ -76,24 +77,26 @@ pkg_setup() { } src_configure() { + # LTO type mismatch, https://bugs.gentoo.org/861458 + filter-lto + 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)" + -Dinstall-appdata=false + -Dplugin=true + $(meson_feature dbus) + $(meson_feature libcanberra) + $(meson_feature ssl tls) + $(meson_use gtk gtk-frontend) + $(meson_use !gtk text-frontend) + $(meson_use theme-manager) + + $(meson_use plugin-checksum with-checksum) + $(meson_use plugin-fishlim with-fishlim) -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_use plugin-sysinfo with-sysinfo) ) meson_src_configure } @@ -101,7 +104,7 @@ src_configure() { src_install() { meson_src_install dodoc readme.md - find "${D}" -name '*.la' -delete || die + find "${ED}" -type f -name '*.la' -delete || die } pkg_preinst() { @@ -127,7 +130,6 @@ pkg_postinst() { 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)" } diff --git a/net-irc/hexchat/hexchat-2.14.3.ebuild b/net-irc/hexchat/hexchat-2.16.2.ebuild index 953c7cdaa78b..f42e8da5a93d 100644 --- a/net-irc/hexchat/hexchat-2.14.3.ebuild +++ b/net-irc/hexchat/hexchat-2.16.2.ebuild @@ -1,28 +1,32 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +LUA_COMPAT=( lua5-{1..5} luajit ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit meson mono-env python-single-r1 xdg +inherit lua-single meson mono-env python-single-r1 xdg DESCRIPTION="Graphical IRC client based on XChat" HOMEPAGE="https://hexchat.github.io/" if [[ "${PV}" == "9999" ]] ; then inherit git-r3 + # We need to empty SRC_URI or else mono-env breaks the live ebuild SRC_URI="" EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" else - SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux" + SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv 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} )" +IUSE="dbus debug +gtk libcanberra lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + plugin-fishlim? ( ssl ) + python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" dev-libs/glib:2 @@ -34,33 +38,37 @@ RDEPEND=" x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) - libproxy? ( net-libs/libproxy ) - libnotify? ( x11-libs/libnotify ) - lua? ( dev-lang/lua:0= ) + lua? ( ${LUA_DEPS} ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) - python? ( ${PYTHON_DEPS} ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/cffi[${PYTHON_USEDEP}] + ' 'python*') ) + ssl? ( dev-libs/openssl:0= ) theme-manager? ( || ( - ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) + ( + 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 + dev-util/glib-utils sys-devel/gettext virtual/pkgconfig " pkg_setup() { + use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup if use theme-manager ; then mono-env_pkg_setup @@ -70,23 +78,22 @@ pkg_setup() { 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)" + -Dinstall-appdata=false + -Dplugin=true + $(meson_feature dbus) + $(meson_feature libcanberra) + $(meson_feature ssl tls) + $(meson_use gtk gtk-frontend) + $(meson_use !gtk text-frontend) + $(meson_use theme-manager) + + $(meson_use plugin-checksum with-checksum) + $(meson_use plugin-fishlim with-fishlim) + -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_use plugin-sysinfo with-sysinfo) ) meson_src_configure } @@ -94,7 +101,7 @@ src_configure() { src_install() { meson_src_install dodoc readme.md - find "${D}" -name '*.la' -delete || die + find "${ED}" -type f -name '*.la' -delete || die } pkg_preinst() { @@ -120,7 +127,6 @@ pkg_postinst() { 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)" } diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild index 2bb1b8275bc8..1958b10d37e7 100644 --- a/net-irc/hexchat/hexchat-9999.ebuild +++ b/net-irc/hexchat/hexchat-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 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,8} ) +LUA_COMPAT=( lua5-{1..5} luajit ) +PYTHON_COMPAT=( python3_{10..12} ) inherit lua-single meson mono-env python-single-r1 xdg @@ -13,17 +13,19 @@ HOMEPAGE="https://hexchat.github.io/" if [[ "${PV}" == "9999" ]] ; then inherit git-r3 + # We need to empty SRC_URI or else mono-env breaks the live ebuild SRC_URI="" EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" else - SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" + SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~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" +IUSE="dbus debug +gtk libcanberra lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + plugin-fishlim? ( ssl ) python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" @@ -36,28 +38,31 @@ RDEPEND=" x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) - libproxy? ( net-libs/libproxy ) - libnotify? ( x11-libs/libnotify ) lua? ( ${LUA_DEPS} ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) - python? ( ${PYTHON_DEPS} ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/cffi[${PYTHON_USEDEP}] + ' 'python*') ) + ssl? ( dev-libs/openssl:0= ) theme-manager? ( || ( - ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) + ( + 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 + dev-util/glib-utils sys-devel/gettext virtual/pkgconfig " @@ -73,23 +78,22 @@ pkg_setup() { 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)" + -Dinstall-appdata=false + -Dplugin=true + $(meson_feature dbus) + $(meson_feature libcanberra) + $(meson_feature ssl tls) + $(meson_use gtk gtk-frontend) + $(meson_use !gtk text-frontend) + $(meson_use theme-manager) + + $(meson_use plugin-checksum with-checksum) + $(meson_use plugin-fishlim with-fishlim) + -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_use plugin-sysinfo with-sysinfo) ) meson_src_configure } @@ -97,7 +101,7 @@ src_configure() { src_install() { meson_src_install dodoc readme.md - find "${D}" -name '*.la' -delete || die + find "${ED}" -type f -name '*.la' -delete || die } pkg_preinst() { @@ -123,7 +127,6 @@ pkg_postinst() { 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)" } diff --git a/net-irc/hexchat/metadata.xml b/net-irc/hexchat/metadata.xml index a9f4370c0437..beb97dc0e90f 100644 --- a/net-irc/hexchat/metadata.xml +++ b/net-irc/hexchat/metadata.xml @@ -1,14 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> + <email>nex+b-g-o@nexadn.de</email> + <name>Adrian Schollmeyer</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <use> <flag name="libcanberra">Enable sound event support using <pkg>media-libs/libcanberra</pkg></flag> - <flag name="libproxy">Enable proxy support.</flag> <flag name="plugin-checksum">Build Checksum plugin (needs plugins)</flag> <flag name="plugin-fishlim">Build FiSHLiM plugin (needs plugins @@ -18,12 +21,8 @@ <flag name="theme-manager">Build the theme manager (mono)</flag> </use> <upstream> - <maintainer status="active"> - <email>tingping@tingping.se</email> - <name>TingPing</name> - </maintainer> <bugs-to>https://github.com/hexchat/hexchat/issues</bugs-to> - <doc lang="en">http://hexchat.readthedocs.org/en/latest</doc> + <doc lang="en">https://hexchat.readthedocs.io/en/latest</doc> <remote-id type="github">hexchat/hexchat</remote-id> </upstream> </pkgmetadata> diff --git a/net-irc/ii/Manifest b/net-irc/ii/Manifest index 4871af24cd36..4ddd4fef37d4 100644 --- a/net-irc/ii/Manifest +++ b/net-irc/ii/Manifest @@ -1 +1,3 @@ DIST ii-1.8.tar.gz 12326 BLAKE2B 7ae90d788aaec0a359ce46370f27c0ce62c6f77e8cda61d9d168d0ebd7de927a478b42a591631f2c193f3816b2a1b39cf79607326b073bcbeefe4291e0fb95f6 SHA512 2b41a0611ac76612c9333e8490709ee22d17506f0c5d7e680a0d8f3f8b511bd5b279555cf609c1543aba71948819369a3c306b1168086890aa49c145b7860e17 +DIST ii-1.9.tar.gz 12672 BLAKE2B 95da596de00fb311a69b907ab25c0089aafa512085b25fe5753206cdeaa0fec3d9a16eb38d60c68542f7002efd1052e69e1f5542f535363d38760cab508b3d99 SHA512 a665a6d1e1ffe56e370da2d703e677436ef4e18e763bb3cadbbf55e01812454ce4b79e8a20eda23846fdbe5a441ec8c534c9394995b3441472ce8a74c9035279 +DIST ii-2.0.tar.gz 11129 BLAKE2B ee8b4e1169f1f59a9f09fa2a96fc898b0c48a337708a19a208fd344453f620bb3a832e25c26a20f7d14e2e5a7924d8a1d97efabdbb269125c2117f453d5f737f SHA512 ab8102b5669495b7bc6a3311245f3eb49d2add1e387290e41deb51e121f4c7c98a09d117052c345d8b896149276a83790c0b78efe3ed19fc52bc00575bf8e44a diff --git a/net-irc/ii/ii-1.8.ebuild b/net-irc/ii/ii-1.8.ebuild index 2bb1b227445e..be2821b3f793 100644 --- a/net-irc/ii/ii-1.8.ebuild +++ b/net-irc/ii/ii-1.8.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs DESCRIPTION="A minimalist FIFO and filesystem-based IRC client" @@ -15,14 +15,8 @@ KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux" src_prepare() { default - sed -i \ - -e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \ - -e '/^CC/d' \ - -e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \ - config.mk || die - sed -i \ - -e 's|@${CC}|$(CC)|g' \ - Makefile || die + sed -i -e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \ + -e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' config.mk || die } src_compile() { @@ -30,7 +24,9 @@ src_compile() { } src_install() { - dobin ii - dodoc CHANGES FAQ README - doman *.1 + emake \ + DESTDIR="${D}" \ + PREFIX="${EPREFIX}"/usr \ + DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ + install } diff --git a/net-irc/ii/ii-1.9.ebuild b/net-irc/ii/ii-1.9.ebuild new file mode 100644 index 000000000000..f1cd0011b17c --- /dev/null +++ b/net-irc/ii/ii-1.9.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="A minimalist FIFO and filesystem-based IRC client" +HOMEPAGE="https://tools.suckless.org/ii/" +SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux" + +src_prepare() { + default + + sed -i -e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \ + -e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \ + -e 's|doc|doc/${PF}|' config.mk || die + + sed -i -e 's|(DOCPREFIX)/ii|(DOCPREFIX)|' Makefile || die +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + emake \ + DESTDIR="${D}" \ + PREFIX="${EPREFIX}"/usr \ + install +} diff --git a/net-irc/ii/ii-2.0.ebuild b/net-irc/ii/ii-2.0.ebuild new file mode 100644 index 000000000000..e932246b3013 --- /dev/null +++ b/net-irc/ii/ii-2.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="A minimalist FIFO and filesystem-based IRC client" +HOMEPAGE="https://tools.suckless.org/ii/" +SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux" + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + emake \ + DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ + DOCPREFIX="${EPREFIX}/usr/share/doc/${PF}" \ + install +} diff --git a/net-irc/ii/ii-9999.ebuild b/net-irc/ii/ii-9999.ebuild index 0cb5a9d7e15b..2241af190778 100644 --- a/net-irc/ii/ii-9999.ebuild +++ b/net-irc/ii/ii-9999.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit git-r3 toolchain-funcs DESCRIPTION="A minimalist FIFO and filesystem-based IRC client" @@ -10,27 +11,15 @@ EGIT_REPO_URI="https://git.suckless.org/ii" LICENSE="MIT" SLOT="0" -KEYWORDS="" - -src_prepare() { - default - - sed -i \ - -e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \ - -e '/^CC/d' \ - -e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \ - config.mk || die - sed -i \ - -e 's|@${CC}|$(CC)|g' \ - Makefile || die -} src_compile() { emake CC="$(tc-getCC)" } src_install() { - dobin ii - dodoc CHANGES FAQ README - doman *.1 + emake \ + DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ + DOCPREFIX="${EPREFIX}/usr/share/doc/${PF}" \ + install } diff --git a/net-irc/ii/metadata.xml b/net-irc/ii/metadata.xml index 6f49eba8f496..7a7911eb78b4 100644 --- a/net-irc/ii/metadata.xml +++ b/net-irc/ii/metadata.xml @@ -1,5 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>fulade@riseup.net</email> + <name>Vladimir Kuznetsov</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> </pkgmetadata> diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest index 26f0ac924f98..4f047c848ab2 100644 --- a/net-irc/inspircd/Manifest +++ b/net-irc/inspircd/Manifest @@ -1 +1,2 @@ -DIST inspircd-3.8.1.tar.gz 850997 BLAKE2B aebf085b21b99fae989d5d75c28223cf5ef5aa8f872886af099800683718e51aa3650a8968968e2434de738a5d5770a26f84a02c9b1270dffdc9efdd2e8c9f86 SHA512 be16dd18882bdb424ebeb131e382db073adaf37914e7c8333bd1c266242f2c48e6c721f0ecae72159bca229790413dabee67fd4a4a3c83588c48c8bb15e604fa +DIST inspircd-3.16.1-fix-build-paths.patch.bz2 4751 BLAKE2B 78ae06bfbdd6d389af2890aadebc5765f16d1616bb9c1b8820a21b2f2a283f4f4aea5bc4f7edc5d61acc80da67ca80a2d0b007a669cf7a37f1ea77b11f552643 SHA512 1fec0c784a1d306a62c9a5320236bfb53bffd4278bbcc8439ea640500b8668cec4e6c23174d1d88f8109bc88549c931ff889b4c07a8f0f5446bb85a434665702 +DIST inspircd-3.16.1.tar.gz 877817 BLAKE2B a54992c32a13a512bce93157b23a17d433fbdbf7efcaa54a66be17628335db379d0abbb14e22a455e069fd8fb2a1f3e0152a112acbe634e6de87208b4a1b8cd5 SHA512 2b488858b0012bcb3eb92a33960e9927c861587c7b7451a47fd3e10a97fad9c392524d98712593fd455c5cbae7fd1779e4b90b9e55680c2f36b483e0acf2bba5 diff --git a/net-irc/inspircd/files/inspircd-3.7.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.7.0-fix-path-builds.patch deleted file mode 100644 index 92e1c4b6032f..000000000000 --- a/net-irc/inspircd/files/inspircd-3.7.0-fix-path-builds.patch +++ /dev/null @@ -1,338 +0,0 @@ -diff --git a/docs/conf/codepages/ascii.conf.example b/docs/conf/codepages/ascii.conf -similarity index 100% -rename from docs/conf/codepages/ascii.conf.example -rename to docs/conf/codepages/ascii.conf -diff --git a/docs/conf/codepages/latin1.conf.example b/docs/conf/codepages/latin1.conf -similarity index 97% -rename from docs/conf/codepages/latin1.conf.example -rename to docs/conf/codepages/latin1.conf -index 3beb002fd..f5c6b98dc 100644 ---- a/docs/conf/codepages/latin1.conf.example -+++ b/docs/conf/codepages/latin1.conf -@@ -39,4 +39,4 @@ - <cpcase lower="222" upper="254"> # þ => Þ - - # Include the ASCII rules to avoid duplication. --<include file="examples/codepages/ascii.conf.example"> -+<include file="/etc/inspircd/codepages/ascii.conf"> -diff --git a/docs/conf/codepages/rfc1459.conf.example b/docs/conf/codepages/rfc1459.conf -similarity index 100% -rename from docs/conf/codepages/rfc1459.conf.example -rename to docs/conf/codepages/rfc1459.conf -diff --git a/docs/conf/codepages/strict-rfc1459.conf.example b/docs/conf/codepages/strict-rfc1459.conf -similarity index 100% -rename from docs/conf/codepages/strict-rfc1459.conf.example -rename to docs/conf/codepages/strict-rfc1459.conf -diff --git a/docs/conf/filter.conf.example b/docs/conf/filter.conf -similarity index 100% -rename from docs/conf/filter.conf.example -rename to docs/conf/filter.conf -diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf -similarity index 100% -rename from docs/conf/helpop.conf.example -rename to docs/conf/helpop.conf -diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf -similarity index 99% -rename from docs/conf/inspircd.conf.example -rename to docs/conf/inspircd.conf -index d678b5be3..607141381 100644 ---- a/docs/conf/inspircd.conf.example -+++ b/docs/conf/inspircd.conf -@@ -250,7 +250,7 @@ - # This can be done by using <connect registered="no"> # - - # To enable IRCCloud on your network uncomment this: --#<include file="examples/providers/irccloud.conf.example"> -+#<include file="/etc/inspircd/providers/irccloud.conf"> - - # A connect class with <connect:deny> set denies connections from the specified host/IP range. - <connect -@@ -494,11 +494,11 @@ - - # This file has all the information about oper classes, types and o:lines. - # You *MUST* edit it. --#<include file="examples/opers.conf.example"> -+#<include file="/etc/inspircd/opers.conf"> - - # This file has all the information about server links and ulined servers. - # You *MUST* edit it if you intend to link servers. --#<include file="examples/links.conf.example"> -+#<include file="/etc/inspircd/links.conf"> - - #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# - # # -@@ -507,7 +507,7 @@ - # - # motd - displayed on connect and when a user executes /MOTD - # Modules can also define their own files --<files motd="examples/motd.txt.example"> -+<files motd="/etc/inspircd/motd.txt"> - - # Example of an executable file include. Note this will be read on rehash, - # not when the command is run. -@@ -543,7 +543,7 @@ - # the default of 'inspircd.pid' is used. # - # # - --#<pid file="/path/to/inspircd.pid"> -+#<pid file="/var/run/inspircd/inspircd.pid"> - - #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-# - # # -@@ -697,7 +697,7 @@ - # messages (requires the stripcolor module). - # - topiclock Channel mode +t - limits changing the topic to (half)ops - # You can also configure this on a per-channel basis with a channel mode. -- # See m_exemptchanops in modules.conf.example for more details. -+ # See m_exemptchanops in modules.conf for more details. - exemptchanops="censor:o filter:o nickflood:o nonick:v regmoderated:o" - - # invitebypassmodes: This allows /INVITE to bypass other channel modes. -@@ -1045,7 +1045,7 @@ - # provide almost all the features of InspIRCd. :) # - # # - # The default does nothing -- we include it for simplicity for you. # --#<include file="examples/modules.conf.example"> -+#<include file="/etc/inspircd/modules.conf"> - - #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION #-#-#-#-#-#-#-#-#-#-#-# - # # -@@ -1054,13 +1054,13 @@ - # exemptions for services pseudoclients: # - # - # Anope users should uncomment this: --#<include file="examples/services/anope.conf.example"> -+#<include file="/etc/inspircd/aliases/anope.conf"> - # - # Atheme users should uncomment this: --#<include file="examples/services/atheme.conf.example"> -+#<include file="/etc/inspircd/aliases/atheme.conf"> - # - # Users of other services should uncomment this: --#<include file="examples/services/generic.conf.example"> -+#<include file="/etc/inspircd/aliases/generic.conf"> - - ######################################################################### - # # -diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf -similarity index 98% -rename from docs/conf/links.conf.example -rename to docs/conf/links.conf -index 256ac10f9..40f5be35d 100644 ---- a/docs/conf/links.conf.example -+++ b/docs/conf/links.conf -@@ -121,4 +121,4 @@ - - # Once you have edited this file you can remove this line. This is just to - # ensure that you don't hastily include the file without reading it. --<die reason="Using links.conf.example without editing it is a security risk"> -+<die reason="Using links.conf without editing it is a security risk"> -diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf -similarity index 99% -rename from docs/conf/modules.conf.example -rename to docs/conf/modules.conf -index 2e50977bd..315d376cf 100644 ---- a/docs/conf/modules.conf.example -+++ b/docs/conf/modules.conf -@@ -576,10 +576,10 @@ - # and case mapping. - # - # You should include one of the following files to set your codepage: --#<include file="examples/codepages/ascii.conf.example"> --#<include file="examples/codepages/latin1.conf.example"> --#<include file="examples/codepages/rfc1459.conf.example"> --#<include file="examples/codepages/strict-rfc1459.conf.example"> -+#<include file="/etc/inspircd/codepages/ascii.conf"> -+#<include file="/etc/inspircd/codepages/latin1.conf"> -+#<include file="/etc/inspircd/codepages/rfc1459.conf"> -+#<include file="/etc/inspircd/codepages/strict-rfc1459.conf"> - # - # You can also define a custom codepage. For details on how to do this - # please refer to the docs site: -@@ -853,7 +853,7 @@ - # anticaps, auditorium-see, auditorium-vis, blockcaps, blockcolor, # - # censor, filter, flood, nickflood, noctcp, nonick, nonotice, # - # regmoderated, stripcolor, and topiclock. # --# See <options:exemptchanops> in inspircd.conf.example for a more # -+# See <options:exemptchanops> in inspircd.conf for a more # - # detailed list of the restriction modes that can be exempted. # - # These are settable using: /MODE #chan +X <restriction>:<status> # - #<module name="exemptchanops"> -@@ -889,7 +889,7 @@ - # Your choice of regex engine must match on all servers network-wide. # - # # - # To learn more about the configuration of this module, read # --# examples/filter.conf.example, which covers the various types of # -+# filter.conf, which covers the various types of # - # filters and shows how to add exemptions. # - # # - #-#-#-#-#-#-#-#-#-#-#- FILTER CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-# -@@ -898,7 +898,7 @@ - # specify below the path to the filter.conf file, or define some # - # <keyword> tags. # - # # --#<include file="examples/filter.conf.example"> -+#<include file="/etc/inspircd/filter.conf"> - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # Flash Policy Daemon module: Allows Flash IRC clients (e.g. LightIRC)# -@@ -988,7 +988,7 @@ - # If you specify to use the helpop module, then specify below the # - # path to the helpop.conf file. # - # # --#<include file="examples/helpop.conf.example"> -+#<include file="/etc/inspircd/helpop.conf"> - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # Hide chans module: Allows users to hide their channels list from non- -@@ -1581,7 +1581,7 @@ - # onoper - If on, the message is sent on /OPER, otherwise it's # - # only sent when /OPERMOTD is used. # - # # --#<opermotd file="examples/opermotd.txt.example" onoper="yes"> -+#<opermotd file="/etc/inspircd/opermotd.txt" onoper="yes"> - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # Override module: Adds support for oper override. -@@ -2172,7 +2172,7 @@ - # connections in order to oper up. It is highly recommended to load - # this module if you use TLS (SSL) on your network. - # For how to use the oper features, please see the first --# example <oper> tag in opers.conf.example. -+# example <oper> tag in opers.conf. - # - #<module name="sslinfo"> - # -diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt -similarity index 96% -rename from docs/conf/motd.txt.example -rename to docs/conf/motd.txt -index 9281cd4b9..a4ac6964b 100644 ---- a/docs/conf/motd.txt.example -+++ b/docs/conf/motd.txt -@@ -23,7 +23,7 @@ - `-.__ `----""" __.-' - `--..____..--' - -- +---- To change this see \bmotd.txt.example\x ----+ -+ +---- To change this see \bmotd.txt \x ----+ - | | - | * \bWeb:\x https://www.inspircd.org | - | * \bIRC:\x irc.inspircd.org #inspircd | -diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt -similarity index 96% -rename from docs/conf/opermotd.txt.example -rename to docs/conf/opermotd.txt -index a25d90380..68671a081 100644 ---- a/docs/conf/opermotd.txt.example -+++ b/docs/conf/opermotd.txt -@@ -23,7 +23,7 @@ - `-.__ `----""" __.-' - `--..____..--' - -- +-- To change this see \bopermotd.txt.example\x --+ -+ +-- To change this see \bopermotd.txt \x --+ - | | - | * \bWeb:\x https://www.inspircd.org | - | * \bIRC:\x irc.inspircd.org #inspircd | -diff --git a/docs/conf/opers.conf.example b/docs/conf/opers.conf -similarity index 99% -rename from docs/conf/opers.conf.example -rename to docs/conf/opers.conf -index d8c266b1f..9517b3685 100644 ---- a/docs/conf/opers.conf.example -+++ b/docs/conf/opers.conf -@@ -182,4 +182,4 @@ - - # Once you have edited this file you can remove this line. This is just to - # ensure that you don't hastily include the file without reading it. --<die reason="Using opers.conf.example without editing it is a security risk"> -+<die reason="Using opers.conf without editing it is a security risk"> -diff --git a/docs/conf/providers/irccloud.conf.example b/docs/conf/providers/irccloud.conf -similarity index 100% -rename from docs/conf/providers/irccloud.conf.example -rename to docs/conf/providers/irccloud.conf -diff --git a/docs/conf/quotes.txt.example b/docs/conf/quotes.txt -similarity index 100% -rename from docs/conf/quotes.txt.example -rename to docs/conf/quotes.txt -diff --git a/docs/conf/services/anope.conf.example b/docs/conf/services/anope.conf -similarity index 86% -rename from docs/conf/services/anope.conf.example -rename to docs/conf/services/anope.conf -index 5c8f859ff..69a1ab50a 100644 ---- a/docs/conf/services/anope.conf.example -+++ b/docs/conf/services/anope.conf -@@ -2,7 +2,7 @@ - # by Anope. See https://www.anope.org for more information on Anope. - - # This file inherits from the generic config to avoid repetition. --<include file="examples/services/generic.conf.example"> -+<include file="/etc/inspircd/services/generic.conf"> - - # /GLOBAL <message> - # Sends a global notice. -diff --git a/docs/conf/services/atheme.conf.example b/docs/conf/services/atheme.conf -similarity index 98% -rename from docs/conf/services/atheme.conf.example -rename to docs/conf/services/atheme.conf -index d509522b8..c1e906ff7 100644 ---- a/docs/conf/services/atheme.conf.example -+++ b/docs/conf/services/atheme.conf -@@ -3,7 +3,7 @@ - # information on Atheme. - - # This file inherits from the generic config to avoid repetition. --<include file="examples/services/generic.conf.example"> -+<include file="/etc/inspircd/services/generic.conf"> - - # Long hand aliases for services pseudoclients. - <alias text="ALIS" replace="SQUERY $requirement :$2-" requires="ALIS" uline="yes"> -diff --git a/docs/conf/services/generic.conf.example b/docs/conf/services/generic.conf -similarity index 100% -rename from docs/conf/services/generic.conf.example -rename to docs/conf/services/generic.conf -diff --git a/make/template/main.mk b/make/template/main.mk -index 9f905f970..c87da5d73 100644 ---- a/make/template/main.mk -+++ b/make/template/main.mk -@@ -221,10 +221,10 @@ install: target - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH) - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH) - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH) -- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/codepages -- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/providers -- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services -- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql -+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/codepages -+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/providers -+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/services -+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/sql - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH) - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH) - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH) -@@ -244,11 +244,11 @@ endif - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-testssl.1 $(MANPATH) 2>/dev/null - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/testssl $(BINPATH)/inspircd-testssl 2>/dev/null -- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH) -- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/*.example $(EXAPATH)/codepages -- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers -- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services -- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql -+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH) -+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/* $(CONPATH)/codepages -+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/* $(CONPATH)/providers -+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/* $(CONPATH)/services -+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/sql - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH) - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null - @echo "" -@@ -263,7 +263,6 @@ endif - @echo ' Data:' $(DATPATH) - @echo 'To start the ircd, run:' $(SCRPATH)/inspircd start - @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf -- @echo 'Examples are available at:' $(EXAPATH) - - GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@ - ./configure --update diff --git a/net-irc/inspircd/inspircd-3.16.1.ebuild b/net-irc/inspircd/inspircd-3.16.1.ebuild new file mode 100644 index 000000000000..e179adf0a0da --- /dev/null +++ b/net-irc/inspircd/inspircd-3.16.1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd toolchain-funcs + +DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd" +HOMEPAGE="https://www.inspircd.org/" +SRC_URI=" + https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/clinew/gentoo-distfiles/raw/master/inspircd-${PV}-fix-build-paths.patch.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +IUSE="argon2 debug gnutls ldap maxminddb mbedtls mysql pcre pcre2 postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre" + +RDEPEND=" + acct-group/inspircd + acct-user/inspircd + dev-lang/perl + argon2? ( app-crypt/argon2 ) + gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) + ldap? ( net-nds/openldap:= ) + maxminddb? ( dev-libs/libmaxminddb:= ) + mbedtls? ( net-libs/mbedtls:= ) + mysql? ( dev-db/mysql-connector-c:= ) + pcre? ( dev-libs/libpcre ) + pcre2? ( dev-libs/libpcre2 ) + postgres? ( dev-db/postgresql:= ) + re2? ( dev-libs/re2:= ) + sqlite? ( >=dev-db/sqlite-3.0 ) + ssl? ( dev-libs/openssl:= ) + tre? ( dev-libs/tre )" +DEPEND="${RDEPEND}" + +DOCS=( docs/. .configure/apparmor ) +PATCHES=( "${WORKDIR}"/${P}-fix-build-paths.patch ) + +src_configure() { + local extras="" + + use argon2 && extras+="argon2," + use gnutls && extras+="ssl_gnutls," + use ldap && extras+="ldap," + use maxminddb && extras+="geo_maxmind," + use mbedtls && extras+="ssl_mbedtls," + use mysql && extras+="mysql," + use pcre && extras+="regex_pcre," + use pcre2 && extras+="regex_pcre2," + use postgres && extras+="pgsql," + use re2 && extras+="regex_re2," + use regex-posix && extras+="regex_posix," + use regex-stdlib && extras+="regex_stdlib," + use sqlite && extras+="sqlite3," + use ssl && extras+="ssl_openssl," + use sslrehashsignal && extras+="sslrehashsignal," + use tre && extras+="regex_tre," + + # The first configuration run enables certain "extra" InspIRCd + # modules, the second run generates the actual makefile. + if [[ -n "${extras}" ]]; then + ./configure --enable-extras=${extras%,} + fi + + local myconf=( + --disable-auto-extras + --disable-ownership + --system + --uid ${PN} + --gid ${PN} + --binary-dir="/usr/bin" + --data-dir="/var/lib/${PN}/data" + --example-dir="/usr/share/doc/${PV}" + --manual-dir="/usr/share/man" + --module-dir="/usr/$(get_libdir)/${PN}/modules") + CXX="$(tc-getCXX)" ./configure "${myconf[@]}" +} + +src_compile() { + emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" $(usev debug INSPIRCD_DEBUG=2) INSPIRCD_VERBOSE=1 +} + +src_install() { + default + + insinto "/usr/include/${PN}" + doins -r include/. + + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + systemd_dounit .configure/inspircd.service + + keepdir "/var/log/${PN}" + insinto "/etc/logrotate.d" + newins .configure/logrotate "${PN}" + + diropts -o"${PN}" -g"${PN}" -m0700 + keepdir "/var/lib/${PN}/data" + + rmdir "${ED}"/run{/inspircd,} || die +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + elog "You will find example configuration files under " + elog "/usr/share/doc/${PN}" + elog "Read the ${PN}.conf.example file carefully before " + elog "starting the service." + fi +} diff --git a/net-irc/inspircd/inspircd-3.8.1.ebuild b/net-irc/inspircd/inspircd-3.8.1.ebuild deleted file mode 100644 index 355015a8d696..000000000000 --- a/net-irc/inspircd/inspircd-3.8.1.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit toolchain-funcs - -DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd" -HOMEPAGE="https://www.inspircd.org/" -SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre" - -RDEPEND=" - acct-group/inspircd - acct-user/inspircd - dev-lang/perl - gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) - ldap? ( net-nds/openldap ) - maxminddb? ( dev-libs/libmaxminddb ) - mbedtls? ( net-libs/mbedtls:= ) - mysql? ( dev-db/mysql-connector-c:= ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql:= ) - re2? ( dev-libs/re2:= ) - sqlite? ( >=dev-db/sqlite-3.0 ) - ssl? ( dev-libs/openssl:= ) - tre? ( dev-libs/tre )" -DEPEND="${RDEPEND}" - -DOCS=( docs/. ) -PATCHES=( "${FILESDIR}"/${PN}-3.7.0-fix-path-builds.patch ) - -src_prepare() { - default - - # Patch the inspircd launcher with the inspircd user - sed -i -e "s/@UID@/${PN}/" "make/template/${PN}" || die -} - -src_configure() { - local extras="" - - use gnutls && extras+="m_ssl_gnutls.cpp," - use ldap && extras+="m_ldap.cpp," - use maxminddb && extras+="m_geo_maxmind.cpp," - use mbedtls && extras+="m_ssl_mbedtls.cpp," - use mysql && extras+="m_mysql.cpp," - use pcre && extras+="m_regex_pcre.cpp," - use postgres && extras+="m_pgsql.cpp," - use re2 && extras+="m_regex_re2.cpp," - use regex-posix && extras+="m_regex_posix.cpp," - use regex-stdlib && extras+="m_regex_stdlib.cpp," - use sqlite && extras+="m_sqlite3.cpp," - use ssl && extras+="m_ssl_openssl.cpp," - use sslrehashsignal && extras+="m_sslrehashsignal.cpp," - use tre && extras+="m_regex_tre.cpp," - - # The first configuration run enables certain "extra" InspIRCd - # modules, the second run generates the actual makefile. - if [[ -n "${extras}" ]]; then - ./configure --disable-interactive --enable-extras=${extras%,} - fi - - local myconf=( - --disable-interactive - --disable-auto-extras - --prefix="/usr/$(get_libdir)/${PN}" - --config-dir="/etc/${PN}" - --data-dir="/var/lib/${PN}/data" - --log-dir="/var/log/${PN}" - --binary-dir="/usr/bin" - --module-dir="/usr/$(get_libdir)/${PN}/modules" - --manual-dir="/usr/share/man") - CXX="$(tc-getCXX)" ./configure "${myconf[@]}" -} - -src_compile() { - emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" $(usex debug 'INSPIRCD_DEBUG=2' '') INSPIRCD_VERBOSE=1 -} - -src_install() { - default - - insinto "/usr/include/${PN}" - doins -r include/. - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - - keepdir "/var/log/${PN}" - - diropts -o"${PN}" -g"${PN}" -m0700 - keepdir "/var/lib/${PN}/data" -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog "You will find example configuration files under " - elog "/usr/share/doc/${PN}" - elog "Read the ${PN}.conf.example file carefully before " - elog "starting the service." - fi - local pv - for pv in ${REPLACING_VERSIONS}; do - if ver_test "${pv}" -lt "2.0.24-r1"; then - elog "Starting with 2.0.24-r1 the daemon is no longer started" - elog "with the --logfile option and you are thus expected to define" - elog "logging in the InspIRCd configuration file if you want it." - fi - if ver_test "${pv}" -lt "3.0.0"; then - elog "Version 3.0 is a major upgrade which contains breaking" - elog "changes. You will need to update your configuration files." - elog "See: https://docs.inspircd.org/3/configuration-changes" - fi - done -} diff --git a/net-irc/inspircd/metadata.xml b/net-irc/inspircd/metadata.xml index f1f04d7eca62..41305043803e 100644 --- a/net-irc/inspircd/metadata.xml +++ b/net-irc/inspircd/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <longdescription lang="en"> InspIRCd is a modular Internet Relay Chat (IRC) server written in C++ @@ -12,11 +12,13 @@ para ser estable, moderno y ligero. </longdescription> <use> + <flag name="argon2">Enable Argon2 hashes in modules</flag> <flag name="gnutls">Enable TLS support</flag> <flag name="ldap">Enable LDAP support</flag> <flag name="maxminddb">Add support for geolocation using libMaxMindDB</flag> <flag name="mbedtls">Add support for TLS using the mbedTLS library</flag> <flag name="mysql">Enable MySQL database backend</flag> + <flag name="pcre2">Add support for Perl Compatible Regular Expressions 2</flag> <flag name="postgres">Enable PostgreSQL database backend</flag> <flag name="re2">Add support for Google RE2 regular expressions library</flag> <flag name="regex-posix">Add support for POSIX Regular Expressions</flag> @@ -29,11 +31,11 @@ <upstream> <remote-id type="github">inspircd/inspircd</remote-id> </upstream> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>wadecline@hotmail.com</email> <name>Wade Cline</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/net-irc/irccloud-desktop-bin/Manifest b/net-irc/irccloud-desktop-bin/Manifest index 1be8b3ad48df..d47a0b218cdb 100644 --- a/net-irc/irccloud-desktop-bin/Manifest +++ b/net-irc/irccloud-desktop-bin/Manifest @@ -1 +1 @@ -DIST irccloud-desktop_0.15.0_linux_amd64.deb 56822648 BLAKE2B 9311a0b1c7aca956cbcd75be20dd11d6114c4a593d7f3fb3cbc06d9806d9fe8631d72af3e0f209a3ecb1211a8027cd9d55c0999366359fe49e219a3f6efb9429 SHA512 69d3a6edaae05a71100ca791eb0986e5b58070fd20ec23ae853e14d59f613f2f25470983de34f24222c7f67e609ae5e2a83b5dc0dbadb9c49e9165b3d5b550d1 +DIST irccloud-desktop_0.16.0_linux_amd64.deb 57611554 BLAKE2B f96f9c146d4492e9fe4976f59e9965fc1ecc7b2976f9ffdb24a6a1db72f6c041b4623f41f34fbf18c5445a098b4d24fd4fe62d66fc28501d64403a539a7bd6de SHA512 7d03a4a121d90b6ce25e76cda0298a29e96f9b199e71030522a41cd0c0eb550be2ecdc080c0592dd835c18c00b3648000f3cbd193844e18ac8f46f1d15c0b74f diff --git a/net-irc/irccloud-desktop-bin/irccloud-desktop-bin-0.15.0.ebuild b/net-irc/irccloud-desktop-bin/irccloud-desktop-bin-0.16.0-r1.ebuild index fd92a49e7005..d74305c54ff9 100644 --- a/net-irc/irccloud-desktop-bin/irccloud-desktop-bin-0.15.0.ebuild +++ b/net-irc/irccloud-desktop-bin/irccloud-desktop-bin-0.16.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,8 +6,7 @@ EAPI=7 inherit desktop unpacker xdg DESCRIPTION="IRCCloud Desktop Client" -HOMEPAGE="https://github.com/irccloud/irccloud-desktop - https://www.irccloud.com/" +HOMEPAGE="https://github.com/irccloud/irccloud-desktop https://www.irccloud.com/" SRC_URI="https://github.com/irccloud/irccloud-desktop/releases/download/v${PV}/irccloud-desktop_${PV}_linux_amd64.deb" LICENSE="Apache-2.0" @@ -16,28 +15,31 @@ KEYWORDS="~amd64" RESTRICT="mirror strip" DEPEND=" + >=app-accessibility/at-spi2-core-2.0.0 + media-libs/alsa-lib + net-print/cups >=x11-libs/gtk+-3.0 x11-libs/libnotify >=dev-libs/nss-3 x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/xdg-utils - net-print/cups - >=app-accessibility/at-spi2-core-2.0.0 " + RDEPEND="${DEPEND}" S="${WORKDIR}" +QA_PREBUILT="/opt/IRCCloud/*" + src_unpack() { unpack_deb ${A} } src_install() { - sed -i 's/--no-sandbox//g' usr/share/applications/irccloud.desktop || die domenu usr/share/applications/irccloud.desktop - for size in 16 32 48 64 128 256 512; do + for size in {16,32,48,64,128,256,512}; do doicon -s ${size} usr/share/icons/hicolor/${size}x${size}/apps/irccloud.png done diff --git a/net-irc/irccloud-desktop-bin/metadata.xml b/net-irc/irccloud-desktop-bin/metadata.xml index 915f00227065..4d1e1ea205c7 100644 --- a/net-irc/irccloud-desktop-bin/metadata.xml +++ b/net-irc/irccloud-desktop-bin/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>zx2c4@gentoo.org</email> diff --git a/net-irc/ircii/Manifest b/net-irc/ircii/Manifest index 7e2389987a28..da664954e08e 100644 --- a/net-irc/ircii/Manifest +++ b/net-irc/ircii/Manifest @@ -1 +1 @@ -DIST ircii-20190117.tar.bz2 606327 BLAKE2B f7ee5c98f6106f07fec8feb0840aba87a052e5927c5e591f34ea28a9a017fb64c711983e472ae001465cbe29b6b9d88ab65d67c4bb303b9e01dde853aba66bf4 SHA512 08ca96cd62bae35245b40791c8588752b96136b53e5c9434d0f7976d03841fca80e8c83cf8608aad79c381820b06e00167447c6dc0c6294c6b3dfd91a9fdb6d4 +DIST ircii-20240111.tar.bz2 576700 BLAKE2B 785177e30dbe3b417aec9fb348574e4f539adcfef41534743c050d39aa0e0ba00ea52accc20b785a836f7496e66975549b85fa17a58c280d893f5c0927e1bb1b SHA512 4705b851671f89d1b4903539eb7e701913748138d460572bfeb7e6d565e760b9782aecb55d82c691f6f182864b12e78e13a7b5a1e3abcd535e5bc24c9815e1aa diff --git a/net-irc/ircii/ircii-20190117.ebuild b/net-irc/ircii/ircii-20190117.ebuild deleted file mode 100644 index 677beaac500a..000000000000 --- a/net-irc/ircii/ircii-20190117.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="An IRC and ICB client that runs under most UNIX platforms" -SRC_URI="https://ircii.warped.com/${P}.tar.bz2 - https://ircii.warped.com/old/${P}.tar.bz2" -HOMEPAGE="http://eterna.com.au/ircii/" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="ipv6" - -DEPEND="sys-libs/ncurses:0= - virtual/libiconv" -# This and irc-client both install /usr/bin/irc #247987 -RDEPEND="${DEPEND} - !net-irc/irc-client" - -PATCHES=( "${FILESDIR}/${PN}-manpage-path.patch" ) - -src_configure() { - tc-export CC - econf $(use_enable ipv6) -} - -src_install() { - emake -j1 DESTDIR="${D}" install - - dodoc ChangeLog INSTALL NEWS README \ - doc/Copyright doc/crypto doc/VERSIONS doc/ctcp -} diff --git a/net-irc/ircii/ircii-20240111.ebuild b/net-irc/ircii/ircii-20240111.ebuild new file mode 100644 index 000000000000..aed697690162 --- /dev/null +++ b/net-irc/ircii/ircii-20240111.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="An IRC and ICB client that runs under most UNIX platforms" +HOMEPAGE="http://eterna23.net/ircii/" +SRC_URI="https://ircii.warped.com/${P}.tar.bz2 + https://ircii.warped.com/old/${P}.tar.bz2 + https://dev.gentoo.org/~bkohler/dist/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" + +DEPEND="dev-libs/openssl:0= + sys-libs/ncurses:0= + virtual/libcrypt:= + virtual/libiconv" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-manpage-path.patch" ) +DOCS=( ChangeLog INSTALL NEWS README doc/Copyright doc/crypto doc/VERSIONS + doc/ctcp ) + +src_configure() { + tc-export CC + # --with-lto only appends -flto (so does --without-lto, sigh) + econf +} + +src_install() { + # Still needed as of 20221016, otherwise man dirs don't exist + # at the right time. + emake -j1 DESTDIR="${D}" install + einstalldocs +} diff --git a/net-irc/ircii/metadata.xml b/net-irc/ircii/metadata.xml index ee9a82ac4170..aa20bff17b1d 100644 --- a/net-irc/ircii/metadata.xml +++ b/net-irc/ircii/metadata.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>bkohler@gentoo.org</email> <name>Ben Kohler</name> </maintainer> </pkgmetadata> - diff --git a/net-irc/ircmap/ircmap-0.99-r1.ebuild b/net-irc/ircmap/ircmap-0.99-r1.ebuild index 33fb8a2051d5..87b21231fff0 100644 --- a/net-irc/ircmap/ircmap-0.99-r1.ebuild +++ b/net-irc/ircmap/ircmap-0.99-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,21 +6,17 @@ EAPI=7 DESCRIPTION="Scripts to treate diagrams of IRC networks using the LINKS command" HOMEPAGE="http://pasky.or.cz/irc/" SRC_URI="http://pasky.or.cz/irc/${PN}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}" + LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 x86" -IUSE="" RDEPEND=" media-gfx/graphviz dev-lang/perl " -BDEPEND="${RDEPEND} - >=sys-apps/sed-4 -" -DEPEND="" - -S="${WORKDIR}"/${PN} +BDEPEND="${RDEPEND}" src_compile() { sed -i \ diff --git a/net-irc/ircmap/metadata.xml b/net-irc/ircmap/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/net-irc/ircmap/metadata.xml +++ b/net-irc/ircmap/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-irc/ircstats/metadata.xml b/net-irc/ircstats/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/net-irc/ircstats/metadata.xml +++ b/net-irc/ircstats/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest index 4b8b5f10205b..4a9db7b276f7 100644 --- a/net-irc/irker/Manifest +++ b/net-irc/irker/Manifest @@ -1 +1,2 @@ -DIST irker-2.19.tar.gz 44502 BLAKE2B d777ed3b4308dca7f6bb2483bc03ba8ba50a55574da3e4de63138fe88483ae6d3ac46f414a94801d7f27c740e38ddcde494cea4c846fbc59d736441b692747f4 SHA512 7516ebe8adc74902eacc657f0a1d421c285a72f4ce08b84fd93b22635d49ba52acf7aedd03dde9012bc16496be3162bda9fa8486af3df1657af4cabf8719d7c7 +DIST irker-2.23.tar.gz 45889 BLAKE2B 5e0039f83783f994083321da8a5f65aace8769a7aaa45d4d9111c604b563f997b17bfe80e30e123559beaab9147de2e2ff3f98588632151af4d1ab0f1cdfa71e SHA512 f812ed81906c13d8b1b2e3cd86b36fdd8a8d6961eb2bc163b2c309908b8469409e087b4fa36637eb9588773f494ff309e2540b1f8ddfc3eec37aa2e3443357a3 +DIST irker-2.24.tar.gz 45728 BLAKE2B e1db85ea21163eb831cdfc9c9961bd77377890caef5af60d979c6fdc523c7b3680af6b1ce2e36bfda620e1785067381e1ac4ffb96e47314cac68be6014885f78 SHA512 a4f686c05c8018be8caf480d6e0d368042f82905cd4d67ede4a6cb0ff65a067d25116f68c3d3ea849db6f15a8f88c48ef2a314fa92a96bce38796a2b236b4a43 diff --git a/net-irc/irker/files/irkerd.confd b/net-irc/irker/files/irkerd.confd index 42ae7323612a..9b74518472c4 100644 --- a/net-irc/irker/files/irkerd.confd +++ b/net-irc/irker/files/irkerd.confd @@ -12,8 +12,8 @@ # Debug Level (critical, error, warning, info, debug) # IRKERD_LOGLEVEL="" -# To run an anonymous irkerd safely. It should not be able -# to write to anywhere on your system +# To run an anonymous irkerd safely. It should not be able to write to anywhere +# on your system. If the user is undefined or empty, it defaults to "nobody". # IRKERD_USER="" # see man pages for irkerd for valid cmdline options diff --git a/net-irc/irker/files/irkerd.initd b/net-irc/irker/files/irkerd.initd index 6417d45ebf8e..cd4d1012e80c 100644 --- a/net-irc/irker/files/irkerd.initd +++ b/net-irc/irker/files/irkerd.initd @@ -1,33 +1,28 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -: ${pidfile:=/run/${RC_SVCNAME}.pid} - -: ${IRKERD_NICK:=} -: ${IRKERD_PASSWORD:=} -: ${IRKERD_USER:=nobody} +: "${pidfile:=/run/${RC_SVCNAME}.pid}" +: "${IRKERD_USER:=nobody}" depend() { use net } -start () { - if [[ ${IRKERD_LOGFILE} ]] ; then +start() ( + if [ -n "${IRKERD_LOGFILE}" ] ; then checkpath -f \ -o "${IRKERD_USER}" \ "${IRKERD_LOGFILE}" \ || return 1 fi - if [[ -z "${IRKERD_USER}" ]] ; then - die "IRKERD_USER is mandatory" - fi - - [[ -n "${IRKERD_LOGLEVEL}" ]] && IRKERD_OPTS="${IRKERD_OPTS} -d ${IRKERD_LOGLEVEL}" - [[ -n "${IRKERD_LOGFILE}" ]] && IRKERD_OPTS="${IRKERD_OPTS} -l ${IRKERD_LOGFILE}" - [[ -n "${IRKERD_NICK}" ]] && IRKERD_OPTS="${IRKERD_OPTS} -n ${IRKERD_NICK}" - [[ -n "${IRKERD_PASSWORD}" ]] && IRKERD_OPTS="${IRKERD_OPTS} -p ${IRKERD_PASSWORD}" + set -f + set -- ${IRKERD_OPTS} + [ -n "${IRKERD_LOGLEVEL}" ] && set -- "$@" -d "${IRKERD_LOGLEVEL}" + [ -n "${IRKERD_LOGFILE}" ] && set -- "$@" -l "${IRKERD_LOGFILE}" + [ -n "${IRKERD_NICK}" ] && set -- "$@" -n "${IRKERD_NICK}" + [ -n "${IRKERD_PASSWORD}" ] && set -- "$@" -p "${IRKERD_PASSWORD}" ebegin "Starting ${RC_SVCNAME}" start-stop-daemon --start \ @@ -35,6 +30,6 @@ start () { --user "${IRKERD_USER}" \ --make-pidfile --pidfile "${pidfile}" \ --exec /usr/bin/irkerd \ - -- ${IRKERD_OPTS} < /dev/null + -- "$@" < /dev/null eend $? -} +) diff --git a/net-irc/irker/files/irkerd.service b/net-irc/irker/files/irkerd.service new file mode 100644 index 000000000000..232a8d5811a5 --- /dev/null +++ b/net-irc/irker/files/irkerd.service @@ -0,0 +1,21 @@ +# Copyright 2012 Wulf C. Krueger <philantrop@exherbo.org> +# Copyright 2022 Arthur Zamarin <arthurzam@gentoo.org> +# Distributed under the terms of the BSD LICENSE + +[Unit] +Description=Internet Relay Chat (IRC) notification daemon +Requires=network.target +Documentation=man:irkerd(8) man:irkerhook(1) man:irk(1) + +[Service] +ExecStart=@EPREFIX@/usr/bin/irkerd +User=irker +DynamicUser=yes +NoNewPrivileges=yes +CapabilityBoundingSet= +PrivateDevices=yes +ProtectHome=yes + +[Install] +WantedBy=multi-user.target +Alias=irker.service diff --git a/net-irc/irker/irker-2.19.ebuild b/net-irc/irker/irker-2.23.ebuild index 53daad840219..2bd4516b8c36 100644 --- a/net-irc/irker/irker-2.19.ebuild +++ b/net-irc/irker/irker-2.23.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="ssl" inherit optfeature python-single-r1 systemd @@ -14,19 +14,19 @@ SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86" +KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" # Dependency notes: # NOTE: No pkgconfig dep here because of the systemd sed below # NOTE: No need for asciidoc here as it's only used for the # 'release' makefile target. +RDEPEND="${PYTHON_DEPS}" BDEPEND=" app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ${PYTHON_DEPS} " -RDEPEND="${PYTHON_DEPS}" DOCS=( NEWS README hacking.adoc security.adoc ) HTML_DOCS=( irkerd.html irkerhook.html ) @@ -35,25 +35,23 @@ src_prepare() { default # Rely on systemd eclass for systemd service install - sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile \ - || die "sed failed" + sed -e "/^SYSTEMDSYSTEMUNITDIR/d" -i Makefile || die "sed failed" # Prefix support - sed -i -e "/^ExecStart=/ s:=/:=${EPREFIX}/:" irkerd.service \ - || die "sed failed" + sed -e "s|@EPREFIX@|${EPREFIX}|" "${FILESDIR}"/irkerd.service > "${WORKDIR}"/irkerd.service || die "sed failed" } src_install() { default - python_doscript "${ED}/usr/bin/irkerd" + python_doscript "${ED}"/usr/bin/irkerd # Not installed with the default Makefile python_doscript irk irkerhook.py - newinitd "${FILESDIR}/irkerd.initd" irkerd - newconfd "${FILESDIR}/irkerd.confd" irkerd + newinitd "${FILESDIR}"/irkerd.initd irkerd + newconfd "${FILESDIR}"/irkerd.confd irkerd - systemd_dounit irkerd.service + systemd_dounit "${WORKDIR}"/irkerd.service docinto examples dodoc filter-example.py filter-test.py diff --git a/net-irc/irker/irker-2.24.ebuild b/net-irc/irker/irker-2.24.ebuild new file mode 100644 index 000000000000..56c668a66660 --- /dev/null +++ b/net-irc/irker/irker-2.24.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="ssl" + +inherit optfeature python-single-r1 systemd + +DESCRIPTION="Submission tools for IRC notifications" +HOMEPAGE="http://www.catb.org/esr/irker/ https://gitlab.com/esr/irker" +SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Dependency notes: +# NOTE: No pkgconfig dep here because of the systemd sed below +# NOTE: No need for asciidoc here as it's only used for the +# 'release' makefile target. +RDEPEND="${PYTHON_DEPS}" +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto + ${PYTHON_DEPS} +" + +DOCS=( NEWS README hacking.adoc security.adoc ) +HTML_DOCS=( irkerd.html irkerhook.html ) + +src_prepare() { + default + + # Rely on systemd eclass for systemd service install + sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile || die "sed failed" + + # Prefix support + sed -e "s|@EPREFIX@|${EPREFIX}|" "${FILESDIR}"/irkerd.service > "${WORKDIR}"/irkerd.service || die "sed failed" +} + +src_install() { + default + + python_doscript "${ED}"/usr/bin/irkerd + # Not installed with the default Makefile + python_doscript irk irkerhook.py + + newinitd "${FILESDIR}"/irkerd.initd irkerd + newconfd "${FILESDIR}"/irkerd.confd irkerd + + systemd_dounit "${WORKDIR}"/irkerd.service + + docinto examples + dodoc filter-example.py filter-test.py +} + +pkg_postinst() { + optfeature "SOCKS5 proxy support" dev-python/PySocks +} diff --git a/net-irc/irker/metadata.xml b/net-irc/irker/metadata.xml index ee05af555f14..37943e119742 100644 --- a/net-irc/irker/metadata.xml +++ b/net-irc/irker/metadata.xml @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sam@gentoo.org</email> <name>Sam James</name> </maintainer> - <maintainer type="person"> - <email>patrick@gentoo.org</email> - <name>Patrick Lauer</name> - </maintainer> <stabilize-allarches/> <upstream> <remote-id type="gitlab">esr/irker</remote-id> diff --git a/net-irc/iroffer-dinoex/Manifest b/net-irc/iroffer-dinoex/Manifest index a414aafd6c08..a514b2eb9877 100644 --- a/net-irc/iroffer-dinoex/Manifest +++ b/net-irc/iroffer-dinoex/Manifest @@ -1,3 +1 @@ -DIST iroffer-dinoex-3.30.tar.gz 541131 BLAKE2B ea61113dffcd14b162153aa03c55a203d8ccd99e8f81de53a9ab8543bd91e948509281f753a8f332445eec102b6bd2b51972ff8bedb8b574b55b9325f6969269 SHA512 e45dc3dd901cbb73a9d59cd5a672834c7b6527864eb3385121856af562680a0f91e8846e8690fc60a6349dc4c4fc1cf190d3ac01813c6c045ef18147d61b7d4d -DIST iroffer-dinoex-3.31.tar.gz 527712 BLAKE2B 8e57058af9aad9537d29a15140ab59c921d2549eb9e7a2ce9145fc1c27a4307bea882927012b04fc9f0737a8853d927c79cc0f3156dfa311072c59589fe0221f SHA512 677aa03a33b99d8062db077bba47fb18b2e9279243691981bbd09cb2859fcb4792e1383225b9698edb23370ce0f60667a09480644d31171e9a8234d80052dd80 DIST iroffer-dinoex-3.32.tar.gz 1321125 BLAKE2B 3a124d16911d97d0ec937b86c9e0ad513ebdcea5e09e4cb1a53753c03d5e13347d0bf1116bf9abe0137fb7a05bbc7a8e31c2c0da5c15cc4e0b55e067d62b1461 SHA512 03d662cf7eb3093b1f050eda8777011d6e7a833dc2fcf65d29ef0294a0d6ce4e2cea273e2d4e6ee6ba2364c088890ac6338a3aa8e6477d5e2a1a990a6e4e9603 diff --git a/net-irc/iroffer-dinoex/files/iroffer-dinoex-3.29-config.patch b/net-irc/iroffer-dinoex/files/iroffer-dinoex-3.29-config.patch deleted file mode 100644 index 5dc9d6183ef6..000000000000 --- a/net-irc/iroffer-dinoex/files/iroffer-dinoex-3.29-config.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -ru iroffer-dinoex-3.29/beispiel.config iroffer-dinoex-3.29.NEW/beispiel.config ---- iroffer-dinoex-3.29/beispiel.config 2013-02-01 08:28:18.000000000 +0100 -+++ iroffer-dinoex-3.29.NEW/beispiel.config 2013-03-09 18:43:33.084000000 +0100 -@@ -15,19 +15,19 @@ - ############################################################################## - ### - pid file - ### - ### Schreibt die Prozess-ID beim Start in diese Datei ### --pidfile mybot.pid -+pidfile /var/run/iroffer-dinoex/iroffer-dinoex.pid - - ############################################################################## - ### - log file - ### - ### logfile gibt die Logdatei fr den Bot an. ### --logfile mybot.log -+logfile /var/log/iroffer-dinoex/mybot.log - - ############################################################################## - ### - log rotate - ### - ### logrotate gibt den Zeitraum vor, nach dem die Logdatei gewechselt ### - ### wird, mgliche Werte "none" (nie), "monthly" (monatlich), ### - ### "weekly" (wchentlich), "daily" (tglich) und 1-24 (stndlich). ### --logrotate weekly -+logrotate none - - ############################################################################## - ### - expire logfiles - ### -@@ -48,7 +48,7 @@ - ### Diese Datei dient als allgemeines Datenlager fr die bereitgestellten ### - ### Dateien und die dazugehrigen statistische Daten. Hier werden auch die ### - ### Beschreibungen der Pakete gespeichert. ### --statefile mybot.state -+statefile /var/lib/iroffer-dinoex/mybot.state - - ############################################################################## - ### - old state file - ### -@@ -74,7 +74,7 @@ - ### als Packliste auf einer Webseite zu dienen, oder fr andere Zwecke. ### - ### Wenn xdcclistfileraw gesetzt ist, werden die IRC-Farbcode auch mit ### - ### ausgegeben. ### --xdcclistfile mybot.txt -+xdcclistfile /var/lib/iroffer-dinoex/mybot.txt - #xdcclistfileraw - - ############################################################################## -diff -ru iroffer-dinoex-3.29/exemple.config iroffer-dinoex-3.29.NEW/exemple.config ---- iroffer-dinoex-3.29/exemple.config 2013-02-01 08:26:21.000000000 +0100 -+++ iroffer-dinoex-3.29.NEW/exemple.config 2013-03-09 18:45:35.340000000 +0100 -@@ -15,18 +15,18 @@ - ############################################################################## - ### - pid file - ### - ### crit l'identifiant du processus dans ce fichier au lancement. ### --pidfile monbot.pid -+pidfile /var/run/iroffer-dinoex/iroffer-dinoex.pid - - ############################################################################## - ### - log file - ### - ### crit le journal du robot dans ce fichier. ### --logfile monbot.log -+logfile /var/log/iroffer-dinoex/mybot.log - - ############################################################################## - ### - log rotate - ### - ### Archivage du journal jamais (none), quotidien (daily), ### - ### hebdomadaire (weekly) ou mensuelle (monthly). ### --logrotate weekly -+logrotate none - - ############################################################################## - ### - expire logfiles - ### -@@ -44,7 +44,7 @@ - ############################################################################## - ### - state file - ### - ### Fichier temporaire de stockage des informations d'tat d'Iroffer. ### --statefile monbot.state -+statefile /var/lib/iroffer-dinoex/mybot.state - - ############################################################################## - ### - old state file - ### -@@ -71,7 +71,7 @@ - ### xdcclistfile et Iroffer crira la liste XDCC ds que ncessaire. ### - ### Si xdcclistfileraw est dfini, le fichier sera crit avec les ### - ### caractres spciaux IRC (couleur, format, etc.) ### --xdcclistfile monbot.txt -+xdcclistfile /var/lib/iroffer-dinoex/mybot.txt - #xdcclistfileraw - - ############################################################################## -diff -ru iroffer-dinoex-3.29/sample.config iroffer-dinoex-3.29.NEW/sample.config ---- iroffer-dinoex-3.29/sample.config 2013-02-01 08:26:58.000000000 +0100 -+++ iroffer-dinoex-3.29.NEW/sample.config 2013-03-09 18:46:30.612000000 +0100 -@@ -15,18 +15,18 @@ - ############################################################################## - ### - pid file - ### - ### Writes the process id to this file on startup ### --pidfile mybot.pid -+pidfile /var/run/iroffer-dinoex/iroffer-dinoex.pid - - ############################################################################## - ### - log file - ### - ### Writes logging information to this file. ### --logfile mybot.log -+logfile /var/log/iroffer-dinoex/mybot.log - - ############################################################################## - ### - log rotate - ### - ### After the time given here a logfile will be rotated. ### - ### logrotate can be set to none, 1 - 24 hours, daily, weekly or monthly ### --logrotate weekly -+logrotate none - - ############################################################################## - ### - expire logfiles - ### -@@ -44,7 +44,7 @@ - ############################################################################## - ### - state file - ### - ### temporary storage for iroffer state information across restarts ### --statefile mybot.state -+statefile /var/lib/iroffer-dinoex/mybot.state - - ############################################################################## - ### - old state file - ### -@@ -71,7 +71,7 @@ - ### needed. ### - ### If xdcclistfileraw is set the file will be written with the IRC ### - ### control characters included (color, formatting, etc..). ### --xdcclistfile mybot.txt -+xdcclistfile /var/lib/iroffer-dinoex/mybot.txt - #xdcclistfileraw - - ############################################################################## diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild deleted file mode 100644 index 4779e79651ed..000000000000 --- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="de en fr it" -PLOCALE_BACKUP="en" - -inherit l10n toolchain-funcs user - -DESCRIPTION="IRC fileserver using DCC" -HOMEPAGE="http://iroffer.dinoex.net/" -SRC_URI="http://iroffer.dinoex.net/${P}.tar.gz - http://iroffer.dinoex.net/HISTORY/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp" - -REQUIRED_USE=" - admin? ( http ) - gnutls? ( ssl ) -" - -RDEPEND="chroot? ( dev-libs/nss ) - curl? ( - net-misc/curl[ssl?] - gnutls? ( net-misc/curl[curl_ssl_gnutls] ) - !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) - ) - geoip? ( dev-libs/geoip ) - gnutls? ( net-libs/gnutls ) - ruby? ( dev-lang/ruby:* ) - ssl? ( !gnutls? ( dev-libs/openssl:0= ) )" - -DEPEND="${RDEPEND}" - -pkg_setup() { - enewgroup iroffer - enewuser iroffer -1 -1 -1 iroffer -} - -src_prepare() { - eapply "${FILESDIR}/${PN}-3.29-config.patch" - eapply "${FILESDIR}/${PN}-Werror.patch" - - eapply_user - - l10n_find_plocales_changes "" 'help-admin-' '.txt' -} - -do_configure() { - echo ./Configure $* - ./Configure $* || die "configure phase failed" -} - -src_configure() { - do_configure \ - PREFIX="${EPREFIX}/usr"\ - CC="$(tc-getCC)"\ - $(usex debug '-profiling' '' '' '')\ - $(usex debug '-debug' '' '' '')\ - $(usex geoip '-geoip' '' '' '')\ - $(usex chroot '' '-no-chroot' '' '')\ - $(usex curl '-curl' '' '' '' )\ - $(usex gnutls '-tls' '' '' '' '')\ - $(usex upnp '-upnp' '' '' '')\ - $(usex ruby '-ruby' '' '' '')\ - $(usex kqueue '-kqueue' '' '' '')\ - $(usex blowfish '' '-no-blowfish' '' '')\ - $(usex ssl '' '-no-openssl' '' '')\ - $(usex http '' '-no-http' '' '')\ - $(usex admin '' '-no-admin' '' '')\ - $(usex telnet '' '-no-telnet' '' '')\ - $(usex memsave '' '-no-memsave' '' '') -} - -src_compile() { - # TODO: default compile targets always include chrooted target, which is not good - emake CC="$(tc-getCC)" $(l10n_get_locales) -} - -myloc() { - emake DESTDIR="${D}" install-${1} - - dodoc help-admin-${1}.txt - use http && dodoc doc/INSTALL-linux-${1}.html - - insinto /etc/${PN} - case ${1} in - "de") - doins beispiel.config;; - "fr") - doins exemple.config;; - *) - doins sample.config;; - esac -} - -src_install() { - l10n_for_each_locale_do myloc - - dodoc README* THANKS TODO - doman iroffer.1 xdcc.7 - - newinitd "${FILESDIR}/${PN}.init" ${PN} - newconfd "${FILESDIR}/${PN}.conf" ${PN} - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" ${PN} - - if use ruby; then - insinto /usr/share/${PN} - doins ruby-sample.rb - fi - - if use http; then - insinto /usr/share/${PN}/htdocs - doins htdocs/* - fi -} diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild deleted file mode 100644 index 1fb0085c0a07..000000000000 --- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="de en fr it" -PLOCALE_BACKUP="en" - -inherit l10n toolchain-funcs user - -DESCRIPTION="IRC fileserver using DCC" -HOMEPAGE="http://iroffer.dinoex.net/" -SRC_URI="http://iroffer.dinoex.net/${P}.tar.gz - http://iroffer.dinoex.net/HISTORY/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp" - -REQUIRED_USE=" - admin? ( http ) - gnutls? ( ssl ) -" - -RDEPEND="chroot? ( dev-libs/nss ) - curl? ( - net-misc/curl[ssl?] - gnutls? ( net-misc/curl[curl_ssl_gnutls] ) - !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) - ) - geoip? ( dev-libs/geoip ) - gnutls? ( net-libs/gnutls ) - ruby? ( dev-lang/ruby:* ) - ssl? ( !gnutls? ( dev-libs/openssl:0= ) )" - -DEPEND="${RDEPEND}" - -pkg_setup() { - enewgroup iroffer - enewuser iroffer -1 -1 -1 iroffer -} - -src_prepare() { - eapply "${FILESDIR}/${P}-config.patch" - eapply "${FILESDIR}/${PN}-Werror.patch" - - eapply_user - - l10n_find_plocales_changes "" 'help-admin-' '.txt' -} - -do_configure() { - echo ./Configure $* - ./Configure $* || die "configure phase failed" -} - -src_configure() { - do_configure \ - CC="$(tc-getCC)" - PREFIX="${EPREFIX}/usr"\ - $(usex debug '-profiling' '' '' '')\ - $(usex debug '-debug' '' '' '')\ - $(usex geoip '-geoip' '' '' '')\ - $(usex chroot '' '-no-chroot' '' '')\ - $(usex curl '-curl' '' '' '' )\ - $(usex gnutls '-tls' '' '' '' '')\ - $(usex upnp '-upnp' '' '' '')\ - $(usex ruby '-ruby' '' '' '')\ - $(usex kqueue '-kqueue' '' '' '')\ - $(usex blowfish '' '-no-blowfish' '' '')\ - $(usex ssl '' '-no-openssl' '' '')\ - $(usex http '' '-no-http' '' '')\ - $(usex admin '' '-no-admin' '' '')\ - $(usex telnet '' '-no-telnet' '' '')\ - $(usex memsave '' '-no-memsave' '' '') -} - -src_compile() { - # TODO: default compile targets always include chrooted target, which is not good - emake CC="$(tc-getCC)" $(l10n_get_locales) -} - -myloc() { - emake DESTDIR="${D}" install-${1} - - dodoc help-admin-${1}.txt - use http && dodoc doc/INSTALL-linux-${1}.html - - insinto /etc/${PN} - case ${1} in - "de") - doins beispiel.config;; - "fr") - doins exemple.config;; - *) - doins sample.config;; - esac -} - -src_install() { - l10n_for_each_locale_do myloc - - dodoc README* THANKS TODO - doman iroffer.1 xdcc.7 - - newinitd "${FILESDIR}/${PN}.init" ${PN} - newconfd "${FILESDIR}/${PN}.conf" ${PN} - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" ${PN} - - if use ruby; then - insinto /usr/share/${PN} - doins ruby-sample.rb - fi - - if use http; then - insinto /usr/share/${PN}/htdocs - doins htdocs/* - fi -} diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.32.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.32-r2.ebuild index a1293eaa5bbf..2c9940d22b0b 100644 --- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.32.ebuild +++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.32-r2.ebuild @@ -1,29 +1,31 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PLOCALES="de en fr it" PLOCALE_BACKUP="en" -inherit l10n toolchain-funcs user +inherit plocale toolchain-funcs DESCRIPTION="IRC fileserver using DCC" -HOMEPAGE="http://iroffer.dinoex.net/" -SRC_URI="http://iroffer.dinoex.net/${P}.tar.gz - http://iroffer.dinoex.net/HISTORY/${P}.tar.gz" +HOMEPAGE="https://iroffer.net/" +SRC_URI="https://iroffer.net/${P}.tar.gz + https://iroffer.net/HISTORY/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp" +KEYWORDS="amd64 x86" +IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http +memsave ruby ssl +telnet upnp" REQUIRED_USE=" admin? ( http ) gnutls? ( ssl ) " -RDEPEND="chroot? ( dev-libs/nss ) +RDEPEND="virtual/libcrypt:= + acct-user/iroffer + chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) @@ -36,18 +38,13 @@ RDEPEND="chroot? ( dev-libs/nss ) DEPEND="${RDEPEND}" -pkg_setup() { - enewgroup iroffer - enewuser iroffer -1 -1 -1 iroffer -} - src_prepare() { eapply "${FILESDIR}/${PN}-3.31-config.patch" eapply "${FILESDIR}/${PN}-Werror.patch" eapply_user - l10n_find_plocales_changes "" 'help-admin-' '.txt' + plocale_find_changes "" 'help-admin-' '.txt' } do_configure() { @@ -67,7 +64,6 @@ src_configure() { $(usex gnutls '-tls' '' '' '' '')\ $(usex upnp '-upnp' '' '' '')\ $(usex ruby '-ruby' '' '' '')\ - $(usex kqueue '-kqueue' '' '' '')\ $(usex blowfish '' '-no-blowfish' '' '')\ $(usex ssl '' '-no-openssl' '' '')\ $(usex http '' '-no-http' '' '')\ @@ -78,7 +74,7 @@ src_configure() { src_compile() { # TODO: default compile targets always include chrooted target, which is not good - emake CC="$(tc-getCC)" $(l10n_get_locales) + emake CC="$(tc-getCC)" $(plocale_get_locales) } myloc() { @@ -99,7 +95,7 @@ myloc() { } src_install() { - l10n_for_each_locale_do myloc + plocale_for_each_locale myloc dodoc README* THANKS TODO doman iroffer.1 xdcc.7 diff --git a/net-irc/iroffer-dinoex/metadata.xml b/net-irc/iroffer-dinoex/metadata.xml index dbdad77e576d..99fb03dc3bd0 100644 --- a/net-irc/iroffer-dinoex/metadata.xml +++ b/net-irc/iroffer-dinoex/metadata.xml @@ -1,20 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> - </maintainer> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="admin">Compile with HTTP Admin</flag> <flag name="blowfish">Compile with blowfish encryption support</flag> <flag name="chroot">Compile with chroot support</flag> <flag name="http">Compile with HTTP server support</flag> - <flag name="kqueue">Compile with kqueue() support</flag> <flag name="memsave">Compile with memory protection</flag> <flag name="telnet">Compile with Telnet server support</flag> </use> diff --git a/net-irc/irssi-xmpp/Manifest b/net-irc/irssi-xmpp/Manifest index 8591f0735720..f5edb6775b23 100644 --- a/net-irc/irssi-xmpp/Manifest +++ b/net-irc/irssi-xmpp/Manifest @@ -1,2 +1,3 @@ +DIST irssi-xmpp-0.54-irssi.patch.xz 4060 BLAKE2B 305120bed1e05fc144ca4bbade4894f3f7b20d3f0fe8946182db9525c0b8ed6ce37228233a36b5a24f080cac7d0496097609fd8319294e0e140d9046bfc216ce SHA512 8865084b167138cc02feec39a014c6ea3c047f32430d531b0fb84f9172cf43024c44ffafb274a5c049e4b1060bf30a7f219ba22ce2ea4e2858fe000cd2538f5a DIST irssi-xmpp-0.54-musl-build.patch 24443 BLAKE2B b0ed65a688d0db84f89bc65c429b4754cd4dcfb9de2c1cd5aa64f4e02badc82d26ab42b2a29a3658910dcdbf61b2d49eca4c1b4355b5566c5a3bd120e06340bb SHA512 1417c328867b59de41f71fa720cb00581352604acec9787db183820f1ffb77209623bc236aa5b6e4f661c3780ee5c3d407aecbc286176a4d850f6e40bebecd45 DIST irssi-xmpp-0.54.tar.gz 65618 BLAKE2B 5dd1f3a858cdb397351b93800fdd2050aa8e5764ac2e03008d629dee7d825b02bce4bfc627ab2d3249392efe43ceb1530a7ccefc3241c8ca101cc2963d28f872 SHA512 31ddd9e0147eec23d08b8bcbe242e831d612cb2d00f3b56776e9d0b87db9bd76d4bb147422cdf18c0567f0e0463ab828ab7a0ef80a2b35cfdc0a8be962b39f14 diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.54-r1.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.54-r1.ebuild new file mode 100644 index 000000000000..f8c6c3ba96c9 --- /dev/null +++ b/net-irc/irssi-xmpp/irssi-xmpp-0.54-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Irssi plugin providing Jabber/XMPP support" +HOMEPAGE="https://github.com/cdidier/irssi-xmpp" +SRC_URI="https://github.com/cdidier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-musl-build.patch" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-irssi.patch.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + net-irc/irssi + net-libs/loudmouth +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${DISTDIR}"/${P}-musl-build.patch + "${WORKDIR}"/${P}-irssi.patch +) + +src_prepare() { + default + + sed -e "s/{MAKE} doc-install/{MAKE}/" \ + -i Makefile || die #322355 +} + +src_compile() { + emake PREFIX=/usr CC="$(tc-getCC)" +} + +src_install() { + emake DESTDIR="${ED}" PREFIX=/usr IRSSI_LIB=/usr/$(get_libdir)/irssi install + dodoc README.md NEWS TODO docs/* +} diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild index fab3d7c47f16..785cfd482a3e 100644 --- a/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild +++ b/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit toolchain-funcs -DESCRIPTION="An irssi plugin providing Jabber/XMPP support" -HOMEPAGE="https://cybione.org/~irssi-xmpp/" +DESCRIPTION="Irssi plugin providing Jabber/XMPP support" +HOMEPAGE="https://github.com/cdidier/irssi-xmpp" SRC_URI="https://github.com/cdidier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-musl-build.patch" diff --git a/net-irc/irssi-xmpp/metadata.xml b/net-irc/irssi-xmpp/metadata.xml index d726f7c84157..162019069aed 100644 --- a/net-irc/irssi-xmpp/metadata.xml +++ b/net-irc/irssi-xmpp/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest index ae60ab3219c1..eb9df20f8142 100644 --- a/net-irc/irssi/Manifest +++ b/net-irc/irssi/Manifest @@ -1 +1,2 @@ -DIST irssi-1.2.2.tar.xz 1140844 BLAKE2B c1758828285c3f3210d6920455382e52279587280ecdc4ba7d73562c164ebd6618b1bb32d387439be2696f948044f66eb73b78ed2b0635286f8c3d93530167f2 SHA512 5444ac102ff9ad3a6399a47c967d138e181330dd226eac68886d35fee4ad455932b9306a367bee3478095158e41ba67fb46deb8f0a33512046b9b83bae37c610 +DIST irssi-1.4.4.tar.xz 1213784 BLAKE2B 5b77ca692130a87228eea05f9a8d2da65a7c483e031d8c12dbd29bb9cd629444aae28bc3ffe0dc862891f59047997a323cea3b4d9d388573d4f06b569abbf950 SHA512 da28ac7a527be301d0615d6d733e4cf4e09bb6d4f5c70bc33ff70e22439a01f197bb5d91b4432ca74d3ac2dbb3235f30d53efc63a4279de8664923c2ccdbdbea +DIST irssi-1.4.5.tar.xz 1215688 BLAKE2B 573d8552137cb09c152fe0d1f9196c966bc0afb23e8817fed7315a07d2fc36b3ffabf5e8384bb80a48aa24cf57e5d336f40e708a4c9ef6bad3ec8ce10125f196 SHA512 5d80107ad625feb6d2b3ac807f517c5cfeae58986d3fbfe53ea82f2dee70396f5092abdc6ef137c5651e4515e081591079b37f0e428f69990db493cfe14e4f36 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 deleted file mode 100644 index 63d26958b7bf..000000000000 --- a/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -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/files/irssi-1.4.4-fix-usage-of-type-in-ExtUtils.patch b/net-irc/irssi/files/irssi-1.4.4-fix-usage-of-type-in-ExtUtils.patch new file mode 100644 index 000000000000..517618e15098 --- /dev/null +++ b/net-irc/irssi/files/irssi-1.4.4-fix-usage-of-type-in-ExtUtils.patch @@ -0,0 +1,43 @@ +https://patch-diff.githubusercontent.com/raw/irssi/irssi/pull/1474.patch +From: Ailin Nemui <ailin@d5421s.localdomain> +Date: Tue, 4 Jul 2023 10:27:09 +0200 +Subject: [PATCH] fix usage of $type in ExtUtils::ParseXS 3.50 + +--- a/src/perl/common/typemap ++++ b/src/perl/common/typemap +@@ -28,5 +28,5 @@ T_IrssiObj + $arg = iobject_bless((SERVER_REC *)$var); + + T_PlainObj +- $arg = plain_bless($var, \"$type\"); ++ $arg = plain_bless($var, \"$ntype\"); + +--- a/src/perl/irc/typemap ++++ b/src/perl/irc/typemap +@@ -36,5 +36,5 @@ T_DccObj + $arg = simple_iobject_bless((DCC_REC *)$var); + + T_PlainObj +- $arg = plain_bless($var, \"$type\"); ++ $arg = plain_bless($var, \"$ntype\"); + +--- a/src/perl/textui/typemap ++++ b/src/perl/textui/typemap +@@ -18,7 +18,7 @@ T_BufferLineWrapper + OUTPUT + + T_PlainObj +- $arg = plain_bless($var, \"$type\"); ++ $arg = plain_bless($var, \"$ntype\"); + + T_BufferLineWrapper + $arg = perl_buffer_line_bless($var); +--- a/src/perl/ui/typemap ++++ b/src/perl/ui/typemap +@@ -13,5 +13,5 @@ T_PlainObj + OUTPUT + + T_PlainObj +- $arg = plain_bless($var, \"$type\"); ++ $arg = plain_bless($var, \"$ntype\"); + diff --git a/net-irc/irssi/irssi-1.2.2-r1.ebuild b/net-irc/irssi/irssi-1.2.2-r1.ebuild deleted file mode 100644 index f26fe2a1b73c..000000000000 --- a/net-irc/irssi/irssi-1.2.2-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2021 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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/irssi/irssi-1.4.4-r1.ebuild b/net-irc/irssi/irssi-1.4.4-r1.ebuild new file mode 100644 index 000000000000..e8939bb71134 --- /dev/null +++ b/net-irc/irssi/irssi-1.4.4-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GENTOO_DEPEND_ON_PERL="no" +inherit perl-module meson + +DESCRIPTION="A modular textUI IRC client with IPv6 support" +HOMEPAGE="https://irssi.org/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" + inherit git-r3 +else + # Keep for _rc compability + MY_P="${P/_/-}" + + SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="otr +perl selinux +proxy" + +RDEPEND=" + >=dev-libs/glib-2.6.0 + dev-libs/openssl:= + sys-libs/ncurses:= + otr? ( + >=dev-libs/libgcrypt-1.2.0:= + >=net-libs/libotr-4.1.0 + ) + perl? ( dev-lang/perl:= ) +" +DEPEND="${RDEPEND}" +BDEPEND="dev-lang/perl + virtual/pkgconfig" +RDEPEND+=" selinux? ( sec-policy/selinux-irc )" + +PATCHES=( + "${FILESDIR}"/${P}-fix-usage-of-type-in-ExtUtils.patch +) + +src_configure() { + local emesonargs=( + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + -Dwith-perl-lib=vendor + -Dwith-otr=$(usex otr) + -Dwith-proxy=$(usex proxy) + -Dwith-perl=$(usex perl) + + # Carried over from autotools (for now?), bug #677804 + -Ddisable-utf8proc=yes + -Dwith-fuzzer=no + -Dinstall-glib=no + ) + + meson_src_configure +} + +src_test() { + # We don't want perl-module's src_test + meson_src_test +} + +src_install() { + meson_src_install + + use perl && perl_delete_localpod +} diff --git a/net-irc/irssi/irssi-1.4.5.ebuild b/net-irc/irssi/irssi-1.4.5.ebuild new file mode 100644 index 000000000000..af36e8606a06 --- /dev/null +++ b/net-irc/irssi/irssi-1.4.5.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GENTOO_DEPEND_ON_PERL="no" +inherit perl-module meson + +DESCRIPTION="A modular textUI IRC client with IPv6 support" +HOMEPAGE="https://irssi.org/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" + inherit git-r3 +else + # Keep for _rc compability + MY_P="${P/_/-}" + + SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="otr +perl selinux +proxy" + +RDEPEND=" + >=dev-libs/glib-2.6.0 + dev-libs/openssl:= + sys-libs/ncurses:= + otr? ( + >=dev-libs/libgcrypt-1.2.0:= + >=net-libs/libotr-4.1.0 + ) + perl? ( dev-lang/perl:= ) +" +DEPEND="${RDEPEND}" +BDEPEND="dev-lang/perl + virtual/pkgconfig" +RDEPEND+=" selinux? ( sec-policy/selinux-irc )" + +src_configure() { + local emesonargs=( + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + -Dwith-perl-lib=vendor + -Dwith-otr=$(usex otr) + -Dwith-proxy=$(usex proxy) + -Dwith-perl=$(usex perl) + + # Carried over from autotools (for now?), bug #677804 + -Ddisable-utf8proc=yes + -Dwith-fuzzer=no + -Dinstall-glib=no + ) + + meson_src_configure +} + +src_test() { + # We don't want perl-module's src_test + meson_src_test +} + +src_install() { + meson_src_install + + use perl && perl_delete_localpod +} diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild index e613910b5096..40772b5198b3 100644 --- a/net-irc/irssi/irssi-9999.ebuild +++ b/net-irc/irssi/irssi-9999.ebuild @@ -1,73 +1,68 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 GENTOO_DEPEND_ON_PERL="no" - -inherit autotools perl-module git-r3 - -EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" +inherit perl-module meson DESCRIPTION="A modular textUI IRC client with IPv6 support" HOMEPAGE="https://irssi.org/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" + inherit git-r3 +else + # Keep for _rc compability + MY_P="${P/_/-}" + + SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +fi + LICENSE="GPL-2" SLOT="0" -IUSE="otr +perl selinux socks5 +proxy libressl" +IUSE="otr +perl selinux +proxy" -COMMON_DEPEND="sys-libs/ncurses:0= +RDEPEND=" >=dev-libs/glib-2.6.0 - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) + dev-libs/openssl:= + sys-libs/ncurses:= otr? ( - >=dev-libs/libgcrypt-1.2.0:0= + >=dev-libs/libgcrypt-1.2.0:= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) - socks5? ( >=net-proxy/dante-1.1.18 )" - -DEPEND=" - ${COMMON_DEPEND} - virtual/pkgconfig - dev-lang/perl - || ( - www-client/lynx - www-client/elinks - )" - -RDEPEND=" - ${COMMON_DEPEND} - selinux? ( sec-policy/selinux-irc )" +" +DEPEND="${RDEPEND}" +BDEPEND="dev-lang/perl + virtual/pkgconfig" +RDEPEND+=" selinux? ( sec-policy/selinux-irc )" -src_prepare() { - sed -i -e /^autoreconf/d autogen.sh || die - NOCONFIGURE=1 ./autogen.sh || die +src_configure() { + local emesonargs=( + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + -Dwith-perl-lib=vendor + -Dwith-otr=$(usex otr) + -Dwith-proxy=$(usex proxy) + -Dwith-perl=$(usex perl) + + # Carried over from autotools (for now?), bug #677804 + -Ddisable-utf8proc=yes + -Dwith-fuzzer=no + -Dinstall-glib=no + ) - default - eautoreconf + meson_src_configure } -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_test() { + # We don't want perl-module's src_test + meson_src_test } src_install() { - default + meson_src_install use perl && perl_delete_localpod - - rm -f "${ED}"/usr/$(get_libdir)/irssi/modules/*.{a,la} || die - - dodoc AUTHORS ChangeLog README.md TODO NEWS } diff --git a/net-irc/irssi/metadata.xml b/net-irc/irssi/metadata.xml index 4944f1133301..1831fc0a69c2 100644 --- a/net-irc/irssi/metadata.xml +++ b/net-irc/irssi/metadata.xml @@ -1,18 +1,10 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>swegener@gentoo.org</email> <name>Sven Wegener</name> </maintainer> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> - <maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> - </maintainer> <use> <flag name="otr">Adds support for a loadable IRC otr module</flag> <flag name="proxy">Adds support for a loadable IRC proxy module</flag> diff --git a/net-irc/irssistats/files/irssistats-0.75-clang16-build-fix.patch b/net-irc/irssistats/files/irssistats-0.75-clang16-build-fix.patch new file mode 100644 index 000000000000..b162c4868ce3 --- /dev/null +++ b/net-irc/irssistats/files/irssistats-0.75-clang16-build-fix.patch @@ -0,0 +1,40 @@ +Bug: https://bugs.gentoo.org/897866 +--- a/irssistats.c ++++ b/irssistats.c +@@ -29,6 +29,7 @@ + #include <time.h> + #include <string.h> + #include <locale.h> ++#include <ctype.h> + #ifdef __WIN32__ + #define GLOBALCONF "irssistats.conf" + #else +@@ -1561,19 +1562,19 @@ void gen_xhtml(char *xhtmlfile) + fclose(fic); + } + +-void parse_config(char *configfile) ++void expand(char *path) + { +- void expand(char *path) ++ char temp[MAXLINELENGTH]; ++ if (*path=='~') + { +- char temp[MAXLINELENGTH]; +- if (*path=='~') +- { +- snprintf(temp,MAXLINELENGTH-1,"%s%s",getenv("HOME"),path+1); +- temp[MAXLINELENGTH-1]='\0'; +- strcpy(path,temp); +- } ++ snprintf(temp,MAXLINELENGTH-1,"%s%s",getenv("HOME"),path+1); ++ temp[MAXLINELENGTH-1]='\0'; ++ strcpy(path,temp); + } ++} + ++void parse_config(char *configfile) ++{ + FILE *fic; + char line[MAXLINELENGTH]; + char keyword[MAXLINELENGTH]; diff --git a/net-irc/irssistats/irssistats-0.75-r1.ebuild b/net-irc/irssistats/irssistats-0.75-r2.ebuild index 0a674f4d68c6..237b8d945551 100644 --- a/net-irc/irssistats/irssistats-0.75-r1.ebuild +++ b/net-irc/irssistats/irssistats-0.75-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -11,15 +11,14 @@ SRC_URI="http://royale.zerezo.com/irssistats/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" - KEYWORDS="amd64 ppc sparc x86" DEPEND="net-irc/irssi" -src_prepare() { - default - eapply "${FILESDIR}/${P}-Makefile.patch" -} +PATCHES=( + "${FILESDIR}/${P}-Makefile.patch" + "${FILESDIR}/${P}-clang16-build-fix.patch" +) src_compile() { emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/net-irc/irssistats/metadata.xml b/net-irc/irssistats/metadata.xml index 4c8a12b5bc36..85e4ed814fa2 100644 --- a/net-irc/irssistats/metadata.xml +++ b/net-irc/irssistats/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> -</maintainer> +<!-- maintainer-needed --> </pkgmetadata> diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest index 1c591d124e4f..918d8944e737 100644 --- a/net-irc/konversation/Manifest +++ b/net-irc/konversation/Manifest @@ -1,2 +1,2 @@ -DIST konversation-1.7.7.tar.xz 3357584 BLAKE2B 9f6817a1e01674f383879eeaafc65a50825aa7554fedcf7fbe7affc43da16f7198761ca12b510d9980df5a5f41819a5415043ec91de55f1cb4d86e62e8e23ea0 SHA512 99026007af7fa00b82240c1f0e46a8d3db6c3434948aff7d0b01c2f99bccdd227a2a705bd83bce1ca2e47be13866d5d0a981c8b4ff8dec472612d6ee40f9ed2c -DIST konversation-20.12.2.tar.xz 4222016 BLAKE2B 9f53e2f805959a2decbac907a8614f09f33edd2c0be666ef775893ec1101f1a243435314f10f2099c42631883fec07eea0ca28336b03860c6487e00d4606f78a SHA512 b9410c2a6b39f50734a1daa1903441c282fdbe128d0b0cb0cff3611ffb6bdd49a58d0f1b66dd3b9d6232110ed1ff82677ba14e2877d431602cad4a55248fc341 +DIST konversation-23.08.5.tar.xz 4490296 BLAKE2B 027b53e5b59f6666818eb83c4ec8bbbafa6ebc4b02c512eb032090f535de166456a93c5f1f4d93a583d11bbf33f8defe165941527c35891a7b40109a99e27552 SHA512 4de29fa128934dcf2a41f6f06bb0d1a6dc0080ca572f1ce9d30c41d16ce36c285fe390f5fc8d06cbf0b0fd307f36c75068954aeb1847482f106d33c0801ba0ef +DIST konversation-24.05.0.tar.xz 4387364 BLAKE2B c6b14519955f351ebbb90d51e51ebee1a60aca6d02dd57ba9d858fa4389a20e5cfeb55e165ccf8b360a03554d86a73b6b0be030314659d5bb43a22520c398e49 SHA512 97da01f374fb3c715b1b6bde52823699474a68f2452ed485a2fd76520ddbb57a2023289ab3c211d6e812c362071696ef66c633214300cf2527bf8334efff206f diff --git a/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch b/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch deleted file mode 100644 index d856a17215a9..000000000000 --- a/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 271da4bd1e584026fc24d93474ca6cf9e50fa6d7 Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Mon, 16 Sep 2019 18:18:49 +0100 -Subject: Drop effectively unused kemoticons support - -Summary: -Konversation only supported emoticons if config value EnableEmotIcons -was true. This by default was false and there is no UI for configuring -this, making it effectively unused. - -This appears to be deliberate from the code comments. - -This helps clear up some KEmoticon library usage for future KF6 -transitioning. - -UTF-8 emoticons work correctly. - -Test Plan: Compiles - -Differential Revision: https://phabricator.kde.org/D24000 ---- - src/CMakeLists.txt | 2 -- - src/config/konversation.kcfg | 8 -------- - src/viewer/ircview.cpp | 3 --- - 3 files changed, 13 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index c2077b3..89616a6 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -138,7 +138,6 @@ set(viewer_SRCS - viewer/topiclabel.cpp - viewer/awaylabel.cpp - viewer/editnotifydialog.cpp -- viewer/emoticons.cpp - viewer/images.cpp - viewer/quickbutton.cpp - viewer/searchbar.cpp -@@ -224,7 +223,6 @@ target_link_libraries(konversation - KF5::Bookmarks - KF5::ConfigWidgets - KF5::Crash -- KF5::Emoticons - KF5::I18n - KF5::IdleTime - KF5::NotifyConfig -diff --git a/src/config/konversation.kcfg b/src/config/konversation.kcfg -index 1d59eaf..3f0b7a6 100644 ---- a/src/config/konversation.kcfg -+++ b/src/config/konversation.kcfg -@@ -844,14 +844,6 @@ - <label></label> - <whatsthis></whatsthis> - </entry> -- <entry key="EnableEmotIcons" type="Bool"> -- <default>false</default> -- <label>Enable emoticons</label> -- </entry> -- <entry key="EmotIconTheme" type="String"> -- <default>Default</default> -- <label>Emoticons theme</label> -- </entry> - </group> - <group name="PreferencesDialog"> - <entry name="PreferencesDialogSize" key="Size" type="Size"> -diff --git a/src/viewer/ircview.cpp b/src/viewer/ircview.cpp -index c129f61..15f78ca 100644 ---- a/src/viewer/ircview.cpp -+++ b/src/viewer/ircview.cpp -@@ -20,7 +20,6 @@ - #include "application.h" - #include "highlight.h" - #include "sound.h" --#include "emoticons.h" - #include "notificationhandler.h" - - #include <QDrag> -@@ -1214,8 +1213,6 @@ QString IRCView::filter(const QString& line, const QString& defaultColor, const - QLatin1String("\">") + filteredLine + QLatin1String("</font>"); - } - -- filteredLine = Konversation::Emoticons::parseEmoticons(filteredLine); -- - return filteredLine; - } - --- -cgit v1.1 - -From f1e6ec37b9a9ead194606795ed23a1ec70a784cc Mon Sep 17 00:00:00 2001 -From: Peter Simonsson <peter.simonsson@gmail.com> -Date: Tue, 7 Apr 2020 16:37:53 +0200 -Subject: Remove KEmoticons from dependencies as it's not used - ---- - CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5315dbd..19facd8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED - CoreAddons - Crash - DocTools -- Emoticons - I18n - IdleTime - NotifyConfig --- -cgit v1.1 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 deleted file mode 100644 index f631a9493483..000000000000 --- a/net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch +++ /dev/null @@ -1,347 +0,0 @@ -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/files/konversation-1.7.7-no-solid.patch b/net-irc/konversation/files/konversation-1.7.7-no-solid.patch deleted file mode 100644 index 53ea4a3d7a1d..000000000000 --- a/net-irc/konversation/files/konversation-1.7.7-no-solid.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3d8a425ef426019c49abea20baa58461900c731d Mon Sep 17 00:00:00 2001 -From: "Friedrich W. H. Kossebau" <kossebau@kde.org> -Date: Thu, 29 Oct 2020 13:15:22 +0100 -Subject: [PATCH] Remove unused explicit dep on and linkage of Solid - -(still pulled in via public dep of KIOFileWidgets, but not used by us) ---- - CMakeLists.txt | 1 - - src/CMakeLists.txt | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 72ec982d..bcd101e1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,7 +30,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED - NotifyConfig - KIO - Parts -- Solid - Wallet - WidgetsAddons - GlobalAccel -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 460325f1..680053e2 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -244,7 +244,6 @@ target_link_libraries(konversation - KF5::KIOFileWidgets - KF5::KIOWidgets - KF5::Parts -- KF5::Solid - KF5::Wallet - KF5::WidgetsAddons - KF5::GlobalAccel --- -GitLab - diff --git a/net-irc/konversation/files/konversationrc b/net-irc/konversation/files/konversationrc index 932374b6bf45..3f4a06eff4e9 100644 --- a/net-irc/konversation/files/konversationrc +++ b/net-irc/konversation/files/konversationrc @@ -13,12 +13,12 @@ Name=#gentoo-xfce [Server 0] Port=8001 SSLEnabled=false -Server=chat.freenode.net +Server=irc.libera.chat [ServerGroup 0] AutoConnect=false AutoJoinChannels=Channel 0,Channel 1,Channel 2,Channel 3 EnableNotifications=true Expanded=false -Name=Freenode +Name=Libera ServerList=Server 0 diff --git a/net-irc/konversation/konversation-1.7.7-r1.ebuild b/net-irc/konversation/konversation-1.7.7-r1.ebuild deleted file mode 100644 index d3f2f657db22..000000000000 --- a/net-irc/konversation/konversation-1.7.7-r1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# 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 - "${FILESDIR}"/${P}-no-solid.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/konversation/konversation-20.12.2.ebuild b/net-irc/konversation/konversation-23.08.5.ebuild index 5e0ea6be4c39..82a8ada7d872 100644 --- a/net-irc/konversation/konversation-20.12.2.ebuild +++ b/net-irc/konversation/konversation-23.08.5.ebuild @@ -1,26 +1,25 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" -KDE_RELEASE_SERVICE="true" -KFMIN=5.74.0 -QTMIN=5.15.2 -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org optfeature DESCRIPTION="User friendly IRC Client" -HOMEPAGE="https://konversation.kde.org https://apps.kde.org/en/konversation" +HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/" LICENSE="GPL-2" SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" IUSE="+crypt" -BDEPEND="sys-devel/gettext" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtmultimedia-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 @@ -48,13 +47,13 @@ DEPEND=" >=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 ) + crypt? ( >=app-crypt/qca-2.3.0:2[qt5(+)] ) " RDEPEND="${DEPEND} >=dev-qt/qtsvg-${QTMIN}:5 - crypt? ( >=app-crypt/qca-2.3.0:2[ssl] ) + crypt? ( >=app-crypt/qca-2.3.0:2[qt5(+),ssl] ) " +BDEPEND="sys-devel/gettext" src_configure() { local mycmakeargs=( @@ -71,3 +70,10 @@ src_install() { insinto /etc/xdg doins "${FILESDIR}"/konversationrc } + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + optfeature "konsole view" "kde-apps/konsolepart:5" "kde-apps/konsole:5" + fi + ecm_pkg_postinst +} diff --git a/net-irc/konversation/konversation-24.05.0.ebuild b/net-irc/konversation/konversation-24.05.0.ebuild new file mode 100644 index 000000000000..f91970b7bef7 --- /dev/null +++ b/net-irc/konversation/konversation-24.05.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="User friendly IRC Client" +HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/" + +LICENSE="GPL-2" +SLOT="6" +KEYWORDS="~amd64" +IUSE="+crypt" + +DEPEND=" + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml] + >=dev-qt/qtmultimedia-${QTMIN}:6 + >=dev-qt/qttools-${QTMIN}:6[qdbus] + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kbookmarks-${KFMIN}:6 + >=kde-frameworks/kcodecs-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kidletime-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/knotifyconfig-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwallet-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-frameworks/kxmlgui-${KFMIN}:6 + crypt? ( >=app-crypt/qca-2.3.7:2[qt6] ) +" +RDEPEND="${DEPEND} + >=dev-qt/qtsvg-${QTMIN}:6 + crypt? ( >=app-crypt/qca-2.3.7:2[qt6,ssl] ) +" +BDEPEND="sys-devel/gettext" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package crypt Qca-qt6) + ) + + ecm_src_configure +} + +src_install() { + ecm_src_install + + # Bug 616162 + insinto /etc/xdg + doins "${FILESDIR}"/konversationrc +} diff --git a/net-irc/konversation/metadata.xml b/net-irc/konversation/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/net-irc/konversation/metadata.xml +++ b/net-irc/konversation/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + </upstream> </pkgmetadata> diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest index 7f23849cfe8b..4bcf368c9fb8 100644 --- a/net-irc/kvirc/Manifest +++ b/net-irc/kvirc/Manifest @@ -1 +1,2 @@ -DIST kvirc-5.2_pre20200605155236.tar.gz 6170072 BLAKE2B 2652bcae16263615ccbf494d8265a1ecf997525dbfa70d4ace0c3f6ae58231ce575dfe444a60e2751bb7741445bf44297fafb260c05bad6d637f8dc89eb254b4 SHA512 84499fe13337f114587ff267d5e85e39ef61d99e88c84cfc9f0341a5db2e17b50d644bf8483de420c3629f073d6e3eeb81e25de357a723f54e39f154cb4b7da1 +DIST kvirc-5.2.0.tar.gz 6365703 BLAKE2B fda63b6579b9d8d75eae5c2b039f474f4a810c79c74d98da0adebc4bec51c19286a9fb4a219dafefdf4132709394e946dd5aa30d1335ce1af4cbffd60764578d SHA512 01a183ae283b774dc096ec4bf81509ad79acf10fb3c82e06f66b7360736d32c1514856849ef562e2fc2b4ef3019e0842d17de8a762c7858dbac34f85de125079 +DIST kvirc-5.2.2.tar.gz 6362952 BLAKE2B ba90de3730dee0466c21cd658eda622bfb8f601e1af79d53952b2b016c0bacf0dc1d83c78f307288cc2e3bfda409773adfffc1b53fba6a0d8c682a5ab8739259 SHA512 dcb140051cebe4eaa82d8b8e221e4df3f40695b3b3a9aa9842ef5325e3129c73d08e5849589385793efc1eb70fd115ee634422af8be3f943eea79719a4159ea5 diff --git a/net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch b/net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch new file mode 100644 index 000000000000..0d2944e30830 --- /dev/null +++ b/net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch @@ -0,0 +1,69 @@ +From da4659a9d9c30b6d89875f328cca88758ef568c6 Mon Sep 17 00:00:00 2001 +From: Aleksei Bavshin <alebastr89@gmail.com> +Date: Wed, 17 Jan 2024 20:58:27 -0800 +Subject: [PATCH] Fix build with Qt5 and WANT_DCC_VIDEO +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +``` +src/modules/dcc/DccVideoWindow.cpp: In member function ‘virtual const QString& DccVideoWindow::target()’: +src/modules/dcc/DccVideoWindow.cpp:660:40: error: cannot convert ‘QString’ to ‘QString*’ in assignment +``` +--- + src/modules/dcc/DccVideoWindow.cpp | 14 ++------------ + src/modules/dcc/DccVideoWindow.h | 2 +- + 2 files changed, 3 insertions(+), 13 deletions(-) + +diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp +index 7f4f66ea42..7cf8058fe8 100644 +--- a/src/modules/dcc/DccVideoWindow.cpp ++++ b/src/modules/dcc/DccVideoWindow.cpp +@@ -396,7 +396,6 @@ DccVideoWindow::DccVideoWindow(DccDescriptor * dcc, const char * name) + { + m_pDescriptor = dcc; + m_pSlaveThread = nullptr; +- m_pszTarget = nullptr; + + m_pButtonBox = new KviTalHBox(this); + +@@ -557,12 +556,6 @@ DccVideoWindow::~DccVideoWindow() + } + + KviThreadManager::killPendingEvents(this); +- +- if(m_pszTarget) +- { +- delete m_pszTarget; +- m_pszTarget = nullptr; +- } + } + + void DccVideoWindow::resizeEvent(QResizeEvent *) +@@ -654,11 +647,8 @@ void DccVideoWindow::connectionInProgress() + const QString & DccVideoWindow::target() + { + // This may change on the fly... +- if(!m_pszTarget) +- m_pszTarget = new QString(); +- +- m_pszTarget = QString::asprintf("%s@%s:%s", m_pDescriptor->szNick.toUtf8().data(), m_pDescriptor->szIp.toUtf8().data(), m_pDescriptor->szPort.toUtf8().data()); +- return *m_pszTarget; ++ m_szTarget = QString::asprintf("%s@%s:%s", m_pDescriptor->szNick.toUtf8().data(), m_pDescriptor->szIp.toUtf8().data(), m_pDescriptor->szPort.toUtf8().data()); ++ return m_szTarget; + } + + void DccVideoWindow::getBaseLogFileName(QString & buffer) +diff --git a/src/modules/dcc/DccVideoWindow.h b/src/modules/dcc/DccVideoWindow.h +index 98bb622f5b..d0f957ea3e 100644 +--- a/src/modules/dcc/DccVideoWindow.h ++++ b/src/modules/dcc/DccVideoWindow.h +@@ -129,7 +129,7 @@ class DccVideoWindow : public DccWindow + QGridLayout * m_pLayout; + QTimer m_Timer; + QLabel * m_pVideoLabel[3]; +- QString * m_pszTarget; ++ QString m_szTarget; + DccVideoThread * m_pSlaveThread; + QByteArray m_tmpTextDataOut; + QString m_szLocalNick; diff --git a/net-irc/kvirc/files/kvirc-5.2.0-qtver.patch b/net-irc/kvirc/files/kvirc-5.2.0-qtver.patch new file mode 100644 index 000000000000..9f3700ec9d9b --- /dev/null +++ b/net-irc/kvirc/files/kvirc-5.2.0-qtver.patch @@ -0,0 +1,25 @@ +From a301aa4998c4f0040d093cd2950b7b2f4ec4dcdc Mon Sep 17 00:00:00 2001 +From: Alexey Sokolov <sokolov@google.com> +Date: Sun, 21 Jan 2024 21:07:37 +0000 +Subject: [PATCH] Fix ability to select Qt5 vs Qt6 + +https://bugs.gentoo.org/922636 +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aabc0988b..9368e81c9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -389,7 +389,9 @@ endif() + ############################################################################ + + # first check if Qt6 or Qt5 has to be used +-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core) ++if(NOT DEFINED QT_VERSION_MAJOR) ++ find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core) ++endif() + # second, detect available modules for the specific Qt version + find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets) + if(Qt${QT_VERSION_MAJOR}Widgets_FOUND) diff --git a/net-irc/kvirc/kvirc-5.2.0-r1.ebuild b/net-irc/kvirc/kvirc-5.2.0-r1.ebuild new file mode 100644 index 000000000000..e9b6d4a308d7 --- /dev/null +++ b/net-irc/kvirc/kvirc-5.2.0-r1.ebuild @@ -0,0 +1,162 @@ +# Copyright 2009-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" +DESCRIPTION="Advanced IRC Client" +HOMEPAGE="https://www.kvirc.net/ https://github.com/kvirc/KVIrc" +CMAKE_MAKEFILE_GENERATOR="emake" +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake flag-o-matic python-single-r1 xdg + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/kvirc/KVIrc" +else + SRC_URI="https://github.com/kvirc/KVIrc/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 ~ppc ~ppc64 ~riscv x86" + S="${WORKDIR}/KVIrc-${PV}" +fi + +LICENSE="GPL-2+" +SLOT="0" +IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora" +REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )" + +BDEPEND="dev-lang/perl:0 + virtual/pkgconfig + doc? ( app-text/doxygen ) + kde? ( kde-frameworks/extra-cmake-modules:0 ) + nls? ( sys-devel/gettext )" +DEPEND="dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + sys-libs/zlib:0= + x11-libs/libX11 + x11-libs/libXScrnSaver + audiofile? ( media-libs/audiofile ) + dbus? ( dev-qt/qtdbus:5 ) + dcc-video? ( dev-qt/qtmultimedia:5[widgets] ) + kde? ( + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/knotifications:5 + kde-frameworks/kservice:5 + kde-frameworks/kwindowsystem:5 + kde-frameworks/kxmlgui:5 + ) + perl? ( dev-lang/perl:0= ) + phonon? ( media-libs/phonon[qt5(+)] ) + python? ( ${PYTHON_DEPS} ) + spell? ( app-text/enchant:2 ) + ssl? ( dev-libs/openssl:0= ) + theora? ( + media-libs/libogg + media-libs/libtheora + media-libs/libvorbis + )" +RDEPEND="${DEPEND} + gsm? ( media-sound/gsm )" + +DOCS=() + +PATCHES=( + "${FILESDIR}/kvirc-5.2.0-qtver.patch" +) + +pkg_setup() { + if use python; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + cmake_src_prepare + + if [[ "${PV}" == "9999" ]]; then + KVIRC_GIT_REVISION="$(git show -s --format=%H)" + KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)" + einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}" + sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" \ + -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed" + fi +} + +src_configure() { + append-flags -fno-strict-aliasing + + local libdir="$(get_libdir)" + local mycmakeargs=( + -DLIB_SUFFIX=${libdir#lib} + -DWANT_ENV_FLAGS=ON + -DWANT_VERBOSE=ON + + -DWANT_CRYPT=ON + -DWANT_DCC_VOICE=ON + -DWANT_IPC=ON + -DWANT_IPV6=ON + -DWANT_TRANSPARENCY=ON + + -DWANT_AUDIOFILE=$(usex audiofile) + -DWANT_DCC_VIDEO=$(usex dcc-video) + -DWANT_DEBUG=$(usex debug) + -DWANT_DOXYGEN=$(usex doc) + -DWANT_GETTEXT=$(usex nls) + -DWANT_GSM=$(usex gsm) + -DWANT_KDE=$(usex kde) + -DWANT_MEMORY_PROFILE=$(usex profile) + -DWANT_OGG_THEORA=$(usex theora) + -DWANT_OPENSSL=$(usex ssl) + -DWANT_OSS=$(usex oss) + -DWANT_PERL=$(usex perl) + -DWANT_PHONON=$(usex phonon) + -DWANT_PYTHON=$(usex python) + -DWANT_QTDBUS=$(usex dbus) + -DWANT_QTWEBKIT=OFF + -DWANT_SPELLCHECKER=$(usex spell) + -DQT_VERSION_MAJOR=5 + + # COMPILE_SVG_SUPPORT not used in source code. + -DWANT_QTSVG=OFF + ) + if use python; then + mycmakeargs+=( + -DPython3_INCLUDE_DIR="$(python_get_includedir)" + -DPython3_LIBRARY="$(python_get_library_path)" + ) + fi + if [[ "${PV}" == "9999" ]]; then + mycmakeargs+=( + -DMANUAL_REVISION=${KVIRC_GIT_REVISION} + -DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/} + ) + fi + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + cmake_src_compile devdocs + fi +} + +src_install() { + cmake_src_install + + if use doc; then + ( + docinto html + dodoc -r "${BUILD_DIR}/doc/api/html/"* + ) + fi +} diff --git a/net-irc/kvirc/kvirc-5.2.0-r2.ebuild b/net-irc/kvirc/kvirc-5.2.0-r2.ebuild new file mode 100644 index 000000000000..bb2c098eb7b8 --- /dev/null +++ b/net-irc/kvirc/kvirc-5.2.0-r2.ebuild @@ -0,0 +1,164 @@ +# Copyright 2009-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" +DESCRIPTION="Advanced IRC Client" +HOMEPAGE="https://www.kvirc.net/ https://github.com/kvirc/KVIrc" +CMAKE_MAKEFILE_GENERATOR="emake" +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake flag-o-matic python-single-r1 xdg + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/kvirc/KVIrc" +else + SRC_URI="https://github.com/kvirc/KVIrc/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}/KVIrc-${PV}" +fi + +LICENSE="GPL-2+" +SLOT="0" +IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webengine" +REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )" + +BDEPEND="dev-lang/perl:0 + virtual/pkgconfig + doc? ( app-text/doxygen ) + kde? ( kde-frameworks/extra-cmake-modules:0 ) + nls? ( sys-devel/gettext )" +DEPEND="dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + sys-libs/zlib:0= + x11-libs/libX11 + x11-libs/libXScrnSaver + audiofile? ( media-libs/audiofile ) + dbus? ( dev-qt/qtdbus:5 ) + dcc-video? ( dev-qt/qtmultimedia:5[widgets] ) + kde? ( + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/knotifications:5 + kde-frameworks/kservice:5 + kde-frameworks/kwindowsystem:5 + kde-frameworks/kxmlgui:5 + ) + perl? ( dev-lang/perl:0= ) + phonon? ( media-libs/phonon[qt5(+)] ) + python? ( ${PYTHON_DEPS} ) + spell? ( app-text/enchant:2 ) + ssl? ( dev-libs/openssl:0= ) + theora? ( + media-libs/libogg + media-libs/libtheora + media-libs/libvorbis + ) + webengine? ( dev-qt/qtwebengine:5[widgets] )" +RDEPEND="${DEPEND} + gsm? ( media-sound/gsm )" + +DOCS=() + +PATCHES=( + "${FILESDIR}/kvirc-5.2.0-qtver.patch" + "${FILESDIR}/kvirc-5.2.0-dccvideo.patch" +) + +pkg_setup() { + if use python; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + cmake_src_prepare + + if [[ "${PV}" == "9999" ]]; then + KVIRC_GIT_REVISION="$(git show -s --format=%H)" + KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)" + einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}" + sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" \ + -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed" + fi +} + +src_configure() { + append-flags -fno-strict-aliasing + + local libdir="$(get_libdir)" + local mycmakeargs=( + -DLIB_SUFFIX=${libdir#lib} + -DWANT_ENV_FLAGS=ON + -DWANT_VERBOSE=ON + + -DWANT_CRYPT=ON + -DWANT_DCC_VOICE=ON + -DWANT_IPC=ON + -DWANT_IPV6=ON + -DWANT_TRANSPARENCY=ON + + -DWANT_AUDIOFILE=$(usex audiofile) + -DWANT_DCC_VIDEO=$(usex dcc-video) + -DWANT_DEBUG=$(usex debug) + -DWANT_DOXYGEN=$(usex doc) + -DWANT_GETTEXT=$(usex nls) + -DWANT_GSM=$(usex gsm) + -DWANT_KDE=$(usex kde) + -DWANT_MEMORY_PROFILE=$(usex profile) + -DWANT_OGG_THEORA=$(usex theora) + -DWANT_OPENSSL=$(usex ssl) + -DWANT_OSS=$(usex oss) + -DWANT_PERL=$(usex perl) + -DWANT_PHONON=$(usex phonon) + -DWANT_PYTHON=$(usex python) + -DWANT_QTDBUS=$(usex dbus) + -DWANT_QTWEBENGINE=$(usex webengine) + -DWANT_SPELLCHECKER=$(usex spell) + -DQT_VERSION_MAJOR=5 + + # COMPILE_SVG_SUPPORT not used in source code. + -DWANT_QTSVG=OFF + ) + if use python; then + mycmakeargs+=( + -DPython3_INCLUDE_DIR="$(python_get_includedir)" + -DPython3_LIBRARY="$(python_get_library_path)" + ) + fi + if [[ "${PV}" == "9999" ]]; then + mycmakeargs+=( + -DMANUAL_REVISION=${KVIRC_GIT_REVISION} + -DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/} + ) + fi + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + cmake_src_compile devdocs + fi +} + +src_install() { + cmake_src_install + + if use doc; then + ( + docinto html + dodoc -r "${BUILD_DIR}/doc/api/html/"* + ) + fi +} diff --git a/net-irc/kvirc/kvirc-5.2.2.ebuild b/net-irc/kvirc/kvirc-5.2.2.ebuild new file mode 100644 index 000000000000..5f7c77b52cf6 --- /dev/null +++ b/net-irc/kvirc/kvirc-5.2.2.ebuild @@ -0,0 +1,159 @@ +# Copyright 2009-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" +DESCRIPTION="Advanced IRC Client" +HOMEPAGE="https://www.kvirc.net/ https://github.com/kvirc/KVIrc" +CMAKE_MAKEFILE_GENERATOR="emake" +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake flag-o-matic python-single-r1 xdg + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/kvirc/KVIrc" +else + SRC_URI="https://github.com/kvirc/KVIrc/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 ~ppc ~ppc64 ~riscv x86" + S="${WORKDIR}/KVIrc-${PV}" +fi + +LICENSE="GPL-2+" +SLOT="0" +IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webengine" +REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )" + +BDEPEND="dev-lang/perl:0 + virtual/pkgconfig + doc? ( app-text/doxygen ) + kde? ( kde-frameworks/extra-cmake-modules:0 ) + nls? ( sys-devel/gettext )" +DEPEND="dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + sys-libs/zlib:0= + x11-libs/libX11 + x11-libs/libXScrnSaver + audiofile? ( media-libs/audiofile ) + dbus? ( dev-qt/qtdbus:5 ) + dcc-video? ( dev-qt/qtmultimedia:5[widgets] ) + kde? ( + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/knotifications:5 + kde-frameworks/kservice:5 + kde-frameworks/kwindowsystem:5 + kde-frameworks/kxmlgui:5 + ) + perl? ( dev-lang/perl:0= ) + phonon? ( media-libs/phonon[qt5(+)] ) + python? ( ${PYTHON_DEPS} ) + spell? ( app-text/enchant:2 ) + ssl? ( dev-libs/openssl:0= ) + theora? ( + media-libs/libogg + media-libs/libtheora + media-libs/libvorbis + ) + webengine? ( dev-qt/qtwebengine:5[widgets] )" +RDEPEND="${DEPEND} + gsm? ( media-sound/gsm )" + +DOCS=() + +pkg_setup() { + if use python; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + cmake_src_prepare + + if [[ "${PV}" == "9999" ]]; then + KVIRC_GIT_REVISION="$(git show -s --format=%H)" + KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)" + einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}" + sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" \ + -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed" + fi +} + +src_configure() { + append-flags -fno-strict-aliasing + + local libdir="$(get_libdir)" + local mycmakeargs=( + -DLIB_SUFFIX=${libdir#lib} + -DWANT_ENV_FLAGS=ON + -DWANT_VERBOSE=ON + + -DWANT_CRYPT=ON + -DWANT_DCC_VOICE=ON + -DWANT_IPC=ON + -DWANT_IPV6=ON + -DWANT_TRANSPARENCY=ON + + -DWANT_AUDIOFILE=$(usex audiofile) + -DWANT_DCC_VIDEO=$(usex dcc-video) + -DWANT_DEBUG=$(usex debug) + -DWANT_DOXYGEN=$(usex doc) + -DWANT_GETTEXT=$(usex nls) + -DWANT_GSM=$(usex gsm) + -DWANT_KDE=$(usex kde) + -DWANT_MEMORY_PROFILE=$(usex profile) + -DWANT_OGG_THEORA=$(usex theora) + -DWANT_OPENSSL=$(usex ssl) + -DWANT_OSS=$(usex oss) + -DWANT_PERL=$(usex perl) + -DWANT_PHONON=$(usex phonon) + -DWANT_PYTHON=$(usex python) + -DWANT_QTDBUS=$(usex dbus) + -DWANT_QTWEBENGINE=$(usex webengine) + -DWANT_SPELLCHECKER=$(usex spell) + -DQT_VERSION_MAJOR=5 + + # COMPILE_SVG_SUPPORT not used in source code. + -DWANT_QTSVG=OFF + ) + if use python; then + mycmakeargs+=( + -DPython3_INCLUDE_DIR="$(python_get_includedir)" + -DPython3_LIBRARY="$(python_get_library_path)" + ) + fi + if [[ "${PV}" == "9999" ]]; then + mycmakeargs+=( + -DMANUAL_REVISION=${KVIRC_GIT_REVISION} + -DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/} + ) + fi + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + cmake_src_compile devdocs + fi +} + +src_install() { + cmake_src_install + + if use doc; then + ( + docinto html + dodoc -r "${BUILD_DIR}/doc/api/html/"* + ) + fi +} diff --git a/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild b/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild deleted file mode 100644 index f73ede8d1ee5..000000000000 --- a/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 2009-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -CMAKE_MAKEFILE_GENERATOR="emake" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) - -inherit cmake flag-o-matic python-single-r1 xdg-utils - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/kvirc/KVIrc" - KVIRC_GIT_REVISION="" - KVIRC_GIT_SOURCES_DATE="" -else - KVIRC_GIT_REVISION="e66a5106ef55a92e2532c38aa255ac376ba6afe1" - KVIRC_GIT_SOURCES_DATE="${PV#*_pre}" - KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}" -fi - -DESCRIPTION="Advanced IRC Client" -HOMEPAGE="https://www.kvirc.net/ https://github.com/kvirc/KVIrc" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="audiofile +dbus dcc_video debug doc gsm kde libressl +nls oss +perl +phonon profile +python spell +ssl theora webkit" -REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )" - -BDEPEND="dev-lang/perl:0 - >=dev-util/cmake-3.16 - virtual/pkgconfig - doc? ( app-doc/doxygen ) - kde? ( kde-frameworks/extra-cmake-modules:5 ) - nls? ( sys-devel/gettext )" -DEPEND="dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - sys-libs/zlib:0= - x11-libs/libX11 - x11-libs/libXScrnSaver - audiofile? ( media-libs/audiofile ) - dbus? ( dev-qt/qtdbus:5 ) - dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) - kde? ( - kde-frameworks/kcoreaddons:5 - kde-frameworks/ki18n:5 - kde-frameworks/knotifications:5 - kde-frameworks/kservice:5 - kde-frameworks/kwindowsystem:5 - kde-frameworks/kxmlgui:5 - ) - perl? ( dev-lang/perl:0= ) - phonon? ( media-libs/phonon[qt5(+)] ) - python? ( ${PYTHON_DEPS} ) - spell? ( app-text/enchant:0= ) - ssl? ( - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) - ) - theora? ( - media-libs/libogg - media-libs/libtheora - media-libs/libvorbis - ) - webkit? ( dev-qt/qtwebkit:5 )" -RDEPEND="${DEPEND} - gsm? ( media-sound/gsm )" - -if [[ "${PV}" != "9999" ]]; then - S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}" -fi - -DOCS=() - -pkg_setup() { - if use python; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - cmake_src_prepare - - if [[ "${PV}" == "9999" ]]; then - KVIRC_GIT_REVISION="$(git show -s --format=%H)" - KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)" - fi - einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}" - sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed" -} - -src_configure() { - append-flags -fno-strict-aliasing - - local libdir="$(get_libdir)" - local mycmakeargs=( - -DLIB_SUFFIX=${libdir#lib} - -DMANUAL_REVISION=${KVIRC_GIT_REVISION} - -DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/} - -DWANT_ENV_FLAGS=ON - -DWANT_VERBOSE=ON - - -DWANT_CRYPT=ON - -DWANT_DCC_VOICE=ON - -DWANT_IPC=ON - -DWANT_IPV6=ON - -DWANT_TRANSPARENCY=ON - - -DWANT_AUDIOFILE=$(usex audiofile ON OFF) - -DWANT_DCC_VIDEO=$(usex dcc_video ON OFF) - -DWANT_DEBUG=$(usex debug ON OFF) - -DWANT_DOXYGEN=$(usex doc ON OFF) - -DWANT_GETTEXT=$(usex nls ON OFF) - -DWANT_GSM=$(usex gsm ON OFF) - -DWANT_KDE=$(usex kde ON OFF) - -DWANT_MEMORY_PROFILE=$(usex profile ON OFF) - -DWANT_OGG_THEORA=$(usex theora ON OFF) - -DWANT_OPENSSL=$(usex ssl ON OFF) - -DWANT_OSS=$(usex oss ON OFF) - -DWANT_PERL=$(usex perl ON OFF) - -DWANT_PHONON=$(usex phonon ON OFF) - -DWANT_PYTHON=$(usex python ON OFF) - -DWANT_QTDBUS=$(usex dbus ON OFF) - -DWANT_QTWEBKIT=$(usex webkit ON OFF) - -DWANT_SPELLCHECKER=$(usex spell ON OFF) - - # COMPILE_SVG_SUPPORT not used in source code. - -DWANT_QTSVG=OFF - ) - if use python; then - mycmakeargs+=( - -DPython3_INCLUDE_DIR="$(python_get_includedir)" - -DPython3_LIBRARY="$(python_get_library_path)" - ) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc; then - cmake_src_compile devdocs - fi -} - -src_install() { - cmake_src_install - - if use doc; then - ( - docinto html - dodoc -r "${BUILD_DIR}/doc/api/html/"* - ) - fi -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild index 5e4569dadd03..32a984d0afbb 100644 --- a/net-irc/kvirc/kvirc-9999.ebuild +++ b/net-irc/kvirc/kvirc-9999.ebuild @@ -1,45 +1,35 @@ -# Copyright 2009-2020 Gentoo Authors +# Copyright 2009-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" +DESCRIPTION="Advanced IRC Client" +HOMEPAGE="https://www.kvirc.net/ https://github.com/kvirc/KVIrc" CMAKE_MAKEFILE_GENERATOR="emake" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) +PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake flag-o-matic python-single-r1 xdg-utils +inherit cmake flag-o-matic python-single-r1 xdg if [[ "${PV}" == "9999" ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/kvirc/KVIrc" - KVIRC_GIT_REVISION="" - KVIRC_GIT_SOURCES_DATE="" -else - KVIRC_GIT_REVISION="" - KVIRC_GIT_SOURCES_DATE="${PV#*_pre}" - KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}" -fi - -DESCRIPTION="Advanced IRC Client" -HOMEPAGE="https://www.kvirc.net/ https://github.com/kvirc/KVIrc" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" else - SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/kvirc/KVIrc/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}/KVIrc-${PV}" fi LICENSE="GPL-2+" SLOT="0" -KEYWORDS="" -IUSE="audiofile +dbus dcc_video debug doc gsm kde libressl +nls oss +perl +phonon profile +python spell +ssl theora webkit" +IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webengine" REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )" BDEPEND="dev-lang/perl:0 - >=dev-util/cmake-3.16 virtual/pkgconfig - doc? ( app-doc/doxygen ) - kde? ( kde-frameworks/extra-cmake-modules:5 ) + doc? ( app-text/doxygen ) + kde? ( kde-frameworks/extra-cmake-modules:0 ) nls? ( sys-devel/gettext )" DEPEND="dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 @@ -53,7 +43,7 @@ DEPEND="dev-qt/qtcore:5 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) - dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) + dcc-video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 @@ -65,24 +55,17 @@ DEPEND="dev-qt/qtcore:5 perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) python? ( ${PYTHON_DEPS} ) - spell? ( app-text/enchant:0= ) - ssl? ( - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) - ) + spell? ( app-text/enchant:2 ) + ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) - webkit? ( dev-qt/qtwebkit:5 )" + webengine? ( dev-qt/qtwebengine:5[widgets] )" RDEPEND="${DEPEND} gsm? ( media-sound/gsm )" -if [[ "${PV}" != "9999" ]]; then - S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}" -fi - DOCS=() pkg_setup() { @@ -97,9 +80,10 @@ src_prepare() { if [[ "${PV}" == "9999" ]]; then KVIRC_GIT_REVISION="$(git show -s --format=%H)" KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)" + einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}" + sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" \ + -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed" fi - einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}" - sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed" } src_configure() { @@ -108,8 +92,6 @@ src_configure() { local libdir="$(get_libdir)" local mycmakeargs=( -DLIB_SUFFIX=${libdir#lib} - -DMANUAL_REVISION=${KVIRC_GIT_REVISION} - -DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/} -DWANT_ENV_FLAGS=ON -DWANT_VERBOSE=ON @@ -119,23 +101,24 @@ src_configure() { -DWANT_IPV6=ON -DWANT_TRANSPARENCY=ON - -DWANT_AUDIOFILE=$(usex audiofile ON OFF) - -DWANT_DCC_VIDEO=$(usex dcc_video ON OFF) - -DWANT_DEBUG=$(usex debug ON OFF) - -DWANT_DOXYGEN=$(usex doc ON OFF) - -DWANT_GETTEXT=$(usex nls ON OFF) - -DWANT_GSM=$(usex gsm ON OFF) - -DWANT_KDE=$(usex kde ON OFF) - -DWANT_MEMORY_PROFILE=$(usex profile ON OFF) - -DWANT_OGG_THEORA=$(usex theora ON OFF) - -DWANT_OPENSSL=$(usex ssl ON OFF) - -DWANT_OSS=$(usex oss ON OFF) - -DWANT_PERL=$(usex perl ON OFF) - -DWANT_PHONON=$(usex phonon ON OFF) - -DWANT_PYTHON=$(usex python ON OFF) - -DWANT_QTDBUS=$(usex dbus ON OFF) - -DWANT_QTWEBKIT=$(usex webkit ON OFF) - -DWANT_SPELLCHECKER=$(usex spell ON OFF) + -DWANT_AUDIOFILE=$(usex audiofile) + -DWANT_DCC_VIDEO=$(usex dcc-video) + -DWANT_DEBUG=$(usex debug) + -DWANT_DOXYGEN=$(usex doc) + -DWANT_GETTEXT=$(usex nls) + -DWANT_GSM=$(usex gsm) + -DWANT_KDE=$(usex kde) + -DWANT_MEMORY_PROFILE=$(usex profile) + -DWANT_OGG_THEORA=$(usex theora) + -DWANT_OPENSSL=$(usex ssl) + -DWANT_OSS=$(usex oss) + -DWANT_PERL=$(usex perl) + -DWANT_PHONON=$(usex phonon) + -DWANT_PYTHON=$(usex python) + -DWANT_QTDBUS=$(usex dbus) + -DWANT_QTWEBENGINE=$(usex webengine) + -DWANT_SPELLCHECKER=$(usex spell) + -DQT_VERSION_MAJOR=5 # COMPILE_SVG_SUPPORT not used in source code. -DWANT_QTSVG=OFF @@ -146,6 +129,12 @@ src_configure() { -DPython3_LIBRARY="$(python_get_library_path)" ) fi + if [[ "${PV}" == "9999" ]]; then + mycmakeargs+=( + -DMANUAL_REVISION=${KVIRC_GIT_REVISION} + -DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/} + ) + fi cmake_src_configure } @@ -168,13 +157,3 @@ src_install() { ) fi } - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/net-irc/kvirc/metadata.xml b/net-irc/kvirc/metadata.xml index 2d32a6643ad3..a983cfff0bb5 100644 --- a/net-irc/kvirc/metadata.xml +++ b/net-irc/kvirc/metadata.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>arfrever.fta@gmail.com</email> - <name>Arfrever Frehtes Taifersar Arahesis</name> + <maintainer type="person" proxied="yes"> + <email>alexey+gentoo@asokolov.org</email> + <name>Alexey Sokolov</name> </maintainer> - <maintainer type="person"> - <email>floppym@gentoo.org</email> - <name>Mike Gilbert</name> - <description>Proxy</description> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <use> - <flag name="dcc_video">Support video connections over DCC protocol</flag> + <flag name="dcc-video">Support video connections over DCC protocol</flag> <flag name="phonon">Support Phonon for audio output</flag> + <flag name="webengine">Support Qt WebEngine</flag> </use> <upstream> <remote-id type="github">kvirc/KVIrc</remote-id> diff --git a/net-irc/limnoria-plugins-chantracker/Manifest b/net-irc/limnoria-plugins-chantracker/Manifest new file mode 100644 index 000000000000..1d7f6b163dd6 --- /dev/null +++ b/net-irc/limnoria-plugins-chantracker/Manifest @@ -0,0 +1,3 @@ +DIST limnoria-plugins-chantracker-1.6_p20220429.tar.gz 52444 BLAKE2B cbd4187b1b288402b45680a8a7ae080028e68d8409d01ef7c53ad99aae1c94336701a98fe66de29261cb12472ebc9102e31d2862c3da872fe9f55fd40b61cb0b SHA512 ff59e7f42c8fccc2214496e884ae8ef931b8e77839d898fb23fd2551bb91d1865134047fda9001892cd29b892ca4af6b959015d7e763bbeedaf7d13382af1113 +DIST limnoria-plugins-chantracker-1.6_p20220803.tar.gz 52514 BLAKE2B c6053e0c00b41ab7defeadd14bb2c740b33e51a5a2712d69a7867876c0563261444c934f6c3d58c0dab67ed2ce9839e1a3835f15ca9e744ff1468e543ecd3bc2 SHA512 d3ef76404c136c65251503418acbf9e8f9cf6125ea39e2845ccd4b8ce56faef936d5a4d780ae9aedb82b215cd4f3fa88dc51b9f8880b2fd1b9d05fe718646dad +DIST limnoria-plugins-chantracker-1.6_p20221109.tar.gz 52828 BLAKE2B 565464aa82e08d2c674dfc247863149b6a1bf667062306ba7cac564e797d94b72777b97c3fe60d0e612c4be052794103569f6b67e8678728a15417f9ce7655f8 SHA512 2e30e7edaeaa99382f8067c3632ae5bface9738d19223e752089ef9c8b16c3bd51f003d9c0206065b794e57cdc12728d018632b9a035183b69b4d8c532739804 diff --git a/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6_p20220429.ebuild b/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6_p20220429.ebuild new file mode 100644 index 000000000000..4ecb6427352d --- /dev/null +++ b/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6_p20220429.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit vcs-snapshot + +COMMIT="3931b790d5f339ede546dbf925ff1e327f7132db" + +DESCRIPTION="supybot ban management and channel flood/spam/repeat protections plugin" +HOMEPAGE="https://github.com/ncoevoet/ChanTracker" +SRC_URI="https://github.com/ncoevoet/ChanTracker/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64 ~riscv ~x86" +SLOT=0 + +RDEPEND="net-irc/limnoria" + +DOCS="README.md" + +src_install() { + default + insinto /usr/share/limnoria-extra-plugins/ncoevoet/ChanTracker + doins -r * +} + +pkg_postinst() { + elog "Before this plugin can be used, your bot will need to be told where to" + elog "load it from. To do this, add /usr/share/limnoria-extra-plugins/ncoevoet when" + elog "prompted during the bot creation wizard, or add it to a running bots config" + elog "with the command" + elog + elog " config directories.plugins [config directories.plugins], /usr/share/limnoria-extra-plugins/ncoevoet" +} diff --git a/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6_p20220803.ebuild b/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6_p20220803.ebuild new file mode 100644 index 000000000000..481c294d7549 --- /dev/null +++ b/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6_p20220803.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit vcs-snapshot + +COMMIT="0d257df7d63d24610462ad611555741d7655daa9" + +DESCRIPTION="supybot ban management and channel flood/spam/repeat protections plugin" +HOMEPAGE="https://github.com/ncoevoet/ChanTracker" +SRC_URI="https://github.com/ncoevoet/ChanTracker/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64 ~riscv ~x86" +SLOT=0 + +RDEPEND="net-irc/limnoria" + +DOCS="README.md" + +src_install() { + default + insinto /usr/share/limnoria-extra-plugins/ncoevoet/ChanTracker + doins -r * +} + +pkg_postinst() { + elog "Before this plugin can be used, your bot will need to be told where to" + elog "load it from. To do this, add /usr/share/limnoria-extra-plugins/ncoevoet when" + elog "prompted during the bot creation wizard, or add it to a running bots config" + elog "with the command" + elog + elog " config directories.plugins [config directories.plugins], /usr/share/limnoria-extra-plugins/ncoevoet" +} diff --git a/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6_p20221109.ebuild b/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6_p20221109.ebuild new file mode 100644 index 000000000000..95fc75da97cd --- /dev/null +++ b/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6_p20221109.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit vcs-snapshot + +COMMIT="e50ca6fe0d8a8b6beb38a8ec5e37e770188b7d9c" + +DESCRIPTION="supybot ban management and channel flood/spam/repeat protections plugin" +HOMEPAGE="https://github.com/ncoevoet/ChanTracker" +SRC_URI="https://github.com/ncoevoet/ChanTracker/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64 ~riscv ~x86" +SLOT=0 + +RDEPEND="net-irc/limnoria" + +DOCS="README.md" + +src_install() { + default + insinto /usr/share/limnoria-extra-plugins/ncoevoet/ChanTracker + doins -r * +} + +pkg_postinst() { + elog "Before this plugin can be used, your bot will need to be told where to" + elog "load it from. To do this, add /usr/share/limnoria-extra-plugins/ncoevoet when" + elog "prompted during the bot creation wizard, or add it to a running bots config" + elog "with the command" + elog + elog " config directories.plugins [config directories.plugins], /usr/share/limnoria-extra-plugins/ncoevoet" +} diff --git a/net-irc/limnoria-plugins-chantracker/metadata.xml b/net-irc/limnoria-plugins-chantracker/metadata.xml new file mode 100644 index 000000000000..ae56d850325d --- /dev/null +++ b/net-irc/limnoria-plugins-chantracker/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> + <stabilize-allarches/> + <upstream> + <remote-id type="github">ncoevoet/ChanTracker</remote-id> + <bugs-to>https://github.com/ncoevoet/ChanTracker/issues</bugs-to> + </upstream> +</pkgmetadata> diff --git a/net-irc/limnoria-plugins-jlu5/Manifest b/net-irc/limnoria-plugins-jlu5/Manifest new file mode 100644 index 000000000000..529f8aab3bbb --- /dev/null +++ b/net-irc/limnoria-plugins-jlu5/Manifest @@ -0,0 +1,3 @@ +DIST limnoria-plugins-jlu5-20210801.tar.gz 98414 BLAKE2B 6ad5bb32171fd9169cf5e31c7f360e95f5450445eef36e0274a49ce175f80fd8b4f629482dfd8b7adf93de847597548d75ffb61418077de6df9f09399b0c0960 SHA512 bd5aa8ece48064b7783d72a40595dee3fd78c7305d1b1d52e3c37b13476a28f6234d2ed0773ea9566e47d1454d7d6daa66fb16b1c5e1f0d5b81a305bff39eaac +DIST limnoria-plugins-jlu5-20220201.tar.gz 93602 BLAKE2B 6585c459081314c93565b381c3a8ba90c53acb08cd72f690a4f46069c87edefcdc2fd5a60bd7b76239da92edcc490784bbc2f0e8ae67c6c564fcec0229b2e7e0 SHA512 1386654f182131b1f2c6acb495f1fdd7ab67970bfae0366cf73f5eddc7fcfb4e019ab0e7347f32f71f1f4d3369bb33b9237fbd01cb27e5ced71fe69c4c0e520f +DIST limnoria-plugins-jlu5-20220201_p20221108.tar.gz 102622 BLAKE2B 15e56e1523907c242ceda1effc3d2b788dc1fb4a266e7d70d8da052e2bda613d271ab8b379e7a86d42d5a2094f37d4d71cc64251696e751c19e674c782829c0c SHA512 73564d3a76a5fed0f0b70952f2091ec992d771bdbfe0749e0c7dfef35eb8463aa55ba8f33c36b044541c045d259081680ec2dea6dfd27de6b542896691103cb1 diff --git a/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20210801.ebuild b/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20210801.ebuild new file mode 100644 index 000000000000..69cdecaa468f --- /dev/null +++ b/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20210801.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit vcs-snapshot + +MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}" + +DESCRIPTION="A collection of plugins for the Limnoria IRC bot" +HOMEPAGE="https://github.com/jlu5/SupyPlugins" +SRC_URI="https://github.com/jlu5/SupyPlugins/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD GPL-2+" +KEYWORDS="~amd64 ~riscv ~x86" +SLOT=0 + +RDEPEND=" + net-irc/limnoria + dev-python/beautifulsoup4 +" + +DOCS=( + "README.md" + "requirements.txt" +) + +src_install() { + default + insinto /usr/share/limnoria-extra-plugins/jlu5 + doins -r * +} + +pkg_postinst() { + elog "Before these plugins can be used, your bot will need to be told where to" + elog "load them from. To do this, add /usr/share/limnoria-extra-plugins/jlu5 when" + elog "prompted during the bot creation wizard, or add it to a running bots config" + elog "with the command" + elog + elog " config directories.plugins [config directories.plugins], /usr/share/limnoria-extra-plugins/jlu5" +} diff --git a/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20220201.ebuild b/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20220201.ebuild new file mode 100644 index 000000000000..b5f393a796e5 --- /dev/null +++ b/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20220201.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit vcs-snapshot + +MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}" + +DESCRIPTION="A collection of plugins for the Limnoria IRC bot" +HOMEPAGE="https://github.com/jlu5/SupyPlugins" +SRC_URI="https://github.com/jlu5/SupyPlugins/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD GPL-2+" +KEYWORDS="~amd64 ~riscv ~x86" +SLOT=0 + +RDEPEND=" + net-irc/limnoria + dev-python/beautifulsoup4 +" + +DOCS=( + "README.md" + "requirements.txt" +) + +src_install() { + default + insinto /usr/share/limnoria-extra-plugins/jlu5 + doins -r * +} + +pkg_postinst() { + elog "Before these plugins can be used, your bot will need to be told where to" + elog "load them from. To do this, add /usr/share/limnoria-extra-plugins/jlu5 when" + elog "prompted during the bot creation wizard, or add it to a running bots config" + elog "with the command" + elog + elog " config directories.plugins [config directories.plugins], /usr/share/limnoria-extra-plugins/jlu5" +} diff --git a/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20220201_p20221108.ebuild b/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20220201_p20221108.ebuild new file mode 100644 index 000000000000..7cbb40b0749a --- /dev/null +++ b/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20220201_p20221108.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit vcs-snapshot + +MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}" +COMMIT="9f6e6bff96fa7c849123054cd656f6e4af2cec94" + +DESCRIPTION="A collection of plugins for the Limnoria IRC bot" +HOMEPAGE="https://github.com/jlu5/SupyPlugins" +SRC_URI="https://github.com/jlu5/SupyPlugins/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD GPL-2+" +KEYWORDS="~amd64 ~riscv ~x86" +SLOT=0 + +RDEPEND=" + net-irc/limnoria + dev-python/beautifulsoup4 +" + +DOCS=( + "README.md" + "requirements.txt" +) + +src_install() { + default + insinto /usr/share/limnoria-extra-plugins/jlu5 + doins -r * +} + +pkg_postinst() { + elog "Before these plugins can be used, your bot will need to be told where to" + elog "load them from. To do this, add /usr/share/limnoria-extra-plugins/jlu5 when" + elog "prompted during the bot creation wizard, or add it to a running bots config" + elog "with the command" + elog + elog " config directories.plugins [config directories.plugins], /usr/share/limnoria-extra-plugins/jlu5" +} diff --git a/net-irc/limnoria-plugins-jlu5/metadata.xml b/net-irc/limnoria-plugins-jlu5/metadata.xml new file mode 100644 index 000000000000..c1e7bd9b058b --- /dev/null +++ b/net-irc/limnoria-plugins-jlu5/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> + <stabilize-allarches/> + <upstream> + <remote-id type="github">jlu5/SupyPlugins</remote-id> + <bugs-to>https://github.com/jlu5/SupyPlugins/issues</bugs-to> + </upstream> +</pkgmetadata> diff --git a/net-irc/limnoria-plugins-progval/Manifest b/net-irc/limnoria-plugins-progval/Manifest new file mode 100644 index 000000000000..02f27dbb9375 --- /dev/null +++ b/net-irc/limnoria-plugins-progval/Manifest @@ -0,0 +1,3 @@ +DIST limnoria-plugins-progval-20220205.tar.gz 4950629 BLAKE2B 242dd75aca7aa6af8ebcff9f6f13965986669819129cb30ffa46c4026680e6951ae92d646aeb9506a6031f08975df98110276e2aa69ec2bc4831a474ac1f3010 SHA512 4b405a3d845761592abcff16a0c7b0ef8820921cb9c02ac7cfe3db695b535503ba63ce9945bc396b238c74e36c2a8b3f004eefe945a33af8fc91e1c740b2897a +DIST limnoria-plugins-progval-20220513.tar.gz 4951977 BLAKE2B e7acf8b023035cf74465287441ee8825ef6cfcbbd2279bfde8a8014ab0f29b21b381d991e1948558a1722897f2a16f2aca1942fbd118f74609c00ccf489f7540 SHA512 166967f6562946a1ee7c06a21788d7b806f1f9a56c0666dc1d515e894474dfd0da1cbb07259198410b07298ae992a3f352953f938aa850fbb9cb8da361dd58ed +DIST limnoria-plugins-progval-20221113.tar.gz 4952558 BLAKE2B 58c1fa35936a1a5961149f950b0d6e3f0f745f029cd02f3efc26ab6f7dffb836cee89374e09aaa91681b9ab3d8dbdd145cf52c273723acd15adacccb44a413fa SHA512 d1f46748c9efc7642347b6de55c3a3e8f506727815a706375e81f7cc9a8f4d906ddcbf52021049dd86399be7fb4d23d6fa37972dc33f72753b2588069b0bf687 diff --git a/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20220205.ebuild b/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20220205.ebuild new file mode 100644 index 000000000000..961b1410ead4 --- /dev/null +++ b/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20220205.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit vcs-snapshot + +COMMIT="73620183d46855498cc4642d2bc0d466635dfb41" + +DESCRIPTION="Collection of plugins for Supybot/Limnoria I wrote or forked" +HOMEPAGE="https://github.com/ProgVal/Supybot-plugins" +SRC_URI="https://github.com/ProgVal/Supybot-plugins/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD GPL-2 GPL-3 MIT" +KEYWORDS="~amd64 ~riscv ~x86" +SLOT=0 + +RDEPEND="net-irc/limnoria" + +DOCS=( + "README.md" + "requirements.txt" +) + +src_install() { + default + insinto /usr/share/limnoria-extra-plugins/ProgVal + doins -r * +} + +pkg_postinst() { + elog "Before this plugin can be used, your bot will need to be told where to" + elog "load it from. To do this, add /usr/share/limnoria-extra-plugins/ProgVal when" + elog "prompted during the bot creation wizard, or add it to a running bots config" + elog "with the command" + elog + elog " config directories.plugins [config directories.plugins], /usr/share/limnoria-extra-plugins/ProgVal" +} diff --git a/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20220513.ebuild b/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20220513.ebuild new file mode 100644 index 000000000000..e09158d15f4b --- /dev/null +++ b/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20220513.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit vcs-snapshot + +COMMIT="d09a37d7caf524a4a4b70f036038aaa9fd838974" + +DESCRIPTION="Collection of plugins for Supybot/Limnoria I wrote or forked" +HOMEPAGE="https://github.com/ProgVal/Supybot-plugins" +SRC_URI="https://github.com/ProgVal/Supybot-plugins/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD GPL-2 GPL-3 MIT" +KEYWORDS="~amd64 ~riscv ~x86" +SLOT=0 + +RDEPEND="net-irc/limnoria" + +DOCS=( + "README.md" + "requirements.txt" +) + +src_install() { + default + insinto /usr/share/limnoria-extra-plugins/ProgVal + doins -r * +} + +pkg_postinst() { + elog "Before this plugin can be used, your bot will need to be told where to" + elog "load it from. To do this, add /usr/share/limnoria-extra-plugins/ProgVal when" + elog "prompted during the bot creation wizard, or add it to a running bots config" + elog "with the command" + elog + elog " config directories.plugins [config directories.plugins], /usr/share/limnoria-extra-plugins/ProgVal" +} diff --git a/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20221113.ebuild b/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20221113.ebuild new file mode 100644 index 000000000000..ce1a80de8c45 --- /dev/null +++ b/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20221113.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit vcs-snapshot + +COMMIT="938bde510ae40ca0e2c7d832f7156fba2f0fa7ec" + +DESCRIPTION="Collection of plugins for Supybot/Limnoria I wrote or forked" +HOMEPAGE="https://github.com/ProgVal/Supybot-plugins" +SRC_URI="https://github.com/ProgVal/Supybot-plugins/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD GPL-2 GPL-3 MIT" +KEYWORDS="~amd64 ~riscv ~x86" +SLOT=0 + +RDEPEND="net-irc/limnoria" + +DOCS=( + "README.md" + "requirements.txt" +) + +src_install() { + default + insinto /usr/share/limnoria-extra-plugins/ProgVal + doins -r * +} + +pkg_postinst() { + elog "Before this plugin can be used, your bot will need to be told where to" + elog "load it from. To do this, add /usr/share/limnoria-extra-plugins/ProgVal when" + elog "prompted during the bot creation wizard, or add it to a running bots config" + elog "with the command" + elog + elog " config directories.plugins [config directories.plugins], /usr/share/limnoria-extra-plugins/ProgVal" +} diff --git a/net-irc/limnoria-plugins-progval/metadata.xml b/net-irc/limnoria-plugins-progval/metadata.xml new file mode 100644 index 000000000000..412fc347b9b7 --- /dev/null +++ b/net-irc/limnoria-plugins-progval/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> + <stabilize-allarches/> + <upstream> + <remote-id type="github">ProgVal/Supybot-plugins</remote-id> + <bugs-to>https://github.com/ProgVal/Supybot-plugins/issues</bugs-to> + </upstream> +</pkgmetadata> diff --git a/net-irc/limnoria/Manifest b/net-irc/limnoria/Manifest index 863cbcd269de..0e35b0e6a2a3 100644 --- a/net-irc/limnoria/Manifest +++ b/net-irc/limnoria/Manifest @@ -1 +1,3 @@ -DIST limnoria-20200124.tar.gz 1034653 BLAKE2B 895a0820efcd58429e457e0cb8dbcb864e56a3bce9fab9546cf622aabc7711a015432812c4193d2dabe7a85043c623ce427504c1c8e78530499c8db2c589bd8e SHA512 828c4927e2ce00c012d17f8a2b2d629370c34915e7e4f71de6df67259e643448c33a60d9cf742b2d827e21e17326a8fc20be875eac826edf64406eda906567a4 +DIST limnoria-20220814.tar.gz 1124320 BLAKE2B f2c32a444726d7e25560a7408c11c4c9d4536823eda2e4eb7b57b880f5d3aaf5c6e560d6b912c2e4b35b04e6d4f767f66aa5bd2411b9820644bef3372a34deb6 SHA512 7a7e73c9c4583310dbe0032e2b058977c102d01f7b9bea03c505153cbc45dadb88087186c036e05b1d07c7361d3e2d077a669a857241152a6726245b8b424317 +DIST limnoria-20220927.tar.gz 1125411 BLAKE2B f10c112c59e74ad018291df770ad9ae8829f90cb57125e7be066964e9987a069ff778dc8c3e562fe2f04627c173d611f6089975d0b44c47b72a9c41fcb429983 SHA512 9e8d57c34d1ff23e1772be618d9f9a8fae909200d3002ea97a95a5ba6545781d68194c4c796fa7f8683a0f3a267566ade01dd74f26110e7e0febef8ff739d88a +DIST limnoria-20221116.tar.gz 1125332 BLAKE2B b5007cb832ea98f41ad9513554177eab2cf7948b363c4cfad538a7e4c4f91390625bbf187e046118551da2fbe8272968acb1280b8d4ea19ffe2ac67b2b83af92 SHA512 3c26a36b7094d2a36397d7d0cfbb9b9503b6beaec123c6022146a5c241e5cc2ff70c56ad4064269b315d2f5c07e9e09853f27b251b35d3efc3065c4831742e2c diff --git a/net-irc/limnoria/limnoria-20200124.ebuild b/net-irc/limnoria/limnoria-20220814.ebuild index 03b9171f694b..89a8614cf3dd 100644 --- a/net-irc/limnoria/limnoria-20200124.ebuild +++ b/net-irc/limnoria/limnoria-20220814.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{9..10} ) +DISTUTILS_IN_SOURCE_BUILD=yes # needed for tests inherit distutils-r1 MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}" @@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://github.com/ProgVal/${MY_PN}/archive/master-${MY_PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${MY_PN}-master-${MY_PV}" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~riscv ~x86" fi DESCRIPTION="Python based extensible IRC infobot and channel bot" @@ -38,15 +38,13 @@ RDEPEND=" dev-python/PySocks[${PYTHON_USEDEP}] dev-python/sqlalchemy[${PYTHON_USEDEP}] crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) - !net-irc/supybot - !net-irc/supybot-plugins" + ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )" BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )" -python_prepare() { - einfo "Removing the RSS plugin because of clashes between libxml2's Python3" - einfo "bindings and feedparser." - rm -r "plugins/RSS" || die +python_prepare_all() { + # replace "installed on ${timestamp}" with real version + echo "version='${MY_PV//-/.}'" > "${S}"/src/version.py || die + distutils-r1_python_prepare_all } python_test() { @@ -55,9 +53,11 @@ python_test() { EXCLUDE_PLUGINS=() # intermittent failure due to issues loading libsandbox.so from LD_PRELOAD # runs successfully when running the tests on the installed system - EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Unix" ) - # Runs despite --no-network (GH #1392) - EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Aka" ) + EXCLUDE_PLUGINS+=( + --exclude="${PLUGINS_DIR}/Unix" + --exclude="${PLUGINS_DIR}/Aka" + --exclude="${PLUGINS_DIR}/Misc" + ) "${EPYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \ --plugins-dir="${PLUGINS_DIR}" --no-network \ --disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \ diff --git a/net-irc/limnoria/limnoria-20220927.ebuild b/net-irc/limnoria/limnoria-20220927.ebuild new file mode 100644 index 000000000000..89a8614cf3dd --- /dev/null +++ b/net-irc/limnoria/limnoria-20220927.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{9..10} ) +DISTUTILS_IN_SOURCE_BUILD=yes # needed for tests +inherit distutils-r1 + +MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}" +MY_PN="Limnoria" +MY_P="${MY_PN}-${MY_PV}" + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/ProgVal/${MY_PN}.git" + EGIT_BRANCH="testing" + inherit git-r3 +else + SRC_URI="https://github.com/ProgVal/${MY_PN}/archive/master-${MY_PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${MY_PN}-master-${MY_PV}" + KEYWORDS="~amd64 ~riscv ~x86" +fi + +DESCRIPTION="Python based extensible IRC infobot and channel bot" +HOMEPAGE="https://docs.limnoria.net" +LICENSE="BSD GPL-2 GPL-2+" +SLOT="0" +IUSE="crypt ssl test" +RESTRICT=" !test? ( test )" + +RDEPEND=" + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/ecdsa[${PYTHON_USEDEP}] + dev-python/feedparser[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/sqlalchemy[${PYTHON_USEDEP}] + crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )" +BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )" + +python_prepare_all() { + # replace "installed on ${timestamp}" with real version + echo "version='${MY_PV//-/.}'" > "${S}"/src/version.py || die + distutils-r1_python_prepare_all +} + +python_test() { + pushd "${T}" > /dev/null || die + PLUGINS_DIR="${BUILD_DIR}"/lib/supybot/plugins + EXCLUDE_PLUGINS=() + # intermittent failure due to issues loading libsandbox.so from LD_PRELOAD + # runs successfully when running the tests on the installed system + EXCLUDE_PLUGINS+=( + --exclude="${PLUGINS_DIR}/Unix" + --exclude="${PLUGINS_DIR}/Aka" + --exclude="${PLUGINS_DIR}/Misc" + ) + "${EPYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \ + --plugins-dir="${PLUGINS_DIR}" --no-network \ + --disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \ + || die "Tests failed under ${EPYTHON}" + popd > /dev/null || die +} + +python_install_all() { + distutils-r1_python_install_all + doman man/* +} + +pkg_postinst() { + elog "Complete user documentation is available at https://limnoria-doc.readthedocs.org/" + elog "" + elog "Use supybot-wizard to create a configuration file." + elog "Run supybot </path/to/config> to use the bot." +} diff --git a/net-irc/limnoria/limnoria-20221116-r1.ebuild b/net-irc/limnoria/limnoria-20221116-r1.ebuild new file mode 100644 index 000000000000..3da735a7e56b --- /dev/null +++ b/net-irc/limnoria/limnoria-20221116-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_IN_SOURCE_BUILD=yes # needed for tests +inherit distutils-r1 + +MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}" +MY_PN="Limnoria" +MY_P="${MY_PN}-${MY_PV}" + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/ProgVal/${MY_PN}.git" + EGIT_BRANCH="testing" + inherit git-r3 +else + SRC_URI="https://github.com/ProgVal/${MY_PN}/archive/master-${MY_PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${MY_PN}-master-${MY_PV}" + KEYWORDS="~amd64 ~riscv ~x86" +fi + +DESCRIPTION="Python based extensible IRC infobot and channel bot" +HOMEPAGE="https://docs.limnoria.net" +LICENSE="BSD GPL-2 GPL-2+" +SLOT="0" +IUSE="crypt ssl" + +RDEPEND=" + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/ecdsa[${PYTHON_USEDEP}] + dev-python/feedparser[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/sqlalchemy[${PYTHON_USEDEP}] + crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )" + +python_prepare_all() { + # replace "installed on ${timestamp}" with real version + echo "version='${MY_PV//-/.}'" > "${S}"/src/version.py || die + distutils-r1_python_prepare_all +} + +python_test() { + pushd "${T}" > /dev/null || die + PLUGINS_DIR="${BUILD_DIR}"/lib/supybot/plugins + EXCLUDE_PLUGINS=() + # intermittent failure due to issues loading libsandbox.so from LD_PRELOAD + # runs successfully when running the tests on the installed system + EXCLUDE_PLUGINS+=( + --exclude="${PLUGINS_DIR}/Unix" + --exclude="${PLUGINS_DIR}/Aka" + --exclude="${PLUGINS_DIR}/Misc" + ) + "${EPYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \ + --plugins-dir="${PLUGINS_DIR}" --no-network \ + --disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \ + || die "Tests failed under ${EPYTHON}" + popd > /dev/null || die +} + +python_install_all() { + distutils-r1_python_install_all + doman man/* +} + +pkg_postinst() { + elog "Complete user documentation is available at https://limnoria-doc.readthedocs.org/" + elog "" + elog "Use supybot-wizard to create a configuration file." + elog "Run supybot </path/to/config> to use the bot." +} diff --git a/net-irc/limnoria/limnoria-20221116.ebuild b/net-irc/limnoria/limnoria-20221116.ebuild new file mode 100644 index 000000000000..4c9f1af4daec --- /dev/null +++ b/net-irc/limnoria/limnoria-20221116.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_IN_SOURCE_BUILD=yes # needed for tests +inherit distutils-r1 + +MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}" +MY_PN="Limnoria" +MY_P="${MY_PN}-${MY_PV}" + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/ProgVal/${MY_PN}.git" + EGIT_BRANCH="testing" + inherit git-r3 +else + SRC_URI="https://github.com/ProgVal/${MY_PN}/archive/master-${MY_PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${MY_PN}-master-${MY_PV}" + KEYWORDS="~amd64 ~riscv ~x86" +fi + +DESCRIPTION="Python based extensible IRC infobot and channel bot" +HOMEPAGE="https://docs.limnoria.net" +LICENSE="BSD GPL-2 GPL-2+" +SLOT="0" +IUSE="crypt ssl test" +RESTRICT=" !test? ( test )" + +RDEPEND=" + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/ecdsa[${PYTHON_USEDEP}] + dev-python/feedparser[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/sqlalchemy[${PYTHON_USEDEP}] + crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )" +BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )" + +python_prepare_all() { + # replace "installed on ${timestamp}" with real version + echo "version='${MY_PV//-/.}'" > "${S}"/src/version.py || die + distutils-r1_python_prepare_all +} + +python_test() { + pushd "${T}" > /dev/null || die + PLUGINS_DIR="${BUILD_DIR}"/lib/supybot/plugins + EXCLUDE_PLUGINS=() + # intermittent failure due to issues loading libsandbox.so from LD_PRELOAD + # runs successfully when running the tests on the installed system + EXCLUDE_PLUGINS+=( + --exclude="${PLUGINS_DIR}/Unix" + --exclude="${PLUGINS_DIR}/Aka" + --exclude="${PLUGINS_DIR}/Misc" + ) + "${EPYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \ + --plugins-dir="${PLUGINS_DIR}" --no-network \ + --disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \ + || die "Tests failed under ${EPYTHON}" + popd > /dev/null || die +} + +python_install_all() { + distutils-r1_python_install_all + doman man/* +} + +pkg_postinst() { + elog "Complete user documentation is available at https://limnoria-doc.readthedocs.org/" + elog "" + elog "Use supybot-wizard to create a configuration file." + elog "Run supybot </path/to/config> to use the bot." +} diff --git a/net-irc/limnoria/limnoria-9999.ebuild b/net-irc/limnoria/limnoria-99999999.ebuild index 03b9171f694b..2bb6c682e6e1 100644 --- a/net-irc/limnoria/limnoria-9999.ebuild +++ b/net-irc/limnoria/limnoria-99999999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 @@ -25,8 +25,7 @@ DESCRIPTION="Python based extensible IRC infobot and channel bot" HOMEPAGE="https://docs.limnoria.net" LICENSE="BSD GPL-2 GPL-2+" SLOT="0" -IUSE="crypt ssl test" -RESTRICT=" !test? ( test )" +IUSE="crypt ssl" RDEPEND=" dev-python/chardet[${PYTHON_USEDEP}] @@ -41,7 +40,6 @@ RDEPEND=" ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) !net-irc/supybot !net-irc/supybot-plugins" -BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )" python_prepare() { einfo "Removing the RSS plugin because of clashes between libxml2's Python3" diff --git a/net-irc/limnoria/metadata.xml b/net-irc/limnoria/metadata.xml index 05291b97d3d0..c50cfe04cade 100644 --- a/net-irc/limnoria/metadata.xml +++ b/net-irc/limnoria/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>NP-Hardass@gentoo.org</email> - <name>NP-Hardass</name> - </maintainer> + <!-- maintainer-needed --> <stabilize-allarches/> <use> <flag name="crypt">Enables user authentication with GPG</flag> diff --git a/net-irc/metadata.xml b/net-irc/metadata.xml index 29c5171b1496..f33b75c7fb26 100644 --- a/net-irc/metadata.xml +++ b/net-irc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The net-irc category contains IRC (Internet Relay Chat) clients and @@ -36,4 +36,3 @@ Kategoria net-irc zawiera klienty i serwery sieci IRC (Internet Relay Chat). </longdescription> </catmetadata> - diff --git a/net-irc/muh/metadata.xml b/net-irc/muh/metadata.xml index 29c7fa784d5b..ac31185322c5 100644 --- a/net-irc/muh/metadata.xml +++ b/net-irc/muh/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/net-irc/muh/muh-2.2a-r1.ebuild b/net-irc/muh/muh-2.2a-r2.ebuild index 97826829ea13..2a6148e7ec8c 100644 --- a/net-irc/muh/muh-2.2a-r1.ebuild +++ b/net-irc/muh/muh-2.2a-r2.ebuild @@ -1,22 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Persistent IRC bouncer" HOMEPAGE="http://mind.riot.org/muh/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86" IUSE="ipv6" -RDEPEND="" +RDEPEND="virtual/libcrypt:=" DEPEND="${RDEPEND}" src_configure() { - econf --datadir=/usr/share/muh $(use_enable ipv6) + econf \ + --datadir=/usr/share/muh \ + $(use_enable ipv6) } src_install() { @@ -25,10 +27,8 @@ src_install() { } pkg_postinst() { - elog elog "You'll need to configure muh before running it." elog "Put your config in ~/.muh/muhrc" elog "A sample config is /usr/share/muh/muhrc" elog "For more information, see the documentation." - elog } diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest index f22bc4771b7e..d7843a4c462e 100644 --- a/net-irc/ngircd/Manifest +++ b/net-irc/ngircd/Manifest @@ -1 +1,2 @@ -DIST ngircd-26.1.tar.gz 562938 BLAKE2B a1a4ca8b6e12a02cb4ba2e07d777cf77051b5330464c91634cfac0b385157ab7c648e3b71151247bc8ee6cc847e84755fdca3d9b4a25205bbb57b8296995dd17 SHA512 4a3ee379dd8d8655a71134c745f750359ceb0512e184db555f65f2bcab68087480365a35680a9ec75b1e6eb0fef23e1cbe0a0e13c3c58d211e5a520a8eeaa71c +DIST ngircd-26.1.tar.xz 375812 BLAKE2B 4bd7dae47b579bdfaceee0e3ff1b30ac7c70326cd9d609a128192b1efbec17ac50010cb1bf27f4ca6d921700b7bd8cf3d0e8fb5bc569a84d6a101be10ec5832a SHA512 6333244e3fb2dc00ee9812c8c45990baa95ff473a7037a0a11ca495bed86fa438110ad5151d86b9274b6187d86b7b5712fdca2b74b8cb92f7f66fa10cf1961ee +DIST ngircd-26.1.tar.xz.sig 310 BLAKE2B 6bf3330387ef01af32c0026e12e5fe5a9a34f5d5fc221a66931312fb70d17832259b94e370ddc49f8834d0d29b9c53b52f11ddec3bfc12655472e046cc569e99 SHA512 c1bbc481dd92e487706fa0b3b18dffd214018946fad8ced77feccc1105a65fcc33c82b0e93529a14ad103ef784da20e3bf86358a8f26cdddeac9f947833d6848 diff --git a/net-irc/ngircd/files/ngircd-26.1-systemd-unit.patch b/net-irc/ngircd/files/ngircd-26.1-systemd-unit.patch new file mode 100644 index 000000000000..f15025cc4856 --- /dev/null +++ b/net-irc/ngircd/files/ngircd-26.1-systemd-unit.patch @@ -0,0 +1,24 @@ +diff --git a/contrib/ngircd.service b/contrib/ngircd.service +index e4c30e2..ba1b513 100644 +--- a/contrib/ngircd.service ++++ b/contrib/ngircd.service +@@ -12,8 +12,8 @@ Before=bopm.service + + [Service] + Type=forking +-User=irc +-Group=irc ++User=ngircd ++Group=ngircd + # Settings & limits: + CapabilityBoundingSet=CAP_SYS_CHROOT CAP_NET_BIND_SERVICE + MemoryDenyWriteExecute=yes +@@ -27,7 +27,7 @@ ProtectKernelTunables=yes + ProtectSystem=full + RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX + RestrictRealtime=yes +-RuntimeDirectory=ircd ++RuntimeDirectory=ngircd + RuntimeDirectoryMode=750 + # Try to load "default files" from any Debian package variant to keep this + # unit generic. diff --git a/net-irc/ngircd/files/ngircd.conf b/net-irc/ngircd/files/ngircd.conf new file mode 100644 index 000000000000..e9993a3430ef --- /dev/null +++ b/net-irc/ngircd/files/ngircd.conf @@ -0,0 +1 @@ +d /run/ngircd 0755 ngircd ngircd - diff --git a/net-irc/ngircd/files/ngircd.conf.d b/net-irc/ngircd/files/ngircd.conf.d new file mode 100644 index 000000000000..6088e5dae69a --- /dev/null +++ b/net-irc/ngircd/files/ngircd.conf.d @@ -0,0 +1,8 @@ +# Configuration file +#NGIRCD_CONFIGFILE="/etc/ngircd/ngircd.conf" + +# PID file +#NGIRCD_PIDFILE="/var/run/ngircd/ngircd.pid" + +# Options for ngircd +#NGIRCD_OPTS="-d -s" diff --git a/net-irc/ngircd/files/ngircd.init-r1.d b/net-irc/ngircd/files/ngircd.init-r1.d deleted file mode 100644 index 3346d698d441..000000000000 --- a/net-irc/ngircd/files/ngircd.init-r1.d +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net - use logger - provide ircd -} - -start() { - ebegin "Starting ngIRCd" - start-stop-daemon --start --quiet --exec /usr/sbin/ngircd - eend $? -} - -stop() { - ebegin "Stopping ngIRCd" - start-stop-daemon --stop --quiet --exec /usr/sbin/ngircd - eend $? -} diff --git a/net-irc/ngircd/files/ngircd.init-r2.d b/net-irc/ngircd/files/ngircd.init-r2.d new file mode 100644 index 000000000000..1a54154ff417 --- /dev/null +++ b/net-irc/ngircd/files/ngircd.init-r2.d @@ -0,0 +1,52 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +extra_commands="configtest" +extra_started_commands="reload" + +description="IRC server" +description_configtest="Run ngircd's internal config check." +description_reload="Reload the ngircd's configuration." + +: ${NGIRCD_CONFIGFILE:=/etc/ngircd/${RC_SVCNAME}.conf} + +command="/usr/sbin/ngircd" +command_args="${NGIRCD_OPTS} -f \"${NGIRCD_CONFIGFILE}\"" +command_args_foreground="-n" +command_user="ngircd:ngircd" +pidfile="${NGIRCD_PIDFILE:-/var/run/ngircd/${RC_SVCNAME}.pid}" + +depend() { + need net + use logger + provide ircd +} + +start_pre() { + checkpath -f "${pidfile}" -o ${command_user} || return 1 + if [ "${RC_CMD}" != "restart" ]; then + configtest || return 1 + fi +} + +stop_pre() { + if [ "${RC_CMD}" = "restart" ]; then + configtest || return 1 + fi +} + +reload() { + configtest || return 1 + ebegin "Refreshing ${RC_SVCNAME}'s configuration" + start-stop-daemon --signal SIGHUP --pidfile "${pidfile}" + eend $? "Failed to reload ${RC_SVCNAME}" +} + +configtest() { + ebegin "Checking ${RC_SVCNAME}'s configuration" + # "press enter to continue" + echo | ${command} -f "${NGIRCD_CONFIGFILE}" -t >/dev/null + + eend $? "failed, please correct errors in the config file" +} diff --git a/net-irc/ngircd/metadata.xml b/net-irc/ngircd/metadata.xml index 92912912526f..b9ed1a091b88 100644 --- a/net-irc/ngircd/metadata.xml +++ b/net-irc/ngircd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sam@gentoo.org</email> diff --git a/net-irc/ngircd/ngircd-26.1-r5.ebuild b/net-irc/ngircd/ngircd-26.1-r5.ebuild new file mode 100644 index 000000000000..edb828a920e5 --- /dev/null +++ b/net-irc/ngircd/ngircd-26.1-r5.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/alexbarton.asc +inherit tmpfiles systemd verify-sig + +DESCRIPTION="An IRC server written from scratch" +HOMEPAGE="https://ngircd.barton.de/" +SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.xz" +SRC_URI+=" verify-sig? ( https://arthur.barton.de/pub/${PN}/${P}.tar.xz.sig )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm arm64 x86 ~x64-macos" +IUSE="debug gnutls ident irc-plus +ipv6 pam +ssl strict-rfc tcpd test zlib" + +# Flaky test needs investigation (bug #719256) +RESTRICT="test" + +RDEPEND=" + acct-user/ngircd + irc-plus? ( virtual/libiconv ) + ident? ( net-libs/libident ) + pam? ( sys-libs/pam ) + ssl? ( + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( + dev-libs/openssl:0= + ) + ) + tcpd? ( sys-apps/tcp-wrappers ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + test? ( + dev-tcltk/expect + net-misc/netkit-telnetd + ) + verify-sig? ( sec-keys/openpgp-keys-alexbarton ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-26.1-systemd-unit.patch +) + +src_prepare() { + default + + if ! use prefix ; then + sed -i \ + -e "/;ServerUID = /s/65534/ngircd/" \ + -e "/;ServerGID = /s/65534/ngircd/" \ + doc/sample-ngircd.conf.tmpl || die + fi + + # Make pidfiles work out-of-the-box + sed -i \ + -e "/;PidFile = /s/;//" \ + -e "/;ServerUID = /s/;//" \ + -e "/;ServerGID = /s/;//" \ + doc/sample-ngircd.conf.tmpl || die + + # Note that if we need to use automake, we need a certain version (for now): + # https://github.com/ngircd/ngircd/issues/261 + # WANT_AUTOMAKE=1.11 + # eautomake +} + +src_configure() { + local myeconfargs=( + --sysconfdir="${EPREFIX}"/etc/${PN} + + $(use_enable debug sniffer) + $(use_enable debug) + $(use_enable irc-plus ircplus) + $(use_enable ipv6) + $(use_enable strict-rfc) + $(use_with irc-plus iconv) + $(use_with ident) + $(use_with pam) + $(use_with tcpd tcp-wrappers) + $(use_with zlib) + ) + + if use ssl ; then + if use gnutls ; then + myeconfargs+=( + $( use_with gnutls ) + ) + else + myeconfargs+=( + $( use_with !gnutls openssl ) + ) + fi + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + fowners ngircd:ngircd /etc/ngircd/ngircd.conf + + newinitd "${FILESDIR}"/ngircd.init-r2.d ngircd + newconfd "${FILESDIR}"/ngircd.conf.d ngircd + + systemd_dounit contrib/ngircd.{service,socket} + + dotmpfiles "${FILESDIR}"/ngircd.conf +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] && use pam ; then + elog "ngircd will use PAMIsOptionalPAM by default, please change this option." + elog "You may not be able to login until you change this." + fi + + tmpfiles_process ngircd.conf +} diff --git a/net-irc/ngircd/ngircd-26.1.ebuild b/net-irc/ngircd/ngircd-26.1.ebuild deleted file mode 100644 index 4a9c13b03363..000000000000 --- a/net-irc/ngircd/ngircd-26.1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Bug: https://github.com/ngircd/ngircd/issues/261 -WANT_AUTOMAKE=1.11.6 -inherit autotools - -DESCRIPTION="An IRC server written from scratch" -HOMEPAGE="https://ngircd.barton.de/" -SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 x86 ~x64-macos" -IUSE="debug gnutls ident irc-plus +ipv6 libressl pam +ssl strict-rfc tcpd test zlib" - -#RESTRICT="!test? ( test )" -# Flaky test needs investigation (bug 719256) -RESTRICT="test" - -RDEPEND=" - acct-user/ngircd - acct-group/ngircd - irc-plus? ( virtual/libiconv ) - ident? ( net-libs/libident ) - pam? ( sys-libs/pam ) - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ) - tcpd? ( sys-apps/tcp-wrappers ) - zlib? ( sys-libs/zlib ) -" - -BDEPEND="sys-devel/automake:1.11" - -DEPEND=" - ${RDEPEND} - test? ( - dev-tcltk/expect - net-misc/netkit-telnetd - ) -" - -src_prepare() { - default - - if ! use prefix; then - sed -i \ - -e "s:;ServerUID = 65534:ServerUID = ngircd:" \ - -e "s:;ServerGID = 65534:ServerGID = ngircd:" \ - doc/sample-ngircd.conf.tmpl || die - fi - - # Once https://github.com/ngircd/ngircd/pull/270 is in a release (ngircd 26), we can remove - # the eautomake/autotools machinery. - eautomake -} - -src_configure() { - local myconf=( - --sysconfdir="${EPREFIX}"/etc/"${PN}" - $(use_enable debug sniffer) - $(use_enable debug) - $(use_enable irc-plus ircplus) - $(use_enable ipv6) - $(use_enable strict-rfc) - $(use_with irc-plus iconv) - $(use_with ident) - $(use_with pam) - $(use_with tcpd tcp-wrappers) - $(use_with zlib) - ) - - if use ssl; then - if use gnutls; then - myconf+=( - $( use_with gnutls ) - ) - else - myconf+=( - $( use_with !gnutls openssl ) - ) - fi - fi - - econf "${myconf[@]}" -} - -src_install() { - default - newinitd "${FILESDIR}"/ngircd.init-r1.d ngircd -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]] && use pam; then - elog "ngircd will use PAMIsOptionalPAM by default, please change this option." - elog "You may not be able to login until you change this." - fi -} diff --git a/net-irc/ninja/metadata.xml b/net-irc/ninja/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/net-irc/ninja/metadata.xml +++ b/net-irc/ninja/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild b/net-irc/ninja/ninja-1.5.9_pre14-r2.ebuild index ab35441f4f58..0956bf5760c6 100644 --- a/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild +++ b/net-irc/ninja/ninja-1.5.9_pre14-r2.ebuild @@ -1,31 +1,43 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -S=${WORKDIR}/${P/_*/} +inherit toolchain-funcs DESCRIPTION="Ninja IRC Client" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" SRC_URI="ftp://qoop.org/ninja/stable/${P/_/}.tar.gz" -SLOT="0" +S="${WORKDIR}"/${P/_*/} + LICENSE="GPL-2" -KEYWORDS="amd64 ppc ~ppc64 ~sparc x86" +SLOT="0" +KEYWORDS="amd64 ppc ~ppc64 ~riscv ~sparc x86" IUSE="ncurses ipv6 ssl" RESTRICT="test" -DEPEND="ncurses? ( sys-libs/ncurses ) - ssl? ( dev-libs/openssl )" +DEPEND=" + virtual/libcrypt:= + ncurses? ( sys-libs/ncurses:= ) + ssl? ( dev-libs/openssl:= ) +" RDEPEND="${DEPEND}" MAKEOPTS="${MAKEOPTS} -j1" src_configure() { + tc-export CC + econf $(use_enable ipv6) + + # Generated post-configure + sed -i -e "s:/usr/lib:/usr/$(get_libdir):" Makefile || die } src_install() { default - mv "${ED}"/usr/bin/ninja{,_irc} || die #436804 + + # bug #436804 + mv "${ED}"/usr/bin/ninja{,_irc} || die } diff --git a/net-irc/onis/metadata.xml b/net-irc/onis/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/net-irc/onis/metadata.xml +++ b/net-irc/onis/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-irc/onis/onis-0.8.2-r1.ebuild b/net-irc/onis/onis-0.8.2-r2.ebuild index 9b3ca1036075..116e9a2b9432 100644 --- a/net-irc/onis/onis-0.8.2-r1.ebuild +++ b/net-irc/onis/onis-0.8.2-r2.ebuild @@ -1,23 +1,22 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit eutils +inherit perl-functions DESCRIPTION="onis not irc stats" HOMEPAGE="http://verplant.org/onis/" SRC_URI="http://verplant.org/${PN}/${P}.tar.bz2" + LICENSE="LGPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86" -IUSE="" RDEPEND="dev-lang/perl" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" +BDEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/0.6.0-nochdir.patch" ) +PATCHES=( "${FILESDIR}"/0.6.0-nochdir.patch ) src_prepare() { default @@ -25,17 +24,15 @@ src_prepare() { } src_install() { - eval $(perl -V:installprivlib) - dobin onis - insinto "${installprivlib}" - doins -r lib/Onis + perl_domodule -r lib/Onis insinto /usr/share/onis - doins -r lang reports/* + doins -r lang reports/. - dodoc CHANGELOG README THANKS onis.conf users.conf + einstalldocs + dodoc onis.conf users.conf } pkg_postinst() { diff --git a/net-irc/pisg/metadata.xml b/net-irc/pisg/metadata.xml index 573e63b80b6e..347aff2c4b81 100644 --- a/net-irc/pisg/metadata.xml +++ b/net-irc/pisg/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/net-irc/pisg/pisg-0.73-r1.ebuild b/net-irc/pisg/pisg-0.73-r1.ebuild index 4a1954fff342..54a92b9c409a 100644 --- a/net-irc/pisg/pisg-0.73-r1.ebuild +++ b/net-irc/pisg/pisg-0.73-r1.ebuild @@ -1,34 +1,29 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit perl-module DESCRIPTION="Perl IRC Statistics Generator" HOMEPAGE="http://pisg.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" - RDEPEND="dev-perl/Text-Iconv" -DEPEND=">=sys-apps/sed-4" src_prepare() { + default + sed -i \ -e 's!lang\.txt!/usr/share/pisg/lang.txt!' \ -e 's!layout/!/usr/share/pisg/layout/!' \ modules/Pisg.pm || die "sed failed" } -src_compile() { - einfo "Nothing to compile" -} - src_install() { perl_set_version @@ -43,7 +38,9 @@ src_install() { dodoc docs/{FORMATS,pisg-doc.txt} \ docs/dev/API pisg.cfg README doman docs/pisg.1 - dohtml docs/pisg-doc.html + + docinto html + dodoc docs/pisg-doc.html } pkg_postinst() { diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest index d0ec1d6fc022..058a64023088 100644 --- a/net-irc/polari/Manifest +++ b/net-irc/polari/Manifest @@ -1 +1 @@ -DIST polari-3.36.3.tar.xz 1030640 BLAKE2B 72cee290c21cd0a1f96d25e02993dadba14247bb3b38d2ce62ebbe8670a9c7498e7dd123bef2ab3ffaea78019109697186cee409dd78a554afbbc5b5c4db56b5 SHA512 dcf8018ffdaffe2867ab7c3bbc1c874090df0ff5435ec16746780ae081dc61a0b7ec0e58d706b6e7eb8957b1f3fe9c24b586db831ab8b0565fa05c1bf3adae38 +DIST polari-45.0.tar.xz 1060220 BLAKE2B cca8d79a33b3874d9f13b9110687e0fac3cbc1a9b7a2652f2e315d0ee0b996263946e209da3141763f18293e77127d843beac96155168cb5a24af88ff1de3f85 SHA512 33a3a0ef6960d2ac11fc312efc859a5ea75198c4ae8e74ff0885f9d0aa04f4e59d84be1495db3f498486b595aac66a91ec63d121a92557d9386dfbaed60bb409 diff --git a/net-irc/polari/metadata.xml b/net-irc/polari/metadata.xml index 996e7cacd217..0773743177b0 100644 --- a/net-irc/polari/metadata.xml +++ b/net-irc/polari/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/polari</remote-id> + </upstream> </pkgmetadata> diff --git a/net-irc/polari/polari-3.36.3.ebuild b/net-irc/polari/polari-45.0-r1.ebuild index dad3791fcd02..884a63fd4d56 100644 --- a/net-irc/polari/polari-3.36.3.ebuild +++ b/net-irc/polari/polari-45.0-r1.ebuild @@ -1,31 +1,34 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit gnome.org gnome2-utils meson xdg -DESCRIPTION="An IRC client for Gnome" -HOMEPAGE="https://wiki.gnome.org/Apps/Polari" +DESCRIPTION="An IRC client for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Polari https://gitlab.gnome.org/GNOME/polari" -LICENSE="GPL-2+" +LICENSE="GPL-2+ CC0-1.0 CC-BY-SA-4.0" SLOT="0" -KEYWORDS="amd64 ~arm x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="test" RESTRICT="!test? ( test )" +# GTK3 still used by thumbnailer: https://gitlab.gnome.org/GNOME/polari/-/issues/223 DEPEND=" + x11-libs/gtk+:3[introspection] + gui-libs/gtk:4[introspection] + gui-libs/libadwaita:1[introspection] >=dev-libs/glib-2.43.4:2 - >=x11-libs/gtk+-3.21.6:3[introspection] net-libs/telepathy-glib[introspection] >=dev-libs/gobject-introspection-1.50:= - >=dev-libs/gjs-1.57.3 + >=dev-libs/gjs-1.73.1 x11-libs/gdk-pixbuf:2[introspection] >=app-text/gspell-1.4.0[introspection] x11-libs/pango[introspection] app-crypt/libsecret[introspection] - net-libs/libsoup:2.4[introspection] + net-libs/libsoup:3.0[introspection] net-im/telepathy-logger[introspection] " RDEPEND="${DEPEND} @@ -37,7 +40,9 @@ BDEPEND=" dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig - test? ( dev-lang/spidermonkey:60 ) + test? ( + dev-libs/json-glib + ) " pkg_postinst() { diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest index 7feaa0cb2399..f6983e85c549 100644 --- a/net-irc/psybnc/Manifest +++ b/net-irc/psybnc/Manifest @@ -1 +1 @@ -DIST psyBNC-2.3.2-9.tar.gz 318676 BLAKE2B 0197aa3bc8c770738a7d4d5a5a79b77f7a0cafeef60ccca1167172b28af05c0cd9836f7e9816c873dafa2e55b0bf9ce54cfbe3958939405f58f7f3874ec7ea64 SHA512 b664f57610e54fadd938b359a0e8052b8fe3dd36bd1ee339f36ee22ae4d36a76e803425c5133f925ac18c01767ffbc8a2f471c014b5b76b05894cfea9fe5416b +DIST psyBNC-2.4.3.tar.gz 1108733 BLAKE2B e0f02cab97b503301db0a4c111497e4f99b75d8d2c798b2b5d97997a4c4921d8a7de8dabad79c1291fa4b7efce0d1ed0c7dede1345b155561bb6ce6033b591bb SHA512 02228baef6fa889d5e12bfa715facc2eab3b033c01b1f799a1c6c995ef9eedfacf3ed328c875f52595d64c47124c20e4145288b2636182dea17ec9027d367bb7 diff --git a/net-irc/psybnc/files/compile.diff b/net-irc/psybnc/files/compile.diff deleted file mode 100644 index 99e55b6d8cdc..000000000000 --- a/net-irc/psybnc/files/compile.diff +++ /dev/null @@ -1,79 +0,0 @@ -diff -Naurp a/src/p_blowfish.c b/src/p_blowfish.c ---- a/src/p_blowfish.c 2007-02-26 12:16:53.000000000 +0000 -+++ b/src/p_blowfish.c 2007-02-26 12:17:11.000000000 +0000 -@@ -31,7 +31,7 @@ static char rcsid[] = "@(#)# $Id$ - #include <string.h> - #include <config.h> - --char *strmncpy(char *dest, char *source, size_t len); -+char *strmncpy(char *dest, const char *source, size_t len); - char *lngtxt(int msgnum); - - #define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt));strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; } -diff -Naurp a/src/p_global.h b/src/p_global.h ---- a/src/p_global.h 2007-02-26 12:16:53.000000000 +0000 -+++ b/src/p_global.h 2007-02-26 12:17:11.000000000 +0000 -@@ -972,8 +972,8 @@ int checklogging(int usern); - #endif - - #ifndef P_MEMORY --unsigned long *__pmalloc(unsigned long size,char *module,char *function,int line); --void _pfree(void * pointer,char *module, char *function, int line); -+unsigned long *__pmalloc(unsigned long size,const char *module,const char *function,int line); -+void _pfree(void * pointer,char *module, const char *function, int line); - struct usert *user(int usern); - struct newpeert *newpeer(int usern); - struct datalinkt *datalink(int usern); -@@ -1092,7 +1092,7 @@ int replace(char *rps, char whatc, char - char *nobreak(char *tobreak); - char *randstring(int length); - char *strmcat(char *first,char *second); --char *strmncpy(char *dest, char *source, unsigned int len); -+char *strmncpy(char *dest, const char *source, unsigned int len); - int strmncasecmp(char *one, char *two); - int strmcmp(char *one, char *two); - int strmwildcmp(char *line, char *wildcard); -diff -Naurp a/src/p_memory.c b/src/p_memory.c ---- a/src/p_memory.c 2007-02-26 12:16:53.000000000 +0000 -+++ b/src/p_memory.c 2007-02-26 12:17:11.000000000 +0000 -@@ -32,7 +32,7 @@ FILE *logm=NULL; - - /* malloc-wrapper. No memory will log an error entry and kill the bouncer */ - --unsigned long *__pmalloc(unsigned long size,char *module,char *function, int line) -+unsigned long *__pmalloc(unsigned long size,const char *module,const char *function, int line) - { - unsigned long *rc; - if (!(rc=(unsigned long *)malloc(size))) -@@ -53,7 +53,7 @@ unsigned long *__pmalloc(unsigned long s - return rc; - } - --void _pfree(unsigned long *pointer, char *module, char *function, int line) -+void _pfree(unsigned long *pointer, char *module, const char *function, int line) - { - #ifdef LOGALLOC - if(logm==NULL) -diff -Naurp a/src/p_string.c b/src/p_string.c ---- a/src/p_string.c 2007-02-26 12:16:53.000000000 +0000 -+++ b/src/p_string.c 2007-02-26 12:17:11.000000000 +0000 -@@ -51,7 +51,7 @@ char *lngtxt(unsigned int msgnum) - - /* string copy with len and zero delimit */ - --char *strmncpy(char *dest, char *source, unsigned int len) -+char *strmncpy(char *dest, const char *source, unsigned int len) - { - char bf[strlen(source)+2]; - char *pt; -diff -Naurp a/src/match.c b/src/match.c ---- a/src/match.c 2007-02-26 12:26:10.000000000 +0000 -+++ b/src/match.c 2007-02-26 12:26:17.000000000 +0000 -@@ -36,6 +36,7 @@ - /* Remove the next line to use this in IrcII */ - #define EGGDROP - -+#include <p_global.h> - - /* =================================================================== - * Best to leave stuff after this point alone, but go on and change diff --git a/net-irc/psybnc/files/ldflags-fix.patch b/net-irc/psybnc/files/ldflags-fix.patch deleted file mode 100644 index f5bc776b1e6b..000000000000 --- a/net-irc/psybnc/files/ldflags-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aurp a/tools/autoconf.c b/tools/autoconf.c ---- a/tools/autoconf.c 2010-10-10 20:25:29.295001235 +0000 -+++ b/tools/autoconf.c 2010-10-10 20:26:02.738999569 +0000 -@@ -449,7 +449,7 @@ int main() - fprintf(makefile,"TARGET = psybnc\n"); - fprintf(makefile,"\n"); - fprintf(makefile,"all: $(OBJS)\n"); -- fprintf(makefile," $(CC) -o $(TARGET) $(CFLAGS) $(OBJS) $(LIBS)\n"); -+ fprintf(makefile," $(CC) -o $(TARGET) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)\n"); - fprintf(makefile," @strip $(TARGET)\n"); - if(ssl==0) - { diff --git a/net-irc/psybnc/files/psybnc-2.4.3-Fix-build-with-Clang-16.patch b/net-irc/psybnc/files/psybnc-2.4.3-Fix-build-with-Clang-16.patch new file mode 100644 index 000000000000..83b9b07d73a0 --- /dev/null +++ b/net-irc/psybnc/files/psybnc-2.4.3-Fix-build-with-Clang-16.patch @@ -0,0 +1,212 @@ +From 9ced946bc4f6da7ccb74573af4a9a89400f9cd69 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 23 Oct 2022 18:21:25 +0100 +Subject: [PATCH] Fix build with Clang 16 + +Bug: https://bugs.gentoo.org/724916 +Bug: https://bugs.gentoo.org/831310 +Bug: https://bugs.gentoo.org/861464 +Bug: https://bugs.gentoo.org/874105 +--- a/src/p_client.c ++++ b/src/p_client.c +@@ -213,7 +213,7 @@ int repeatserverinit(int usern) + } + + /* who is on the bounce ? */ +-int cmdbwho(usern) ++int cmdbwho(int usern) + { + struct usernodes *th; + int userl; +@@ -508,7 +508,7 @@ int firstwelcome(void) + } + + /* first user connects */ +-int firstuser(npeer) ++int firstuser(int npeer) + { + int linkto; + pcontext; +--- a/tools/autoconf.c ++++ b/tools/autoconf.c +@@ -38,6 +38,7 @@ + #include <ctype.h> + #include <signal.h> + #include <errno.h> ++#include <time.h> + #include "config.h" + #include "src/p_version.h" + +From 907107edea5f9d74b59a7c24762cfa8413a42f90 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 23 Oct 2022 18:41:05 +0100 +Subject: [PATCH] Fix build with Clang 16 + +--- a/src/p_client.c ++++ b/src/p_client.c +@@ -22,6 +22,8 @@ + #define P_CLIENT + + #include <p_global.h> ++#include <stdio.h> ++#include <stdlib.h> + + int cmdaddlink(int usern, int type); + int quitclient(int usern); +--- a/src/p_dcc.c ++++ b/src/p_dcc.c +@@ -22,6 +22,7 @@ + #define P_DCC + + #include <p_global.h> ++#include <stdlib.h> + + #ifdef DCCCHAT + +--- a/src/p_hash.c ++++ b/src/p_hash.c +@@ -25,6 +25,11 @@ + + /* local types */ + ++#ifdef IPV6 ++int cmddefaultipv6(int usern); ++int cmdpreferipv6(int usern); ++#endif ++ + struct hasht { + int commandmsgnum; + int(*handler)(int); +@@ -174,8 +179,10 @@ struct hasht inboundhash[]={ + {1252, printhelp, 1253, 1254 ,0,0}, + {1450, cmdbdone, 1451, 1452 ,0,0}, + {1460, cmdsetconnectdelay, 1461, 1462 ,0,1}, ++#ifdef IPV6 + {1480, cmddefaultipv6, 1481, 1482 ,0,1}, + {1490, cmdpreferipv6, 1491, 1492 ,0,0}, ++#endif + #ifdef MYSQL_IPCHECK + #ifdef HAVE_MYSQL + {2001, cmdmysqlipcheck, 2002, 2003 ,0,1}, +--- a/src/p_inifunc.c ++++ b/src/p_inifunc.c +@@ -22,6 +22,7 @@ + #define P_INIFUNC + + #include <p_global.h> ++#include <stdlib.h> + + /* reset the config cache */ + +--- a/src/p_memory.c ++++ b/src/p_memory.c +@@ -22,6 +22,7 @@ + #define P_MEMORY + + #include <p_global.h> ++#include <stdlib.h> + + FILE *logm=NULL; + +--- a/src/p_network.c ++++ b/src/p_network.c +@@ -22,6 +22,7 @@ + #define P_NETWORK + + #include <p_global.h> ++#include <stdlib.h> + + int netdefault(int usern, char *netname, char *myparentnick); + +--- a/src/p_peer.c ++++ b/src/p_peer.c +@@ -22,6 +22,7 @@ + #define P_PEER + + #include <p_global.h> ++#include <stdlib.h> + + /* MySQL for IP check */ + #ifdef MYSQL_IPCHECK +--- a/src/p_script.c ++++ b/src/p_script.c +@@ -22,6 +22,7 @@ + #define P_SCRIPT + + #include <p_global.h> ++#include <stdlib.h> + + #ifdef SCRIPTING + +--- a/src/p_server.c ++++ b/src/p_server.c +@@ -22,6 +22,8 @@ + #define P_SERVER + + #include <p_global.h> ++#include <stdlib.h> ++ + void create_oidentd_conf(); + + sigjmp_buf serveralarmret; +--- a/src/p_socket.c ++++ b/src/p_socket.c +@@ -22,6 +22,7 @@ + #define P_SOCKET + + #include <p_global.h> ++#include <stdlib.h> + + #define MAX_SENDQ 1000 + +--- a/src/p_string.c ++++ b/src/p_string.c +@@ -22,6 +22,7 @@ + #define P_STRING + + #include <p_global.h> ++#include <stdlib.h> + + char langname[100]; + +--- a/src/p_topology.c ++++ b/src/p_topology.c +@@ -22,7 +22,7 @@ + #define P_TOPOLOGY + + #include <p_global.h> +- ++#include <stdlib.h> + + #define TP_ROOT 0 + #define TP_LTO 1 +--- a/src/p_uchannel.c ++++ b/src/p_uchannel.c +@@ -22,6 +22,7 @@ + #define P_UCHANNEL + + #include <p_global.h> ++#include <stdlib.h> + + /* bring the channel modes into the right order, return formulated mode */ + +--- a/src/p_userfile.c ++++ b/src/p_userfile.c +@@ -22,6 +22,7 @@ + #define P_USERFILE + + #include <p_global.h> ++#include <stdlib.h> + + /* loading a specific user */ + +--- a/src/psybnc.c ++++ b/src/psybnc.c +@@ -34,6 +34,7 @@ + + #include <p_global.h> + #include <p_data.h> ++#include <stdlib.h> + + int slice=0; + diff --git a/net-irc/psybnc/files/psybnc-2.4.3-strmncpy-lto-mismatch.patch b/net-irc/psybnc/files/psybnc-2.4.3-strmncpy-lto-mismatch.patch new file mode 100644 index 000000000000..cd0325613fe1 --- /dev/null +++ b/net-irc/psybnc/files/psybnc-2.4.3-strmncpy-lto-mismatch.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/861464 +--- a/src/p_global.h ++++ b/src/p_global.h +@@ -1109,7 +1109,7 @@ int replace(char *rps, char whatc, char toc); + char *nobreak(char *tobreak); + char *randstring(int length); + char *strmcat(char *first,char *second); +-char *strmncpy(char *dest, char *source, unsigned int len); ++char *strmncpy(char *dest, char *source, size_t len); + int strmncasecmp(char *one, char *two); + int strmcmp(char *one, char *two); + int strmwildcmp(char *line, char *wildcard); +--- a/src/p_string.c ++++ b/src/p_string.c +@@ -56,7 +56,7 @@ int ucase (char *inc) + + /* string copy with len and zero delimit */ + +-char *strmncpy(char *dest, char *source, unsigned int len) ++char *strmncpy(char *dest, char *source, size_t len) + { + char bf[strlen(source)+2]; + char *pt; diff --git a/net-irc/psybnc/files/psybnc-oidentd.initd b/net-irc/psybnc/files/psybnc-oidentd.initd index 354e6416c23e..b50c8b132c7c 100644 --- a/net-irc/psybnc/files/psybnc-oidentd.initd +++ b/net-irc/psybnc/files/psybnc-oidentd.initd @@ -7,19 +7,19 @@ depend() { } check_config() { - if [[ ! -f ${PSYBNC_CONFIG} ]] + if [ ! -f ${PSYBNC_CONFIG} ] then eerror "Please set \$PSYBNC_CONFIG in /etc/conf.d/psybnc!" return 1 fi - if [[ ! -d "${PSYBNC_HOME}" ]] + if [ ! -d "${PSYBNC_HOME}" ] then eerror "Please set \$PSYBNC_HOME in /etc/conf.d/psybnc!" return 1 fi - if [[ -z "${PSYBNC_USER}" ]] + if [ -z "${PSYBNC_USER}" ] then eerror "Please set \$PSYBNC_USER in /etc/conf.d/psybnc!" return 1 @@ -29,7 +29,7 @@ check_config() { start() { check_config || return 1 ebegin "Starting psyBNC" - start-stop-daemon --start --quiet --chuid "${PSYBNC_USER}" --chdir "${PSYBNC_HOME}" -e HOME="${PSYBNC_HOME}" --exec /usr/bin/psybnc -- "${PSYBNC_CONFIG}" &>/dev/null + start-stop-daemon --start --quiet --chuid "${PSYBNC_USER}" --chdir "${PSYBNC_HOME}" -e HOME="${PSYBNC_HOME}" --exec /usr/bin/psybnc -- "${PSYBNC_CONFIG}" >/dev/null 2>&1 eend $? } diff --git a/net-irc/psybnc/files/psybnc.initd b/net-irc/psybnc/files/psybnc.initd index add37167139b..da01ec9ac422 100644 --- a/net-irc/psybnc/files/psybnc.initd +++ b/net-irc/psybnc/files/psybnc.initd @@ -7,19 +7,19 @@ depend() { } check_config() { - if [[ ! -f ${PSYBNC_CONFIG} ]] + if [ ! -f ${PSYBNC_CONFIG} ] then eerror "Please set \$PSYBNC_CONFIG in /etc/conf.d/psybnc!" return 1 fi - if [[ ! -d "${PSYBNC_HOME}" ]] + if [ ! -d "${PSYBNC_HOME}" ] then eerror "Please set \$PSYBNC_HOME in /etc/conf.d/psybnc!" return 1 fi - if [[ -z "${PSYBNC_USER}" ]] + if [ -z "${PSYBNC_USER}" ] then eerror "Please set \$PSYBNC_USER in /etc/conf.d/psybnc!" return 1 @@ -29,7 +29,7 @@ check_config() { start() { check_config || return 1 ebegin "Starting psyBNC" - start-stop-daemon --start --quiet --chuid "${PSYBNC_USER}" --chdir "${PSYBNC_HOME}" --exec /usr/bin/psybnc -- "${PSYBNC_CONFIG}" &>/dev/null + start-stop-daemon --start --quiet --chuid "${PSYBNC_USER}" --chdir "${PSYBNC_HOME}" --exec /usr/bin/psybnc -- "${PSYBNC_CONFIG}" >/dev/null 2>&1 eend $? } diff --git a/net-irc/psybnc/metadata.xml b/net-irc/psybnc/metadata.xml index cb2540fa5671..11896864794a 100644 --- a/net-irc/psybnc/metadata.xml +++ b/net-irc/psybnc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!--maintainer-needed--> <use> diff --git a/net-irc/psybnc/psybnc-2.4.3-r1.ebuild b/net-irc/psybnc/psybnc-2.4.3-r1.ebuild new file mode 100644 index 000000000000..e9be325cd095 --- /dev/null +++ b/net-irc/psybnc/psybnc-2.4.3-r1.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_PV="$(ver_rs 3 -)" +PSYBNC_HOME="/var/lib/psybnc" + +DESCRIPTION="A multi-user and multi-server gateway to IRC networks" +HOMEPAGE="http://www.psybnc.at/index.html" +SRC_URI="http://psybnc.org/download/psyBNC-${PV}.tar.gz" +S="${WORKDIR}"/${PN} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="ipv6 ssl oidentd scripting multinetwork" + +DEPEND=" + acct-group/psybnc + acct-user/psybnc + net-dns/c-ares + ssl? ( >=dev-libs/openssl-0.9.7d:= ) + oidentd? ( >=net-misc/oidentd-2.0 ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-2.4.3-Fix-build-with-Clang-16.patch + "${FILESDIR}"/${PN}-2.4.3-strmncpy-lto-mismatch.patch +) + +src_unpack() { + unpack ${A} + cd "${S}" || die + + # Useless files + rm -f */INFO || die + + # Pretend we already have a certificate, we generate it in pkg_config + touch key/psybnc.cert.pem || die + + if [[ -f "${EPREFIX}"/usr/share/psybnc/salt.h ]]; then + einfo "Using existing salt.h for password encryption" + cp "${EPREFIX}"/usr/share/psybnc/salt.h salt.h || die + fi +} + +src_prepare() { + default + + # Add oidentd + use oidentd && PATCHES+=( "${FILESDIR}"/${P}-oidentd.patch ) + + # Add scripting support + use scripting && PATCHES+=( "${FILESDIR}"/${P}-scripting.patch ) + + # Add multinetwork support + use multinetwork && PATCHES+=( "${FILESDIR}"/${P}-multinetwork.patch ) + + # Prevent stripping the binary + sed -i -e "/@strip/ d" tools/autoconf.c || die +} + +src_compile() { + if use ipv6; then + rm -f tools/chkipv6.c || die + fi + + if use ssl; then + rm -f tools/chkssl.c || die + fi + + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin psybnc + + insinto /usr/share/psybnc + doins -r help lang salt.h + fperms 0600 /usr/share/psybnc/salt.h + + insinto /etc/psybnc + doins "${FILESDIR}"/psybnc.conf + + keepdir "${PSYBNC_HOME}"/{log,motd,scripts} + dosym ../../../usr/share/psybnc/lang "${PSYBNC_HOME}"/lang + dosym ../../../usr/share/psybnc/help "${PSYBNC_HOME}"/help + + fowners psybnc:psybnc "${PSYBNC_HOME}"/{,log,motd,scripts} /etc/psybnc/psybnc.conf + fperms 0750 "${PSYBNC_HOME}"/{,log,motd,scripts} + fperms 0640 /etc/psybnc/psybnc.conf + + if use ssl; then + keepdir /etc/psybnc/ssl + dosym ../../../etc/psybnc/ssl "${PSYBNC_HOME}"/key + else + # Drop SSL listener from psybnc.conf + sed -i -e "/^# Default SSL listener$/,+4 d" "${D}"/etc/psybnc/psybnc.conf || die + fi + + if use oidentd; then + insinto /etc + doins "${FILESDIR}"/oidentd.conf.psybnc + fperms 640 /etc/oidentd.conf.psybnc + # Install init-script with oidentd-support + newinitd "${FILESDIR}"/psybnc-oidentd.initd psybnc + else + # Install init-script without oidentd-support + newinitd "${FILESDIR}"/psybnc.initd psybnc + fi + + if use scripting ; then + dodoc SCRIPTING + fi + + newconfd "${FILESDIR}"/psybnc.confd psybnc + + dodoc CHANGES FAQ README TODO + docinto example-script + dodoc scripts/example/DEFAULT.SCRIPT +} + +pkg_config() { + if use ssl; then + if [[ -f "${EROOT}"/etc/psybnc/ssl/psybnc.cert.pem || -f "${EROOT}"/etc/psybnc/ssl/psybnc.key.pem ]]; then + ewarn "Existing /etc/psybnc/psybnc.cert.pem or /etc/psybnc/psybnc.key.pem found!" + ewarn "Remove /etc/psybnc/psybnc.*.pem and run emerge --config =${CATEGORY}/${PF} again." + return + fi + + einfo "Generating certificate request..." + openssl req -new -out "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem \ + -keyout "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -nodes || die + + einfo "Generating self-signed certificate..." + openssl req -x509 -days 365 -in "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem \ + -key "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem \ + -out "${ROOT}"/etc/psybnc/ssl/psybnc.cert.pem || die + + einfo "Setting permissions on files..." + chown root:psybnc "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem || die + chmod 0640 "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem || die + fi +} + +pkg_postinst() { + if use ssl; then + elog + elog "Please run \"emerge --config =${CATEGORY}/${PF}\" to create the needed SSL certificates." + fi + + if use oidentd; then + elog + elog "You have enabled oidentd-support. You will need to set" + elog "up your ${EROOT}/etc/oident.conf file before running psybnc. An example" + elog "for psyBNC can be found under ${EROOT}/etc/oidentd.conf.psybnc" + fi + + elog + elog "You can connect to psyBNC on port 23998 with user gentoo and password gentoo." + elog "Please edit the psyBNC configuration at ${EROOT}/etc/psybnc/psybnc.conf to change this." + elog + elog "To be able to reuse an existing psybnc.conf, you need to make sure that the" + elog "old salt.h is available at ${EROOT}/usr/share/psybnc/salt.h when compiling a new" + elog "version of psyBNC. It is needed for password encryption and decryption." + elog +} diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild b/net-irc/psybnc/psybnc-2.4.3.ebuild index b6593d48d197..e4b61275e275 100644 --- a/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild +++ b/net-irc/psybnc/psybnc-2.4.3.ebuild @@ -1,31 +1,34 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit toolchain-funcs user +inherit toolchain-funcs MY_PV="$(ver_rs 3 -)" PSYBNC_HOME="/var/lib/psybnc" DESCRIPTION="A multi-user and multi-server gateway to IRC networks" HOMEPAGE="http://www.psybnc.at/index.html" -SRC_URI="http://www.psybnc.at/download/beta/psyBNC-${MY_PV}.tar.gz" +SRC_URI="http://psybnc.org/download/psyBNC-${PV}.tar.gz" +S="${WORKDIR}"/${PN} LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="ipv6 ssl oidentd scripting multinetwork" -DEPEND="ssl? ( >=dev-libs/openssl-0.9.7d ) - oidentd? ( >=net-misc/oidentd-2.0 )" +DEPEND=" + acct-group/psybnc + acct-user/psybnc + ssl? ( >=dev-libs/openssl-0.9.7d:= ) + oidentd? ( >=net-misc/oidentd-2.0 ) +" RDEPEND="${DEPEND}" -S="${WORKDIR}"/"${PN}" -pkg_setup() { - enewgroup psybnc - enewuser psybnc -1 -1 ${PSYBNC_HOME} psybnc -} +PATCHES=( + "${FILESDIR}"/${PN}-2.4.3-Fix-build-with-Clang-16.patch +) src_unpack() { unpack ${A} @@ -37,25 +40,23 @@ src_unpack() { # Pretend we already have a certificate, we generate it in pkg_config touch key/psybnc.cert.pem || die - if [[ -f ${ROOT}/usr/share/psybnc/salt.h ]]; then + if [[ -f "${EPREFIX}"/usr/share/psybnc/salt.h ]]; then einfo "Using existing salt.h for password encryption" - cp "${ROOT}"/usr/share/psybnc/salt.h salt.h || die + cp "${EPREFIX}"/usr/share/psybnc/salt.h salt.h || die fi } src_prepare() { default - eapply "${FILESDIR}/compile.diff" - eapply "${FILESDIR}/ldflags-fix.patch" - # add oidentd - use oidentd && eapply "${FILESDIR}/${P}-oidentd.patch" + # Add oidentd + use oidentd && PATCHES+=( "${FILESDIR}"/${P}-oidentd.patch ) - # add scripting support - use scripting && eapply "${FILESDIR}/${P}-scripting.patch" + # Add scripting support + use scripting && PATCHES+=( "${FILESDIR}"/${P}-scripting.patch ) - # add multinetwork support - use multinetwork && eapply "${FILESDIR}/${P}-multinetwork.patch" + # Add multinetwork support + use multinetwork && PATCHES+=( "${FILESDIR}"/${P}-multinetwork.patch ) # Prevent stripping the binary sed -i -e "/@strip/ d" tools/autoconf.c || die @@ -65,6 +66,7 @@ src_compile() { if use ipv6; then rm -f tools/chkipv6.c || die fi + if use ssl; then rm -f tools/chkssl.c || die fi @@ -83,8 +85,8 @@ src_install() { doins "${FILESDIR}"/psybnc.conf keepdir "${PSYBNC_HOME}"/{log,motd,scripts} - dosym /usr/share/psybnc/lang "${PSYBNC_HOME}"/lang - dosym /usr/share/psybnc/help "${PSYBNC_HOME}"/help + dosym ../../../usr/share/psybnc/lang "${PSYBNC_HOME}"/lang + dosym ../../../usr/share/psybnc/help "${PSYBNC_HOME}"/help fowners psybnc:psybnc "${PSYBNC_HOME}"/{,log,motd,scripts} /etc/psybnc/psybnc.conf fperms 0750 "${PSYBNC_HOME}"/{,log,motd,scripts} @@ -92,7 +94,7 @@ src_install() { if use ssl; then keepdir /etc/psybnc/ssl - dosym /etc/psybnc/ssl "${PSYBNC_HOME}"/key + dosym ../../../etc/psybnc/ssl "${PSYBNC_HOME}"/key else # Drop SSL listener from psybnc.conf sed -i -e "/^# Default SSL listener$/,+4 d" "${D}"/etc/psybnc/psybnc.conf || die @@ -102,23 +104,27 @@ src_install() { insinto /etc doins "${FILESDIR}"/oidentd.conf.psybnc fperms 640 /etc/oidentd.conf.psybnc - # install init-script with oidentd-support + # Install init-script with oidentd-support newinitd "${FILESDIR}"/psybnc-oidentd.initd psybnc else - # install init-script without oidentd-support + # Install init-script without oidentd-support newinitd "${FILESDIR}"/psybnc.initd psybnc fi + if use scripting ; then + dodoc SCRIPTING + fi + newconfd "${FILESDIR}"/psybnc.confd psybnc - dodoc CHANGES FAQ README SCRIPTING TODO + dodoc CHANGES FAQ README TODO docinto example-script dodoc scripts/example/DEFAULT.SCRIPT } pkg_config() { if use ssl; then - if [[ -f ${ROOT}/etc/psybnc/ssl/psybnc.cert.pem || -f ${ROOT}/etc/psybnc/ssl/psybnc.key.pem ]]; then + if [[ -f "${EROOT}"/etc/psybnc/ssl/psybnc.cert.pem || -f "${EROOT}"/etc/psybnc/ssl/psybnc.key.pem ]]; then ewarn "Existing /etc/psybnc/psybnc.cert.pem or /etc/psybnc/psybnc.key.pem found!" ewarn "Remove /etc/psybnc/psybnc.*.pem and run emerge --config =${CATEGORY}/${PF} again." return @@ -127,10 +133,12 @@ pkg_config() { einfo "Generating certificate request..." openssl req -new -out "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem \ -keyout "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -nodes || die + einfo "Generating self-signed certificate..." openssl req -x509 -days 365 -in "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem \ -key "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem \ -out "${ROOT}"/etc/psybnc/ssl/psybnc.cert.pem || die + einfo "Setting permissions on files..." chown root:psybnc "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem || die chmod 0640 "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem || die @@ -140,20 +148,22 @@ pkg_config() { pkg_postinst() { if use ssl; then elog - elog "Please run \"emerge --config =${CATEGORY}/${PF}\" to create needed SSL certificates." + elog "Please run \"emerge --config =${CATEGORY}/${PF}\" to create the needed SSL certificates." fi + if use oidentd; then elog elog "You have enabled oidentd-support. You will need to set" - elog "up your /etc/oident.conf file before running psybnc. An example" - elog "for psyBNC can be found under /etc/oidentd.conf.psybnc" + elog "up your ${EROOT}/etc/oident.conf file before running psybnc. An example" + elog "for psyBNC can be found under ${EROOT}/etc/oidentd.conf.psybnc" fi + elog elog "You can connect to psyBNC on port 23998 with user gentoo and password gentoo." - elog "Please edit the psyBNC configuration at /etc/psybnc/psybnc.conf to change this." + elog "Please edit the psyBNC configuration at ${EROOT}/etc/psybnc/psybnc.conf to change this." elog elog "To be able to reuse an existing psybnc.conf, you need to make sure that the" - elog "old salt.h is available at /usr/share/psybnc/salt.h when compiling a new" + elog "old salt.h is available at ${EROOT}/usr/share/psybnc/salt.h when compiling a new" elog "version of psyBNC. It is needed for password encryption and decryption." elog } diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest index 1ef7551ac44b..43a0bf9abda1 100644 --- a/net-irc/quassel/Manifest +++ b/net-irc/quassel/Manifest @@ -1 +1 @@ -DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd SHA512 4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c +DIST quassel-0.14.0.tar.bz2 4774297 BLAKE2B c17c64a2ed6c414c94c12b2fa0b8abf40810608e3e4f35df19db597444e09594efc9569c65855c3df5e2c211c2d65a46482f20c3d912c87140c66fa4f022b3b8 SHA512 ea6b9723acab5ce73f760692770c1340c03bf277d2c99a2520345bfb6a7bb6fdc64a01dccfd7026341b46ee727821e1bcc2f487be72dfbc155f1de1ad264763f diff --git a/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch b/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch deleted file mode 100644 index f0305ea53ce7..000000000000 --- a/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch +++ /dev/null @@ -1,118 +0,0 @@ -commit c90702bdbc43fc542d7df6d5ec4b321912ca0035 -Author: Manuel Nickschas <sputnick@quassel-irc.org> -Date: Tue Jan 7 18:34:54 2020 +0100 - - common: Disable enum type stream operators for Qt >= 5.14 - - Starting from version 5.14, Qt provides stream operators for enum - types, which collide with the ones we ship in types.h. Disable - Quassel's stream operators when compiling against Qt 5.14 or later. - - Add a unit test that ensures that enum serialization honors the width - of the underlying type. - -diff --git a/src/common/types.h b/src/common/types.h -index 467d9fb2..c4b9f364 100644 ---- a/src/common/types.h -+++ b/src/common/types.h -@@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress) - typedef QList<MsgId> MsgIdList; - typedef QList<BufferId> BufferIdList; - -+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - /** - * Catch-all stream serialization operator for enum types. - * -@@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) { - value = static_cast<T>(v); - return in; - } -+#endif - - // Exceptions - -diff --git a/src/common/typestest.cpp b/src/common/typestest.cpp -new file mode 100644 -index 00000000..04031c29 ---- /dev/null -+++ b/src/common/typestest.cpp -@@ -0,0 +1,79 @@ -+/*************************************************************************** -+ * Copyright (C) 2005-2020 by the Quassel Project * -+ * devel@quassel-irc.org * -+ * * -+ * This program is free software; you can redistribute it and/or modify * -+ * it under the terms of the GNU General Public License as published by * -+ * the Free Software Foundation; either version 2 of the License, or * -+ * (at your option) version 3. * -+ * * -+ * This program is distributed in the hope that it will be useful, * -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of * -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -+ * GNU General Public License for more details. * -+ * * -+ * You should have received a copy of the GNU General Public License * -+ * along with this program; if not, write to the * -+ * Free Software Foundation, Inc., * -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * -+ ***************************************************************************/ -+ -+#include <cstdint> -+ -+#include <QByteArray> -+#include <QDataStream> -+#include <QObject> -+ -+#include "testglobal.h" -+#include "types.h" -+ -+using namespace ::testing; -+ -+class EnumHolder -+{ -+ Q_GADGET -+ -+public: -+ enum class Enum16 : uint16_t {}; -+ enum class Enum32 : uint32_t {}; -+ -+ enum class EnumQt16 : uint16_t {}; -+ Q_ENUM(EnumQt16) -+ enum class EnumQt32 : uint32_t {}; -+ Q_ENUM(EnumQt32) -+}; -+ -+// Verify that enums are (de)serialized as their underlying type -+TEST(TypesTest, enumSerialization) -+{ -+ QByteArray data; -+ QDataStream out(&data, QIODevice::WriteOnly); -+ -+ // Serialize -+ out << EnumHolder::Enum16(0xabcd); -+ ASSERT_THAT(data.size(), Eq(2)); -+ out << EnumHolder::Enum32(0x123456); -+ ASSERT_THAT(data.size(), Eq(6)); -+ out << EnumHolder::EnumQt16(0x4321); -+ ASSERT_THAT(data.size(), Eq(8)); -+ out << EnumHolder::Enum32(0xfedcba); -+ ASSERT_THAT(data.size(), Eq(12)); -+ ASSERT_THAT(out.status(), Eq(QDataStream::Status::Ok)); -+ -+ // Deserialize -+ QDataStream in(data); -+ EnumHolder::Enum16 enum16; -+ EnumHolder::Enum32 enum32; -+ EnumHolder::EnumQt16 enumQt16; -+ EnumHolder::EnumQt32 enumQt32; -+ in >> enum16 >> enum32 >> enumQt16 >> enumQt32; -+ ASSERT_THAT(in.status(), Eq(QDataStream::Status::Ok)); -+ EXPECT_TRUE(in.atEnd()); -+ -+ EXPECT_THAT((int)enum16, Eq(0xabcd)); -+ EXPECT_THAT((int)enum32, Eq(0x123456)); -+ EXPECT_THAT((int)enumQt16, Eq(0x4321)); -+ EXPECT_THAT((int)enumQt32, Eq(0xfedcba)); -+} -+ -+#include "typestest.moc" diff --git a/net-irc/quassel/files/quassel-0.14.0-cxxflags.patch b/net-irc/quassel/files/quassel-0.14.0-cxxflags.patch new file mode 100644 index 000000000000..119261f789af --- /dev/null +++ b/net-irc/quassel/files/quassel-0.14.0-cxxflags.patch @@ -0,0 +1,32 @@ +From b1eff3d32b2a18c52a8f30632746956a17089204 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Sat, 8 Jan 2022 13:26:05 -0500 +Subject: [PATCH] cmake: avoid de-duplication of user's CXXFLAGS + +Use the "SHELL:" prefix behavior introduced in cmake 3.12 to avoid the +option de-duplication behavior of add_compile_options(). + +Bug: https://bugs.gentoo.org/830738 +--- + cmake/QuasselMacros.cmake | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake +index 3f9f09269..9ba0003a8 100644 +--- a/cmake/QuasselMacros.cmake ++++ b/cmake/QuasselMacros.cmake +@@ -410,8 +410,12 @@ endfunction() + function(process_cmake_cxx_flags) + string(TOUPPER ${CMAKE_BUILD_TYPE} upper_build_type) + set(cxx_flags "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${upper_build_type}}") +- separate_arguments(sep_cxx_flags UNIX_COMMAND ${cxx_flags}) +- add_compile_options(${sep_cxx_flags}) ++ if(CMAKE_VERSION VERSION_LESS 3.12) ++ separate_arguments(sep_cxx_flags UNIX_COMMAND ${cxx_flags}) ++ add_compile_options(${sep_cxx_flags}) ++ else() ++ add_compile_options("SHELL:${cxx_flags}") ++ endif() + set(CMAKE_CXX_FLAGS "" PARENT_SCOPE) + set(CMAKE_CXX_FLAGS_${upper_build_type} "" PARENT_SCOPE) + endfunction() diff --git a/net-irc/quassel/files/quassel-0.14.0-fix-desktop-application-name.patch b/net-irc/quassel/files/quassel-0.14.0-fix-desktop-application-name.patch new file mode 100644 index 000000000000..ef70a608c406 --- /dev/null +++ b/net-irc/quassel/files/quassel-0.14.0-fix-desktop-application-name.patch @@ -0,0 +1,56 @@ +https://github.com/quassel/quassel/pull/615 + +From 020c163421691fa37330826df92ac0a248721290 Mon Sep 17 00:00:00 2001 +From: Jeremy Visser <jeremy@visser.name> +Date: Tue, 18 Apr 2023 21:47:45 +1000 +Subject: [PATCH] uisupport: fix application name for .desktop shell + integration + +When building for KDE (cmake -DUSE_KDE=1), the KAboutData constructor +as invoked by uisupport causes the resulting application name to be +"org.kde.quassel". + +At least on GNOME, this "org.kde.quassel" doesn't match the +corresponding "quasselclient.desktop" file, which means the app doesn't +get a pretty name/icon in the app launcher. + +The solution is to call KAboutData::setDesktopFileName() with the +desired name. + +This issue doesn't occur when building with USE_KDE=0 for two reasons: +one, because QtUiApplication already calls +QGuiApplication::setDesktopFileName() with the correct value, and two, +if desktopFileName is unset, the binary name "quasselclient" would be used +instead, which still matches "quasselclient.desktop". + +An alternative workaround would be to set this flag in the +quasselclient.desktop file: + + StartupWMClass=org.kde.quassel + +But I would say this is worse because the "org.kde" doesn't make sense, +since this is not a KDE project. +--- + src/uisupport/aboutdata.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/uisupport/aboutdata.cpp b/src/uisupport/aboutdata.cpp +index d489da3d6..380e54a54 100644 +--- a/src/uisupport/aboutdata.cpp ++++ b/src/uisupport/aboutdata.cpp +@@ -114,13 +114,14 @@ AboutData& AboutData::addCredits(std::initializer_list<AboutPerson> credits) + + KAboutData AboutData::kAboutData() const + { +- KAboutData aboutData(Quassel::buildInfo().applicationName, tr("Quassel IRC"), Quassel::buildInfo().plainVersionString); ++ KAboutData aboutData(Quassel::buildInfo().clientApplicationName, tr("Quassel IRC"), Quassel::buildInfo().plainVersionString); + aboutData.addLicense(KAboutLicense::GPL_V2); + aboutData.addLicense(KAboutLicense::GPL_V3); + aboutData.setShortDescription(tr("A modern, distributed IRC client")); + aboutData.setProgramLogo(QVariant::fromValue(QImage(":/pics/quassel-logo.png"))); + aboutData.setBugAddress("https://bugs.quassel-irc.org/projects/quassel-irc/issues/new"); + aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8()); ++ aboutData.setDesktopFileName(Quassel::buildInfo().clientApplicationName); + + for (const auto& person : authors()) { + aboutData.addAuthor(person.prettyName(), person.task(), person.emailAddress()); diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml index 57498aeffbe6..d8bd1c0d5959 100644 --- a/net-irc/quassel/metadata.xml +++ b/net-irc/quassel/metadata.xml @@ -1,13 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>patrick@gentoo.org</email> - <name>Patrick Lauer</name> - </maintainer> - <maintainer type="person"> - <email>johu@gentoo.org</email> - <name>Johannes Huber</name> + <email>sam@gentoo.org</email> + <name>Sam James</name> </maintainer> <use> <flag name="bundled-icons"> @@ -36,17 +32,17 @@ used. You need this enabled on the server, but you might want to disable it on the client. </flag> - <flag name="snorenotify"> - Support for Snore notification framework. - </flag> <flag name="urlpreview"> Use QtWebEngine rendering engine for showing URL thumbnails. </flag> - <flag name="X"> + <flag name="gui"> Build the Qt5 GUI client for quassel. If this USE flag is disabled, the GUI is not built, and cannot be used. You might want to disable this on the server, but you need it enabled on the client. </flag> </use> + <upstream> + <remote-id type="github">quassel/quassel</remote-id> + </upstream> </pkgmetadata> diff --git a/net-irc/quassel/quassel-0.13.1-r2.ebuild b/net-irc/quassel/quassel-0.14.0-r2.ebuild index 57fc94c79cd1..e0ce1c5cdfce 100644 --- a/net-irc/quassel/quassel-0.13.1-r2.ebuild +++ b/net-irc/quassel/quassel-0.14.0-r2.ebuild @@ -1,14 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake xdg-utils pax-utils systemd +inherit cmake optfeature pax-utils systemd xdg-utils if [[ ${PV} != *9999* ]]; then MY_P=${PN}-${PV/_/-} - SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~sparc-solaris" + if [[ ${PV} == *_rc* ]] ; then + SRC_URI="https://github.com/quassel/quassel/archive/refs/tags/${PV/_/-}.tar.gz -> ${P}.tar.gz" + else + SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2" + KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux" + fi S="${WORKDIR}/${MY_P}" else EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" ) @@ -17,29 +21,42 @@ fi DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity" HOMEPAGE="https://quassel-irc.org/" + LICENSE="GPL-3" SLOT="0" -IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server -snorenotify +ssl syslog urlpreview X" +IUSE="bundled-icons crypt +dbus gui kde ldap monolithic oxygen postgres +server spell syslog test urlpreview" + +REQUIRED_USE=" + || ( gui server monolithic ) + crypt? ( || ( server monolithic ) ) + kde? ( dbus spell ) + ldap? ( || ( server monolithic ) ) + postgres? ( || ( server monolithic ) ) + spell? ( || ( gui monolithic ) ) + syslog? ( || ( server monolithic ) ) +" + +RESTRICT="!test? ( test )" SERVER_DEPEND=" acct-group/quassel acct-user/quassel - dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) - ldap? ( net-nds/openldap ) + ldap? ( net-nds/openldap:= ) postgres? ( dev-qt/qtsql:5[postgres] ) - !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) + !postgres? ( + dev-qt/qtsql:5[sqlite] + dev-db/sqlite:3[threadsafe(+),-secure-delete] + ) syslog? ( virtual/logger ) " - GUI_DEPEND=" dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( - kde-frameworks/breeze-icons:5 - oxygen? ( kde-frameworks/oxygen-icons:5 ) + kde-frameworks/breeze-icons:* + oxygen? ( kde-frameworks/oxygen-icons:* ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 @@ -53,15 +70,14 @@ GUI_DEPEND=" kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 - kde-frameworks/sonnet:5 ) - snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) + spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) " - -DEPEND=" +RDEPEND=" + dev-libs/boost:= dev-qt/qtcore:5 - dev-qt/qtnetwork:5[ssl?] + dev-qt/qtnetwork:5[ssl] sys-libs/zlib monolithic? ( ${SERVER_DEPEND} @@ -69,52 +85,57 @@ DEPEND=" ) !monolithic? ( server? ( ${SERVER_DEPEND} ) - X? ( ${GUI_DEPEND} ) + gui? ( ${GUI_DEPEND} ) + ) +" +DEPEND=" + ${RDEPEND} + test? ( + dev-cpp/gtest + dev-qt/qttest:5 ) " -RDEPEND="${DEPEND}" BDEPEND=" dev-qt/linguist-tools:5 - kde-frameworks/extra-cmake-modules + kde-frameworks/extra-cmake-modules:0 " DOCS=( AUTHORS ChangeLog README.md ) -REQUIRED_USE=" - || ( X server monolithic ) - crypt? ( || ( server monolithic ) ) - kde? ( || ( X monolithic ) dbus ) - ldap? ( || ( server monolithic ) ) - postgres? ( || ( server monolithic ) ) - snorenotify? ( || ( X monolithic ) ) - syslog? ( || ( server monolithic ) ) -" - -PATCHES=( "${FILESDIR}/${P}-qt5.14.patch" ) +PATCHES=( + "${FILESDIR}/${P}-cxxflags.patch" + "${FILESDIR}/${P}-fix-desktop-application-name.patch" +) src_configure() { local mycmakeargs=( - -DUSE_QT4=OFF - -DUSE_QT5=ON -DUSE_CCACHE=OFF -DCMAKE_SKIP_RPATH=ON -DEMBED_DATA=OFF -DWITH_WEBKIT=OFF -DWITH_BUNDLED_ICONS=$(usex bundled-icons) - $(cmake_use_find_package dbus dbusmenu-qt5) - $(cmake_use_find_package dbus Qt5DBus) + -DWANT_QTCLIENT=$(usex gui) -DWITH_KDE=$(usex kde) -DWITH_LDAP=$(usex ldap) -DWANT_MONO=$(usex monolithic) -DWITH_OXYGEN_ICONS=$(usex oxygen) -DWANT_CORE=$(usex server) - $(cmake_use_find_package snorenotify LibsnoreQt5) + -DBUILD_TESTING=$(usex test) -DWITH_WEBENGINE=$(usex urlpreview) - -DWANT_QTCLIENT=$(usex X) ) - if use server || use monolithic; then - mycmakeargs+=( $(cmake_use_find_package crypt QCA2-QT5) ) + # bug #830708 + if use gui || use monolithic ; then + mycmakeargs+=( + -DCMAKE_DISABLE_FIND_PACKAGE_LibsnoreQt5=ON + $(cmake_use_find_package dbus dbusmenu-qt5) + $(cmake_use_find_package dbus Qt5DBus) + $(cmake_use_find_package spell KF5Sonnet) + ) + fi + + if use server || use monolithic ; then + mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) ) fi cmake_src_configure @@ -124,34 +145,37 @@ src_install() { cmake_src_install if use server ; then - # needs PAX marking wrt bug#346255 - pax-mark m "${ED}/usr/bin/quasselcore" + # Needs PaX marking, bug #346255 + pax-mark m "${ED}"/usr/bin/quasselcore - # init scripts & systemd unit + # Init scripts & systemd unit newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore systemd_dounit "${FILESDIR}"/quasselcore.service # logrotate insinto /etc/logrotate.d - newins "${FILESDIR}/quassel.logrotate" quassel + newins "${FILESDIR}"/quassel.logrotate quassel fi } +src_test() { + LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" cmake_src_test +} + pkg_postinst() { - if use monolithic && use ssl ; then + if use monolithic ; then elog "Information on how to enable SSL support for client/core connections" - elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support." + elog "is available at: https://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support" fi - if use server; then - einfo "If you want to generate SSL certificate remember to run:" - einfo " emerge --config =${CATEGORY}/${PF}" + if use server ; then + einfo "If you want to generate SSL certificate, remember to run:" + einfo " emerge --config =${CATEGORY}/${PF}" fi if use server || use monolithic ; then - einfo "Quassel can use net-misc/oidentd package if installed on your system." - einfo "Consider installing it if you want to run quassel within identd daemon." + optfeature "running Quassel within an ident daemon" "net-misc/oidentd" fi xdg_icon_cache_update @@ -162,17 +186,19 @@ pkg_postrm() { } pkg_config() { - if use server && use ssl; then - # generate the pem file only when it does not already exist - QUASSEL_DIR=/var/lib/${PN} - if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then - einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\"" + if use server ; then + # Generate the pem file only when it does not already exist + QUASSEL_DIR="${EROOT}"/var/lib/${PN} + + if [[ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]] ; then + einfo "Generating Quassel SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\"" openssl req -x509 -nodes -days 365 -newkey rsa:2048 \ -keyout "${QUASSEL_DIR}/quasselCert.pem" \ - -out "${QUASSEL_DIR}/quasselCert.pem" - # permissions for the key - chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem" - chmod 400 "${QUASSEL_DIR}/quasselCert.pem" + -out "${QUASSEL_DIR}/quasselCert.pem" || die + + # Permissions for the key + chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem" || die + chmod 400 "${QUASSEL_DIR}/quasselCert.pem" || die else einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists." einfo "Remove it if you want to create new one." diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild index 68d94a9e3ea2..ceeefc6bbf10 100644 --- a/net-irc/quassel/quassel-9999.ebuild +++ b/net-irc/quassel/quassel-9999.ebuild @@ -1,14 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake xdg-utils pax-utils systemd +inherit cmake optfeature pax-utils systemd xdg-utils if [[ ${PV} != *9999* ]]; then MY_P=${PN}-${PV/_/-} - SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2" - KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris" + if [[ ${PV} == *_rc* ]] ; then + SRC_URI="https://github.com/quassel/quassel/archive/refs/tags/${PV/_/-}.tar.gz -> ${P}.tar.gz" + else + SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux" + fi S="${WORKDIR}/${MY_P}" else EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" ) @@ -17,28 +21,42 @@ fi DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity" HOMEPAGE="https://quassel-irc.org/" + LICENSE="GPL-3" SLOT="0" -IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server -snorenotify syslog urlpreview X" +IUSE="bundled-icons crypt +dbus gui kde ldap monolithic oxygen postgres +server spell syslog test urlpreview" + +REQUIRED_USE=" + || ( gui server monolithic ) + crypt? ( || ( server monolithic ) ) + kde? ( dbus spell ) + ldap? ( || ( server monolithic ) ) + postgres? ( || ( server monolithic ) ) + spell? ( || ( gui monolithic ) ) + syslog? ( || ( server monolithic ) ) +" + +RESTRICT="!test? ( test )" SERVER_DEPEND=" acct-group/quassel acct-user/quassel crypt? ( app-crypt/qca:2[ssl] ) - ldap? ( net-nds/openldap ) + ldap? ( net-nds/openldap:= ) postgres? ( dev-qt/qtsql:5[postgres] ) - !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) + !postgres? ( + dev-qt/qtsql:5[sqlite] + dev-db/sqlite:3[threadsafe(+),-secure-delete] + ) syslog? ( virtual/logger ) " - GUI_DEPEND=" dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( - kde-frameworks/breeze-icons:5 - oxygen? ( kde-frameworks/oxygen-icons:5 ) + kde-frameworks/breeze-icons:* + oxygen? ( kde-frameworks/oxygen-icons:* ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 @@ -52,13 +70,12 @@ GUI_DEPEND=" kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 - kde-frameworks/sonnet:5 ) - snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) + spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) " - RDEPEND=" + dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] sys-libs/zlib @@ -68,29 +85,23 @@ RDEPEND=" ) !monolithic? ( server? ( ${SERVER_DEPEND} ) - X? ( ${GUI_DEPEND} ) + gui? ( ${GUI_DEPEND} ) ) " -DEPEND="${RDEPEND} - dev-libs/boost +DEPEND=" + ${RDEPEND} + test? ( + dev-cpp/gtest + dev-qt/qttest:5 + ) " BDEPEND=" dev-qt/linguist-tools:5 - kde-frameworks/extra-cmake-modules:5 + kde-frameworks/extra-cmake-modules:0 " DOCS=( AUTHORS ChangeLog README.md ) -REQUIRED_USE=" - || ( X server monolithic ) - crypt? ( || ( server monolithic ) ) - kde? ( || ( X monolithic ) dbus ) - ldap? ( || ( server monolithic ) ) - postgres? ( || ( server monolithic ) ) - snorenotify? ( || ( X monolithic ) ) - syslog? ( || ( server monolithic ) ) -" - src_configure() { local mycmakeargs=( -DUSE_CCACHE=OFF @@ -98,19 +109,27 @@ src_configure() { -DEMBED_DATA=OFF -DWITH_WEBKIT=OFF -DWITH_BUNDLED_ICONS=$(usex bundled-icons) - $(cmake_use_find_package dbus dbusmenu-qt5) - $(cmake_use_find_package dbus Qt5DBus) + -DWANT_QTCLIENT=$(usex gui) -DWITH_KDE=$(usex kde) -DWITH_LDAP=$(usex ldap) -DWANT_MONO=$(usex monolithic) -DWITH_OXYGEN_ICONS=$(usex oxygen) -DWANT_CORE=$(usex server) - $(cmake_use_find_package snorenotify LibsnoreQt5) + -DBUILD_TESTING=$(usex test) -DWITH_WEBENGINE=$(usex urlpreview) - -DWANT_QTCLIENT=$(usex X) ) - if use server || use monolithic; then + # bug #830708 + if use gui || use monolithic ; then + mycmakeargs+=( + -DCMAKE_DISABLE_FIND_PACKAGE_LibsnoreQt5=ON + $(cmake_use_find_package dbus dbusmenu-qt5) + $(cmake_use_find_package dbus Qt5DBus) + $(cmake_use_find_package spell KF5Sonnet) + ) + fi + + if use server || use monolithic ; then mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) ) fi @@ -120,35 +139,38 @@ src_configure() { src_install() { cmake_src_install - if use server; then - # needs PAX marking wrt bug#346255 - pax-mark m "${ED}/usr/bin/quasselcore" + if use server ; then + # Needs PaX marking, bug #346255 + pax-mark m "${ED}"/usr/bin/quasselcore - # init scripts & systemd unit + # Init scripts & systemd unit newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore systemd_dounit "${FILESDIR}"/quasselcore.service # logrotate insinto /etc/logrotate.d - newins "${FILESDIR}/quassel.logrotate" quassel + newins "${FILESDIR}"/quassel.logrotate quassel fi } +src_test() { + LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" cmake_src_test +} + pkg_postinst() { - if use monolithic; then + if use monolithic ; then elog "Information on how to enable SSL support for client/core connections" - elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support." + elog "is available at: https://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support" fi - if use server; then - einfo "If you want to generate SSL certificate remember to run:" - einfo " emerge --config =${CATEGORY}/${PF}" + if use server ; then + einfo "If you want to generate SSL certificate, remember to run:" + einfo " emerge --config =${CATEGORY}/${PF}" fi if use server || use monolithic ; then - einfo "Quassel can use net-misc/oidentd package if installed on your system." - einfo "Consider installing it if you want to run quassel within identd daemon." + optfeature "running Quassel within an ident daemon" "net-misc/oidentd" fi xdg_icon_cache_update @@ -159,17 +181,19 @@ pkg_postrm() { } pkg_config() { - if use server; then - # generate the pem file only when it does not already exist - QUASSEL_DIR=/var/lib/${PN} - if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then - einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\"" + if use server ; then + # Generate the pem file only when it does not already exist + QUASSEL_DIR="${EROOT}"/var/lib/${PN} + + if [[ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]] ; then + einfo "Generating Quassel SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\"" openssl req -x509 -nodes -days 365 -newkey rsa:2048 \ -keyout "${QUASSEL_DIR}/quasselCert.pem" \ - -out "${QUASSEL_DIR}/quasselCert.pem" - # permissions for the key - chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem" - chmod 400 "${QUASSEL_DIR}/quasselCert.pem" + -out "${QUASSEL_DIR}/quasselCert.pem" || die + + # Permissions for the key + chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem" || die + chmod 400 "${QUASSEL_DIR}/quasselCert.pem" || die else einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists." einfo "Remove it if you want to create new one." diff --git a/net-irc/quasselgrep/Manifest b/net-irc/quasselgrep/Manifest deleted file mode 100644 index 13616f833907..000000000000 --- a/net-irc/quasselgrep/Manifest +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 8cdbffdc53bd..000000000000 --- a/net-irc/quasselgrep/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <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> - </upstream> -</pkgmetadata> diff --git a/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild b/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild deleted file mode 100644 index 2a17d4e0303d..000000000000 --- a/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..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" - -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" - -RDEPEND="dev-python/future[${PYTHON_USEDEP}] - dev-python/pycryptodome[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}]" - -pkg_postinst() { - optfeature "access postgres db" dev-python/psycopg:2 -} diff --git a/net-irc/rbot/Manifest b/net-irc/rbot/Manifest index ca7d6c77ec02..527001b62919 100644 --- a/net-irc/rbot/Manifest +++ b/net-irc/rbot/Manifest @@ -1 +1 @@ -DIST rbot-0.9.15_p20160325.tar.gz 762685 BLAKE2B 68146d241bd57198e0a7a9e5ae033827116bbe31d3bdc05bf42aa644c5dd900254bbe7317461aa553ad92daac299439721a85cd8dd41033cf38b9e97b268e1ee SHA512 b0bc90ee2c6ddb3cdd92cdd5f3a45520d20bc97327b3d694235f7ba94f13ef3c884d4658b083f71bfee2cbeff3cbc7a57c251c4d28bfee293e2556f64e7b4160 +DIST rbot-0.9.15_p20210609.tar.gz 769331 BLAKE2B 7dcdb3ffefefc0b2bfc8d232aec7fec2efecbbf2b025745673acac21733ed115c247cd988db0fb2739174ab1dad9fada83e1a291219e480d294ac32d1bbaad38 SHA512 068e3171bc2d2d0ffea36fbdf342766672fb83b9a4359b154b44b5e0283e6d1d0308dd7fbd66b515bcabb4ecc0eeca95fe670b49654e5d082a0be376138d4e50 diff --git a/net-irc/rbot/metadata.xml b/net-irc/rbot/metadata.xml index 9be5ac250eb4..ac19f02219bc 100644 --- a/net-irc/rbot/metadata.xml +++ b/net-irc/rbot/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ruby@gentoo.org</email> @@ -21,11 +21,6 @@ to enable the "translator" plugin for rbot. If the USE flag is disabled the plugin is also disabled by default. </flag> - <flag name="shorturl"> - Add dependency over <pkg>dev-ruby/shorturl</pkg>, which is needed - to enable the "shortenurl" plugin for rbot. If the USE flag is - disabled the plugin is also disabled by default. - </flag> <flag name="nls"> Build and install translation for the messages coming from the bot and its plugins (through <pkg>dev-ruby/ruby-gettext</pkg>). diff --git a/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild b/net-irc/rbot/rbot-0.9.15_p20210609.ebuild index 495f009bcfe2..fda274cc6b6a 100644 --- a/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild +++ b/net-irc/rbot/rbot-0.9.15_p20210609.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -USE_RUBY="ruby23 ruby24 ruby25" +EAPI=8 +USE_RUBY="ruby30 ruby31 ruby32" -GITHUB_COMMIT="e358601cc521d8aced941eb928fae2d8c53cf0c2" -inherit ruby-ng eutils user +GITHUB_COMMIT="3ace72d5642284665fce2c33c99dfeb1b931b2c6" +inherit ruby-ng strip-linguas DESCRIPTION="A ruby IRC bot" HOMEPAGE="https://ruby-rbot.org/" @@ -14,14 +14,18 @@ SRC_URI="https://github.com/ruby-rbot/rbot/archive/${GITHUB_COMMIT}.tar.gz -> ${ LICENSE="|| ( feh GPL-2 )" SLOT="0" KEYWORDS="~amd64" -IUSE="spell aspell timezone translator shorturl nls figlet +IUSE="spell aspell timezone translator nls figlet fortune cal host sqlite toilet" ILINGUAS="zh_CN zh_TW ru nl de fi fr it ja" RUBY_S="${PN}-${GITHUB_COMMIT}" -RUBY_PATCHES=( rbot-rakefile-gettext.patch ) +CDEPEND=" + acct-group/rbot + acct-user/rbot +" RDEPEND+=" + ${CDEPEND} spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) @@ -33,6 +37,8 @@ RDEPEND+=" cal? ( sys-apps/util-linux ) host? ( net-dns/bind-tools )" +DEPEND+="${CDEPEND}" + ruby_add_bdepend " test? ( dev-ruby/sqlite3 @@ -46,15 +52,12 @@ ruby_add_rdepend " dev-ruby/tokyocabinet timezone? ( dev-ruby/tzinfo:* ) translator? ( dev-ruby/mechanize ) - shorturl? ( dev-ruby/shorturl ) nls? ( dev-ruby/ruby-gettext >=dev-ruby/locale-2.0.5-r2 ) " -pkg_setup() { - enewuser rbot -1 -1 /var/lib/rbot nobody -} - all_ruby_prepare() { + eapply -p0 "${FILESDIR}"/rbot-rakefile-gettext.patch + # Avoid tests that are only compatible with ruby22 rm -f test/test_journal.rb || die @@ -62,7 +65,7 @@ all_ruby_prepare() { sed -i -e 's/::Config/::RbConfig/' setup.rb || die # Avoid tests for optional dependencies that are not packaged. - sed -i -e '/RegistryDaybreakTest/,/^end/ s:^:#:' test/test_registry.rb || die + # sed -i -e '/RegistryDaybreakTest/,/^end/ s:^:#:' test/test_registry.rb || die # Avoid broken tests that call code that doesn't exist rm -f test/test_plugins_threshold.rb || die @@ -104,7 +107,6 @@ all_ruby_compile() { use_rbot_plugin timezone time use_rbot_plugin translator translator - use_rbot_plugin shorturl shortenurls use_rbot_plugin fortune fortune use_rbot_conf_path fortune fortune.path /usr/bin/fortune diff --git a/net-irc/rhapsody/metadata.xml b/net-irc/rhapsody/metadata.xml index 266675de63bf..1c31338e2c3c 100644 --- a/net-irc/rhapsody/metadata.xml +++ b/net-irc/rhapsody/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/net-irc/rhapsody/rhapsody-0.28b.ebuild b/net-irc/rhapsody/rhapsody-0.28b.ebuild index 921c22d2b274..d95565a1196f 100644 --- a/net-irc/rhapsody/rhapsody-0.28b.ebuild +++ b/net-irc/rhapsody/rhapsody-0.28b.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,11 +7,11 @@ inherit toolchain-funcs DESCRIPTION="IRC client intended to be displayed on a text console" HOMEPAGE="http://rhapsody.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}_${PV}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~riscv x86" IUSE="" DEPEND=">=sys-libs/ncurses-5.0:0=" diff --git a/net-irc/scrollz/Manifest b/net-irc/scrollz/Manifest index 8c876bc6f271..1de1f0cea048 100644 --- a/net-irc/scrollz/Manifest +++ b/net-irc/scrollz/Manifest @@ -1 +1,2 @@ -DIST ScrollZ-2.3.tar.gz 981707 BLAKE2B ee7c1955dbd2515204d805052d091274c3c7e08257a798c357c5a195c12d7ebc85a160cd40ddf1b2aa87a1b628bebf630c3b7428bde1f230bf9b372f74cc74d2 SHA512 cb3dc2f462452c605c688805ed5128e0197eb4daae895c03f00631c4e9a0994f89a9c55b7e0591588f3f313dab66fcbeb1683b42ef75c3b714185b40703b1979 +DIST ScrollZ-2.3.1.tar.gz 980735 BLAKE2B 39cd79a3c1a77bef730ecfadc8a9e78243e34781cc66cc068be698d18decc24e1001b21302e2069eb4cc21de41b4fd24a4e20a1e7a8e1d0a776ad02e1f215444 SHA512 3fc8386a16ec8ef3cce178465e04485b6dd2d5a4fc93099a8af5a6127ec66357ce7b12173c59b33eeaddf142d17d3e979821ab0f30087806545afe1ecfc168d3 +DIST scrollz-2.3.1-patches.tar.xz 71696 BLAKE2B a0408017a23492f056bf464fb4ed9c20d59ca1f545bbd6b4f8f9b3097f82086a53b099558a18e72042126357f5f508d80a30eabb2a58368c198e2d077be3eb99 SHA512 37b035d838d215186b67621aecfe1d12869f7883d266a418227a2e768f569c2992598eaf93b4e0846c2e33d3e1325b3f0d39a285a0de4c78f4aedb190907bed5 diff --git a/net-irc/scrollz/files/scrollz-2.3-fcommon.patch b/net-irc/scrollz/files/scrollz-2.3-fcommon.patch deleted file mode 100644 index 2c0c85f0b96b..000000000000 --- a/net-irc/scrollz/files/scrollz-2.3-fcommon.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://svnweb.freebsd.org/ports/head/irc/scrollz/files/patch-a8b05aab?view=markup&pathrev=545768 -https://bugs.gentoo.org/708640 ----- ---- a/include/ircterm.h -+++ b/include/ircterm.h -@@ -89,9 +89,9 @@ extern char *CM, - extern int SG; - /**************************** PATCHED by Flier ******************************/ - #ifdef WANTANSI --char *SETAF, -+extern char *SETAF, - *SETAB; --int NUMCOLORS; -+extern int NUMCOLORS; - #endif /* WANTANSI */ - /****************************************************************************/ - diff --git a/net-irc/scrollz/metadata.xml b/net-irc/scrollz/metadata.xml index 6f49eba8f496..a324b587c6fb 100644 --- a/net-irc/scrollz/metadata.xml +++ b/net-irc/scrollz/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">ScrollZ/ScrollZ</remote-id> + </upstream> </pkgmetadata> diff --git a/net-irc/scrollz/scrollz-2.3.ebuild b/net-irc/scrollz/scrollz-2.3.1.ebuild index a76e2d53cdc3..bdee35abb91b 100644 --- a/net-irc/scrollz/scrollz-2.3.ebuild +++ b/net-irc/scrollz/scrollz-2.3.1.ebuild @@ -1,41 +1,45 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs MY_P="ScrollZ-${PV}" DESCRIPTION="Advanced IRC client based on ircII" HOMEPAGE="https://www.scrollz.info/" SRC_URI="https://www.scrollz.info/download/${MY_P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz" +S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" - +KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="gmp gnutls ipv6 ssl" REQUIRED_USE="gnutls? ( ssl )" BDEPEND="virtual/pkgconfig" DEPEND=" - sys-libs/ncurses:0= - gmp? ( dev-libs/gmp:0= ) + sys-libs/ncurses:= + virtual/libcrypt:= + gmp? ( dev-libs/gmp:= ) ssl? ( - gnutls? ( net-libs/gnutls:0= ) - !gnutls? ( dev-libs/openssl:0= ) + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( dev-libs/openssl:= ) ) " RDEPEND="${DEPEND}" -S="${WORKDIR}/ScrollZ-${MY_P}" - PATCHES=( - "${FILESDIR}/${PN}-2.3-fcommon.patch" + # https://github.com/ScrollZ/ScrollZ/pull/30 + "${WORKDIR}"/${P}-patches ) src_configure() { + # Many -Wdeprecated-non-prototype warnings + append-cflags -std=gnu89 + local _myssl if use ssl; then diff --git a/net-irc/senpai/Manifest b/net-irc/senpai/Manifest new file mode 100644 index 000000000000..9664d4f158df --- /dev/null +++ b/net-irc/senpai/Manifest @@ -0,0 +1,4 @@ +DIST senpai-0.2.0-deps.tar.xz 28187856 BLAKE2B 8c5065c8ea996d3136fca04ed5964d8a690039018cd0f15b0ed4977d2b22c397695ff355070570ff6cffa1b65c283b9cdf0f9b6408921b8f81ee0c200a7f6663 SHA512 06dd81b78b87336963b0a9b412404a5b5e0c429758d52ccd23ccf467bf5c96edfe151ee5e883d14dd0b835dcd1bbd3955d8dc97a7004e0d14e9d265a42ee2aee +DIST senpai-0.2.0.tar.gz 60909 BLAKE2B 6250dee33b6aa8a1b4eb109b3e1469ff7f78d2e530a06ad8ee77ef30f38b0907a8425a6408800cef15704955ec8bff29ebfcbd6a5f23470e92c3c89a24ab4182 SHA512 ab0a58396058d0b3691c4168755069e4c5b45266531d2d032cd6be95133a60a9ea8ceb274d6920459daacd63788b2232c66113aea7986ac01dc59132994c02a8 +DIST senpai-0.3.0-deps.tar.xz 29404960 BLAKE2B f18e5bb94b61bde8e1d652bfc5900ace6f5646cb399da7a0c739945845ebc3b9ab2a5dd8eb96ca54ff95703afc7dbabc5b0c680427f3ed1af5f79167aa3f7f3c SHA512 12093096ef57f8bb9fc9c06ad74fc9107fc90c7db84e92d0fd59c68935d0bf1d14c17db78144d789f4786ce18747efda7f65dd2c5d3d6564466a49cb3a67c9ed +DIST senpai-0.3.0.tar.gz 106061 BLAKE2B bf174cc958c2b3a93f3a243ea26cf4488ce5486cbdedbe2ebc1d6a47481818adb274ba6fa940e7265364c6947e935e6d806ef71e6623c304f9226f301f6ea5d5 SHA512 5aa80cc8b3b80d29b503e51377e703cea5fb006c961d677b4afb9e096671b83128a6050c3e70c314ee653d2e8610cd19f47deb1e0a1bfbb125da28e35ca509a5 diff --git a/net-irc/senpai/metadata.xml b/net-irc/senpai/metadata.xml new file mode 100644 index 000000000000..7063eaa16d1c --- /dev/null +++ b/net-irc/senpai/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>cat@catcream.org</email> + <name>Alfred Persson</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="sourcehut">~taiite/senpai</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-irc/senpai/senpai-0.2.0.ebuild b/net-irc/senpai/senpai-0.2.0.ebuild new file mode 100644 index 000000000000..d53c9251fc34 --- /dev/null +++ b/net-irc/senpai/senpai-0.2.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="Modern terminal IRC client. NOTICE me :senpai!" +HOMEPAGE="https://sr.ht/~taiite/senpai" +SRC_URI="https://git.sr.ht/~taiite/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://github.com/alfredfo/${PN}-deps/raw/master/${P}-deps.tar.xz" + +LICENSE="Apache-2.0 BSD BSD-2 ISC MIT" +SLOT="0" +KEYWORDS="~amd64" + +S="${WORKDIR}/${PN}-v${PV}" + +BDEPEND=" + app-text/scdoc +" + +src_compile() { + ego build ${GOFLAGS} ./cmd/senpai + + scdoc <doc/senpai.1.scd >doc/senpai.1 || die + scdoc <doc/senpai.5.scd >doc/senpai.5 || die +} + +src_install() { + dobin senpai + + doman doc/senpai.{1,5} + einstalldocs +} diff --git a/net-irc/senpai/senpai-0.3.0.ebuild b/net-irc/senpai/senpai-0.3.0.ebuild new file mode 100644 index 000000000000..c7980f05f872 --- /dev/null +++ b/net-irc/senpai/senpai-0.3.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="Modern terminal IRC client. NOTICE me :senpai!" +HOMEPAGE="https://sr.ht/~delthas/senpai" +SRC_URI="https://git.sr.ht/~delthas/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://github.com/alfredfo/${PN}-deps/raw/master/${P}-deps.tar.xz" + +LICENSE="Apache-2.0 BSD BSD-2 ISC MIT" +SLOT="0" +KEYWORDS="~amd64" + +S="${WORKDIR}/${PN}-v${PV}" + +BDEPEND=" + app-text/scdoc +" + +src_compile() { + ego build ${GOFLAGS} ./cmd/senpai + + scdoc <doc/senpai.1.scd >doc/senpai.1 || die + scdoc <doc/senpai.5.scd >doc/senpai.5 || die +} + +src_install() { + dobin senpai + + doman doc/senpai.{1,5} + einstalldocs +} diff --git a/net-irc/sic/metadata.xml b/net-irc/sic/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/net-irc/sic/metadata.xml +++ b/net-irc/sic/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-irc/sic/sic-1.2-r1.ebuild b/net-irc/sic/sic-1.2-r1.ebuild index 8ca301bc99ac..7812ded5abf8 100644 --- a/net-irc/sic/sic-1.2-r1.ebuild +++ b/net-irc/sic/sic-1.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~riscv x86" PATCHES=( "${FILESDIR}/${PN}-1.2-include-path.patch" diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest new file mode 100644 index 000000000000..dbad38d41da7 --- /dev/null +++ b/net-irc/soju/Manifest @@ -0,0 +1,4 @@ +DIST soju-0.6.2-deps.tar.xz 146973828 BLAKE2B 170660a36635859327f7f4f5a03e2fe7feb31e113191dfffeae28a3d5e247454556a76da86743a69c43b4dee8749b117cfcfc231cccf9362efb2b20196f4d023 SHA512 57c4156c781bcb3ea76ec1f1174923d08b95b7c15e6f3b933ab150c64a94f80972dd53020737568a3507a4de2f20b87c2c615be8247c9222bf21a87b42b2ca43 +DIST soju-0.6.2.tar.gz 161636 BLAKE2B c4d05d924b921b5d7ba9a61f0d3f269d6ed1a6ba9935a29b694dbc2a6193d0ff633e7c60e1f182b5dfc5aaeb93e4dfb9c98ee46035fdffe13facc8e9bc236171 SHA512 fb74a3eb732b30f2cc0be2c4ada531e160442e6d9b725672784f0b4e4865c2a52970a086f04255d2213305b4a7d041d6a669201aec365216c6bb7764d2b3b769 +DIST soju-0.7.0-deps.tar.xz 89862684 BLAKE2B d56302c5b330c581365da56f1718571144ac0475fa5879a839e723d2d13aa6cb9793a8f64418098aa0035421192eb2ae955603330ea3be6116db057d5fef3b1a SHA512 08fb5f2e75508840b76fb5f3479023eb735abc128cef0a621a3bafbc8d1dde504cf78812cb4e7921d7aaaafc40595ca592ce0b8aaf21c388fd781b52b5d266d2 +DIST soju-0.7.0.tar.gz 149198 BLAKE2B 2047b61792454f20a7cc4c24466047ffa43f5d56a1726b32f5120686d5fecd1f81d057adafc8696e2d85e922e37ae6f158808c0b35529ca2cb7018ecbec0d381 SHA512 9b199c5e3270e325cb6e101b0e7b5c70af75c831442a135fa0484bd2aef3ada98ab48261cd91342d278bfbbbbb626c2c83eeec8029388a8fe9663515e676ba43 diff --git a/net-irc/soju/files/soju.initd b/net-irc/soju/files/soju.initd new file mode 100644 index 000000000000..db6069e85c5f --- /dev/null +++ b/net-irc/soju/files/soju.initd @@ -0,0 +1,30 @@ +#!/sbin/openrc-run +supervisor=supervise-daemon + +name="soju" +description="User-friendly IRC bouncer" + +: ${command_args:="-config /etc/soju/config"} +: ${error_log:=/var/log/soju.log} + +command=/usr/bin/soju +command_user=soju:soju +directory="/var/lib/$RC_SVCNAME" + +extra_started_commands="reload" +description_reload="Reload TLS certificate" + +depend() { + need net localmount +} + +start_pre() { + checkpath -d -o $command_user "$directory" + checkpath -f -o $command_user "$error_log" +} + +reload() { + ebegin "Reloading TLS certificate" + $supervisor $RC_SVCNAME --signal HUP + eend $? +} diff --git a/net-irc/soju/metadata.xml b/net-irc/soju/metadata.xml new file mode 100644 index 000000000000..7f2f852dba69 --- /dev/null +++ b/net-irc/soju/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>cat@catcream.org</email> + <name>Alfred Persson</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="sourcehut">~emersion/soju</remote-id> + </upstream> + <use> + <flag name="moderncsqlite">Use moderncsqlite, a cgo-free port of + SQLite</flag> + </use> +</pkgmetadata> diff --git a/net-irc/soju/soju-0.6.2.ebuild b/net-irc/soju/soju-0.6.2.ebuild new file mode 100644 index 000000000000..266c4335c650 --- /dev/null +++ b/net-irc/soju/soju-0.6.2.ebuild @@ -0,0 +1,72 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +EAPI=8 + +inherit go-module systemd + +DESCRIPTION="soju is a user-friendly IRC bouncer" +HOMEPAGE="https://soju.im/" +SRC_URI="https://git.sr.ht/~emersion/${PN}/refs/download/v${PV}/${P}.tar.gz" +SRC_URI+=" https://github.com/alfredfo/${PN}-deps/raw/master/${P}-deps.tar.xz" + +LICENSE="AGPL-3 Apache-2.0 MIT BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv" +IUSE="moderncsqlite +sqlite pam" +REQUIRED_USE="?? ( moderncsqlite sqlite )" + +BDEPEND=" + app-text/scdoc +" +RDEPEND=" + acct-user/soju + acct-group/soju + sqlite? ( dev-db/sqlite:3 ) +" +DEPEND="${RDEPEND}" + +src_compile() { + # musl removed legacy LFS64 interfaces in version 1.2.4 temporarily + # reenabled using _LARGEFILE64_SOURCE until this is resolved + # upstream https://github.com/mattn/go-sqlite3/issues/1164 + CGO_CFLAGS="${CGO_CFLAGS}" + if use sqlite; then + GOFLAGS+=" -tags=libsqlite3" + CGO_CFLAGS="-D_LARGEFILE64_SOURCE" + elif use moderncsqlite; then + GOFLAGS+=" -tags=moderncsqlite" + CGO_CFLAGS="-D_LARGEFILE64_SOURCE" + else + GOFLAGS+=" -tags=nosqlite" + fi + # Only way to pass CFLAGS to CGO at the + # moment. https://github.com/gentoo/gentoo/pull/33539/ + export CGO_CFLAGS + use pam && GOFLAGS+=" -tags=pam" + + ego build ${GOFLAGS} ./cmd/soju + ego build ${GOFLAGS} ./cmd/sojudb + ego build ${GOFLAGS} ./cmd/sojuctl + + scdoc <doc/soju.1.scd >doc/soju.1 || die +} + +src_install() { + dobin soju + dobin sojudb + dobin sojuctl + + doman doc/soju.1 + systemd_dounit contrib/soju.service + keepdir /etc/soju + insinto /etc/soju + newins config.in config + newinitd "${FILESDIR}"/soju.initd soju + einstalldocs +} + +pkg_postinst() { + elog "${PN} requires a user database for authenticating clients." + elog "As the soju user, create a database using:" + elog "$ sojudb -config ${EROOT}/etc/soju/config create-user <username> [-admin]" +} diff --git a/net-irc/soju/soju-0.7.0.ebuild b/net-irc/soju/soju-0.7.0.ebuild new file mode 100644 index 000000000000..266c4335c650 --- /dev/null +++ b/net-irc/soju/soju-0.7.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +EAPI=8 + +inherit go-module systemd + +DESCRIPTION="soju is a user-friendly IRC bouncer" +HOMEPAGE="https://soju.im/" +SRC_URI="https://git.sr.ht/~emersion/${PN}/refs/download/v${PV}/${P}.tar.gz" +SRC_URI+=" https://github.com/alfredfo/${PN}-deps/raw/master/${P}-deps.tar.xz" + +LICENSE="AGPL-3 Apache-2.0 MIT BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv" +IUSE="moderncsqlite +sqlite pam" +REQUIRED_USE="?? ( moderncsqlite sqlite )" + +BDEPEND=" + app-text/scdoc +" +RDEPEND=" + acct-user/soju + acct-group/soju + sqlite? ( dev-db/sqlite:3 ) +" +DEPEND="${RDEPEND}" + +src_compile() { + # musl removed legacy LFS64 interfaces in version 1.2.4 temporarily + # reenabled using _LARGEFILE64_SOURCE until this is resolved + # upstream https://github.com/mattn/go-sqlite3/issues/1164 + CGO_CFLAGS="${CGO_CFLAGS}" + if use sqlite; then + GOFLAGS+=" -tags=libsqlite3" + CGO_CFLAGS="-D_LARGEFILE64_SOURCE" + elif use moderncsqlite; then + GOFLAGS+=" -tags=moderncsqlite" + CGO_CFLAGS="-D_LARGEFILE64_SOURCE" + else + GOFLAGS+=" -tags=nosqlite" + fi + # Only way to pass CFLAGS to CGO at the + # moment. https://github.com/gentoo/gentoo/pull/33539/ + export CGO_CFLAGS + use pam && GOFLAGS+=" -tags=pam" + + ego build ${GOFLAGS} ./cmd/soju + ego build ${GOFLAGS} ./cmd/sojudb + ego build ${GOFLAGS} ./cmd/sojuctl + + scdoc <doc/soju.1.scd >doc/soju.1 || die +} + +src_install() { + dobin soju + dobin sojudb + dobin sojuctl + + doman doc/soju.1 + systemd_dounit contrib/soju.service + keepdir /etc/soju + insinto /etc/soju + newins config.in config + newinitd "${FILESDIR}"/soju.initd soju + einstalldocs +} + +pkg_postinst() { + elog "${PN} requires a user database for authenticating clients." + elog "As the soju user, create a database using:" + elog "$ sojudb -config ${EROOT}/etc/soju/config create-user <username> [-admin]" +} diff --git a/net-irc/telepathy-idle/Manifest b/net-irc/telepathy-idle/Manifest index 0983e3c4f7bf..30e326c24a98 100644 --- a/net-irc/telepathy-idle/Manifest +++ b/net-irc/telepathy-idle/Manifest @@ -1,3 +1 @@ -DIST telepathy-idle-0.2.0-py3-1.patch 3849 BLAKE2B 48617c65e8c3af4aa40332eed66c1839b4a9db9c99a4e350fae89879dcbd67c133e0a05fd9a778a5e0ac737ddbf8f999f23095b9a2a3cdef233485b1c9422908 SHA512 41c90befc3bb2df84f35a2f53bbe29885f67a2ceb5dfbf906436655b9400368e74a1a4a6b408f669fa951ae9d50d89bc7e0e2285f50a6fecf1a1d719c307cb24 -DIST telepathy-idle-0.2.0-py3-2.patch 1441 BLAKE2B ea32a2c94216ff320f43c3bf8b537b197c0398507f812eecfab86359e43c53fc2724b2c0d0a0e0a7b342243b07cce38a86f802d9fbc777bba942df939f52a56b SHA512 c9f868f50c5300f4ed06953de935f44e2e87729a36a61d4c1e998d322c1dcdac2759200b66a04c965e9ef591475dfbd5997c83816c6fc2bfb178bfd4bcd260e8 -DIST telepathy-idle-0.2.0.tar.gz 566492 BLAKE2B d0e12bb23b96b7df5afb101ae2c62994777de616d5ea70a10fb2141e68066c7dfaae713340c7f8a2d8ce1f259f302729efa1927eaf7d2a9555120c58e89046f2 SHA512 f5e36afc3ab4b52eb865f2c1e6565b99011a7540fc1a7783d3bbd7bbf50bc671a2147df6bde646c82059a466cc1df9bdb10e2500db5b7bb06d57a989a75c261b +DIST telepathy-idle-0.2.2.tar.gz 606406 BLAKE2B e5d4a19df08bbb59c18d0601357134a6edab085b2b04463b085651f35ee135f0d3f3f27fc35417dcf023913f7ead939161cb1a72cb51824a988aad6c0cb2a136 SHA512 c66cf7b70c84a9b7b1ada01712b8d3b683f15a4021bb2d0f6d868b4ab30e2fb12fd26dd8d5ba25b5050e055bf425295049e84a53198d6586f7cfd7c6bc02f826 diff --git a/net-irc/telepathy-idle/files/telepathy-idle-0.2.0-fixes.patch b/net-irc/telepathy-idle/files/telepathy-idle-0.2.0-fixes.patch deleted file mode 100644 index 07f14f9f4dde..000000000000 --- a/net-irc/telepathy-idle/files/telepathy-idle-0.2.0-fixes.patch +++ /dev/null @@ -1,223 +0,0 @@ -From bf6d596e40e5b9426a68dcd22aa62a697457c4f7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org> -Date: Sat, 13 Feb 2016 10:08:42 +0100 -Subject: [PATCH 1/6] ctcp: Don't bling the non-bling - -When stripping color codes, we currently remove any sequence of digits -following ^C. As color codes use at most two digits, this means that we -also remove any numbers at the start of the colored text - make sure we -stop doing that and only remove digits that are actually part of a color -code. - -https://bugs.freedesktop.org/show_bug.cgi?id=94189 ---- - src/idle-ctcp.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/idle-ctcp.c b/src/idle-ctcp.c -index f282360..f28bf4b 100644 ---- a/src/idle-ctcp.c -+++ b/src/idle-ctcp.c -@@ -98,13 +98,18 @@ gchar *idle_ctcp_kill_blingbling(const gchar *msg) { - case '\x03': /* ^C */ - iter++; - -- while (isdigit(*iter)) -+ /* Color codes are 1-2 digits */ -+ if (isdigit(*iter)) -+ iter++; -+ if (isdigit(*iter)) - iter++; - - if (*iter == ',') { - iter++; - -- while (isdigit(*iter)) -+ if (isdigit(*iter)) -+ iter++; -+ if (isdigit(*iter)) - iter++; - } - break; --- -2.23.0 - -From 5a2510ddea8f165f0808a8841e1dca311c003e20 Mon Sep 17 00:00:00 2001 -From: Diane Trout <diane@ghic.org> -Date: Sat, 4 Nov 2017 23:03:26 -0700 -Subject: [PATCH 2/6] Update self-signed certificate to 2048 bytes with SHA-256 - signature - -Valid for 10 years ---- - tests/twisted/tools/idletest.cert | 26 +++++++++++++++++-------- - tests/twisted/tools/idletest.key | 32 ++++++++++++++++++++++++------- - 2 files changed, 43 insertions(+), 15 deletions(-) - -diff --git a/tests/twisted/tools/idletest.cert b/tests/twisted/tools/idletest.cert -index 655abc2..7ea6bcc 100644 ---- a/tests/twisted/tools/idletest.cert -+++ b/tests/twisted/tools/idletest.cert -@@ -1,10 +1,20 @@ - -----BEGIN CERTIFICATE----- --MIIBTzCB+gIBATANBgkqhkiG9w0BAQQFADAzMRIwEAYDVQQKEwl0ZWxlcGF0aHkx --HTAbBgNVBAsTFHRlbGVwYXRoeSBkZXZlbG9wZXJzMB4XDTA5MDExNDE3NDc0N1oX --DTA5MDExNDE3NDg0N1owMzESMBAGA1UEChMJdGVsZXBhdGh5MR0wGwYDVQQLExR0 --ZWxlcGF0aHkgZGV2ZWxvcGVyczBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC9z/pi --zEMeL+bO3giJVGHGrOHLE7AfDorArwmA0u8Cgu06+J+SW+NJnkj8At4bioxREge6 --yeD6+cHCC9kzXrmXAgMBAAEwDQYJKoZIhvcNAQEEBQADQQBf1qg0gzSztx5pqqM8 --3wI5cEc7k13EzU6X2SkSCSxlMc4pF0hPdr0LuZJpeKBohIgKQ59+3Ny0LuUMEKYW --ikGr -+MIIDUDCCAjigAwIBAgIBATANBgkqhkiG9w0BAQsFADAzMRIwEAYDVQQKEwl0ZWxl -+cGF0aHkxHTAbBgNVBAsTFHRlbGVwYXRoeSBkZXZlbG9wZXJzMB4XDTE3MTEwNTAw -+NTEwMFoXDTE4MTEwNTAwNTEwMFowMzESMBAGA1UEChMJdGVsZXBhdGh5MR0wGwYD -+VQQLExR0ZWxlcGF0aHkgZGV2ZWxvcGVyczCCASIwDQYJKoZIhvcNAQEBBQADggEP -+ADCCAQoCggEBAL3wfZoTzmJqQyjw0tToAflpdmQMTNpzgXvH+uiuu4rWk7oGJsBN -+HZfe4gkoYNLL8PwOGEQcIUN4Y0JU/mc9mSe44Vi0G0t/uJ/gI+CNtHzHjwtwCnYP -+XsbCE69CsarvDVbsQHS6kWfgCYxMA0l+cydUfxuyIoFWjeM4hZs0JwdBGBTAtZkj -+3xo+7Ee3xNBaaOtmoJO/QduAVA0UgiWU69m7Q+5aIuIl9PGOSL4MHqNXq/nwX5Ky -+aFBpXdzmrVn8BophkBgOawp0e+Rhk5fCelyy54lIfpUxeOTP6EtAgsZYbZBPjsuz -+8ewJbdnzcOCwTJpKQv9aHhkTKcK2PkN6tJMCAwEAAaNvMG0wDAYDVR0TAQH/BAIw -+ADAdBgNVHQ4EFgQUuG8blqmQ1SEj/x5OhBc58XFv6vcwCwYDVR0PBAQDAgXgMBEG -+CWCGSAGG+EIBAQQEAwIGQDAeBglghkgBhvhCAQ0EERYPeGNhIGNlcnRpZmljYXRl -+MA0GCSqGSIb3DQEBCwUAA4IBAQBJCT/EPWqv/wUDn7jK4nRXXXwtIL7eYYTAvcJh -+gxtrkkNB1LAp6mnb1WOw+Wbdpf2IgTqfAvpzCRL+kCM80Pqh365JlA5JflzhWxsJ -+xtJQfNfiZhgXKN1rm5lT+U/WgGR6A1serbxUiRN2O6wB8nxtoc7sBJh18pcrwpam -+vOGAolbePV8HPfyBRkCnSw1X6BdifEtxlRCfVWELSI6xQHX8OPTU+uGcvte5uAEi -+7CRRJHlUoojyLOxlJ6IeXh7MjrDIi6tHDqVR9MlRRN3oXhvsN/TtsZUuuC7s280W -+oapk/x7WNDSQsdsi0bmTLrJoZgHzaPRJPCwBFzbj/T1kCC0B - -----END CERTIFICATE----- -diff --git a/tests/twisted/tools/idletest.key b/tests/twisted/tools/idletest.key -index 3a80dab..d579266 100644 ---- a/tests/twisted/tools/idletest.key -+++ b/tests/twisted/tools/idletest.key -@@ -1,9 +1,27 @@ - -----BEGIN RSA PRIVATE KEY----- --MIIBOwIBAAJBAL3P+mLMQx4v5s7eCIlUYcas4csTsB8OisCvCYDS7wKC7Tr4n5Jb --40meSPwC3huKjFESB7rJ4Pr5wcIL2TNeuZcCAwEAAQJBAJLaJc3qWsMwLFJAVjpp --nnwnpUmIoeplRdRtl9yjVWeKrvD2gSh2Qz693dgJbDUGURJecJ+LSS4YMOS+8FLp --KgECIQDhgvqh9KahKphn2/vvcCx3DKBZ7wh9lYIaaAay6IuAhwIhANd5cF48u0ID --39kZCwfhpAKQDxvpqmbnRzB0hISjEpJxAiARfZIo24vM9jvJ2mMI6B9awGzzbLmw --29aya50RZT3kowIhALrT2NJc5iB/K4AZbq8Ovh5auj8Bg3Zl4hvpa11154yBAiAO --F+44Mb+YQi+r526cDv983vCuoU5EM0PbPvJxaWmwtQ== -+MIIEpAIBAAKCAQEAvfB9mhPOYmpDKPDS1OgB+Wl2ZAxM2nOBe8f66K67itaTugYm -+wE0dl97iCShg0svw/A4YRBwhQ3hjQlT+Zz2ZJ7jhWLQbS3+4n+Aj4I20fMePC3AK -+dg9exsITr0Kxqu8NVuxAdLqRZ+AJjEwDSX5zJ1R/G7IigVaN4ziFmzQnB0EYFMC1 -+mSPfGj7sR7fE0Fpo62agk79B24BUDRSCJZTr2btD7loi4iX08Y5Ivgweo1er+fBf -+krJoUGld3OatWfwGimGQGA5rCnR75GGTl8J6XLLniUh+lTF45M/oS0CCxlhtkE+O -+y7Px7Alt2fNw4LBMmkpC/1oeGRMpwrY+Q3q0kwIDAQABAoIBAQC4gJyxh53KMait -+Y0mZcQlB6nULeHtLFDpqL/cGAX3BvvBfGkyYLhCaDvKIrMVo3pxna5Wcy6pwLMhW -+jdNWHBri4A9eKA3/h8Ci5IpVPbFeKEdGd/5hckrBTZLrgyCsh2vwzKtL+FL4kUMV -+Gl1zDbb0NHsIP0CPXLGVT7lQ6xciTidcEcWUh25reGPMew+Xv/fuN2xVOFxwCe5Q -+VdXR7yUFy7ihAyhEhK+TmF5eNRaqKA06KhbA6IME03RiiS/qxVRJgEfarXaibHiX -+KYM612VvZ6GCbQaQBXYGpl2Gnzumro1E49+KgZ6SQlm+2iaDJn1P/vg3rzCUiR37 -+JvgNlap5AoGBAOQxtU5s+PbfdnW4SZu8+k0AtnwxwEvgwZUE5vdij/YApqIHfb2G -+MnuqJ9gNaMBHRoEAM4FXfl6Fjnc2w2fpQxg9U5wFX8bA6EXiqJLgfEbNu5YKPB9e -+BOTgNNrP6FbhwIM6mb0I47Fqzq17uS/GYYd3yRKdL34H9RPgzQms9Ov3AoGBANUV -+doxGnqLoJWb/lLdk7+yRuCmTYwQmIBrAsdWK9mxrlvP5PTc1QRi11E1hcumViFdy -+PBks7TUVmNqynRMaEw5W4VoLl2OrYrDkHxgP6clqwxYFYbldZohxueIdvNDCMLyu -+5/efwEl/NgvnQwb+Z2UHHEP8E3xSl/LrkgCw3P1FAoGBAJlzj+/AOh+RoBCDsAQp -+rcwwaYbU0fJ0ntj+Je8/+X09bNDS5syXPMWKZCbWxZVfmNrQ7tHQq2sWtvoV+oub -+AgJ/4wStXH3EZa3xQNkcWpYmbTn1gf658+KRnxlx7FTYlOPqeU30d2FsaLWi2KJ2 -+7kjx1WZOC4zd/wGyD0+tXjp7AoGAcNM9gwb9hkqfS0s25mhWtY9u0OzOd+rsAt5X -+CzfaRQwu0J3+8NWM01WrxRE9NDtOBudgtP/Z1crKtbnve6bJwkT0a6ZJkae0yO7x -+G9+JLXIPPAC7ftfaq5J0Fyshx/OatL1z6+S1fvURm/nmvrRD8PVz3PeDJcfh1uku -+1JjRWnUCgYAFnAsOddzyRMe52WbeoDbl/AFJZMBbLDb2fI9yGNzy2Y79V0Bvxi3k -+iSp6vHXA2tiVysyeEgVWYOdPmblQ6GRivAW75sgyuma1A0GJqkmd1EPXwbFNod8K -+Ax0XXK2/olLTWtSOs8Cxmopb+V1rpyuTwlhyHc9J4HGEEBeazlYg3A== - -----END RSA PRIVATE KEY----- --- -2.23.0 - -From 0ce3a8fa2bd3f4e72358bb53ecd0acf8fe448483 Mon Sep 17 00:00:00 2001 -From: Diane Trout <diane@ghic.org> -Date: Sat, 4 Nov 2017 23:32:32 -0700 -Subject: [PATCH 3/6] Avoid errors from Python caused by the deliberatly - invalid Unicode - -Because stream.nick is Unicode when sendMessage combines the command, -nick, and invalid utf8 python 2.7 ends up converting everything to -Unicode. Since this test deliberately includes invalid Unicode, Python -notices and throws an exception. - -In Python 3, network traffic is usually encoded as bytes. So I thought -coercing the nick to bytes would be appropriate, and as bytes can contain -anything including invalid Unicode, Python doesn't throw an exception. ---- - tests/twisted/messages/invalid-utf8.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/twisted/messages/invalid-utf8.py b/tests/twisted/messages/invalid-utf8.py -index a48c2f4..725e3bd 100644 ---- a/tests/twisted/messages/invalid-utf8.py -+++ b/tests/twisted/messages/invalid-utf8.py -@@ -33,7 +33,7 @@ def test_with_message(q, stream, parts): - - # Idle's default character set is UTF-8. We send it a message which is - # basically UTF-8, except that one of its code points is invalid. -- stream.sendMessage('PRIVMSG', stream.nick, ':%s' % invalid_utf8, -+ stream.sendMessage('PRIVMSG', bytes(stream.nick), ':%s' % invalid_utf8, - prefix='remoteuser') - - # Idle should signal that *something* was received. If it hasn't validated --- -2.23.0 - -From acf5fcf4d830ae0b5953d8ded8eba4c17726c6f3 Mon Sep 17 00:00:00 2001 -From: Diane Trout <diane@ghic.org> -Date: Mon, 6 Nov 2017 21:46:00 -0800 -Subject: [PATCH 4/6] Returning FALSE from the timer function causes the - timeout to be destroyed - -I asked one of the polari devs and was told that yes it is ok to set -the timer id to zero in the timer function. - -With this patch make check works without changing any of the expected -test results and without any coredumps ---- - src/idle-connection.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/idle-connection.c b/src/idle-connection.c -index 6ab5fea..71c020f 100644 ---- a/src/idle-connection.c -+++ b/src/idle-connection.c -@@ -600,6 +600,7 @@ _force_disconnect (gpointer data) - - IDLE_DEBUG("gave up waiting, forcibly disconnecting"); - idle_server_connection_force_disconnect(priv->conn); -+ priv->force_disconnect_id = 0; - return FALSE; - } - --- -2.23.0 - -From 5e5b677173ef64055b4a7073cb5a15066fc03f70 Mon Sep 17 00:00:00 2001 -From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> -Date: Fri, 14 Feb 2014 12:12:54 +0100 -Subject: [PATCH 5/6] idle-connection: make sure to always reset - force_disconnect_id - -Recent GLib raises a critical when trying to remove an invalid source. - -(cherry picked from commit 12211654baa75db13a05b5c2b3293d1378fcf7a2) ---- - src/idle-connection.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/idle-connection.c b/src/idle-connection.c -index 71c020f..8614d52 100644 ---- a/src/idle-connection.c -+++ b/src/idle-connection.c -@@ -585,6 +585,7 @@ static gboolean _finish_shutdown_idle_func(gpointer data) { - IdleConnectionPrivate *priv = self->priv; - if (priv->force_disconnect_id != 0) { - g_source_remove(priv->force_disconnect_id); -+ priv->force_disconnect_id = 0; - } - - tp_base_connection_finish_shutdown(conn); --- -2.23.0 - diff --git a/net-irc/telepathy-idle/metadata.xml b/net-irc/telepathy-idle/metadata.xml index 4cbddcaa19ad..bcb1e521bc8a 100644 --- a/net-irc/telepathy-idle/metadata.xml +++ b/net-irc/telepathy-idle/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>gnome@gentoo.org</email> <name>Gentoo GNOME Desktop</name> </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">telepathy/telepathy-idle</remote-id> + </upstream> </pkgmetadata> diff --git a/net-irc/telepathy-idle/telepathy-idle-0.2.0-r3.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.2.0-r3.ebuild deleted file mode 100644 index 842f73c12425..000000000000 --- a/net-irc/telepathy-idle/telepathy-idle-0.2.0-r3.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 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit python-single-r1 - -DESCRIPTION="Full-featured IRC connection manager for Telepathy" -HOMEPAGE="https://cgit.freedesktop.org/telepathy/telepathy-idle" -SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz - https://src.fedoraproject.org/rpms/telepathy-idle/raw/93c37581c570200c3f646d0872a9c1327d3b3cb1/f/0001-tools-Fix-errors-running-glib-ginterface-gen-under-P.patch -> ${P}-py3-1.patch - https://src.fedoraproject.org/rpms/telepathy-idle/raw/93c37581c570200c3f646d0872a9c1327d3b3cb1/f/0002-tools-Remove-outdated-is-unicode-checks.patch -> ${P}-py3-2.patch" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - virtual/pkgconfig - test? ( dev-python/twisted-words ) -" -RDEPEND=" - >=dev-libs/dbus-glib-0.51 - >=dev-libs/glib-2.32:2 - >=net-libs/telepathy-glib-0.21 - sys-apps/dbus - ${PYTHON_DEPS} -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-fixes.patch" - "${DISTDIR}"/${P}-py3-{1,2}.patch -) - -src_prepare() { - default - - # Failed in 0.1.16 and code has not moved since october - # Upstream is working on 1.0 - sed -e 's:connect/server-quit-ignore.py::' \ - -e 's:connect/server-quit-noclose.py::' \ - -i tests/twisted/Makefile.{am,in} || die -} diff --git a/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild new file mode 100644 index 000000000000..ccb0f13a940e --- /dev/null +++ b/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit python-single-r1 + +DESCRIPTION="Full-featured IRC connection manager for Telepathy" +HOMEPAGE="https://gitlab.freedesktop.org/telepathy/telepathy-idle" +SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + virtual/pkgconfig +" +RDEPEND=" + >=dev-libs/dbus-glib-0.51 + >=dev-libs/glib-2.32:2 + >=net-libs/telepathy-glib-0.21 + sys-apps/dbus + ${PYTHON_DEPS} +" +DEPEND="${RDEPEND}" diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest index cd58d92f750b..833f4ceb8d9b 100644 --- a/net-irc/unrealircd/Manifest +++ b/net-irc/unrealircd/Manifest @@ -1,3 +1,4 @@ -DIST unrealircd-5.0.6.tar.gz 4975195 BLAKE2B 3ba459e0ec932e9f240825ba9f1fa40e300fe7958f999de86d5653f2e6e4940be8b8da9c885c97bd738abefef601d61da6c4e6c7199c7052d29a74fcf5048828 SHA512 7532e9ab2e039f21796ae813881aec9d34b502ab64efc4323c938232c8901ce882dbcce497ad93df270e4b5fa2e9633c0971f2a6b3213ad458756aea92aa1612 -DIST unrealircd-5.0.7.tar.gz 4995220 BLAKE2B a2996f62b3fe943f9af2cd570866101a501d24f7966378d8e651cf84b9b9d0981fad441b785c6293f4a0668a914cdf191dec52cc6b1e86aac2a51640ca32dbfe SHA512 0b851af26da2ea5d3a04d2ef324d7bd3d3fc820f24d7dfd7e975d6bf1f3954884eb98dc348d291a118d98a214922d3ca1132800381e6f025264856aa06498779 -DIST unrealircd-5.0.8.tar.gz 5013231 BLAKE2B 57365a06b8108239ab10f6cff7d4553b08aa428acb5c635c4b9241c3f82459a5aac18c916a4534f3a8fc9ac1fd4c1d9418c7395233603e576eda40c56d81b110 SHA512 45fc0758a870dbb9c3ff55fc7029d1ecff9dcf65680f31ff331f012efbf9c9bffa60a6fe27b9bab69302d26b8293a1089cfaf1c550a3f2802a549f25e4644770 +DIST unrealircd-5.2.4.tar.gz 7201203 BLAKE2B 06afc8b5e28bbd56971b2ce21da3e000e39366444472786891bfe000754f5fed37b59850f9539b4f01914d6b33c1f9f17a15fe69569620ba5213f39fce1cfcad SHA512 b6784d011bc56b0b8253d61fb1edddb2133e791e9ce4ae978f90059563d11f3f7b3ebca1cf13765b4077ebc39f0699e101bdfc71cbb0c5cf51d508c5a5fdacb3 +DIST unrealircd-5.2.4.tar.gz.asc 866 BLAKE2B 9fc520e93f80a548650b016690036c4e9957e81095f75c34489eb0b83d28548a891196469199cf354207c44b22aaeecfc696995842e9b278ab10fdf5bdb8d7f6 SHA512 0d85a668e2cc3f3d736f3a321e282ecb1fd94d5f605e0e40e8c84a17a6486f8e0d299ec673fe7688fca3ead847f432144ff077547cc90321534406fbe084804b +DIST unrealircd-6.0.4.2.tar.gz 8698501 BLAKE2B e5252dc3e4b332adbbd5a2d435d5be14a7745777dd53b8fa72b79d4cba2c1c92c0f9381b62b9c3031f48347f2ce7086d44f619cb4ec1b4f3a4cd2020f391643b SHA512 2677834660f9e6123ddf5121d9a46908f6071070cc9da085884d6c6ccec9fefc5429effa2890527a1e162984f1c5cd57bcd9cd488e8713613af84fb6d507207d +DIST unrealircd-6.0.4.2.tar.gz.asc 866 BLAKE2B cdfee99a09479d6099ef42e4caa05024b682f35a7d6302b1baa2ac4697b2b430856d9cbd00f0361360050ce5f2a0478dd9c6e1dbb86ec5714de24e5edcfeaeb7 SHA512 3bbad079c486bd072694f246306094a5cdfc7648f49a9ec40743453bec78173454667243a05870a8a19320b31843dfcd15d962d04758cf97cccd8854dbfdfea4 diff --git a/net-irc/unrealircd/files/unrealircd-6.0.4.2-configure-clang16.patch b/net-irc/unrealircd/files/unrealircd-6.0.4.2-configure-clang16.patch new file mode 100644 index 000000000000..d884a1000b52 --- /dev/null +++ b/net-irc/unrealircd/files/unrealircd-6.0.4.2-configure-clang16.patch @@ -0,0 +1,64 @@ +https://github.com/unrealircd/unrealircd/pull/242 + +From 3246e472842237ac9e655e254380c4dd8fea7abc Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 18 Dec 2022 06:18:51 +0000 +Subject: [PATCH] configure.ac: fix -Wimplicit-function-declaration + +Clang 16 makes -Wimplicit-function-declaration error by default. + +Unfortunately, this can lead to misconfiguration or miscompilation of software as configure +tests may then return the wrong result. + +We also fix -Wstrict-prototypes while here as it's easy to do and it prepares +us for C23. + +Fixes the following: +``` +configure:6250: checking if your system has IPv6 support +configure:6275: x86_64-pc-linux-gnu-gcc -o conftest -O2 -pipe -march=native -fdiagnostics-color=always -frecord-gcc-switches -Wreturn-type -ggdb3 -Werror=implicit-function-declaration -Werror=implicit-int -fno-strict-aliasing -fno-common -funsigned-char -Wall -Wextra -Waggregate-return -Wformat-nonliteral -Wduplicated-cond -Wduplicated-branches -Wparentheses -Wno-pointer-sign -Wno-format-zero-length -Wno-format-truncation -Wno-format-overflow -Wno-unused -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-char-subscripts -Wno-sign-compare -Wno-empty-body -Wno-pragmas -Wl,-O1 -Wl,--as-needed -Wl,--defsym=__gentoo_check_ldflags__=0 -Wl,-z,pack-relative-relocs conftest.c >&5 +conftest.c: In function 'main': +conftest.c:30:1: error: implicit declaration of function 'exit' [-Werror=implicit-function-declaration] + 30 | exit(0); /* We only check if the code compiles, that's enough. We can deal with missing runtime IPv6 */ + | ^~~~ +conftest.c:28:1: note: include '<stdlib.h>' or provide a declaration of 'exit' + 27 | #include <sys/socket.h> + +++ |+#include <stdlib.h> + 28 | int main() { +conftest.c:30:1: warning: incompatible implicit declaration of built-in function 'exit' [-Wbuiltin-declaration-mismatch] + 30 | exit(0); /* We only check if the code compiles, that's enough. We can deal with missing runtime IPv6 */ + | ^~~~ +conftest.c:30:1: note: include '<stdlib.h>' or provide a declaration of 'exit' +cc1: some warnings being treated as errors +configure:6275: $? = 1 +``` + +For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2], +or the (new) c-std-porting mailing list [3]. + +[0] https://lwn.net/Articles/913505/ +[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 +[2] https://wiki.gentoo.org/wiki/Modern_C_porting +[3] hosted at lists.linux.dev. +--- a/configure.ac ++++ b/configure.ac +@@ -326,7 +326,7 @@ fi + ]) + AC_CACHE_CHECK(if your system prepends an underscore on symbols,ac_cv_underscore,[ + cat >uscore.c << __EOF__ +-int main() { ++int main(void) { + return 0; + } + __EOF__ +@@ -354,7 +354,8 @@ AC_CACHE_CHECK([if your system has IPv6 support], [ac_cv_ip6], [ + AC_TRY_RUN([ + #include <sys/types.h> + #include <sys/socket.h> +-int main() { ++#include <stdlib.h> ++int main(void) { + int s = socket(AF_INET6, SOCK_STREAM, 0); + exit(0); /* We only check if the code compiles, that's enough. We can deal with missing runtime IPv6 */ + } + diff --git a/net-irc/unrealircd/files/unrealircd.confd-r3 b/net-irc/unrealircd/files/unrealircd.confd-r4 index 66d9878f014c..934ac0e3f59f 100644 --- a/net-irc/unrealircd/files/unrealircd.confd-r3 +++ b/net-irc/unrealircd/files/unrealircd.confd-r4 @@ -1,6 +1,11 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Where to chroot to +# Uncomment this line for chrooting +#UNREALIRCD_CHROOT="/var/chroot/ircd" +UNREALIRCD_CHROOT="" + # Which configuration file to load instead of unrealircd.conf. If you # want to run multiple instances of unrealircd, you must edit # files::pidfile to match UNREALIRCD_PIDFILE. You should also ensure @@ -12,10 +17,10 @@ # that the scheme unrealircd.${instance_name} be used. For each # instance, you may make a copy of this file with the appropriate name # to override default options specific to that instance. -UNREALIRCD_CONF="/etc/unrealircd/${SVCNAME}.conf" +UNREALIRCD_CONF="${UNREALIRCD_CHROOT}/etc/unrealircd/${SVCNAME}.conf" # The path where unrealircd is configured to create its pidfile. -UNREALIRCD_PIDFILE="/run/unrealircd/${SVCNAME#unreal}.pid" +UNREALIRCD_PIDFILE="${UNREALIRCD_CHROOT}/run/unrealircd/${SVCNAME#unreal}.pid" # extra options to pass to unrealircd ... # You should not specify the -f option here; use diff --git a/net-irc/unrealircd/files/unrealircd.initd-r2 b/net-irc/unrealircd/files/unrealircd.initd-r2 deleted file mode 100644 index 7d733a6e185a..000000000000 --- a/net-irc/unrealircd/files/unrealircd.initd-r2 +++ /dev/null @@ -1,38 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Defaults -: ${UNREALIRCD_CONF:=/etc/unrealircd/${SVCNAME}.conf} -: ${UNREALIRCD_PIDFILE:=/run/unrealircd/${SVCNAME#unreal}.pid} - -command="/usr/bin/unrealircd" -# Run the daemon in the foreground and let OpenRC background it. -# This way the PID file is created securely, as root. -command_args="-F -f ${UNREALIRCD_CONF} ${UNREALIRCD_OPTS}" -command_user=unrealircd -command_background=true -pidfile="${UNREALIRCD_PIDFILE}" -start_stop_daemon_args="${UNREALIRCD_SSD_OPTS}" -extra_started_commands="reload" - -depend() { - use dns net - provide ircd -} - -# It is unsafe for the unrealircd user to be able to write to its own -# PID file, since root will be sending e.g. kill signals to the PID -# listed in that file. Ensure that we overwrite the ownership and -# permissions on /run/unrealircd from previous init scripts. -start_pre() { - checkpath --directory --owner root:root --mode 0700 /run/unrealircd -} - -reload() { - ebegin "Reloading ${RC_SVCNAME}" - start-stop-daemon --signal HUP \ - --pidfile "${pidfile}" \ - ${UNREALIRCD_SSD_OPTS} - eend $? -} diff --git a/net-irc/unrealircd/files/unrealircd.initd-r3 b/net-irc/unrealircd/files/unrealircd.initd-r3 new file mode 100644 index 000000000000..5bc03001e87f --- /dev/null +++ b/net-irc/unrealircd/files/unrealircd.initd-r3 @@ -0,0 +1,63 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Defaults +: ${UNREALIRCD_CONF:=/etc/unrealircd/${SVCNAME}.conf} +: ${UNREALIRCD_PIDFILE:=/run/unrealircd/${SVCNAME#unreal}.pid} + +# Convenience variable for the chroot bits, not actually user-controllable via conf.d +UNREALIRCD_USER="unrealircd" +UNREALIRCD_BIN="/usr/bin/unrealircd" +UNREALIRCD_COMMAND_ARGS="-F -f ${UNREALIRCD_CONF} ${UNREALIRCD_OPTS}" + +# Run the daemon in the foreground and let OpenRC background it. +# This way the PID file is created securely, as root. +# https://bugs.unrealircd.org/view.php?id=4990 +# https://bugs.gentoo.org/628434 +command_args="${UNREALIRCD_COMMAND_ARGS}" +command_background=true +pidfile="${UNREALIRCD_PIDFILE}" + +start_stop_daemon_args="${UNREALIRCD_SSD_OPTS}" +extra_started_commands="checkconfig reload" + +if [ -n "${UNREALIRCD_CHROOT}" ]; then + command=/usr/bin/chroot + command_args="--userspec ${UNREALIRCD_USER}:${UNREALIRCD_USER} ${UNREALIRCD_CHROOT} ${UNREALIRCD_BIN} ${UNREALIRCD_COMMAND_ARGS}" +else + # We're running it directly so no need for anything special. + command="${UNREALIRCD_BIN}" + command_user=${UNREALIRCD_USER} +fi + +checkconfig() { + # command_args weirdness because we want to preserve the chroot arguments if it's set + # Only run the configtest for the main instance; it can't work right now for others (no way to specify config file) + [ ${SVCNAME} = unrealircd ] && su -s /bin/sh ${command_user:=root} -c "${command} ${command_args%${UNREALIRCD_COMMAND_ARGS}}" configtest +} + +depend() { + use dns net + provide ircd +} + +# It is unsafe for the unrealircd user to be able to write to its own +# PID file, since root will be sending e.g. kill signals to the PID +# listed in that file. Ensure that we overwrite the ownership and +# permissions on /run/unrealircd from previous init scripts. +start_pre() { + checkpath --directory --owner root:root --mode 0700 "${UNREALIRCD_CHROOT}"/run/unrealircd + + checkconfig || return $? +} + +reload() { + checkconfig || return $? + + ebegin "Reloading ${RC_SVCNAME}" + start-stop-daemon --signal HUP \ + --pidfile "${pidfile}" \ + ${UNREALIRCD_SSD_OPTS} + eend $? +} diff --git a/net-irc/unrealircd/files/unrealircd.tmpfiles b/net-irc/unrealircd/files/unrealircd.tmpfiles new file mode 100644 index 000000000000..37afe71d1d30 --- /dev/null +++ b/net-irc/unrealircd/files/unrealircd.tmpfiles @@ -0,0 +1,2 @@ +d /run/unrealircd 755 unrealircd unrealircd + diff --git a/net-irc/unrealircd/metadata.xml b/net-irc/unrealircd/metadata.xml index a265e93f2b47..e2c92b2ab5c3 100644 --- a/net-irc/unrealircd/metadata.xml +++ b/net-irc/unrealircd/metadata.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>kensington@gentoo.org</email> + <email>sam@gentoo.org</email> + <name>Sam James</name> </maintainer> <use> <flag name="class-nofakelag">Enable an unsupported class::options flag called “nofakelag” allowing you to grant fakelag exemption to normal user (instead of just opers).</flag> @@ -11,4 +12,7 @@ <flag name="operoverride-verify">Enable requiring opers to invite themselves to +s/+p channels</flag> <flag name="operoverride">Enable OperOverride extension</flag> </use> + <upstream> + <remote-id type="github">unrealircd/unrealircd</remote-id> + </upstream> </pkgmetadata> diff --git a/net-irc/unrealircd/unrealircd-5.0.6.ebuild b/net-irc/unrealircd/unrealircd-5.0.6.ebuild deleted file mode 100644 index f7f86359b533..000000000000 --- a/net-irc/unrealircd/unrealircd-5.0.6.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# 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 - - 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-r1.ebuild b/net-irc/unrealircd/unrealircd-5.0.7-r1.ebuild deleted file mode 100644 index 4807b6d11438..000000000000 --- a/net-irc/unrealircd/unrealircd-5.0.7-r1.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# 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 deleted file mode 100644 index 438a6541a211..000000000000 --- a/net-irc/unrealircd/unrealircd-5.0.7.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# 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-r2.ebuild b/net-irc/unrealircd/unrealircd-5.2.4-r1.ebuild index df06523b4325..8a5894b0be4d 100644 --- a/net-irc/unrealircd/unrealircd-5.0.7-r2.ebuild +++ b/net-irc/unrealircd/unrealircd-5.2.4-r1.ebuild @@ -1,32 +1,34 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 SSL_CERT_MANDATORY=1 -inherit ssl-cert systemd +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/unrealircd.asc +inherit autotools ssl-cert systemd verify-sig DESCRIPTION="An advanced Internet Relay Chat daemon" HOMEPAGE="https://www.unrealircd.org/" SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz" +SRC_URI+=" verify-sig? ( https://www.unrealircd.org/downloads/${P}.tar.gz.asc )" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux" -IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes" +KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86 ~amd64-linux" +IUSE="class-nofakelag curl +operoverride operoverride-verify +prefixaq showlistmodes" -RDEPEND=" - acct-group/unrealircd +RDEPEND="acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 + dev-libs/libsodium:= + dev-libs/openssl:0= >=net-dns/c-ares-1.7:= - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - curl? ( net-misc/curl[adns] ) -" + virtual/libcrypt:= + curl? ( net-misc/curl[adns] )" DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" +BDEPEND="virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-unrealircd )" DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} ) @@ -44,7 +46,11 @@ src_prepare() { sed -i -e 's:^//#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die fi - eapply_user + # File is missing from the 5.0.9.1 tarball + sed -i -e '/unrealircd-upgrade-script/d' configure.ac || die + + default + eautoreconf } src_configure() { @@ -56,7 +62,7 @@ src_configure() { --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 \ + --with-modulesdir="${EPREFIX}/usr/$(get_libdir)"/${PN}/modules \ --without-privatelibdir \ --with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \ --with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \ @@ -102,8 +108,8 @@ src_install() { einstalldocs - newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN} - newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN} + newinitd "${FILESDIR}"/${PN}.initd-r3 ${PN} + newconfd "${FILESDIR}"/${PN}.confd-r4 ${PN} # config should be read-only fperms -R 0640 /etc/${PN} @@ -164,7 +170,7 @@ s/"and another one";/"'"${keys[2]}"'";/ eend $? fi - elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf" + elog "UnrealIRCd will not run until you've set up ${EROOT}/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." diff --git a/net-irc/unrealircd/unrealircd-5.0.8.ebuild b/net-irc/unrealircd/unrealircd-6.0.4.2.ebuild index 48b03f3e0792..dbccbe87ef94 100644 --- a/net-irc/unrealircd/unrealircd-5.0.8.ebuild +++ b/net-irc/unrealircd/unrealircd-6.0.4.2.ebuild @@ -1,35 +1,47 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 SSL_CERT_MANDATORY=1 -inherit ssl-cert systemd +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/unrealircd.asc +inherit autotools ssl-cert systemd tmpfiles verify-sig DESCRIPTION="An advanced Internet Relay Chat daemon" HOMEPAGE="https://www.unrealircd.org/" SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz" +SRC_URI+=" verify-sig? ( https://www.unrealircd.org/downloads/${P}.tar.gz.asc )" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux" -IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes" +KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux" +IUSE="class-nofakelag curl geoip +operoverride operoverride-verify" RDEPEND=" acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 + dev-libs/libsodium:= + dev-libs/openssl:= + dev-libs/jansson:= >=net-dns/c-ares-1.7:= - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) + virtual/libcrypt:= curl? ( net-misc/curl[adns] ) + geoip? ( dev-libs/libmaxminddb ) " DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" +BDEPEND=" + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-unrealircd ) +" DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} ) +PATCHES=( + "${FILESDIR}"/${PN}-6.0.4.2-configure-clang16.patch +) + src_prepare() { # QA check against bundled pkgs rm -r extras || die @@ -44,7 +56,11 @@ src_prepare() { sed -i -e 's:^//#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die fi - eapply_user + # File is missing from the 5.0.9.1 tarball + sed -i -e '/unrealircd-upgrade-script/d' configure.ac || die + + default + eautoreconf } src_configure() { @@ -56,7 +72,7 @@ src_configure() { --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 \ + --with-modulesdir="${EPREFIX}/usr/$(get_libdir)"/${PN}/modules \ --without-privatelibdir \ --with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \ --with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \ @@ -66,13 +82,15 @@ src_configure() { --with-system-argon2 \ --with-system-cares \ --with-system-pcre2 \ + --with-system-sodium \ + --with-system-jansson \ --enable-dynamic-linking \ + --with-controlfile="${EPREFIX}"/run/${PN}/unrealircd.ctl \ --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) + $(use_with operoverride-verify) \ + $(use_enable geoip libmaxminddb) } src_install() { @@ -80,6 +98,9 @@ src_install() { keepdir /var/lib/${PN}/tmp newbin src/ircd ${PN} + dobin src/unrealircdctl + + newtmpfiles "${FILESDIR}"/unrealircd.tmpfiles unrealircd.conf ( cd src/modules || die @@ -102,8 +123,8 @@ src_install() { einstalldocs - newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN} - newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN} + newinitd "${FILESDIR}"/${PN}.initd-r3 ${PN} + newconfd "${FILESDIR}"/${PN}.confd-r4 ${PN} # config should be read-only fperms -R 0640 /etc/${PN} @@ -123,6 +144,8 @@ src_install() { } pkg_postinst() { + tmpfiles_process unrealircd.conf + # 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 @@ -142,10 +165,10 @@ pkg_postinst() { 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 + if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"Oozahho1raezoh0iMee4ohvegaifahv5xaepeitaich9tahdiquaid0geecipahdauVaij3zieph4ahi";$' "${unrealircd_conf}"; then ebegin "Generating cloak-keys" local keys=( - $(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3") + $(su ${PN} -s "${EPREFIX}"/bin/sh -c "${PN} -k 2>&1 | tail -n 6 | head -n 3") ) [[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]] eend $? @@ -154,17 +177,17 @@ pkg_postinst() { sed -i \ -e '/cloak-keys/ { n -s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/ +s/"Oozahho1raezoh0iMee4ohvegaifahv5xaepeitaich9tahdiquaid0geecipahdauVaij3zieph4ahi";/'${keys[0]}'/ n -s/"and another one";/"'"${keys[1]}"'";/ +s/"and another one";/'${keys[1]}'/ n -s/"and another one";/"'"${keys[2]}"'";/ +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 "UnrealIRCd will not run until you've set up ${EROOT}/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." diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest index 0b617bc913ec..c25323f624cd 100644 --- a/net-irc/weechat/Manifest +++ b/net-irc/weechat/Manifest @@ -1,3 +1,10 @@ -DIST weechat-2.9.tar.xz 2206584 BLAKE2B 8089cd846ca192ec666a50e8071ed57e1c2518b2d5ea98733b8e3fa6c8c684e8ed14253d787b3f9995a8f481a7413444c3ba262dcb6c100283192bcafb502627 SHA512 c4a5723accb417c0496b5427ee58fbf5d3e842e6d79a7988f8680cd605534cfc9d30f6f4844afe45f5223458f28b8deff1284fff2fb5b7d04cb99a81cde4e13e -DIST weechat-3.0.1.tar.xz 2215312 BLAKE2B 204c110259528c485a832a750a34c6b408e24c9b9c9797d41e2e2bfd5e33dcd4aa7c80c4478e8825155363048306a48bcbc61469813b9a82247c6cbffcc385a7 SHA512 d5b2949b668f622c08d60764aa230f8a4901d358facf83ab13428709854b173830aafe65fec86abacbea08ffe89e6e34131a5e4de37bbb5409454fa223f7885e -DIST weechat-3.0.tar.xz 2215408 BLAKE2B ed43c16af2a9fea101b54714e21d5f28f2b18fed5734c5f6adde857500befd94089f6bd7be5e2ad2738fce4e1bd5b10ebef32d0d46039242efaa2dc7f664eb42 SHA512 d6a68f35dc7363b838af811ff0a0a8d9fff519a4231c66f963e896bdda8653a56608e46333dc866e7dee25c1eafd2f1bf99c443089dde5a268bba637a0dee8ca +DIST weechat-4.0.4.tar.xz 2575788 BLAKE2B aa9d2ad5946ddb72a0dc32e58d43f9e6655fb1ceb448dc6f68644dcc760f7531ed275e4d92b121d6873c7bd1c631cd9ee58c476b47581100f64ed907dd88532a SHA512 ddd150dad253cf4d9bc96122d2d3951c696b19f796a7cbf159edc258d4b18f1b2544b7b62362e7b59d6b3ff3e756de3ce4aaff83b02d3fe2d1cb614162965efd +DIST weechat-4.0.4.tar.xz.asc 833 BLAKE2B 5eed470b576e7980f67eb649bdaddabf6fad33149b5d93702c11f47b0219b0f983641f4b2e0c8a466b472191b49147f732d361ec563fd9317a7735cae22f5ce1 SHA512 7242ae9f71e2b3db19033a522698bf2209651438039aa0aa784b6bcf150e6f6de521b4f84acb11f1208658076c1c97bfb869dacbdf131a438ad68d03e994232d +DIST weechat-4.0.8.tar.xz 2580240 BLAKE2B 4845307a3c3b80cf77387e49a43875ab8c6c83d21e73902725f7860ed1fbebc5b823a8df0074f3a51e1e11c25058879aa772e424704a69cdc379f566efb8beaf SHA512 d54cf070e1e2d5d987cfd10ab469c7cad730f7c73353d4bd474b91ae0f66c4d53eff4031602a324dd6750e5270b603f1dd60c9beeb4c8d3489c28fa1470f8642 +DIST weechat-4.0.8.tar.xz.asc 833 BLAKE2B b25dfe8eb4b257bcd0ca4eceb1736a790672abbd375f7c44400a008cc2072705eb294d65371aa4be99d1deaf8e1bc248189903d38d29e9c1159e337fa0e3c9a7 SHA512 7835f2e752bd8d06869639ed844ff4855a187117b3f57358fa6647ea81f0c9f011c8e4532b92d568430108b7d480e94bdda86e6e21c5f90f17a56b3eaa2182bf +DIST weechat-4.1.2.tar.xz 2635776 BLAKE2B cd11602b74c65ae4ed129c3604afc1eff154494ef239ead1cbcf2e9e54fba5c53b292c52b11887c48e3587dca3ab5b42073af77623087a2d185c9540368a63ab SHA512 9df8b43a7210f06cece1d28fcf8559885a0d5590b5691f63205b215417f132e4d74f4af18b572daae2679d5cf574b61538a7067e03087be10e831fee4f55e115 +DIST weechat-4.1.2.tar.xz.asc 833 BLAKE2B 94d700e074393c4bde8b68bacfe4a37d022f82bbd9697b12a1cf1e98cbb15a4295689c704ce8eaaf095ca96c4eea8c63275232a5ca6f40ab09d534fff24e76c5 SHA512 44cc5be0700b7979c85e44a1037fd467a6a920f22dc831fd3263fe6d8967eda001d09126b33adaed385c4082e33b8849cba3dbec48f4900e50e10f4da32a6edd +DIST weechat-4.1.3.tar.xz 2635936 BLAKE2B b810dc49f817f35b121037663e36dded1dd1f56b8ea7db6b18d60731993efeca956f8ec871001ced480094f1fc2e63c276047c44d1fc1ec27bb13622be1ffc84 SHA512 e33c29ddcaa49aba94f0a7ceada9fd0df0ea63a843ab752eb35d8b1a68ca151ae8d58ab66ec18f82d7ba7846cacaef8a19edcbf4e70f6ae10dd9a3cf09955bb0 +DIST weechat-4.1.3.tar.xz.asc 833 BLAKE2B 3db658a0323dedbe0cd1d057139d3fef216441538391ba36cb4b2763cb80bbd32ddd36f2a0f2330bdcd73722fdd73f02eff39da61a61bfda7a4fd8aaa1f98abb SHA512 054844c78dfeaa60e8a027e96aff994009c07b871b9fd712e3650a709c5bdf7ca1da8b4eb6251c82152153fc4e765f032760387b2a89840effd389d6532ea170 +DIST weechat-4.2.1.tar.xz 2594044 BLAKE2B 336f5f1560a834601ac5a7e6924dfabcc85fdf00f1533f1c5d1d7f2cc627d2b3ca35819b16ed30328271699cf8c314fb33164a9353a7beebc591ae175107f290 SHA512 e9ed67cd45b374435b05043dd9f085d30f4b429dff1afa82fe5f50522283faa86b5e6909ec1f51af033a612abe5f52f4441433bcc94e59027fc5ccff86e84c62 +DIST weechat-4.2.1.tar.xz.asc 833 BLAKE2B abd7e8299e748c228aac82cdfbe4591c75b94d4e213842444ae4332cec316d114b1262f2fcfe92245b236e012c27b942a26e1c018dce0cb0bc4bd0f34584308a SHA512 1f510ea85fd5eef667d738674182dcc78af42d0ea092a7df696f6210657c5d7f13bb631a332b87e1e127d1b40eac17603147fd05eeac363401b705e38fbaf3d5 diff --git a/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch b/net-irc/weechat/files/weechat-3.3-cmake_lua_version.patch index 6ed16efbd064..150fb28b680f 100644 --- a/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch +++ b/net-irc/weechat/files/weechat-3.3-cmake_lua_version.patch @@ -1,9 +1,9 @@ --- a/cmake/FindLua.cmake +++ b/cmake/FindLua.cmake @@ -35,5 +35,5 @@ - + find_package(PkgConfig) if(PKG_CONFIG_FOUND) -- pkg_search_module(LUA lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua) +- pkg_search_module(LUA lua5.4 lua-5.4 lua54 lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua) + pkg_search_module(LUA lua) endif() diff --git a/net-irc/weechat/metadata.xml b/net-irc/weechat/metadata.xml index fcdde9d1fb93..905904120abb 100644 --- a/net-irc/weechat/metadata.xml +++ b/net-irc/weechat/metadata.xml @@ -1,22 +1,36 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> + <maintainer type="person" proxied="yes"> + <email>zoltan@sinustrom.info</email> + <name>Zoltan Puskas</name> + </maintainer> + <maintainer type="person" proxied="yes"> + <email>leohdz172@proton.me</email> + <name>Leonardo Hernández Hernández</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <use> <flag name="alias">Enable plugin for alias control</flag> <flag name="buflist">Enable buflist plugin</flag> <flag name="charset">Enable encoding conversions</flag> + <flag name="enchant">Enable spell checker plugin via Enchant instead of GNU Aspell</flag> <flag name="exec">Enable exec plugin</flag> <flag name="fset">Enable fast set plugin</flag> <flag name="fifo">Enable FIFO support (sh pipes)</flag> <flag name="irc">Enable IRC protocol support</flag> <flag name="logger">Enable support for logging</flag> <flag name="relay">Enable relay plugin (experimental)</flag> + <flag name="relay-api">Enable json API support for the relay plugin (experimental)</flag> <flag name="scripts">Build infrastructure for scripting</flag> <flag name="trigger">Enable trigger plugin</flag> + <flag name="typing">Enable typing plugin</flag> <flag name="xfer">Enable xfer plugin support</flag> </use> + <upstream> + <remote-id type="github">weechat/weechat</remote-id> + </upstream> </pkgmetadata> diff --git a/net-irc/weechat/weechat-3.0-r100.ebuild b/net-irc/weechat/weechat-4.0.4.ebuild index f647e79421f6..a9a7e3727020 100644 --- a/net-irc/weechat/weechat-3.0-r100.ebuild +++ b/net-irc/weechat/weechat-4.0.4.ebuild @@ -1,55 +1,73 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..4} ) -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake lua-single python-single-r1 xdg-utils +inherit cmake lua-single python-single-r1 xdg if [[ ${PV} == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/weechat/weechat.git" else - SRC_URI="https://weechat.org/files/src/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~x64-macos" + inherit verify-sig + SRC_URI="https://weechat.org/files/src/${P}.tar.xz + verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/weechat.org.asc + BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )" + KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~x64-macos" fi DESCRIPTION="Portable and multi-interface IRC client" HOMEPAGE="https://weechat.org/" LICENSE="GPL-3" -SLOT="0" +SLOT="0/${PV}" NETWORKS="+irc" -PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer" +PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer" # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support -SCRIPT_LANGS="guile lua +perl php +python ruby tcl" +# dev-lang/php eclass support is lacking, php plugins don't work. bug #705702 +SCRIPT_LANGS="guile lua +perl +python ruby tcl" LANGS=" cs de es fr it ja pl ru" -IUSE="doc man nls test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" +IUSE="doc enchant man nls selinux test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" REQUIRED_USE=" + enchant? ( spell ) lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) test? ( nls ) " RDEPEND=" + app-arch/zstd:= dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) - guile? ( >=dev-scheme/guile-2.0 ) + guile? ( >=dev-scheme/guile-2.0:12= ) lua? ( ${LUA_DEPS} ) nls? ( virtual/libintl ) - perl? ( dev-lang/perl:= ) - php? ( >=dev-lang/php-7.0:*[embed] ) + perl? ( + dev-lang/perl:= + virtual/libcrypt:= + ) python? ( ${PYTHON_DEPS} ) - ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) - spell? ( app-text/aspell ) + ruby? ( + || ( + dev-lang/ruby:3.1 + dev-lang/ruby:3.0 + ) + ) + selinux? ( sec-policy/selinux-irc ) + spell? ( + enchant? ( app-text/enchant:* ) + !enchant? ( app-text/aspell ) + ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) " @@ -57,7 +75,7 @@ DEPEND="${RDEPEND} test? ( dev-util/cpputest ) " -BDEPEND=" +BDEPEND+=" virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) @@ -65,7 +83,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch + "${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch ) DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc" @@ -91,17 +109,21 @@ src_prepare() { done # install only required documentation ; en always - for i in $(grep add_subdirectory doc/CMakeLists.txt \ - | sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do - if ! has ${i} ${LINGUAS-${i}} ; then - sed -i \ - -e '/add_subdirectory('${i}')/d' \ - doc/CMakeLists.txt || die - fi + local j + for i in $(grep -e 'set(.*en.*)$' doc/CMakeLists.txt \ + | sed -e 's/.*set(\(\w\+\).*/\1/'); do + for j in $(grep set.${i} doc/CMakeLists.txt \ + | sed -e "s/.*${i}\(.*\)).*/\1/" -e 's/ en//'); do + if ! has ${j} ${LINGUAS-${j}} ; then + sed -i \ + -e "s/\(set(${i}.*\) ${j}/\1/" \ + doc/CMakeLists.txt || die + fi + done done # install docs in correct directory - sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die + sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/CMakeLists.txt || die if [[ ${CHOST} == *-darwin* ]]; then # fix linking error on Darwin @@ -115,14 +137,20 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DLIBDIR=/usr/$(get_libdir) + -DLIBDIR="${EPREFIX}/usr/$(get_libdir)" -DENABLE_JAVASCRIPT=OFF -DENABLE_LARGEFILE=ON -DENABLE_NCURSES=ON + -DENABLE_PHP=OFF -DENABLE_ALIAS=$(usex alias) -DENABLE_BUFLIST=$(usex buflist) -DENABLE_CHARSET=$(usex charset) - -DENABLE_DOC=$(usex doc) + # -DENABLE_DOC requires all plugins (except javascript). + # https://github.com/weechat/weechat/blob/v4.0.2/CMakeLists.txt#L144 + # Impossible since php was dropped in net-irc/weechat-3.5.r1.ebuild. bug #705702 + -DENABLE_DOC=OFF + -DENABLE_DOC_INCOMPLETE=$(usex doc) + -DENABLE_ENCHANT=$(usex enchant) -DENABLE_EXEC=$(usex exec) -DENABLE_FIFO=$(usex fifo) -DENABLE_FSET=$(usex fset) @@ -133,7 +161,6 @@ src_configure() { -DENABLE_MAN=$(usex man) -DENABLE_NLS=$(usex nls) -DENABLE_PERL=$(usex perl) - -DENABLE_PHP=$(usex php) -DENABLE_PYTHON=$(usex python) -DENABLE_RELAY=$(usex relay) -DENABLE_RUBY=$(usex ruby) @@ -143,6 +170,7 @@ src_configure() { -DENABLE_TCL=$(usex tcl) -DENABLE_TESTS=$(usex test) -DENABLE_TRIGGER=$(usex trigger) + -DENABLE_TYPING=$(usex typing) -DENABLE_XFER=$(usex xfer) ) cmake_src_configure @@ -156,15 +184,3 @@ src_test() { die "required locale missing" fi } - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/net-irc/weechat/weechat-3.0.1.ebuild b/net-irc/weechat/weechat-4.0.8.ebuild index f8abf272affc..bfad506a743d 100644 --- a/net-irc/weechat/weechat-3.0.1.ebuild +++ b/net-irc/weechat/weechat-4.0.8.ebuild @@ -1,55 +1,73 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..4} ) -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake lua-single python-single-r1 xdg-utils +inherit cmake lua-single python-single-r1 xdg if [[ ${PV} == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/weechat/weechat.git" else - SRC_URI="https://weechat.org/files/src/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos" + inherit verify-sig + SRC_URI="https://weechat.org/files/src/${P}.tar.xz + verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/weechat.org.asc + BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos" fi DESCRIPTION="Portable and multi-interface IRC client" HOMEPAGE="https://weechat.org/" LICENSE="GPL-3" -SLOT="0" +SLOT="0/${PV}" NETWORKS="+irc" -PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer" +PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer" # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support -SCRIPT_LANGS="guile lua +perl php +python ruby tcl" +# dev-lang/php eclass support is lacking, php plugins don't work. bug #705702 +SCRIPT_LANGS="guile lua +perl +python ruby tcl" LANGS=" cs de es fr it ja pl ru" -IUSE="doc man nls test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" +IUSE="doc enchant man nls selinux test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" REQUIRED_USE=" + enchant? ( spell ) lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) test? ( nls ) " RDEPEND=" + app-arch/zstd:= dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) - guile? ( >=dev-scheme/guile-2.0 ) + guile? ( >=dev-scheme/guile-2.0:12= ) lua? ( ${LUA_DEPS} ) nls? ( virtual/libintl ) - perl? ( dev-lang/perl:= ) - php? ( >=dev-lang/php-7.0:*[embed] ) + perl? ( + dev-lang/perl:= + virtual/libcrypt:= + ) python? ( ${PYTHON_DEPS} ) - ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) - spell? ( app-text/aspell ) + ruby? ( + || ( + dev-lang/ruby:3.2 + dev-lang/ruby:3.1 + ) + ) + selinux? ( sec-policy/selinux-irc ) + spell? ( + enchant? ( app-text/enchant:* ) + !enchant? ( app-text/aspell ) + ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) " @@ -57,7 +75,7 @@ DEPEND="${RDEPEND} test? ( dev-util/cpputest ) " -BDEPEND=" +BDEPEND+=" virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) @@ -65,7 +83,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch + "${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch ) DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc" @@ -91,17 +109,21 @@ src_prepare() { done # install only required documentation ; en always - for i in $(grep add_subdirectory doc/CMakeLists.txt \ - | sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do - if ! has ${i} ${LINGUAS-${i}} ; then - sed -i \ - -e '/add_subdirectory('${i}')/d' \ - doc/CMakeLists.txt || die - fi + local j + for i in $(grep -e 'set(.*en.*)$' doc/CMakeLists.txt \ + | sed -e 's/.*set(\(\w\+\).*/\1/'); do + for j in $(grep set.${i} doc/CMakeLists.txt \ + | sed -e "s/.*${i}\(.*\)).*/\1/" -e 's/ en//'); do + if ! has ${j} ${LINGUAS-${j}} ; then + sed -i \ + -e "s/\(set(${i}.*\) ${j}/\1/" \ + doc/CMakeLists.txt || die + fi + done done # install docs in correct directory - sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die + sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/CMakeLists.txt || die if [[ ${CHOST} == *-darwin* ]]; then # fix linking error on Darwin @@ -115,14 +137,20 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DLIBDIR=/usr/$(get_libdir) + -DLIBDIR="${EPREFIX}/usr/$(get_libdir)" -DENABLE_JAVASCRIPT=OFF -DENABLE_LARGEFILE=ON -DENABLE_NCURSES=ON + -DENABLE_PHP=OFF -DENABLE_ALIAS=$(usex alias) -DENABLE_BUFLIST=$(usex buflist) -DENABLE_CHARSET=$(usex charset) - -DENABLE_DOC=$(usex doc) + # -DENABLE_DOC requires all plugins (except javascript). + # https://github.com/weechat/weechat/blob/v4.0.2/CMakeLists.txt#L144 + # Impossible since php was dropped in net-irc/weechat-3.5.r1.ebuild. bug #705702 + -DENABLE_DOC=OFF + -DENABLE_DOC_INCOMPLETE=$(usex doc) + -DENABLE_ENCHANT=$(usex enchant) -DENABLE_EXEC=$(usex exec) -DENABLE_FIFO=$(usex fifo) -DENABLE_FSET=$(usex fset) @@ -133,7 +161,6 @@ src_configure() { -DENABLE_MAN=$(usex man) -DENABLE_NLS=$(usex nls) -DENABLE_PERL=$(usex perl) - -DENABLE_PHP=$(usex php) -DENABLE_PYTHON=$(usex python) -DENABLE_RELAY=$(usex relay) -DENABLE_RUBY=$(usex ruby) @@ -143,6 +170,7 @@ src_configure() { -DENABLE_TCL=$(usex tcl) -DENABLE_TESTS=$(usex test) -DENABLE_TRIGGER=$(usex trigger) + -DENABLE_TYPING=$(usex typing) -DENABLE_XFER=$(usex xfer) ) cmake_src_configure @@ -156,15 +184,3 @@ src_test() { die "required locale missing" fi } - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/net-irc/weechat/weechat-3.0.ebuild b/net-irc/weechat/weechat-4.1.2.ebuild index b33c433ae6d2..d263600453ca 100644 --- a/net-irc/weechat/weechat-3.0.ebuild +++ b/net-irc/weechat/weechat-4.1.2.ebuild @@ -1,34 +1,42 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) +LUA_COMPAT=( lua5-{1..4} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake python-single-r1 xdg-utils +inherit cmake lua-single python-single-r1 xdg if [[ ${PV} == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/weechat/weechat.git" else - SRC_URI="https://weechat.org/files/src/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos" + inherit verify-sig + SRC_URI="https://weechat.org/files/src/${P}.tar.xz + verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/weechat.org.asc + BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )" + KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~x64-macos" fi DESCRIPTION="Portable and multi-interface IRC client" HOMEPAGE="https://weechat.org/" -LICENSE="GPL-3" -SLOT="0" +LICENSE="GPL-3+" +SLOT="0/${PV}" NETWORKS="+irc" -PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer" +PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer" # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support -SCRIPT_LANGS="guile lua +perl php +python ruby tcl" +# dev-lang/php eclass support is lacking, php plugins don't work. bug #705702 +SCRIPT_LANGS="guile lua +perl +python ruby tcl" LANGS=" cs de es fr it ja pl ru" -IUSE="doc man nls test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" +IUSE="doc enchant man nls selinux test +zstd ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" REQUIRED_USE=" + enchant? ( spell ) + lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) test? ( nls ) " @@ -40,33 +48,50 @@ RDEPEND=" sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) - guile? ( >=dev-scheme/guile-2.0 ) - lua? ( dev-lang/lua:0 ) + guile? ( >=dev-scheme/guile-2.0:12= ) + lua? ( ${LUA_DEPS} ) nls? ( virtual/libintl ) - perl? ( dev-lang/perl:= ) - php? ( >=dev-lang/php-7.0:*[embed] ) + perl? ( + dev-lang/perl:= + virtual/libcrypt:= + ) python? ( ${PYTHON_DEPS} ) - ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) - spell? ( app-text/aspell ) + ruby? ( + || ( + dev-lang/ruby:3.2 + dev-lang/ruby:3.1 + ) + ) + selinux? ( sec-policy/selinux-irc ) + spell? ( + enchant? ( app-text/enchant:* ) + !enchant? ( app-text/aspell ) + ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) + zstd? ( app-arch/zstd:= ) " DEPEND="${RDEPEND} test? ( dev-util/cpputest ) " -BDEPEND=" +BDEPEND+=" virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) " +PATCHES=( + "${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch +) + DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc" RESTRICT="!test? ( test )" pkg_setup() { + use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup } @@ -84,17 +109,21 @@ src_prepare() { done # install only required documentation ; en always - for i in $(grep add_subdirectory doc/CMakeLists.txt \ - | sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do - if ! has ${i} ${LINGUAS-${i}} ; then - sed -i \ - -e '/add_subdirectory('${i}')/d' \ - doc/CMakeLists.txt || die - fi + local j + for i in $(grep -e 'set(.*en.*)$' doc/CMakeLists.txt \ + | sed -e 's/.*set(\(\w\+\).*/\1/'); do + for j in $(grep set.${i} doc/CMakeLists.txt \ + | sed -e "s/.*${i}\(.*\)).*/\1/" -e 's/ en//'); do + if ! has ${j} ${LINGUAS-${j}} ; then + sed -i \ + -e "s/\(set(${i}.*\) ${j}/\1/" \ + doc/CMakeLists.txt || die + fi + done done # install docs in correct directory - sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die + sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/CMakeLists.txt || die if [[ ${CHOST} == *-darwin* ]]; then # fix linking error on Darwin @@ -108,14 +137,20 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DLIBDIR=/usr/$(get_libdir) + -DLIBDIR="${EPREFIX}/usr/$(get_libdir)" -DENABLE_JAVASCRIPT=OFF -DENABLE_LARGEFILE=ON -DENABLE_NCURSES=ON + -DENABLE_PHP=OFF -DENABLE_ALIAS=$(usex alias) -DENABLE_BUFLIST=$(usex buflist) -DENABLE_CHARSET=$(usex charset) - -DENABLE_DOC=$(usex doc) + # -DENABLE_DOC requires all plugins (except javascript). + # https://github.com/weechat/weechat/blob/v4.0.2/CMakeLists.txt#L144 + # Impossible since php was dropped in net-irc/weechat-3.5.r1.ebuild. bug #705702 + -DENABLE_DOC=OFF + -DENABLE_DOC_INCOMPLETE=$(usex doc) + -DENABLE_ENCHANT=$(usex enchant) -DENABLE_EXEC=$(usex exec) -DENABLE_FIFO=$(usex fifo) -DENABLE_FSET=$(usex fset) @@ -126,7 +161,6 @@ src_configure() { -DENABLE_MAN=$(usex man) -DENABLE_NLS=$(usex nls) -DENABLE_PERL=$(usex perl) - -DENABLE_PHP=$(usex php) -DENABLE_PYTHON=$(usex python) -DENABLE_RELAY=$(usex relay) -DENABLE_RUBY=$(usex ruby) @@ -136,7 +170,9 @@ src_configure() { -DENABLE_TCL=$(usex tcl) -DENABLE_TESTS=$(usex test) -DENABLE_TRIGGER=$(usex trigger) + -DENABLE_TYPING=$(usex typing) -DENABLE_XFER=$(usex xfer) + -DENABLE_ZSTD=$(usex zstd) ) cmake_src_configure } @@ -149,15 +185,3 @@ src_test() { die "required locale missing" fi } - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/net-irc/weechat/weechat-2.9.ebuild b/net-irc/weechat/weechat-4.1.3.ebuild index ac03ee6e739b..0850f836dca6 100644 --- a/net-irc/weechat/weechat-2.9.ebuild +++ b/net-irc/weechat/weechat-4.1.3.ebuild @@ -1,33 +1,45 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python{3_7,3_8} ) +LUA_COMPAT=( lua5-{1..4} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake python-single-r1 xdg-utils +inherit cmake lua-single python-single-r1 xdg if [[ ${PV} == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/weechat/weechat.git" else - SRC_URI="https://weechat.org/files/src/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~x64-macos" + inherit verify-sig + SRC_URI="https://weechat.org/files/src/${P}.tar.xz + verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/weechat.org.asc + BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos" fi DESCRIPTION="Portable and multi-interface IRC client" HOMEPAGE="https://weechat.org/" -LICENSE="GPL-3" -SLOT="0" +LICENSE="GPL-3+" +SLOT="0/${PV}" NETWORKS="+irc" -PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer" +PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer" # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support -SCRIPT_LANGS="guile lua +perl php +python ruby tcl" +# dev-lang/php eclass support is lacking, php plugins don't work. bug #705702 +SCRIPT_LANGS="guile lua +perl +python ruby tcl" LANGS=" cs de es fr it ja pl ru" -IUSE="doc man nls test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +IUSE="doc enchant man nls selinux test +zstd ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" + +REQUIRED_USE=" + enchant? ( spell ) + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( nls ) +" RDEPEND=" dev-libs/libgcrypt:0= @@ -36,33 +48,50 @@ RDEPEND=" sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) - guile? ( >=dev-scheme/guile-2.0 ) - lua? ( dev-lang/lua:0 ) + guile? ( >=dev-scheme/guile-2.0:12= ) + lua? ( ${LUA_DEPS} ) nls? ( virtual/libintl ) - perl? ( dev-lang/perl:= ) - php? ( >=dev-lang/php-7.0:*[embed] ) + perl? ( + dev-lang/perl:= + virtual/libcrypt:= + ) python? ( ${PYTHON_DEPS} ) - ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) - spell? ( app-text/aspell ) + ruby? ( + || ( + dev-lang/ruby:3.2 + dev-lang/ruby:3.1 + ) + ) + selinux? ( sec-policy/selinux-irc ) + spell? ( + enchant? ( app-text/enchant:* ) + !enchant? ( app-text/aspell ) + ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) + zstd? ( app-arch/zstd:= ) " + DEPEND="${RDEPEND} test? ( dev-util/cpputest ) " -BDEPEND=" +BDEPEND+=" virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) " +PATCHES=( + "${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch +) + DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc" -# tests need to be fixed to not use system plugins if weechat is already installed -RESTRICT="test" +RESTRICT="!test? ( test )" pkg_setup() { + use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup } @@ -80,17 +109,21 @@ src_prepare() { done # install only required documentation ; en always - for i in $(grep add_subdirectory doc/CMakeLists.txt \ - | sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do - if ! has ${i} ${LINGUAS-${i}} ; then - sed -i \ - -e '/add_subdirectory('${i}')/d' \ - doc/CMakeLists.txt || die - fi + local j + for i in $(grep -e 'set(.*en.*)$' doc/CMakeLists.txt \ + | sed -e 's/.*set(\(\w\+\).*/\1/'); do + for j in $(grep set.${i} doc/CMakeLists.txt \ + | sed -e "s/.*${i}\(.*\)).*/\1/" -e 's/ en//'); do + if ! has ${j} ${LINGUAS-${j}} ; then + sed -i \ + -e "s/\(set(${i}.*\) ${j}/\1/" \ + doc/CMakeLists.txt || die + fi + done done # install docs in correct directory - sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die + sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/CMakeLists.txt || die if [[ ${CHOST} == *-darwin* ]]; then # fix linking error on Darwin @@ -104,14 +137,20 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DLIBDIR=/usr/$(get_libdir) + -DLIBDIR="${EPREFIX}/usr/$(get_libdir)" -DENABLE_JAVASCRIPT=OFF -DENABLE_LARGEFILE=ON -DENABLE_NCURSES=ON + -DENABLE_PHP=OFF -DENABLE_ALIAS=$(usex alias) -DENABLE_BUFLIST=$(usex buflist) -DENABLE_CHARSET=$(usex charset) - -DENABLE_DOC=$(usex doc) + # -DENABLE_DOC requires all plugins (except javascript). + # https://github.com/weechat/weechat/blob/v4.0.2/CMakeLists.txt#L144 + # Impossible since php was dropped in net-irc/weechat-3.5.r1.ebuild. bug #705702 + -DENABLE_DOC=OFF + -DENABLE_DOC_INCOMPLETE=$(usex doc) + -DENABLE_ENCHANT=$(usex enchant) -DENABLE_EXEC=$(usex exec) -DENABLE_FIFO=$(usex fifo) -DENABLE_FSET=$(usex fset) @@ -122,7 +161,6 @@ src_configure() { -DENABLE_MAN=$(usex man) -DENABLE_NLS=$(usex nls) -DENABLE_PERL=$(usex perl) - -DENABLE_PHP=$(usex php) -DENABLE_PYTHON=$(usex python) -DENABLE_RELAY=$(usex relay) -DENABLE_RUBY=$(usex ruby) @@ -132,19 +170,18 @@ src_configure() { -DENABLE_TCL=$(usex tcl) -DENABLE_TESTS=$(usex test) -DENABLE_TRIGGER=$(usex trigger) + -DENABLE_TYPING=$(usex typing) -DENABLE_XFER=$(usex xfer) + -DENABLE_ZSTD=$(usex zstd) ) cmake_src_configure } -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update +src_test() { + if $(locale -a | grep -iq "en_US\.utf.*8"); then + cmake_src_test -V + else + eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}" + die "required locale missing" + fi } diff --git a/net-irc/weechat/weechat-4.2.1.ebuild b/net-irc/weechat/weechat-4.2.1.ebuild new file mode 100644 index 000000000000..f20a547c8074 --- /dev/null +++ b/net-irc/weechat/weechat-4.2.1.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} ) +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake lua-single python-single-r1 xdg + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/weechat/weechat.git" +else + inherit verify-sig + SRC_URI="https://weechat.org/files/src/${P}.tar.xz + verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/weechat.org.asc + BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )" + KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~x64-macos" +fi + +DESCRIPTION="Portable and multi-interface IRC client" +HOMEPAGE="https://weechat.org/" + +LICENSE="GPL-3+" +SLOT="0/${PV}" + +NETWORKS="+irc" +PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer" +# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support +# dev-lang/php eclass support is lacking, php plugins don't work. bug #705702 +SCRIPT_LANGS="guile lua +perl +python ruby tcl" +LANGS=" cs de es fr it ja pl ru" +IUSE="doc enchant man nls selinux test +zstd ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" + +REQUIRED_USE=" + enchant? ( spell ) + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( nls ) +" + +RDEPEND=" + dev-libs/libgcrypt:0= + net-libs/gnutls:= + sys-libs/ncurses:0= + sys-libs/zlib:= + net-misc/curl[ssl] + charset? ( virtual/libiconv ) + guile? ( >=dev-scheme/guile-2.0:12= ) + lua? ( ${LUA_DEPS} ) + nls? ( virtual/libintl ) + perl? ( + dev-lang/perl:= + virtual/libcrypt:= + ) + python? ( ${PYTHON_DEPS} ) + ruby? ( + || ( + dev-lang/ruby:3.3 + dev-lang/ruby:3.2 + dev-lang/ruby:3.1 + ) + ) + selinux? ( sec-policy/selinux-irc ) + spell? ( + enchant? ( app-text/enchant:* ) + !enchant? ( app-text/aspell ) + ) + tcl? ( >=dev-lang/tcl-8.4.15:0= ) + zstd? ( app-arch/zstd:= ) +" + +DEPEND="${RDEPEND} + test? ( dev-util/cpputest ) +" + +BDEPEND+=" + virtual/pkgconfig + doc? ( >=dev-ruby/asciidoctor-1.5.4 ) + man? ( >=dev-ruby/asciidoctor-1.5.4 ) + nls? ( >=sys-devel/gettext-0.15 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch +) + +DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc" + +RESTRICT="!test? ( test )" + +pkg_setup() { + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + # install only required translations + local i + for i in ${LANGS} ; do + if ! has ${i} ${LINGUAS-${i}} ; then + sed -i \ + -e "/${i}.po/d" \ + po/CMakeLists.txt || die + fi + done + + # install only required documentation ; en always + local j + for i in $(grep -e 'set(.*en.*)$' doc/CMakeLists.txt \ + | sed -e 's/.*set(\(\w\+\).*/\1/'); do + for j in $(grep set.${i} doc/CMakeLists.txt \ + | sed -e "s/.*${i}\(.*\)).*/\1/" -e 's/ en//'); do + if ! has ${j} ${LINGUAS-${j}} ; then + sed -i \ + -e "s/\(set(${i}.*\) ${j}/\1/" \ + doc/CMakeLists.txt || die + fi + done + done + + # install docs in correct directory + sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/CMakeLists.txt || die + + if [[ ${CHOST} == *-darwin* ]]; then + # fix linking error on Darwin + sed -i "s/+ get_config_var('LINKFORSHARED')//" \ + cmake/FindPython.cmake || die + # allow to find the plugins by default + sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \ + src/core/wee-config.c || die + fi +} + +src_configure() { + local mycmakeargs=( + -DLIBDIR="${EPREFIX}/usr/$(get_libdir)" + -DENABLE_JAVASCRIPT=OFF + -DENABLE_LARGEFILE=ON + -DENABLE_NCURSES=ON + -DENABLE_PHP=OFF + -DENABLE_ALIAS=$(usex alias) + -DENABLE_BUFLIST=$(usex buflist) + -DENABLE_CHARSET=$(usex charset) + # -DENABLE_DOC requires all plugins (except javascript). + # https://github.com/weechat/weechat/blob/v4.0.2/CMakeLists.txt#L144 + # Impossible since php was dropped in net-irc/weechat-3.5.r1.ebuild. bug #705702 + -DENABLE_DOC=OFF + -DENABLE_DOC_INCOMPLETE=$(usex doc) + -DENABLE_ENCHANT=$(usex enchant) + -DENABLE_EXEC=$(usex exec) + -DENABLE_FIFO=$(usex fifo) + -DENABLE_FSET=$(usex fset) + -DENABLE_GUILE=$(usex guile) + -DENABLE_IRC=$(usex irc) + -DENABLE_LOGGER=$(usex logger) + -DENABLE_LUA=$(usex lua) + -DENABLE_MAN=$(usex man) + -DENABLE_NLS=$(usex nls) + -DENABLE_PERL=$(usex perl) + -DENABLE_PYTHON=$(usex python) + -DENABLE_RELAY=$(usex relay) + -DENABLE_RUBY=$(usex ruby) + -DENABLE_SCRIPT=$(usex scripts) + -DENABLE_SCRIPTS=$(usex scripts) + -DENABLE_SPELL=$(usex spell) + -DENABLE_TCL=$(usex tcl) + -DENABLE_TESTS=$(usex test) + -DENABLE_TRIGGER=$(usex trigger) + -DENABLE_TYPING=$(usex typing) + -DENABLE_XFER=$(usex xfer) + -DENABLE_ZSTD=$(usex zstd) + ) + cmake_src_configure +} + +src_test() { + if $(locale -a | grep -iq "en_US\.utf.*8"); then + cmake_src_test -V + else + eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}" + die "required locale missing" + fi +} diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild index 9612d0567f73..84e5faff5549 100644 --- a/net-irc/weechat/weechat-9999.ebuild +++ b/net-irc/weechat/weechat-9999.ebuild @@ -1,38 +1,45 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..4} ) -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake lua-single python-single-r1 xdg-utils +inherit cmake lua-single python-single-r1 xdg if [[ ${PV} == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/weechat/weechat.git" else - SRC_URI="https://weechat.org/files/src/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos" + inherit verify-sig + SRC_URI="https://weechat.org/files/src/${P}.tar.xz + verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/weechat.org.asc + BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos" fi DESCRIPTION="Portable and multi-interface IRC client" HOMEPAGE="https://weechat.org/" -LICENSE="GPL-3" -SLOT="0" +LICENSE="GPL-3+" +SLOT="0/${PV}" NETWORKS="+irc" -PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer" +PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer" # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support -SCRIPT_LANGS="guile lua +perl php +python ruby tcl" +# dev-lang/php eclass support is lacking, php plugins don't work. bug #705702 +SCRIPT_LANGS="guile lua +perl +python ruby tcl" LANGS=" cs de es fr it ja pl ru" -IUSE="doc man nls test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" +IUSE="doc enchant man nls relay-api selinux test +zstd ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" REQUIRED_USE=" + enchant? ( spell ) lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) test? ( nls ) + relay-api? ( relay ) " RDEPEND=" @@ -42,22 +49,35 @@ RDEPEND=" sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) - guile? ( >=dev-scheme/guile-2.0 ) + guile? ( >=dev-scheme/guile-2.0:12= ) lua? ( ${LUA_DEPS} ) nls? ( virtual/libintl ) - perl? ( dev-lang/perl:= ) - php? ( >=dev-lang/php-7.0:*[embed] ) + perl? ( + dev-lang/perl:= + virtual/libcrypt:= + ) python? ( ${PYTHON_DEPS} ) - ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) - spell? ( app-text/aspell ) + ruby? ( + || ( + dev-lang/ruby:3.3 + dev-lang/ruby:3.2 + dev-lang/ruby:3.1 + ) + ) + selinux? ( sec-policy/selinux-irc ) + spell? ( + enchant? ( app-text/enchant:* ) + !enchant? ( app-text/aspell ) + ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) + zstd? ( app-arch/zstd:= ) " DEPEND="${RDEPEND} test? ( dev-util/cpputest ) " -BDEPEND=" +BDEPEND+=" virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) @@ -65,7 +85,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch + "${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch ) DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc" @@ -91,17 +111,21 @@ src_prepare() { done # install only required documentation ; en always - for i in $(grep add_subdirectory doc/CMakeLists.txt \ - | sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do - if ! has ${i} ${LINGUAS-${i}} ; then - sed -i \ - -e '/add_subdirectory('${i}')/d' \ - doc/CMakeLists.txt || die - fi + local j + for i in $(grep -e 'set(.*en.*)$' doc/CMakeLists.txt \ + | sed -e 's/.*set(\(\w\+\).*/\1/'); do + for j in $(grep set.${i} doc/CMakeLists.txt \ + | sed -e "s/.*${i}\(.*\)).*/\1/" -e 's/ en//'); do + if ! has ${j} ${LINGUAS-${j}} ; then + sed -i \ + -e "s/\(set(${i}.*\) ${j}/\1/" \ + doc/CMakeLists.txt || die + fi + done done # install docs in correct directory - sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die + sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/CMakeLists.txt || die if [[ ${CHOST} == *-darwin* ]]; then # fix linking error on Darwin @@ -115,14 +139,20 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DLIBDIR=/usr/$(get_libdir) + -DLIBDIR="${EPREFIX}/usr/$(get_libdir)" -DENABLE_JAVASCRIPT=OFF -DENABLE_LARGEFILE=ON -DENABLE_NCURSES=ON + -DENABLE_PHP=OFF -DENABLE_ALIAS=$(usex alias) -DENABLE_BUFLIST=$(usex buflist) -DENABLE_CHARSET=$(usex charset) - -DENABLE_DOC=$(usex doc) + # -DENABLE_DOC requires all plugins (except javascript). + # https://github.com/weechat/weechat/blob/v4.0.2/CMakeLists.txt#L144 + # Impossible since php was dropped in net-irc/weechat-3.5.r1.ebuild. bug #705702 + -DENABLE_DOC=OFF + -DENABLE_DOC_INCOMPLETE=$(usex doc) + -DENABLE_ENCHANT=$(usex enchant) -DENABLE_EXEC=$(usex exec) -DENABLE_FIFO=$(usex fifo) -DENABLE_FSET=$(usex fset) @@ -133,9 +163,9 @@ src_configure() { -DENABLE_MAN=$(usex man) -DENABLE_NLS=$(usex nls) -DENABLE_PERL=$(usex perl) - -DENABLE_PHP=$(usex php) -DENABLE_PYTHON=$(usex python) -DENABLE_RELAY=$(usex relay) + -DENABLE_CJSON=$(usex relay-api) -DENABLE_RUBY=$(usex ruby) -DENABLE_SCRIPT=$(usex scripts) -DENABLE_SCRIPTS=$(usex scripts) @@ -143,7 +173,9 @@ src_configure() { -DENABLE_TCL=$(usex tcl) -DENABLE_TESTS=$(usex test) -DENABLE_TRIGGER=$(usex trigger) + -DENABLE_TYPING=$(usex typing) -DENABLE_XFER=$(usex xfer) + -DENABLE_ZSTD=$(usex zstd) ) cmake_src_configure } @@ -156,15 +188,3 @@ src_test() { die "required locale missing" fi } - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/net-irc/znc-clientbuffer/files/CMakeLists.txt b/net-irc/znc-clientbuffer/files/CMakeLists.txt new file mode 100644 index 000000000000..92048a07b19d --- /dev/null +++ b/net-irc/znc-clientbuffer/files/CMakeLists.txt @@ -0,0 +1,8 @@ +# Autogenerated using znc-buildmod -v from net-irc/znc-1.8.2 +cmake_minimum_required(VERSION 3.1) +project(ExternalModules LANGUAGES CXX) +find_package(ZNC HINTS /usr/share/znc REQUIRED) + +add_library(module_clientbuffer MODULE clientbuffer.cpp) +znc_setup_module(TARGET module_clientbuffer NAME clientbuffer) +target_link_libraries(module_clientbuffer PRIVATE) diff --git a/net-irc/znc-clientbuffer/metadata.xml b/net-irc/znc-clientbuffer/metadata.xml index b18a0ff2536e..8cca526cf091 100644 --- a/net-irc/znc-clientbuffer/metadata.xml +++ b/net-irc/znc-clientbuffer/metadata.xml @@ -1,9 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>whissi@gentoo.org</email> - <name>Thomas Deutschmann</name> + <maintainer type="person" proxied="yes"> + <email>nex+b-g-o@nexadn.de</email> + <name>Adrian Schollmeyer</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <upstream> <bugs-to>https://git.jordanko.ch/Igloo/Push/issues</bugs-to> diff --git a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild new file mode 100644 index 000000000000..f88d5036124e --- /dev/null +++ b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A ZNC module which provides client specific buffers" +HOMEPAGE="https://github.com/CyberShadow/znc-clientbuffer" +SRC_URI="https://github.com/CyberShadow/znc-clientbuffer/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +DEPEND=" + net-irc/znc:=" + +RDEPEND="${DEPEND}" + +src_prepare() { + cp -v "${FILESDIR}/CMakeLists.txt" "${S}" || die + cmake_src_prepare +} + +src_compile() { + cmake_src_compile +} + +src_install() { + exeinto /usr/$(get_libdir)/znc + doexe "${BUILD_DIR}"/clientbuffer.so + + einstalldocs +} diff --git a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild index 7ad332d77a02..217f9c0703cc 100644 --- a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild +++ b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild @@ -1,11 +1,11 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="A ZNC module which provides client specific buffers" HOMEPAGE="https://github.com/CyberShadow/znc-clientbuffer" -SRC_URI="https://github.com/CyberShadow/znc-clientbuffer/archive/v1.0.48.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/CyberShadow/znc-clientbuffer/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" @@ -21,7 +21,7 @@ DOCS=( README.md ) _emake() { emake \ -j1 \ - PREFIX=${EPREFIX}/usr \ + PREFIX="${EPREFIX}"/usr \ LIBDIR=/$(get_libdir) \ "$@" } @@ -31,7 +31,7 @@ src_compile() { } src_install() { - _emake DESTDIR=${ED} install + _emake DESTDIR="${ED}" install einstalldocs } diff --git a/net-irc/znc-igloo-push/metadata.xml b/net-irc/znc-igloo-push/metadata.xml index 65e385ef1366..43814c921ee8 100644 --- a/net-irc/znc-igloo-push/metadata.xml +++ b/net-irc/znc-igloo-push/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>whissi@gentoo.org</email> - <name>Thomas Deutschmann</name> - </maintainer> + <!-- maintainer-needed --> <longdescription> A ZNC module which provides push notifications through ZNC for the iOS Igloo App while being disconnected from IRC. diff --git a/net-irc/znc-palaver/Manifest b/net-irc/znc-palaver/Manifest index b1dc595c2cc7..b571ecbc2f12 100644 --- a/net-irc/znc-palaver/Manifest +++ b/net-irc/znc-palaver/Manifest @@ -1 +1 @@ -DIST znc-palaver-1.2.1.tar.gz 13302 BLAKE2B 0a46e4dd93f06a2b1705d619b0960a246ebf326fe4ca1afdc152a90274984421478ff52bd942a09dffe58349477d622b2839b2e1af0cb11b5bc8c7a329d3b3a4 SHA512 0cfa4dfcebca79ed0aaa9b44c7395318782237a8752e26810686276587004ab95342f5983e6c9a74950da062c34e634d8a4bf502977289e59686eef069dca84a +DIST znc-palaver-1.2.2.tar.gz 14649 BLAKE2B ad67bbbfc9ad293ce71669d84b7ccb3bd69f52e534662ac35c4a3ecd41fe91af2fe519f109dd2e9b9b824e5970883706a6dc7ebc89b806e74e5ad121466947f8 SHA512 b91ba7200cac393557252874293f131c83a4cea83203457e8f6f91a129d8207c16951b983e52848ce4f54750752f69765ca26b8e3f50e74da2a11138eaf2bdce diff --git a/net-irc/znc-palaver/files/znc-palaver-1.2.1-python310.patch b/net-irc/znc-palaver/files/znc-palaver-1.2.1-python310.patch deleted file mode 100644 index 79e06f30a5ef..000000000000 --- a/net-irc/znc-palaver/files/znc-palaver-1.2.1-python310.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3d5a1a3c2a7cb3de82c618b1e70618195ec4a1e7 Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <conrad@kostecki.com> -Date: Fri, 28 Aug 2020 23:48:23 +0200 -Subject: [PATCH] test/test_palaver.py: loop argument is deprecated - -DeprecationWarning: The loop argument is deprecated since Python 3.8, -and scheduled for removal in Python 3.10. - -Signed-off-by: Conrad Kostecki <conrad@kostecki.com> ---- - test/test_palaver.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/test/test_palaver.py b/test/test_palaver.py -index 1b27878..d22366a 100644 ---- a/test/test_palaver.py -+++ b/test/test_palaver.py -@@ -50,10 +50,10 @@ async def setUp(event_loop): - running_as_root = os.getuid() == 0 - allow_root = ' --allow-root' if running_as_root else '' - -- proc = await asyncio.create_subprocess_shell(f'znc -d test/fixtures --foreground --debug{allow_root}', loop=event_loop) -+ proc = await asyncio.create_subprocess_shell(f'znc -d test/fixtures --foreground --debug{allow_root}') - time.sleep(31 if running_as_root else 1) - -- (reader, writer) = await asyncio.open_connection('localhost', 6698, loop=event_loop) -+ (reader, writer) = await asyncio.open_connection('localhost', 6698) - writer.write(b'CAP LS 302\r\n') - - line = await reader.readline() -@@ -184,7 +184,7 @@ async def connected(reader, writer): - - connected.called = True - -- server = await asyncio.start_server(connected, host='127.0.0.1', port=0, loop=event_loop) -+ server = await asyncio.start_server(connected, host='127.0.0.1', port=0) - await asyncio.sleep(0.2) - addr = server.sockets[0].getsockname() - url = f'Serving on http://{addr[0]}:{addr[1]}/push' -@@ -248,7 +248,7 @@ async def connected(reader, writer): - - connected.called = True - -- server = await asyncio.start_server(connected, host='127.0.0.1', port=0, loop=event_loop) -+ server = await asyncio.start_server(connected, host='127.0.0.1', port=0) - await asyncio.sleep(0.2) - addr = server.sockets[0].getsockname() - url = f'Serving on http://{addr[0]}:{addr[1]}/push' diff --git a/net-irc/znc-palaver/files/znc-palaver-1.2.1-xunit2.patch b/net-irc/znc-palaver/files/znc-palaver-1.2.1-xunit2.patch deleted file mode 100644 index ffbb2ad4543b..000000000000 --- a/net-irc/znc-palaver/files/znc-palaver-1.2.1-xunit2.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3be5f33d76d4e34b1bc2671f7dbbc6c5fc3ccadd Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <conrad@kostecki.com> -Date: Sat, 29 Aug 2020 00:06:53 +0200 -Subject: [PATCH] Makefile: use xunit2 as default for pytest - -PytestDeprecationWarning: The 'junit_family' default -value will change to 'xunit2' in pytest 6.0. - -Signed-off-by: Conrad Kostecki <conrad@kostecki.com> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index d5d4866..e88277e 100644 ---- a/Makefile -+++ b/Makefile -@@ -30,4 +30,4 @@ test/fixtures/modules/palaver.so: palaver.so - .PHONY: test-integration - test-integration: test/fixtures/modules/palaver.so - @mkdir -p test-reports -- pytest --junitxml=test-reports/junit.xml -+ pytest -o junit_family=xunit2 --junitxml=test-reports/junit.xml diff --git a/net-irc/znc-palaver/metadata.xml b/net-irc/znc-palaver/metadata.xml index b0e19e1bdc90..b8dbda6464ad 100644 --- a/net-irc/znc-palaver/metadata.xml +++ b/net-irc/znc-palaver/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>conikost@gentoo.org</email> diff --git a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild b/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild index 7668f69d0217..074d0542dd7a 100644 --- a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild +++ b/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-single-r1 toolchain-funcs @@ -14,9 +14,10 @@ SRC_URI="https://github.com/cocodelabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0" KEYWORDS="amd64 x86" -IUSE="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" + +# Tests need network +RESTRICT="test" RDEPEND=" ${PYTHON_DEPS} @@ -27,17 +28,12 @@ BDEPEND=" $(python_gen_cond_dep ' dev-python/pytest[${PYTHON_USEDEP}] dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/semantic_version[${PYTHON_USEDEP}] + dev-python/semantic-version[${PYTHON_USEDEP}] ') " DOCS=( "CHANGELOG.md" "README.md" ) -PATCHES=( - "${FILESDIR}/${P}-python310.patch" - "${FILESDIR}/${P}-xunit2.patch" -) - src_compile() { tc-export CXX diff --git a/net-irc/znc-playback/metadata.xml b/net-irc/znc-playback/metadata.xml index af3b27264758..97e82cb046d9 100644 --- a/net-irc/znc-playback/metadata.xml +++ b/net-irc/znc-playback/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>whissi@gentoo.org</email> - <name>Thomas Deutschmann</name> - </maintainer> + <!-- maintainer-needed --> <longdescription> The advanced playback module for ZNC makes it possible for IRC clients to avoid undesired repetitive buffer playback. IRC clients may request diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest index f9e311890fed..51254b02c536 100644 --- a/net-irc/znc/Manifest +++ b/net-irc/znc/Manifest @@ -1,3 +1,4 @@ +DIST gtest-1.14.0.tar.gz 867764 BLAKE2B c457f55ac572b9fb1553eee3df7eeeaf1e7dd2c3d747dd5e90dd279038fa5c71bb7b7d9ba1cf7e6143898b2a1d24d100584bd2a48ded41a426870c4825eec1b2 SHA512 765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 -DIST znc-1.8.1.tar.gz 2161359 BLAKE2B 5b9026156a62748659ae0496f9d799e7d1e0815358fa59f7538ca9d750b8f418fe8a57362b5b5bba40cfb00c2adc5fdc3eee0b56ebde50565c97d158296b827e SHA512 87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16 DIST znc-1.8.2.tar.gz 2101215 BLAKE2B 7f0e5840fe57cc6b6549115b0fcf02e6afd3be0bf52e79da0a39bcc1463d983cbeb504bad30f3d2f7582f0295c7210d3c1eec40ec87bcc3546ba2d21a67cca9e SHA512 e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9 +DIST znc-1.9.0.tar.gz 2221116 BLAKE2B 00bf472f0c223684c52a8c1a1a4b699346e58718161e6c40e3423591ef49aa13b6a530eb705e6f9e9cd6ce8937b4ee4e89de62d15aca7f2b19e1e8b603351d6e SHA512 22b8bd6fd7332643860f7a99ceaa0f6d0c9dd8ba9edac14b3f3731c9301eeb58e03e3af8d09e939e453aa980ff9f24afbe79e66d1106993f81d8779c97731a17 diff --git a/net-irc/znc/files/README.gentoo-r1 b/net-irc/znc/files/README.gentoo-r1 index ca41e4dac26b..8fa94e2f0775 100644 --- a/net-irc/znc/files/README.gentoo-r1 +++ b/net-irc/znc/files/README.gentoo-r1 @@ -1,15 +1,15 @@ To run znc as a user, run 'znc --makeconf' to create a configuration file. -To configure the system-wide daemon, you may run 'emerge --config znc'. +To configure the system-wide daemon, you may run 'emerge --config net-irc/znc'. If migrating from a user-based install, you can copy the existing configuration files: - # mkdir /var/lib/znc # mv /home/$USER/.znc/* /var/lib/znc # rm -rf /home/$USER/.znc # chown -R znc:znc /var/lib/znc OpenRC users may also adjust the location of the files and the user running -znc in /etc/conf.d/znc instead. Systemd users may have to overwrite the -existing unit file. +znc in /etc/conf.d/znc instead. +The same thing can be achieved for systemd by overriding the existing +unit file (systemctl edit znc.service). diff --git a/net-irc/znc/files/znc-1.8.2-add-libera.patch b/net-irc/znc/files/znc-1.8.2-add-libera.patch new file mode 100644 index 000000000000..e7015754d8c1 --- /dev/null +++ b/net-irc/znc/files/znc-1.8.2-add-libera.patch @@ -0,0 +1,55 @@ +From 15e2351d40763acee5d246df7c725c3bd259c304 Mon Sep 17 00:00:00 2001 +From: Alexey Sokolov <alexey+znc@asokolov.org> +Date: Wed, 26 May 2021 10:10:20 +0100 +Subject: [PATCH] Switch --makeconf wizard from freenode to libera + +--- + src/znc.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/znc.cpp b/src/znc.cpp +index c5ad17dc69..365367545a 100644 +--- a/src/znc.cpp ++++ b/src/znc.cpp +@@ -778,7 +778,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) { + CUtils::PrintMessage(""); + + do { +- CUtils::GetInput("Name", sNetwork, "freenode"); ++ CUtils::GetInput("Name", sNetwork, "libera"); + } while (!CIRCNetwork::IsValidNetwork(sNetwork)); + + vsLines.push_back("\t<Network " + sNetwork + ">"); +@@ -795,8 +795,8 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) { + bool bSSL = false; + unsigned int uServerPort = 0; + +- if (sNetwork.Equals("freenode")) { +- sHost = "chat.freenode.net"; ++ if (sNetwork.Equals("libera")) { ++ sHost = "irc.libera.chat"; + #ifdef HAVE_LIBSSL + bSSL = true; + #endif +From 688645413c258f1fe42a39e42e5b5d1dead03d71 Mon Sep 17 00:00:00 2001 +From: Alexey Sokolov <alexey+znc@asokolov.org> +Date: Fri, 18 Jun 2021 21:20:53 +0100 +Subject: [PATCH] Fix integration test after switch to libera + +--- + test/integration/framework/znctest.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/integration/framework/znctest.cpp b/test/integration/framework/znctest.cpp +index 195b6083a9..40dae85fc2 100644 +--- a/test/integration/framework/znctest.cpp ++++ b/test/integration/framework/znctest.cpp +@@ -39,7 +39,7 @@ void WriteConfig(QString path) { + p.ReadUntil("Real name"); p.Write(); + p.ReadUntil("Bind host"); p.Write(); + p.ReadUntil("Set up a network?"); p.Write(); +- p.ReadUntil("Name [freenode]"); p.Write("test"); ++ p.ReadUntil("Name [libera]"); p.Write("test"); + p.ReadUntil("Server host (host only)"); p.Write("127.0.0.1"); + p.ReadUntil("Server uses SSL?"); p.Write(); + p.ReadUntil("6667"); p.Write(); diff --git a/net-irc/znc/files/znc-1.8.2-fix-odr-violation.patch b/net-irc/znc/files/znc-1.8.2-fix-odr-violation.patch new file mode 100644 index 000000000000..967d6e35c2ea --- /dev/null +++ b/net-irc/znc/files/znc-1.8.2-fix-odr-violation.patch @@ -0,0 +1,56 @@ +From 3e45b2f35f194100ec3293c7f3e36f95f48b0cb8 Mon Sep 17 00:00:00 2001 +From: Uli Schlachter <psychon@znc.in> +Date: Fri, 5 Aug 2022 16:12:40 +0200 +Subject: [PATCH] Fix an ODR violation + +Building with CFLAGS="-flto -Werror=odr -Werror=lto-type-mismatch +-Werror=strict-aliasing" CXXFLAGS="-flto -Werror=odr +-Werror=lto-type-mismatch -Werror=strict-aliasing" LDFLAGS=-flto fails +due to a violation of the one definition rule. There are two different +definitions of TOption that are both linked into the znc binary. + +Fix this by putting them into anonymous namespaces. + +Fixes: https://github.com/znc/znc/issues/1834 +Signed-off-by: Uli Schlachter <psychon@znc.in> +--- + src/IRCNetwork.cpp | 2 ++ + src/User.cpp | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/IRCNetwork.cpp b/src/IRCNetwork.cpp +index 46a2481a49..99f9242907 100644 +--- a/src/IRCNetwork.cpp ++++ b/src/IRCNetwork.cpp +@@ -363,11 +363,13 @@ CString CIRCNetwork::GetNetworkPath() const { + return sNetworkPath; + } + ++namespace { + template <class T> + struct TOption { + const char* name; + void (CIRCNetwork::*pSetter)(T); + }; ++} + + bool CIRCNetwork::ParseConfig(CConfig* pConfig, CString& sError, + bool bUpgrade) { +diff --git a/src/User.cpp b/src/User.cpp +index 2ab5fac66f..16624adbbe 100644 +--- a/src/User.cpp ++++ b/src/User.cpp +@@ -135,11 +135,13 @@ CUser::~CUser() { + CZNC::Get().AddBytesWritten(m_uBytesWritten); + } + ++namespace { + template <class T> + struct TOption { + const char* name; + void (CUser::*pSetter)(T); + }; ++} + + bool CUser::ParseConfig(CConfig* pConfig, CString& sError) { + TOption<const CString&> StringOptions[] = { diff --git a/net-irc/znc/files/znc-1.8.2-fix-python-3.10.patch b/net-irc/znc/files/znc-1.8.2-fix-python-3.10.patch new file mode 100644 index 000000000000..fe40d190d1ba --- /dev/null +++ b/net-irc/znc/files/znc-1.8.2-fix-python-3.10.patch @@ -0,0 +1,31 @@ +From e8ff16123582eb9d5c321f5c7e652335abfba368 Mon Sep 17 00:00:00 2001 +From: Alexey Sokolov <alexey+znc@asokolov.org> +Date: Sat, 23 May 2020 13:28:13 +0100 +Subject: [PATCH] Fix PY_SSIZE_T_CLEAN python warning + +--- + .travis.yml | 2 +- + modules/modpython.cpp | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/modules/modpython.cpp b/modules/modpython.cpp +index dfe53b5b6b..7bc76fc5c1 100644 +--- a/modules/modpython.cpp ++++ b/modules/modpython.cpp +@@ -14,6 +14,7 @@ + * limitations under the License. + */ + ++#define PY_SSIZE_T_CLEAN + #include <Python.h> + + #include <znc/Chan.h> +@@ -455,7 +456,7 @@ CBSOCK(ConnectionRefused); + void CPySocket::ReadData(const char* data, size_t len) { + PyObject* pyRes = + PyObject_CallMethod(m_pyObj, const_cast<char*>("OnReadData"), +- const_cast<char*>("y#"), data, (int)len); ++ const_cast<char*>("y#"), data, (Py_ssize_t)len); + CHECKCLEARSOCK("OnReadData"); + } + diff --git a/net-irc/znc/files/znc-1.8.2-fix-swig-2.patch b/net-irc/znc/files/znc-1.8.2-fix-swig-2.patch new file mode 100644 index 000000000000..91d7f5657cbe --- /dev/null +++ b/net-irc/znc/files/znc-1.8.2-fix-swig-2.patch @@ -0,0 +1,123 @@ +From 3f4c1cce77cbe1337e5642e9e0e9d048c9e07370 Mon Sep 17 00:00:00 2001 +From: Alexey Sokolov <alexey+znc@asokolov.org> +Date: Fri, 5 Jan 2024 02:19:55 +0000 +Subject: [PATCH] Fix build with SWIG 4.2.0 + +https://bugs.gentoo.org/921230 +--- + modules/modpython/codegen.pl | 88 ++++++++++++++++++++++++++---------- + 1 file changed, 65 insertions(+), 23 deletions(-) + +diff --git a/modules/modpython/codegen.pl b/modules/modpython/codegen.pl +index 1bc09806e0..bbcb148bed 100755 +--- a/modules/modpython/codegen.pl ++++ b/modules/modpython/codegen.pl +@@ -50,29 +50,6 @@ + ***************************************************************************/ + + namespace { +-/* template<class T> +- struct pyobj_to_ptr { +- CString m_sType; +- SvToPtr(const CString& sType) { +- m_sType = sType; +- } +- bool operator()(PyObject* py, T** result) { +- T* x = nullptr; +- int res = SWIG_ConvertPtr(sv, (void**)&x, SWIG_TypeQuery(m_sType.c_str()), 0); +- if (SWIG_IsOK(res)) { +- *result = x; +- return true; +- } +- DEBUG("modpython: "); +- return false; +- } +- }; +- +- CModule::EModRet SvToEModRet(PyObject* py, CModule::EModRet* result) { +- long int x = PyLong_AsLong(); +- return static_cast<CModule::EModRet>(SvUV(sv)); +- }*/ +- + inline swig_type_info* SWIG_pchar_descriptor(void) { + static int init = 0; + static swig_type_info* info = 0; +@@ -83,6 +60,70 @@ + return info; + } + ++// SWIG 4.2.0 replaced SWIG_Python_str_AsChar with SWIG_PyUnicode_AsUTF8AndSize. ++// SWIG doesn't provide any good way to detect SWIG version (other than parsing ++// `swig -version`), but it also introduced SWIG_NULLPTR. ++// So let's abuse that define to do different code for new SWIG. ++#ifdef SWIG_NULLPTR ++ // This is copied from some SWIG 4.2.0 from pystrings.swg ++ inline int SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc) { ++#if PY_VERSION_HEX>=0x03000000 ++#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR) ++ if (PyBytes_Check(obj)) ++#else ++ if (PyUnicode_Check(obj)) ++#endif ++#else ++ if (PyString_Check(obj)) ++#endif ++ { ++ char *cstr; Py_ssize_t len; ++ PyObject *bytes = NULL; ++ int ret = SWIG_OK; ++ if (alloc) ++ *alloc = SWIG_OLDOBJ; ++#if PY_VERSION_HEX>=0x03000000 && defined(SWIG_PYTHON_STRICT_BYTE_CHAR) ++ if (PyBytes_AsStringAndSize(obj, &cstr, &len) == -1) ++ return SWIG_TypeError; ++#else ++ cstr = (char *)SWIG_PyUnicode_AsUTF8AndSize(obj, &len, &bytes); ++ if (!cstr) ++ return SWIG_TypeError; ++ /* The returned string is only duplicated if the char * returned is not owned and memory managed by obj */ ++ if (bytes && cptr) { ++ if (alloc) { ++ //cstr = %new_copy_array(cstr, len + 1, char); ++ cstr = (char *)memcpy((char *)malloc((len + 1)*sizeof(char)), cstr, sizeof(char)*(len + 1)); ++ *alloc = SWIG_NEWOBJ; ++ } else { ++ /* alloc must be set in order to clean up allocated memory */ ++ return SWIG_RuntimeError; ++ } ++ } ++#endif ++ if (cptr) *cptr = cstr; ++ if (psize) *psize = len + 1; ++ Py_XDECREF(bytes); ++ return ret; ++ } else { ++ swig_type_info* pchar_descriptor = SWIG_pchar_descriptor(); ++ if (pchar_descriptor) { ++ void* vptr = 0; ++ if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) { ++ if (cptr) *cptr = (char *) vptr; ++ if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0; ++ if (alloc) *alloc = SWIG_OLDOBJ; ++ return SWIG_OK; ++ } ++ } ++ } ++ return SWIG_TypeError; ++ } ++ ++#else ++ // TODO: at some point drop support for SWIG<4.2.0 (drop this branch of ifdef) ++ ++ // This is copied from some old SWIG version from pystrings.swg + inline int SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc) { + #if PY_VERSION_HEX>=0x03000000 + if (PyUnicode_Check(obj)) +@@ -155,6 +196,7 @@ + } + return SWIG_TypeError; + } ++#endif + + inline int SWIG_AsPtr_CString (PyObject * obj, CString **val) { + char* buf = 0 ; size_t size = 0; int alloc = SWIG_OLDOBJ; diff --git a/net-irc/znc/files/znc-1.8.2-fix-swig.patch b/net-irc/znc/files/znc-1.8.2-fix-swig.patch new file mode 100644 index 000000000000..d07d136c5940 --- /dev/null +++ b/net-irc/znc/files/znc-1.8.2-fix-swig.patch @@ -0,0 +1,43 @@ +From fecdd9895894b3afe903021b0843a422eb4d3308 Mon Sep 17 00:00:00 2001 +From: Alexey Sokolov <alexey+znc@asokolov.org> +Date: Sat, 5 Nov 2022 12:54:40 +0000 +Subject: [PATCH] Add support SWIG 4.1.0, drop support for < 4.0.1 + +https://bugs.gentoo.org/878587 +--- + CMakeLists.txt | 2 +- + modules/modperl/CMakeLists.txt | 1 - + modules/modpython/CMakeLists.txt | 1 - + 3 files changed, 1 insertion(+), 3 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -173,7 +173,7 @@ if(WANT_PYTHON AND NOT EXISTS + endif() + endif() + if(search_swig) +- find_package(SWIG 3.0.0) ++ find_package(SWIG 4.0.1) + if(NOT SWIG_FOUND) + message(FATAL_ERROR + "Can't find SWIG, therefore Perl and Python aren't supported. " +--- a/modules/modperl/CMakeLists.txt ++++ b/modules/modperl/CMakeLists.txt +@@ -53,7 +53,6 @@ if(SWIG_FOUND) + "-I${PROJECT_SOURCE_DIR}/include" + "-I${CMAKE_CURRENT_SOURCE_DIR}/.." + "-I${CMAKE_CURRENT_SOURCE_DIR}/include" +- -DZNC_EXPORT_LIB_EXPORT + -outdir "${CMAKE_CURRENT_BINARY_DIR}" + -o "${CMAKE_CURRENT_BINARY_DIR}/modperl_biglib.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/modperl.i" +--- a/modules/modpython/CMakeLists.txt ++++ b/modules/modpython/CMakeLists.txt +@@ -50,7 +50,6 @@ if(SWIG_FOUND) + "-I${PROJECT_BINARY_DIR}/include" + "-I${PROJECT_SOURCE_DIR}/include" + "-I${CMAKE_CURRENT_SOURCE_DIR}/.." +- -DZNC_EXPORT_LIB_EXPORT + -outdir "${CMAKE_CURRENT_BINARY_DIR}" + -o "${CMAKE_CURRENT_BINARY_DIR}/modpython_biglib.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/modpython.i" diff --git a/net-irc/znc/files/znc-1.8.2-fix-systemd-datadir.patch b/net-irc/znc/files/znc-1.8.2-fix-systemd-datadir.patch new file mode 100644 index 000000000000..06dd6991b4a4 --- /dev/null +++ b/net-irc/znc/files/znc-1.8.2-fix-systemd-datadir.patch @@ -0,0 +1,23 @@ +From d4bfd143b4b12f6e6695878cc1b5168cc31c362c Mon Sep 17 00:00:00 2001 +From: Alexey Sokolov <alexey+znc@asokolov.org> +Date: Tue, 22 Sep 2020 10:20:47 +0100 +Subject: [PATCH] Fix path in systemd service (which shouldn't be here at all) + +https://bugs.gentoo.org/743856 +--- + znc.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/znc.service.in b/znc.service.in +index a6c9e68df..7accad906 100644 +--- a/znc.service.in ++++ b/znc.service.in +@@ -3,7 +3,7 @@ Description=ZNC, an advanced IRC bouncer + After=network.target + + [Service] +-ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/znc -f ++ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/znc -f --datadir=/var/lib/znc + User=znc + + [Install] diff --git a/net-irc/znc/files/znc-1.9.0-skip-modperl-modpython-tests-cleaner.patch b/net-irc/znc/files/znc-1.9.0-skip-modperl-modpython-tests-cleaner.patch new file mode 100644 index 000000000000..fae99b5d6583 --- /dev/null +++ b/net-irc/znc/files/znc-1.9.0-skip-modperl-modpython-tests-cleaner.patch @@ -0,0 +1,248 @@ +https://github.com/znc/znc/commit/f8552fc814ebe662a9fc16d6cafa1c0314498971 + +From f8552fc814ebe662a9fc16d6cafa1c0314498971 Mon Sep 17 00:00:00 2001 +From: Alexey Sokolov <alexey+znc@asokolov.org> +Date: Sun, 25 Feb 2024 14:12:53 +0000 +Subject: [PATCH] Skip modperl/modpython tests cleaner + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -411,6 +411,8 @@ else() + endif() + + configure_file("include/znc/zncconfig.h.cmake.in" "include/znc/zncconfig.h") ++configure_file("test/integration/znctestconfig.h.cmake.in" ++ "test/integration/znctestconfig.h") + add_subdirectory(include) + add_subdirectory(src) + add_subdirectory(modules) +--- a/test/integration/CMakeLists.txt ++++ b/test/integration/CMakeLists.txt +@@ -45,6 +45,7 @@ add_executable(inttest + target_link_libraries(inttest Qt5::Network Threads::Threads) + target_include_directories(inttest PUBLIC + "${PROJECT_SOURCE_DIR}/framework" ++ "${PROJECT_BINARY_DIR}" + "${GTEST_ROOT}" "${GTEST_ROOT}/include" + "${GMOCK_ROOT}" "${GMOCK_ROOT}/include") + target_compile_definitions(inttest PRIVATE +--- a/test/integration/tests/core.cpp ++++ b/test/integration/tests/core.cpp +@@ -14,9 +14,11 @@ + * limitations under the License. + */ + ++#include <gtest/gtest.h> + #include <gmock/gmock.h> + + #include "znctest.h" ++#include "znctestconfig.h" + + using testing::HasSubstr; + using testing::ContainsRegex; +@@ -584,10 +586,9 @@ TEST_P(AllLanguages, ServerDependentCapInModule) { + )"); + break; + case 2: +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PYTHON ++ GTEST_SKIP() << "Modpython is disabled"; ++#endif + znc->CanLeak(); + InstallModule("testmod.py", R"( + import znc +@@ -603,10 +604,9 @@ TEST_P(AllLanguages, ServerDependentCapInModule) { + client.Write("znc loadmod modpython"); + break; + case 3: +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PERL ++ GTEST_SKIP() << "Modperl is disabled"; ++#endif + znc->CanLeak(); + InstallModule("testmod.pm", R"( + package testmod; +--- a/test/integration/tests/scripting.cpp ++++ b/test/integration/tests/scripting.cpp +@@ -15,15 +15,15 @@ + */ + + #include "znctest.h" ++#include "znctestconfig.h" + + namespace znc_inttest { + namespace { + + TEST_F(ZNCTest, Modperl) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PERL ++ GTEST_SKIP() << "Modperl is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + auto ircd = ConnectIRCd(); +@@ -37,10 +37,9 @@ TEST_F(ZNCTest, Modperl) { + } + + TEST_F(ZNCTest, Modpython) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PYTHON ++ GTEST_SKIP() << "Modpython is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + auto ircd = ConnectIRCd(); +@@ -65,10 +64,9 @@ TEST_F(ZNCTest, Modpython) { + } + + TEST_F(ZNCTest, ModpythonSocket) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PYTHON ++ GTEST_SKIP() << "Modpython is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + +@@ -107,10 +105,9 @@ TEST_F(ZNCTest, ModpythonSocket) { + } + + TEST_F(ZNCTest, ModperlSocket) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PERL ++ GTEST_SKIP() << "Modperl is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + +@@ -160,10 +157,9 @@ TEST_F(ZNCTest, ModperlSocket) { + } + + TEST_F(ZNCTest, ModpythonVCString) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PYTHON ++ GTEST_SKIP() << "Modpython is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + +@@ -185,10 +181,9 @@ TEST_F(ZNCTest, ModpythonVCString) { + } + + TEST_F(ZNCTest, ModperlVCString) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PERL ++ GTEST_SKIP() << "Modperl is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + +@@ -214,10 +209,9 @@ TEST_F(ZNCTest, ModperlVCString) { + } + + TEST_F(ZNCTest, ModperlNV) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PERL ++ GTEST_SKIP() << "Modperl is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + +@@ -244,10 +238,9 @@ TEST_F(ZNCTest, ModperlNV) { + } + + TEST_F(ZNCTest, ModpythonPackage) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PYTHON ++ GTEST_SKIP() << "Modpython is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + +@@ -285,10 +278,12 @@ TEST_F(ZNCTest, ModpythonPackage) { + } + + TEST_F(ZNCTest, ModpythonModperl) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PYTHON ++ GTEST_SKIP() << "Modpython is disabled"; ++#endif ++#ifndef WANT_PERL ++ GTEST_SKIP() << "Modperl is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + +@@ -302,11 +297,9 @@ TEST_F(ZNCTest, ModpythonModperl) { + } + + TEST_F(ZNCTest, ModpythonCommand) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } +- ++#ifndef WANT_PYTHON ++ GTEST_SKIP() << "Modpython is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + +--- /dev/null ++++ b/test/integration/znctestconfig.h.cmake.in +@@ -0,0 +1,23 @@ ++/* ++ * Copyright (C) 2004-2024 ZNC, see the NOTICE file for details. ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++#ifndef ZNCTESTCONFIG_H ++#define ZNCTESTCONFIG_H ++ ++#cmakedefine WANT_PYTHON 1 ++#cmakedefine WANT_PERL 1 ++ ++#endif /* ZNCTESTCONFIG_H */ diff --git a/net-irc/znc/metadata.xml b/net-irc/znc/metadata.xml index b58dd845044e..3e24db470216 100644 --- a/net-irc/znc/metadata.xml +++ b/net-irc/znc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sbraz@gentoo.org</email> @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="zlib">Enable mod_deflate-like gzip support for znc's web interface using <pkg>sys-libs/zlib</pkg>.</flag> + <flag name="argon2">Store password hashes using Argon2id instead of SHA-256</flag> </use> <upstream> <remote-id type="github">znc/znc</remote-id> diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2-r2.ebuild index edd0b05a83d8..95ffdfe3d31e 100644 --- a/net-irc/znc/znc-1.8.2.ebuild +++ b/net-irc/znc/znc-1.8.2-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-single-r1 readme.gentoo-r1 systemd @@ -13,8 +13,7 @@ DESCRIPTION="An advanced IRC Bouncer" if [[ ${PV} == *9999* ]]; then inherit git-r3 - EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"} - SRC_URI="" + EGIT_REPO_URI="https://github.com/znc/znc.git" else MY_PV=${PV/_/-} MY_P=${PN}-${MY_PV} @@ -22,47 +21,30 @@ else https://znc.in/releases/archive/${MY_P}.tar.gz test? ( ${GTEST_URL} ) " - KEYWORDS="amd64 arm arm64 x86" - # "If you upgrade your ZNC version you must recompile all your modules." - # - https://wiki.znc.in/Compiling_modules - SLOT="0/${PV}" + KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86" S=${WORKDIR}/${MY_P} fi HOMEPAGE="https://znc.in" LICENSE="Apache-2.0" -IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib" +# "If you upgrade your ZNC version, you must recompile all your modules." +# - https://wiki.znc.in/Compiling_modules +SLOT="0/${PV}" +IUSE="+icu nls perl python +ssl sasl tcl test +zlib" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )" -DEPEND=" - icu? ( dev-libs/icu:= ) - nls? ( dev-libs/boost:=[nls] ) - perl? ( >=dev-lang/perl-5.10:= ) - python? ( ${PYTHON_DEPS} ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tcl? ( dev-lang/tcl:0= ) - zlib? ( sys-libs/zlib:0= ) -" -RDEPEND=" - ${DEPEND} - acct-user/znc - acct-group/znc -" +# perl is a build-time dependency of modpython BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext ) perl? ( - >=dev-lang/swig-3.0.0 + >=dev-lang/swig-4.0.1 >=dev-lang/perl-5.10 ) python? ( - >=dev-lang/swig-3.0.0 + >=dev-lang/swig-4.0.1 >=dev-lang/perl-5.10 ) test? ( @@ -70,8 +52,32 @@ BDEPEND=" dev-qt/qtnetwork:5 ) " +DEPEND=" + icu? ( dev-libs/icu:= ) + nls? ( dev-libs/boost:=[nls] ) + perl? ( >=dev-lang/perl-5.10:= ) + python? ( ${PYTHON_DEPS} ) + sasl? ( >=dev-libs/cyrus-sasl-2 ) + ssl? ( dev-libs/openssl:0= ) + tcl? ( dev-lang/tcl:0= ) + zlib? ( sys-libs/zlib:0= ) +" +RDEPEND=" + ${DEPEND} + acct-user/znc + acct-group/znc +" -PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch + # All these are backports + "${FILESDIR}"/${P}-fix-systemd-datadir.patch + "${FILESDIR}"/${P}-add-libera.patch + "${FILESDIR}"/${P}-fix-python-3.10.patch + "${FILESDIR}"/${P}-fix-odr-violation.patch + "${FILESDIR}"/${P}-fix-swig.patch + "${FILESDIR}"/${P}-fix-swig-2.patch +) pkg_setup() { if use python; then @@ -89,6 +95,8 @@ src_prepare() { sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \ test/CMakeLists.txt || die + sed -i "s|--datadir=|&${EPREFIX}|" znc.service.in || die + cmake_src_prepare } @@ -97,10 +105,11 @@ src_configure() { -DWANT_SYSTEMD=yes # Causes -DSYSTEMD_DIR to be used. -DSYSTEMD_DIR="$(systemd_get_systemunitdir)" -DWANT_ICU="$(usex icu)" - -DWANT_IPV6="$(usex ipv6)" + -DWANT_IPV6=yes -DWANT_I18N="$(usex nls)" -DWANT_PERL="$(usex perl)" -DWANT_PYTHON="$(usex python)" + -DWANT_PYTHON_VERSION="${EPYTHON#python}" -DWANT_CYRUS="$(usex sasl)" -DWANT_OPENSSL="$(usex ssl)" -DWANT_TCL="$(usex tcl)" @@ -140,43 +149,47 @@ src_install() { newinitd "${FILESDIR}"/znc.initd-r2 znc newconfd "${FILESDIR}"/znc.confd-r1 znc + local DOC_CONTENTS + # "local" has its own return value which is not what we want to catch DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die - DISABLE_AUTOFORMATTING=1 + local DISABLE_AUTOFORMATTING=1 readme.gentoo_create_doc } pkg_postinst() { + if [[ -d "${EROOT}/var/lib/znc/.znc/" ]]; then + eerror "${EROOT}/var/lib/znc/.znc/ exists, please move your data to ${EROOT}/var/lib/znc/" + eerror "" + eerror "The systemd unit has changed and now expects data to be located" + eerror "at the root of ${EROOT}/var/lib/znc instead of its '.znc' subfolder." + eerror "The recommended procedure to move the data is the following:" + eerror "1. stop the service: systemctl stop znc.service" + eerror "2. move the data: cp -a '${EROOT}/var/lib/znc/.znc/.' '${EROOT}/var/lib/znc/'" + eerror "3. fix the config file: sed -i 's|${EROOT}/var/lib/znc/.znc|${EROOT}/var/lib/znc|g' '${EROOT}/var/lib/znc/configs/znc.conf'" + eerror "4. restart znc: systemctl start znc.service" + eerror "5. once everything works, remove the old data directory: rm -r '${EROOT}/var/lib/znc/.znc/'" + eerror "See https://bugs.gentoo.org/743856 for details." + fi + if [[ -z "${REPLACING_VERSIONS}" ]]; then # This is a new installation readme.gentoo_print_elog fi - - if [[ -d "${EROOT}"/etc/znc ]]; then - ewarn "${EROOT}/etc/znc exists on your system." - ewarn "Due to the nature of the contents of that folder," - ewarn "we have changed the default configuration to use" - ewarn " ${EROOT}/var/lib/znc" - ewarn "please move ${EROOT}/etc/znc to ${EROOT}/var/lib/znc" - ewarn "or adjust your service configuration." - fi } pkg_config() { - if [[ -e "${EROOT}/var/lib/znc" ]]; then - ewarn "${EROOT}/var/lib/znc already exists, aborting to avoid damaging" - ewarn "any existing configuration. If you are sure you want" - ewarn "to generate a new configuration, remove the folder" - ewarn "and try again." + if [[ -d "${EROOT}/var/lib/znc/configs" ]]; then + ewarn "${EROOT}/var/lib/znc/configs/ already exists," + ewarn "aborting to avoid damaging any existing configuration." + ewarn "If you are sure you want to generate a new configuration," + ewarn "remove the folder and try again." else einfo "Press enter to interactively create a new configuration file for znc." einfo "To abort, press Control-C" read - mkdir -p "${EROOT}/var/lib/znc" || die - chown -R ${PN}:${PN} "${EROOT}/var/lib/znc" || - die "Setting permissions failed" - start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \ - "${EROOT}"/usr/bin/znc -- --makeconf --datadir "${EROOT}/var/lib/znc" || - die "Config failed" + su ${PN} -p -s /bin/sh -c 'ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \ + "${EROOT}"/usr/bin/znc --makeconf \ + --datadir "${EROOT}/var/lib/znc"' || die "Config failed" einfo einfo "You can now start the znc service using the init system of your choice." einfo "Don't forget to enable it if you want to use znc at boot." diff --git a/net-irc/znc/znc-1.8.1.ebuild b/net-irc/znc/znc-1.9.0.ebuild index a47c2912b002..66924afe2f6d 100644 --- a/net-irc/znc/znc-1.8.1.ebuild +++ b/net-irc/znc/znc-1.9.0.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-single-r1 readme.gentoo-r1 systemd -GTEST_VER="1.8.1" +GTEST_VER="1.14.0" GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz" DESCRIPTION="An advanced IRC Bouncer" if [[ ${PV} == *9999* ]]; then inherit git-r3 - EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"} - SRC_URI="" + EGIT_REPO_URI="https://github.com/znc/znc.git" else MY_PV=${PV/_/-} MY_P=${PN}-${MY_PV} @@ -22,45 +21,34 @@ else https://znc.in/releases/archive/${MY_P}.tar.gz test? ( ${GTEST_URL} ) " - KEYWORDS="amd64 arm arm64 x86" + KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86" S=${WORKDIR}/${MY_P} fi HOMEPAGE="https://znc.in" LICENSE="Apache-2.0" -SLOT="0" -IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib" +# "If you upgrade your ZNC version, you must recompile all your modules." +# - https://wiki.znc.in/Compiling_modules +SLOT="0/${PV}" +IUSE="+argon2 +icu nls perl python +ssl sasl tcl test +zlib" RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )" - -DEPEND=" - icu? ( dev-libs/icu:= ) - nls? ( dev-libs/boost:=[nls] ) - perl? ( >=dev-lang/perl-5.10:= ) - python? ( ${PYTHON_DEPS} ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tcl? ( dev-lang/tcl:0= ) - zlib? ( sys-libs/zlib:0= ) -" -RDEPEND=" - ${DEPEND} - acct-user/znc - acct-group/znc +# tests run znc-buildmod which is a Python script +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} icu ) + test? ( ${PYTHON_REQUIRED_USE} ) " + +# perl is a build-time dependency of modpython BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext ) perl? ( - >=dev-lang/swig-3.0.0 + >=dev-lang/swig-4.0.1 >=dev-lang/perl-5.10 ) python? ( - >=dev-lang/swig-3.0.0 + >=dev-lang/swig-4.0.1 >=dev-lang/perl-5.10 ) test? ( @@ -68,11 +56,32 @@ BDEPEND=" dev-qt/qtnetwork:5 ) " +DEPEND=" + dev-cpp/cctz:= + argon2? ( app-crypt/argon2:= ) + icu? ( dev-libs/icu:= ) + nls? ( dev-libs/boost:=[nls] ) + perl? ( >=dev-lang/perl-5.10:= ) + python? ( ${PYTHON_DEPS} ) + sasl? ( >=dev-libs/cyrus-sasl-2 ) + ssl? ( dev-libs/openssl:0= ) + tcl? ( dev-lang/tcl:0= ) + zlib? ( sys-libs/zlib:0= ) +" +RDEPEND=" + ${DEPEND} + acct-user/znc + acct-group/znc +" -PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch ) +PATCHES=( + "${FILESDIR}/${PN}-1.7.1-inttest-dir.patch" + # The following patch is a backport, it can be removed during the next bump + "${FILESDIR}/${P}-skip-modperl-modpython-tests-cleaner.patch" +) pkg_setup() { - if use python; then + if use python || use test; then python-single-r1_pkg_setup fi } @@ -87,6 +96,8 @@ src_prepare() { sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \ test/CMakeLists.txt || die + sed -i "s|--datadir=|&${EPREFIX}|" znc.service.in || die + cmake_src_prepare } @@ -95,10 +106,12 @@ src_configure() { -DWANT_SYSTEMD=yes # Causes -DSYSTEMD_DIR to be used. -DSYSTEMD_DIR="$(systemd_get_systemunitdir)" -DWANT_ICU="$(usex icu)" - -DWANT_IPV6="$(usex ipv6)" + -DWANT_ARGON="$(usex argon2)" + -DWANT_IPV6=yes -DWANT_I18N="$(usex nls)" -DWANT_PERL="$(usex perl)" -DWANT_PYTHON="$(usex python)" + -DWANT_PYTHON_VERSION="${EPYTHON#python}" -DWANT_CYRUS="$(usex sasl)" -DWANT_OPENSSL="$(usex ssl)" -DWANT_TCL="$(usex tcl)" @@ -106,8 +119,8 @@ src_configure() { ) if [[ ${PV} != *9999* ]] && use test; then - export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest" - export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock" + export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googletest" + export GMOCK_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googlemock" fi cmake_src_configure @@ -138,43 +151,47 @@ src_install() { newinitd "${FILESDIR}"/znc.initd-r2 znc newconfd "${FILESDIR}"/znc.confd-r1 znc + local DOC_CONTENTS + # "local" has its own return value which is not what we want to catch DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die - DISABLE_AUTOFORMATTING=1 + local DISABLE_AUTOFORMATTING=1 readme.gentoo_create_doc } pkg_postinst() { + if [[ -d "${EROOT}/var/lib/znc/.znc/" ]]; then + eerror "${EROOT}/var/lib/znc/.znc/ exists, please move your data to ${EROOT}/var/lib/znc/" + eerror "" + eerror "The systemd unit has changed and now expects data to be located" + eerror "at the root of ${EROOT}/var/lib/znc instead of its '.znc' subfolder." + eerror "The recommended procedure to move the data is the following:" + eerror "1. stop the service: systemctl stop znc.service" + eerror "2. move the data: cp -a '${EROOT}/var/lib/znc/.znc/.' '${EROOT}/var/lib/znc/'" + eerror "3. fix the config file: sed -i 's|${EROOT}/var/lib/znc/.znc|${EROOT}/var/lib/znc|g' '${EROOT}/var/lib/znc/configs/znc.conf'" + eerror "4. restart znc: systemctl start znc.service" + eerror "5. once everything works, remove the old data directory: rm -r '${EROOT}/var/lib/znc/.znc/'" + eerror "See https://bugs.gentoo.org/743856 for details." + fi + if [[ -z "${REPLACING_VERSIONS}" ]]; then # This is a new installation readme.gentoo_print_elog fi - - if [[ -d "${EROOT}"/etc/znc ]]; then - ewarn "${EROOT}/etc/znc exists on your system." - ewarn "Due to the nature of the contents of that folder," - ewarn "we have changed the default configuration to use" - ewarn " ${EROOT}/var/lib/znc" - ewarn "please move ${EROOT}/etc/znc to ${EROOT}/var/lib/znc" - ewarn "or adjust your service configuration." - fi } pkg_config() { - if [[ -e "${EROOT}/var/lib/znc" ]]; then - ewarn "${EROOT}/var/lib/znc already exists, aborting to avoid damaging" - ewarn "any existing configuration. If you are sure you want" - ewarn "to generate a new configuration, remove the folder" - ewarn "and try again." + if [[ -d "${EROOT}/var/lib/znc/configs" ]]; then + ewarn "${EROOT}/var/lib/znc/configs/ already exists," + ewarn "aborting to avoid damaging any existing configuration." + ewarn "If you are sure you want to generate a new configuration," + ewarn "remove the folder and try again." else einfo "Press enter to interactively create a new configuration file for znc." einfo "To abort, press Control-C" read - mkdir -p "${EROOT}/var/lib/znc" || die - chown -R ${PN}:${PN} "${EROOT}/var/lib/znc" || - die "Setting permissions failed" - start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \ - "${EROOT}"/usr/bin/znc -- --makeconf --datadir "${EROOT}/var/lib/znc" || - die "Config failed" + su ${PN} -p -s /bin/sh -c 'ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \ + "${EROOT}"/usr/bin/znc --makeconf \ + --datadir "${EROOT}/var/lib/znc"' || die "Config failed" einfo einfo "You can now start the znc service using the init system of your choice." einfo "Don't forget to enable it if you want to use znc at boot." diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild index e407d3d52d23..019d97123dde 100644 --- a/net-irc/znc/znc-9999.ebuild +++ b/net-irc/znc/znc-9999.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-single-r1 readme.gentoo-r1 systemd -GTEST_VER="1.8.1" +GTEST_VER="1.14.0" GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz" DESCRIPTION="An advanced IRC Bouncer" if [[ ${PV} == *9999* ]]; then inherit git-r3 - EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"} - SRC_URI="" + EGIT_REPO_URI="https://github.com/znc/znc.git" else MY_PV=${PV/_/-} MY_P=${PN}-${MY_PV} @@ -22,48 +21,34 @@ else https://znc.in/releases/archive/${MY_P}.tar.gz test? ( ${GTEST_URL} ) " - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - # "If you upgrade your ZNC version you must recompile all your modules." - # - https://wiki.znc.in/Compiling_modules - SLOT="0/${PV}" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" S=${WORKDIR}/${MY_P} fi HOMEPAGE="https://znc.in" LICENSE="Apache-2.0" -SLOT="0" -IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib" +# "If you upgrade your ZNC version, you must recompile all your modules." +# - https://wiki.znc.in/Compiling_modules +SLOT="0/${PV}" +IUSE="+argon2 +icu nls perl python +ssl sasl tcl test +zlib" RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )" - -DEPEND=" - icu? ( dev-libs/icu:= ) - nls? ( dev-libs/boost:=[nls] ) - perl? ( >=dev-lang/perl-5.10:= ) - python? ( ${PYTHON_DEPS} ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tcl? ( dev-lang/tcl:0= ) - zlib? ( sys-libs/zlib:0= ) -" -RDEPEND=" - ${DEPEND} - acct-user/znc - acct-group/znc +# tests run znc-buildmod which is a Python script +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} icu ) + test? ( ${PYTHON_REQUIRED_USE} ) " + +# perl is a build-time dependency of modpython BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext ) perl? ( - >=dev-lang/swig-3.0.0 + >=dev-lang/swig-4.0.1 >=dev-lang/perl-5.10 ) python? ( - >=dev-lang/swig-3.0.0 + >=dev-lang/swig-4.0.1 >=dev-lang/perl-5.10 ) test? ( @@ -71,11 +56,30 @@ BDEPEND=" dev-qt/qtnetwork:5 ) " +DEPEND=" + dev-cpp/cctz:= + argon2? ( app-crypt/argon2:= ) + icu? ( dev-libs/icu:= ) + nls? ( dev-libs/boost:=[nls] ) + perl? ( >=dev-lang/perl-5.10:= ) + python? ( ${PYTHON_DEPS} ) + sasl? ( >=dev-libs/cyrus-sasl-2 ) + ssl? ( dev-libs/openssl:0= ) + tcl? ( dev-lang/tcl:0= ) + zlib? ( sys-libs/zlib:0= ) +" +RDEPEND=" + ${DEPEND} + acct-user/znc + acct-group/znc +" -PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch ) +PATCHES=( + "${FILESDIR}/${PN}-1.7.1-inttest-dir.patch" +) pkg_setup() { - if use python; then + if use python || use test; then python-single-r1_pkg_setup fi } @@ -90,6 +94,8 @@ src_prepare() { sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \ test/CMakeLists.txt || die + sed -i "s|--datadir=|&${EPREFIX}|" znc.service.in || die + cmake_src_prepare } @@ -98,10 +104,12 @@ src_configure() { -DWANT_SYSTEMD=yes # Causes -DSYSTEMD_DIR to be used. -DSYSTEMD_DIR="$(systemd_get_systemunitdir)" -DWANT_ICU="$(usex icu)" - -DWANT_IPV6="$(usex ipv6)" + -DWANT_ARGON="$(usex argon2)" + -DWANT_IPV6=yes -DWANT_I18N="$(usex nls)" -DWANT_PERL="$(usex perl)" -DWANT_PYTHON="$(usex python)" + -DWANT_PYTHON_VERSION="${EPYTHON#python}" -DWANT_CYRUS="$(usex sasl)" -DWANT_OPENSSL="$(usex ssl)" -DWANT_TCL="$(usex tcl)" @@ -109,8 +117,8 @@ src_configure() { ) if [[ ${PV} != *9999* ]] && use test; then - export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest" - export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock" + export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googletest" + export GMOCK_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googlemock" fi cmake_src_configure @@ -141,43 +149,47 @@ src_install() { newinitd "${FILESDIR}"/znc.initd-r2 znc newconfd "${FILESDIR}"/znc.confd-r1 znc + local DOC_CONTENTS + # "local" has its own return value which is not what we want to catch DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die - DISABLE_AUTOFORMATTING=1 + local DISABLE_AUTOFORMATTING=1 readme.gentoo_create_doc } pkg_postinst() { + if [[ -d "${EROOT}/var/lib/znc/.znc/" ]]; then + eerror "${EROOT}/var/lib/znc/.znc/ exists, please move your data to ${EROOT}/var/lib/znc/" + eerror "" + eerror "The systemd unit has changed and now expects data to be located" + eerror "at the root of ${EROOT}/var/lib/znc instead of its '.znc' subfolder." + eerror "The recommended procedure to move the data is the following:" + eerror "1. stop the service: systemctl stop znc.service" + eerror "2. move the data: cp -a '${EROOT}/var/lib/znc/.znc/.' '${EROOT}/var/lib/znc/'" + eerror "3. fix the config file: sed -i 's|${EROOT}/var/lib/znc/.znc|${EROOT}/var/lib/znc|g' '${EROOT}/var/lib/znc/configs/znc.conf'" + eerror "4. restart znc: systemctl start znc.service" + eerror "5. once everything works, remove the old data directory: rm -r '${EROOT}/var/lib/znc/.znc/'" + eerror "See https://bugs.gentoo.org/743856 for details." + fi + if [[ -z "${REPLACING_VERSIONS}" ]]; then # This is a new installation readme.gentoo_print_elog fi - - if [[ -d "${EROOT}"/etc/znc ]]; then - ewarn "${EROOT}/etc/znc exists on your system." - ewarn "Due to the nature of the contents of that folder," - ewarn "we have changed the default configuration to use" - ewarn " ${EROOT}/var/lib/znc" - ewarn "please move ${EROOT}/etc/znc to ${EROOT}/var/lib/znc" - ewarn "or adjust your service configuration." - fi } pkg_config() { - if [[ -e "${EROOT}/var/lib/znc" ]]; then - ewarn "${EROOT}/var/lib/znc already exists, aborting to avoid damaging" - ewarn "any existing configuration. If you are sure you want" - ewarn "to generate a new configuration, remove the folder" - ewarn "and try again." + if [[ -d "${EROOT}/var/lib/znc/configs" ]]; then + ewarn "${EROOT}/var/lib/znc/configs/ already exists," + ewarn "aborting to avoid damaging any existing configuration." + ewarn "If you are sure you want to generate a new configuration," + ewarn "remove the folder and try again." else einfo "Press enter to interactively create a new configuration file for znc." einfo "To abort, press Control-C" read - mkdir -p "${EROOT}/var/lib/znc" || die - chown -R ${PN}:${PN} "${EROOT}/var/lib/znc" || - die "Setting permissions failed" - start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \ - "${EROOT}"/usr/bin/znc -- --makeconf --datadir "${EROOT}/var/lib/znc" || - die "Config failed" + su ${PN} -p -s /bin/sh -c 'ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \ + "${EROOT}"/usr/bin/znc --makeconf \ + --datadir "${EROOT}/var/lib/znc"' || die "Config failed" einfo einfo "You can now start the znc service using the init system of your choice." einfo "Don't forget to enable it if you want to use znc at boot." |