From b17a3ef12038de50228bade1f05502c74e135321 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Sep 2020 14:09:07 +0100 Subject: gentoo resync : 02.09.2020 --- net-irc/Manifest.gz | Bin 7695 -> 8370 bytes net-irc/anope/Manifest | 4 +- net-irc/anope/anope-2.0.6.ebuild | 158 --------------------- net-irc/anope/metadata.xml | 12 -- net-irc/dccserver/Manifest | 2 +- net-irc/dccserver/dccserver-0.5-r1.ebuild | 20 ++- net-irc/ircstats/Manifest | 2 +- net-irc/ircstats/ircstats-1.2.ebuild | 13 +- net-irc/irssi-xmpp/Manifest | 6 +- .../files/irssi-xmpp-0.53-irssi-1.0.patch | 57 -------- net-irc/irssi-xmpp/irssi-xmpp-0.53.ebuild | 38 ----- net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild | 10 +- net-irc/muh/Manifest | 2 +- net-irc/muh/metadata.xml | 3 - net-irc/ngircd/Manifest | 4 - net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch | 77 ---------- net-irc/ngircd/files/ngircd-25-make-env.patch | 75 ---------- net-irc/ngircd/ngircd-25.ebuild | 111 --------------- net-irc/polari/Manifest | 2 +- net-irc/polari/polari-3.36.3.ebuild | 2 +- net-irc/psybnc/Manifest | 2 +- net-irc/psybnc/metadata.xml | 1 - net-irc/quasselgrep/Manifest | 2 +- net-irc/quasselgrep/metadata.xml | 9 +- net-irc/scrollz/Manifest | 3 +- net-irc/scrollz/files/scrollz-2.3-fcommon.patch | 17 +++ net-irc/scrollz/scrollz-2.3.ebuild | 19 +-- net-irc/sic/Manifest | 4 +- net-irc/sic/files/sic-1.2-include-path.patch | 16 +++ net-irc/sic/files/sic-1.2-musl-time-include.patch | 32 +++++ net-irc/sic/sic-1.2-r1.ebuild | 14 +- net-irc/unrealircd/Manifest | 2 +- net-irc/unrealircd/unrealircd-5.0.6.ebuild | 2 +- net-irc/znc-clientbuffer/Manifest | 3 + net-irc/znc-clientbuffer/metadata.xml | 12 ++ .../znc-clientbuffer-1.0.48.ebuild | 37 +++++ net-irc/znc-igloo-push/Manifest | 3 + net-irc/znc-igloo-push/metadata.xml | 15 ++ .../znc-igloo-push/znc-igloo-push-20200520.ebuild | 37 +++++ net-irc/znc-palaver/Manifest | 5 + .../files/znc-palaver-1.2.1-python310.patch | 48 +++++++ .../files/znc-palaver-1.2.1-xunit2.patch | 23 +++ net-irc/znc-palaver/metadata.xml | 16 +++ net-irc/znc-palaver/znc-palaver-1.2.1.ebuild | 60 ++++++++ net-irc/znc-playback/Manifest | 3 + net-irc/znc-playback/metadata.xml | 19 +++ net-irc/znc-playback/znc-playback-20200510.ebuild | 37 +++++ 47 files changed, 450 insertions(+), 589 deletions(-) delete mode 100644 net-irc/anope/anope-2.0.6.ebuild delete mode 100644 net-irc/irssi-xmpp/files/irssi-xmpp-0.53-irssi-1.0.patch delete mode 100644 net-irc/irssi-xmpp/irssi-xmpp-0.53.ebuild delete mode 100644 net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch delete mode 100644 net-irc/ngircd/files/ngircd-25-make-env.patch delete mode 100644 net-irc/ngircd/ngircd-25.ebuild create mode 100644 net-irc/scrollz/files/scrollz-2.3-fcommon.patch create mode 100644 net-irc/sic/files/sic-1.2-include-path.patch create mode 100644 net-irc/sic/files/sic-1.2-musl-time-include.patch create mode 100644 net-irc/znc-clientbuffer/Manifest create mode 100644 net-irc/znc-clientbuffer/metadata.xml create mode 100644 net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild create mode 100644 net-irc/znc-igloo-push/Manifest create mode 100644 net-irc/znc-igloo-push/metadata.xml create mode 100644 net-irc/znc-igloo-push/znc-igloo-push-20200520.ebuild create mode 100644 net-irc/znc-palaver/Manifest create mode 100644 net-irc/znc-palaver/files/znc-palaver-1.2.1-python310.patch create mode 100644 net-irc/znc-palaver/files/znc-palaver-1.2.1-xunit2.patch create mode 100644 net-irc/znc-palaver/metadata.xml create mode 100644 net-irc/znc-palaver/znc-palaver-1.2.1.ebuild create mode 100644 net-irc/znc-playback/Manifest create mode 100644 net-irc/znc-playback/metadata.xml create mode 100644 net-irc/znc-playback/znc-playback-20200510.ebuild (limited to 'net-irc') diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz index 55ba1da0e037..751f0f0ce027 100644 Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest index 692e0ca2399e..d52055042450 100644 --- a/net-irc/anope/Manifest +++ b/net-irc/anope/Manifest @@ -3,8 +3,6 @@ AUX anope-2.0.7-example.conf-user.patch 391 BLAKE2B 781e413ef79a7ca601710957b519 AUX anope-2.0.7-musl-libintl.patch 566 BLAKE2B 7deb854a68c259c9055a086fbb33a63d00544bacd1a9dd2bdd6793d93a8885be195336aa66054933a6bc9cfd1dabb5ff8eaea2529f4fd4841ff51364931fd320 SHA512 11e69a97bc0cca89719584e849577868c045a75ab531bc43c61140b29f640cf761f9f73165ebb70079d0d9e1dfeb335222c8954bf2b037f6b80b9f33da69bf87 AUX anope-conf.d-v2 344 BLAKE2B 8817bba9938aa03abf79e61b86ddde537c6ec68b6584074e1f9bc50fe8334c5d0135ca17551390618f60b26d93f0209789b9337879dbecdcb4fced3d2bb88b3b SHA512 ae1851ccaa128404f3a721c92571ae3c4e0efd18c318485594f87da565b2de505ee9ace580b5d1c4ce4a7b53a4eba8338874195ca3a2cbc415ab6facdb3c9d7a AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f9352f2ada8ba5bc90fc1a8b5e4779bd132606d9297c19fd418db02d8a26b6629da675f6fc0d8c SHA512 e058ccfb4a44238cd1540704f130207236be71799d0a5f4678638d313d958b10dfc5de9cd515f18ccdd9faf41dc93eaf33b5f4013f534efec00adc401a2cb97c -DIST anope-2.0.6-source.tar.gz 1792912 BLAKE2B 00c70723c887821d2dda065f9fdb4c4fc79a1534217dd567c2247c3ae9d0b3c1c07a9e1e9d87bfdf5f7f9be212af5139e29710224e02e80154290dd6d4b5ee7c SHA512 c100758d6159023832bc7a4dceb7d554a9b3cd9120b033efc9a93c7ff28e76a086d0594b66b9cd2946b231421217674990f2a3ebaa8a6598c2a25e2dafd1b65b DIST anope-2.0.7-source.tar.gz 1817484 BLAKE2B 13a4628db8cb885d4636ab1897aab322f7846740e4a3fccd02a417d84a8eb3c942aebf5e0a51f8ca1108f455b44b4e280e7386b42e03f640c9b0e68943252814 SHA512 22a9f3e0d9fe7f68304062829a19b693a3414f94c90f8da601ab98995cbff7310dc22ca40749d50d6722dfb4649817d2f4b1dbe4afa3254b28980f03a491de65 -EBUILD anope-2.0.6.ebuild 5003 BLAKE2B d6d518195763f6673b6472daf36cf8e9ee792a04026b4289741b573cf6b3be669bb03e6a4be436ea5fb5ce4f66ad350918cf7bd6f97ef83b49589ebf7e9b0145 SHA512 9987c769735d6e1521c67143698ceeb3fa3143a020fe34b85d81a254f7b3761908ee1c5200b9999f73f51d7cb686236ecba9002f4e290c8ecdca82592f95bd98 EBUILD anope-2.0.7.ebuild 4305 BLAKE2B 0bfc78a17737d333768066bb5182f2a426f62c5e4de7559226b76aa81a7d7bf6ed1e4ec7748832569d4725f6d0107d4dabfa8ce2110d263fcc4996c850683808 SHA512 d2134d165f68f718c1e60a0056a89dfb346c12e6c2ebb363cd688d50e792860c8292008b2e6020350cac769a3ac0cea51e22a5dffdcedf95a1e735b4857a038a -MISC metadata.xml 1649 BLAKE2B 8d692618d256a242f3314f3bf1df6825e487771dced98ac88d3bc1f697f35d716e514f4789357eaef053a925bc51dbfeb3bcd4144fe31aaa70c11c83b2241a72 SHA512 8622b5d345ec80b7ef759a02bf74690c4755cc10d169d2f61718893d620611012fc98fc85ca912c6ce4a8294df6f69e8129a8649433de7d274ae1e171af15c44 +MISC metadata.xml 901 BLAKE2B 0051a2f196c30f3fddfaae55dc660140a77d8b636454230473107af38f9e54cc059fa012516b07b86d1667bcfaf6fdeec6005de95c48b1b832ebd22826c03210 SHA512 f8271f6ece0d7f9488f317d8f4f8bdc8813521d15a603ea81445e109792ed5720319529f5c5527a902ff323151f4a58fbf62a83110104ce270ae5d96ec154ef6 diff --git a/net-irc/anope/anope-2.0.6.ebuild b/net-irc/anope/anope-2.0.6.ebuild deleted file mode 100644 index 1d78f2271b9f..000000000000 --- a/net-irc/anope/anope-2.0.6.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake user - -DESCRIPTION="Anope IRC Services" -HOMEPAGE="https://anope.org" -SRC_URI="https://github.com/anope/anope/releases/download/${PV}/${P}-source.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="chanstats cs-fantasy-stats cs-fantasy-top gnutls irc2sql ldap - ldap-auth ldap-oper mysql pcre posix sql-auth sql-log sql-oper - sqlite ssl tre" - -REQUIRED_USE=" - chanstats? ( mysql ) - cs-fantasy-stats? ( chanstats mysql ) - cs-fantasy-top? ( chanstats mysql ) - irc2sql? ( mysql ) - ldap-auth? ( ldap ) - ldap-oper? ( ldap ) - sql-auth? ( || ( mysql sqlite ) ) - sql-log? ( mysql ) - sql-oper? ( mysql )" - -BDEPEND="sys-devel/gettext" -DEPEND="${BDEPEND} - mysql? ( dev-db/mysql-connector-c:0= ) - ssl? ( dev-libs/openssl:0= ) - gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= ) - ldap? ( net-nds/openldap ) - pcre? ( dev-libs/libpcre ) - sqlite? ( dev-db/sqlite:3 ) - tre? ( dev-libs/tre )" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/anope-2.0.6-example.conf-pid-path.patch" ) - -S="${WORKDIR}/${P}-source" - -pkg_pretend() { - local replaced_version - for replaced_version in ${REPLACING_VERSIONS} ; do - if ver_test ${replaced_version} -lt 1.8.7 && [[ -f ${ROOT}/opt/anope/data/nick.db ]]; then - eerror "It looks like you have an older version of Anope installed." - eerror "To upgrade, shut down Anope and copy your databases to" - eerror "${ROOT}/var/lib/anope and your configuration to ${ROOT}/etc/anope" - eerror "You can do this by:" - eerror "# mkdir -p ${ROOT}/var/lib/anope ${ROOT}/etc/anope" - eerror "# chown anope:anope ${ROOT}/var/lib/anope" - eerror "# mv ${ROOT}/opt/anope/data/*.db ${ROOT}/var/lib/anope" - eerror "# mv ${ROOT}/opt/anope/data/services.conf ${ROOT}/etc/anope" - die "Please move your anope database files from /opt/anope/data" - fi - done -} - -pkg_setup() { - enewgroup anope - enewuser anope -1 -1 -1 anope -} - -src_prepare() { - anope_use_extra() { - local useflag=$1 - local modulefile=$2 - if use $useflag; then - ln -s "extra/${modulefile}" "modules/" || \ - die "Failed to use ${modulefile}" - fi - } - - anope_use_extra mysql "m_mysql.cpp" - anope_use_extra sqlite "m_sqlite.cpp" - anope_use_extra ssl "m_ssl_openssl.cpp" - anope_use_extra gnutls "m_ssl_gnutls.cpp" - anope_use_extra posix "m_regex_posix.cpp" - anope_use_extra pcre "m_regex_pcre.cpp" - anope_use_extra tre "m_regex_tre.cpp" - anope_use_extra ldap "m_ldap.cpp" - anope_use_extra sql-auth "m_sql_authentication.cpp" - anope_use_extra sql-log "m_sql_log.cpp" - anope_use_extra sql-oper "m_sql_oper.cpp" - anope_use_extra ldap-auth "m_ldap_authentication.cpp" - anope_use_extra ldap-oper "m_ldap_oper.cpp" - anope_use_extra chanstats "stats/m_chanstats.cpp" - anope_use_extra cs-fantasy-top "stats/cs_fantasy_top.cpp" - anope_use_extra cs-fantasy-stats "stats/cs_fantasy_stats.cpp" - anope_use_extra irc2sql "stats/irc2sql/irc2sql.cpp" - anope_use_extra irc2sql "stats/irc2sql/irc2sql.h" - anope_use_extra irc2sql "stats/irc2sql/tables.cpp" - anope_use_extra irc2sql "stats/irc2sql/utils.cpp" - - # Avoid a silly sandbox error - tries to delete /usr/lib/modules - sed -i '/install.*REMOVE_RECURSE.*/d' CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBIN_DIR="libexec/anope" - -DDB_DIR="../var/lib/anope" - -DDOC_DIR="share/doc/${PF}" - -DLIB_DIR="$(get_libdir)/anope" - -DLOCALE_DIR="share/locale" - -DCONF_DIR="/etc/anope" - -DLOGS_DIR="../var/log/anope/" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - newinitd "${FILESDIR}/anope-init.d" "${PN}" - cp "${FILESDIR}/anope-conf.d-v2" "${T}" || die - sed -i "s~%LIBDIR%~${EPREFIX}/usr/$(get_libdir)/anope/~" \ - "${T}/anope-conf.d-v2" || die - newconfd "${T}/anope-conf.d-v2" "${PN}" - dosym ../libexec/anope/services /usr/bin/services - dosym ../libexec/anope/anopesmtp /usr/bin/anopesmtp - keepdir /var/log/anope /var/lib/anope/backups - fowners anope:anope /var/{lib,log}/anope /var/lib/anope/backups - dodoc -r docs/* data/example.conf - insinto /etc/anope - newins data/example.conf services.conf - fowners -R anope:anope /etc/anope - fperms -R 0700 /etc/anope - fperms 0755 /var/log/anope - fperms -R 0750 /var/lib/anope -} - -pkg_preinst() { - if [[ -n ${REPLACING_VERSIONS} ]] ; then - local directory - directory="${ROOT}"/var/lib/anope/pre-update - elog "Making a backup of your databases to ${directory}" - if [ ! -d "${directory}" ]; then - mkdir -p "${directory}" || die "failed to create backup directory" - chown anope:anope "${directory}"/../ || die "failed to chown data directory" - fi - # don't die otherwise merge will fail if there are no existing databases - cp "${ROOT}"/var/lib/anope/*.db "${directory}" - fi -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]] ; then - 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 - fi -} diff --git a/net-irc/anope/metadata.xml b/net-irc/anope/metadata.xml index 9826ad83c454..01ccc819ffe1 100644 --- a/net-irc/anope/metadata.xml +++ b/net-irc/anope/metadata.xml @@ -19,17 +19,5 @@ Provide SSL services using OpenSSL Build modules which require SQL Use dev-libs/tre for regular expressions - - - Channel Statistics - Enables the STATS and GSTATS commands - Enables the (G)TOP and (G)TOP10 commands - Stores channel statistics in a mysql database - Authorize through LDAP - Dynamically ties users to Anope opertypes via LDAP - Add support for POSIX Compatible Regular Expressions - Authorize through SQL - Additional log target in SQL - Allows granting users services operator privileges from SQL diff --git a/net-irc/dccserver/Manifest b/net-irc/dccserver/Manifest index 4333f42818a8..b98696ded318 100644 --- a/net-irc/dccserver/Manifest +++ b/net-irc/dccserver/Manifest @@ -1,3 +1,3 @@ DIST dccserver-0.5.tar.gz 139083 BLAKE2B cdb81051b65f79b6923b0b8cee5360f76395bd1a0d5d5b250a65a4ec12f3440f5e4c0f8c2020263c18265c03bd155563528bed3d80b9af6b468940cadcbbd70e SHA512 0fb2584dc4bee930fa259862206ba875cf0c7a8257799c3fe85d470de6827eab0b304b0e07b8692268fd1a63a82249204c447df92bed0dd994c78ec295040494 -EBUILD dccserver-0.5-r1.ebuild 351 BLAKE2B 52b0f1e149187a628745b8a3a880fee332dace69cdeee4d9f7a32a625a0debeeb53501d8b827ac0356ed5bdbb5b800852ff0b6805846ffc26ac8c7f18e3ad124 SHA512 5a032d17a059fd8e47b66385eee334a1e3491914675ff0ea0943854bd652f062a855c5dbc616c7264cfb8a5d6f84587388a0422328882f20513b9a853af5d265 +EBUILD dccserver-0.5-r1.ebuild 484 BLAKE2B 5391f4b0c172616e096b4b36fcb9c7e515a51ae022e2fdd188f0b2b926e7dc7e595766bd6c263d9077bdeac28442f95a87371001dac15f5761fbefbe367ffb1c SHA512 f0bf5b1ac7a85354ab1d4dd0fd5818867d24bf6bb23afa3c4a433a4999f6107d3bd73ff125d17de7a660934a14e37301d630c24a594c474a42356bfb1f4bb90c MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-irc/dccserver/dccserver-0.5-r1.ebuild b/net-irc/dccserver/dccserver-0.5-r1.ebuild index 2576bf19e353..995df89457bf 100644 --- a/net-irc/dccserver/dccserver-0.5-r1.ebuild +++ b/net-irc/dccserver/dccserver-0.5-r1.ebuild @@ -1,15 +1,25 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +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 x86" -IUSE="" -DEPEND="" -RDEPEND="" +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/ircstats/Manifest b/net-irc/ircstats/Manifest index d05c1497b6da..5974ed61f4a3 100644 --- a/net-irc/ircstats/Manifest +++ b/net-irc/ircstats/Manifest @@ -1,3 +1,3 @@ DIST IRCStats-1.2.tgz 48036 BLAKE2B ecdfd2be915f60af81d907b2347dba9c45e47416c4777d623d4cee04111a8dc57e35e31d303eab53a4424004e7ef57ebfef3b48c484fc27959807a302512d45c SHA512 195c0b5e954526d7c55eee74172db4d55487bc415eea393a780fdfce0886fd4ebc523309b4dbb1db0a2f5eb5d941db7d71e57234b75b11650ead30aa31017b03 -EBUILD ircstats-1.2.ebuild 741 BLAKE2B 3e77479cf8740bd13c305d6243b583a73e82a487e7788dc8bb103d0b8bdba022aca84c679e977dab7f87f8ecbb5df8528dfe021d8849db0a97d93ecba4425019 SHA512 a000f16b18f145156807a78ae918a6a364578fe0936466699b49b519d927f3574e65fc37dfd10d6b78fa758c7c150c9c77e00de1edd9e2a5d26176f2198da480 +EBUILD ircstats-1.2.ebuild 741 BLAKE2B fa4a64c52db42495a819ab21fa4e8f5fc6b122be955b4080e580af7547b35664fecaeb490619b1df3f7f92495f26bcf9df2fa1daf59171425d5ae3507d6905a0 SHA512 09dbcf7aa46b941cf52d83262097d0ebe0049a7c63eb10183a19dd720583d88743f02b2a78d074bc64f58dd7d23aedf7c245bc575594fb5d2495bfd6887e6865 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-irc/ircstats/ircstats-1.2.ebuild b/net-irc/ircstats/ircstats-1.2.ebuild index d50345072372..c893f91fb286 100644 --- a/net-irc/ircstats/ircstats-1.2.ebuild +++ b/net-irc/ircstats/ircstats-1.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs MY_P="IRCStats-${PV}" @@ -14,10 +14,9 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -S="${WORKDIR}"/${MY_P} +S="${WORKDIR}/${MY_P}" src_compile() { - default emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" } @@ -29,6 +28,6 @@ src_install() { } pkg_postinst() { - elog "The IRCStats files have been installed in /usr/share/ircstats" - elog "You can find an example ircstats.cfg in /usr/share/doc/${PF}" + elog "The IRCStats files have been installed in ${EROOT}/usr/share/ircstats" + elog "You can find an example ircstats.cfg in ${EROOT}/usr/share/doc/${PF}" } diff --git a/net-irc/irssi-xmpp/Manifest b/net-irc/irssi-xmpp/Manifest index 98b7c87b9c16..f9aae4c47153 100644 --- a/net-irc/irssi-xmpp/Manifest +++ b/net-irc/irssi-xmpp/Manifest @@ -1,6 +1,4 @@ -AUX irssi-xmpp-0.53-irssi-1.0.patch 1877 BLAKE2B 80956453f37de65bc39ca1e1a2c5fdea704f8389ed4d7e13f03635d00f18608d1ce828dfbd06b3b0004fbe43578cd9a0da624c6085d2e27d1e7c8c85c5cf7be6 SHA512 8fabc71b9b45eace69041c4b446f8227e92ce426980bb03f3251d7fac1d0cf96ef00a3f5f0a21b07590dabc97db605ac39f5d78131d945b95e466c3fd6a2cac7 -DIST irssi-xmpp-0.53.tar.gz 65649 BLAKE2B 69621ae0fadb3b3c1015b5ffa1f4b9e81cc3b92270c07582f5a4cefe83f9ed4e1735527900c6989127c8d70616b316ea42653ee57aa5a8b0e6e5c641cf064346 SHA512 09969db01b77e95248a080599d480b8271dcbe6d42bc90e5e2bb304a2d1b9695b70090ef0a6b7342bf6e17326e0f7a50c11c85e02e6ed742ec55820ffad655be +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 -EBUILD irssi-xmpp-0.53.ebuild 794 BLAKE2B 2d34c668b665062f5007b7935b321d68dc86a6db523032226d69882e0ac19d96cee9320213da09418313dfcefc82e66c49dbfe326578d2c9a4baa89e9bc66547 SHA512 3236a53cdb10bebaf15f5644f20fec2a1a47f2423d7c0d03163978d9c41a1a86a66a5bf6d611cb259db9345d825b6409b1631abd33aac24d5229147eb7bcc83a -EBUILD irssi-xmpp-0.54.ebuild 705 BLAKE2B 4a2bb9ab0f057e4790dd0ea525db35be821395d19bbf46db9410f327e0654163ee6a59c9e964898c967becbd7b1f2502f8c411fbde977c28c5e9b9a1427f4ae2 SHA512 f614e1ae5d0392d38fc114aad5800ec53d008fc90c60844ac7c66b0de64a9ce49cba05ab0053373d1fcb27ef5bb639a7f10835f0138b1a6e2b7f9efbb6ccf733 +EBUILD irssi-xmpp-0.54.ebuild 891 BLAKE2B b3d49990bce3c6f74547e25465faf5e962dca086b787fbc3909d2498794c1aca4e6434306290a98e3dfaac615718c390ee70616b55a8f6460931e44aaf389425 SHA512 250dfaacb0f0ca219d8b3862e7008acbde97732af27f536f22e00ef3e577e4c31a4a4369857cbd71a9d37eb4a8c362c1bb2ed110e8cb036d04e1dde8bd9136d5 MISC metadata.xml 250 BLAKE2B c268b1356ec4037e979bc2cf251f27473ab234bc7f5925b1725445675e59ce59fbd8900ffe5c09acdba75194848c7f001c8b1e6187a11744601dee6e3bd3c273 SHA512 ef7d2ea71e78c9684960143c24b05c0be118fe34e7ff731d4aa37d15b7435d5483440d235a59c2e223674b74cf7a9103c9e70fa1513225cc71b31ec01ea057cb diff --git a/net-irc/irssi-xmpp/files/irssi-xmpp-0.53-irssi-1.0.patch b/net-irc/irssi-xmpp/files/irssi-xmpp-0.53-irssi-1.0.patch deleted file mode 100644 index a92d4db4739b..000000000000 --- a/net-irc/irssi-xmpp/files/irssi-xmpp-0.53-irssi-1.0.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 0d9e5f7f1a0edaea0de312828ce47d11f74ee3dc Mon Sep 17 00:00:00 2001 -From: benaryorg -Date: Fri, 20 Jan 2017 06:31:28 +0100 -Subject: [PATCH] fix build with irssi 1.0 - -use_ssl field of SERVER_CONNECT_REC has been renamed to use_tls. - -Original patch from darix. - -Signed-off-by: benaryorg ---- - src/core/xmpp-servers.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/src/core/xmpp-servers.c b/src/core/xmpp-servers.c -index 405ecd9..8d0b62d 100644 ---- a/src/core/xmpp-servers.c -+++ b/src/core/xmpp-servers.c -@@ -32,6 +32,11 @@ - #include "rosters-tools.h" - #include "tools.h" - -+/* IRSSI_ABI_VERSION was introduced in 0.8.18 */ -+#if !defined(IRSSI_ABI_VERSION) || IRSSI_ABI_VERSION < 6 -+# define use_tls use_ssl -+#endif -+ - static void - channels_join(SERVER_REC *server, const char *data, int automatic) - { -@@ -151,7 +156,7 @@ xmpp_server_init_connect(SERVER_CONNECT_REC *connrec) - server->connect_pid = -1; - - if (server->connrec->port <= 0) -- server->connrec->port = (server->connrec->use_ssl) ? -+ server->connrec->port = (server->connrec->use_tls) ? - LM_CONNECTION_DEFAULT_PORT_SSL : LM_CONNECTION_DEFAULT_PORT; - - if (conn->real_jid == NULL) -@@ -335,7 +340,7 @@ lm_open_cb(LmConnection *connection, gboolean success, - g_free(host); - } else - signal_emit("server connecting", 1, server); -- if (server->connrec->use_ssl) -+ if (server->connrec->use_tls) - signal_emit("xmpp server status", 2, server, - "Using SSL encryption."); - else if (lm_ssl_get_use_starttls(lm_connection_get_ssl(server->lmconn))) -@@ -470,7 +475,7 @@ xmpp_server_connect(XMPP_SERVER_REC *server) - return; - error = NULL; - err_msg = NULL; -- if (server->connrec->use_ssl) { -+ if (server->connrec->use_tls) { - if (!set_ssl(server->lmconn, &error, server, FALSE)) { - err_msg = "Cannot init ssl"; - goto err; diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.53.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.53.ebuild deleted file mode 100644 index 897b1d37ddd4..000000000000 --- a/net-irc/irssi-xmpp/irssi-xmpp-0.53.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="An irssi plugin providing Jabber/XMPP support" -HOMEPAGE="https://cybione.org/~irssi-xmpp/" -SRC_URI="https://github.com/cdidier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - >=net-irc/irssi-0.8.13 - >=net-libs/loudmouth-1.4.0" - -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-irssi-1.0.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="${D}" PREFIX=/usr IRSSI_LIB=/usr/$(get_libdir)/irssi install - dodoc README 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 78831f468181..fab3d7c47f16 100644 --- a/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild +++ b/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild @@ -8,29 +8,33 @@ inherit toolchain-funcs DESCRIPTION="An irssi plugin providing Jabber/XMPP support" HOMEPAGE="https://cybione.org/~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" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" +BDEPEND="virtual/pkgconfig" DEPEND=" net-irc/irssi net-libs/loudmouth " - RDEPEND="${DEPEND}" src_prepare() { default + + eapply "${DISTDIR}/${PN}-0.54-musl-build.patch" + sed -e "s/{MAKE} doc-install/{MAKE}/" \ -i Makefile || die #322355 } src_compile() { - emake PREFIX=/usr + emake PREFIX=/usr CC="$(tc-getCC)" } src_install() { - emake DESTDIR="${D}" PREFIX=/usr IRSSI_LIB=/usr/$(get_libdir)/irssi install + emake DESTDIR="${ED}" PREFIX=/usr IRSSI_LIB=/usr/$(get_libdir)/irssi install dodoc README.md NEWS TODO docs/* } diff --git a/net-irc/muh/Manifest b/net-irc/muh/Manifest index 29127999ead8..98fec8419535 100644 --- a/net-irc/muh/Manifest +++ b/net-irc/muh/Manifest @@ -1,3 +1,3 @@ DIST muh-2.2a.tar.gz 130672 BLAKE2B dd1f925539e7656822c8d66b35ea84ccbf23278e78c5c5d692400a192bb2d93197ad4205169c76de5386dc2fd1bdd191e3979082766af5d759f79c9ceaa44536 SHA512 2e3ba080f420cf063627d4d9b1f4001c76575efb1d3e99ff9c5eee4a483d5beda6e326f0c0d60c3d848b78cac092aac51a98cabc351760ccfa38fe1549c4b4ee EBUILD muh-2.2a-r1.ebuild 737 BLAKE2B 8dcdc7b1396ec55c1a941dff835af9e469568bc5aa6979b0fa774445c6d4f6914926f1ee68570b7163c86a2468c990ebc87f8325dccb20ea3932a876d419ba58 SHA512 3538d3ff4b7bb61b91e882dd70d9d1ed1d433d47d39219b82428898dbe1082ffc6b82fcaf8e2121f35b116fbccf14bbb0e2646094beded2d4a1d4c1be2d01a68 -MISC metadata.xml 312 BLAKE2B 6f854a035f538341f9196db3df9589460e24ba234ae497d0376e719b86a9f3566a775ebdf8f172c4a742616a2bc2dd13624fe80498351cf7dc892e040529882d SHA512 2f77f253666a974f580a98a89580870394b7e97488a21dbc80a0607842eff9c534ac061f9a66f8d8cbf576a7e0c366e0e307f35363fbe1c8b064590d02a4ec9c +MISC metadata.xml 245 BLAKE2B b2bab5f6bb760f76ede22b4c9a562996fe5af5bfa95860b7ee2cae535b12057912e6f0cc0a132fef280e07e2c3afeced09545cffd2d184f8c7ac09916c2ba83f SHA512 aea5221991928997b12a582f7fcce164b9fbf764587c04236389ec5f01904891d2745040ede04da83287fa5810826d77bea413c253f5c45e2f1c03aea2909f1d diff --git a/net-irc/muh/metadata.xml b/net-irc/muh/metadata.xml index fbfe8acaee73..29c7fa784d5b 100644 --- a/net-irc/muh/metadata.xml +++ b/net-irc/muh/metadata.xml @@ -2,9 +2,6 @@ - - Persistent IRC bouncer. - muh diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest index 4b75a46a6d8d..27f5afb40118 100644 --- a/net-irc/ngircd/Manifest +++ b/net-irc/ngircd/Manifest @@ -1,8 +1,4 @@ -AUX ngircd-25-fix-gcc-10.patch 1762 BLAKE2B ad5085da2c8f0fbc01e4fc77c4dc20c461cd8a3aad4dff78ace70d8673b8607f4621d80dd6bd122549882be1a9c3f461812617ebf59bce877ab4e87b9414e5b4 SHA512 73b07fc2fe5475fc7eb999f93504e2cfbbd1a2720335ae4332fd43e2621824626eb0df606585d9424df9e05a21416126692859fd1dc9689883960c8708bf3adf -AUX ngircd-25-make-env.patch 2331 BLAKE2B c65567046e00f3dfa3e5c14e06071bf14fd28257eb799850610b7fe55c4a4745b766d754670be99f635a81239328c27ea3218e878e6f921f1601233e34d08539 SHA512 e32b5e852953cdff7f565e3dc2f521edbf25a42afca62f3fa76d8f33f72e4de96bb4b7b190d036dd573fef04879ecc891d3342353f8f46361c08943f85196329 AUX ngircd.init-r1.d 388 BLAKE2B 10b6d4eb2cd39fe4e3087461cdc15f2ee8f1002e826552e145903b69e16ce46169a2dde19e03af38228ed9ede0473a828aa8cd123ab4a2b043fde448bb180954 SHA512 12e62e23899d1143a35e60bf983c319f72aa13c49123b497963f96317b2990cb2529919336da5a9b5c230e55479c289358261af92d25ef54bd19079908e18158 -DIST ngircd-25.tar.gz 527886 BLAKE2B ab75c9a904fae8da4c89e07bd66bb000bc9b614e27269be3ac6f55254c77abeb2d6f7d0afc6d05630f7c548ea13d842d4c0376123035f9417eda55565a69dcec SHA512 0c96e97da312fe86c50007a72db03f85b9f79df053806f50badd07c7ca8e8bddd99adb478eab8be9630330707d7aa578b5d0bd3017b59bf4515319a64c29ea6c DIST ngircd-26.tar.gz 565579 BLAKE2B edd005179a79bbb51a1401f7d580ebf66cb5bf65d1427453c471a4e7e667d7fd6b320c292e9a7993c5fef6beeae88126fefb73284063451b080ecc0d3e6ca0f1 SHA512 2502baf83e3bfca3e6b83c22fe660fee24732ee875b32a7071a489a8babcc08124738142215b55d4f9bd4e94bec3f2a41889ab18324f772b1674b02883cbfb91 -EBUILD ngircd-25.ebuild 2271 BLAKE2B e77f07b0d40e5e9c2bae30e46d76f9ecac7d999b4e4805856a6e14449c73ce66dba7222843e60bc8271aa9fa935e7253ce50bdf455ec34e0476fa4cf61c57631 SHA512 771716ee4e3fa58df6428cf0d5b3c5bf155827a363521f7943611cfb602f143152e41cb995b885899c35cddf70d8269bed60ee5f568e94633326ebfe43f84fff EBUILD ngircd-26.ebuild 2187 BLAKE2B de64499c0448af9ef9bf156ef4c5fa71ca6573a71baf3bd187ccd440ac27f0d6cfb5cefcf2f9357d57f57077e0b6951916fd946bbff2de01a76ca8e40d2760e9 SHA512 d5bd6005b284b90643fe3444c6cc1a9fec6ef0a5550f9747a803c413625ac17377c33c117d836ccdbcac5e49cd79bae5c897bc13409c00c82b22f5ad8dd2b807 MISC metadata.xml 650 BLAKE2B dd80efa442d59f04e26bb338e371ffa8380a4cdbb630db30e25adbaa930d9f0e4a486bbd05321b8185c23558ad4e29023153a69d1214294c345b46685eb7de86 SHA512 9b8879892c2edc6c7792c22a684f87ae559a43b034ee66f6242e73075012e1f53a33a63fc3ffa62c41f5fd620a4be6c1ffc57a1b62cf42ffa3c032cec4ff743b diff --git a/net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch b/net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch deleted file mode 100644 index 33e0d444bd56..000000000000 --- a/net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch +++ /dev/null @@ -1,77 +0,0 @@ -From f27827d7937375b5348107ca7427abf74c9eff3d Mon Sep 17 00:00:00 2001 -From: michi -Date: Tue, 14 Apr 2020 16:53:02 +0200 -Subject: [PATCH] Unbreak GCC 10 (-fno-common) build - ---- - src/ngircd/conn.c | 1 + - src/ngircd/conn.h | 14 +++++++++++--- - src/ngircd/ngircd.c | 1 + - src/portab/portab.h | 4 ++++ - 4 files changed, 17 insertions(+), 3 deletions(-) - -diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c -index f62e9675..e14e6c08 100644 ---- a/src/ngircd/conn.c -+++ b/src/ngircd/conn.c -@@ -10,6 +10,7 @@ - */ - - #define CONN_MODULE -+#define CONN_MODULE_GLOBAL_INIT - - #include "portab.h" - -diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h -index c642541f..869477f0 100644 ---- a/src/ngircd/conn.h -+++ b/src/ngircd/conn.h -@@ -105,9 +105,17 @@ typedef struct _Connection - #endif - } CONNECTION; - --GLOBAL CONNECTION *My_Connections; --GLOBAL CONN_ID Pool_Size; --GLOBAL long WCounter; -+ -+#ifdef CONN_MODULE_GLOBAL_INIT -+CONNECTION *My_Connections; -+CONN_ID Pool_Size; -+long WCounter; -+#else -+extern CONNECTION *My_Connections; -+extern CONN_ID Pool_Size; -+extern long WCounter; -+#endif -+ - - #define CONNECTION2ID(x) (long)(x - My_Connections) - -diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c -index 7166640b..41255ca0 100644 ---- a/src/ngircd/ngircd.c -+++ b/src/ngircd/ngircd.c -@@ -9,6 +9,7 @@ - * Please read the file COPYING, README and AUTHORS for more information. - */ - -+#define GLOBAL_INIT - #include "portab.h" - - /** -diff --git a/src/portab/portab.h b/src/portab/portab.h -index 70d5ed3e..43f2f907 100644 ---- a/src/portab/portab.h -+++ b/src/portab/portab.h -@@ -102,7 +102,11 @@ typedef unsigned char bool; - #endif - - #undef GLOBAL -+#ifdef GLOBAL_INIT - #define GLOBAL -+#else -+#define GLOBAL extern -+#endif - - /* SPLint */ - diff --git a/net-irc/ngircd/files/ngircd-25-make-env.patch b/net-irc/ngircd/files/ngircd-25-make-env.patch deleted file mode 100644 index e6494c720079..000000000000 --- a/net-irc/ngircd/files/ngircd-25-make-env.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- a/Makefile.am 2016-09-18 18:01:30.000000000 -0000 -+++ b/Makefile.am 2020-04-20 14:01:43.166312404 -0000 -@@ -25,13 +25,13 @@ - rm -f config.log debian - - testsuite: -- cd src/testsuite && make check -+ cd src/testsuite && ${MAKE} check - - lint: -- cd src/ngircd && make lint -+ cd src/ngircd && ${MAKE} lint - - srcdoc: -- cd doc && make srcdoc -+ cd doc && ${MAKE} srcdoc - - have-xcodebuild: - @xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -list \ -@@ -66,7 +66,7 @@ - --out ../../$(distdir).mpkg - rm -f $(distdir).mpkg.zip - zip -ro9 $(distdir).mpkg.zip $(distdir).mpkg -- make osxpkg-clean -+ ${MAKE} osxpkg-clean - - osxpkg-clean: - [ ! -r ngircd.dest ] || sudo -n rm -rf ngircd.dest -@@ -74,12 +74,12 @@ - - osxpkg-dest: have-xcodebuild osxpkg-clean clean - ./configure --prefix=/opt/ngircd -- make xcode -- make -C contrib/MacOSX de.barton.ngircd.plist -+ ${MAKE} xcode -+ ${MAKE} -C contrib/MacOSX de.barton.ngircd.plist - mkdir -p ngircd.dest/opt/ngircd/sbin -- DESTDIR="$$PWD/ngircd.dest" make -C doc install -- DESTDIR="$$PWD/ngircd.dest" make -C contrib install -- DESTDIR="$$PWD/ngircd.dest" make -C man install -+ DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C doc install -+ DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C contrib install -+ DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C man install - cp contrib/MacOSX/build/Default/ngIRCd \ - ngircd.dest/opt/ngircd/sbin/ngircd - rm ngircd.dest/opt/ngircd/etc/ngircd.conf ---- a/doc/Makefile.am 2016-01-16 13:23:40.000000000 -0000 -+++ b/doc/Makefile.am 2020-04-20 14:05:45.316912143 -0000 -@@ -55,7 +55,7 @@ - install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs) - $(MKDIR_P) -m 755 $(DESTDIR)$(sysconfdir) - @if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \ -- make install-config; \ -+ ${MAKE} install-config; \ - fi - $(MKDIR_P) -m 755 $(DESTDIR)$(docdir) - for f in $(static_docs) $(toplevel_docs); do \ -@@ -75,7 +75,7 @@ - uninstall-hook: - rm -rf $(DESTDIR)$(docdir) - @if cmp --silent sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; then \ -- make uninstall-config; \ -+ ${MAKE} uninstall-config; \ - else \ - echo; \ - echo " ** NOTE: Not uninstalling changed configuration file:"; \ -@@ -87,7 +87,7 @@ - rm -f $(DESTDIR)$(sysconfdir)/ngircd.conf - - srcdoc: -- make -C src srcdoc -+ ${MAKE} -C src srcdoc - - .PHONY: install-config uninstall-config srcdoc - diff --git a/net-irc/ngircd/ngircd-25.ebuild b/net-irc/ngircd/ngircd-25.ebuild deleted file mode 100644 index d6a322c5b18a..000000000000 --- a/net-irc/ngircd/ngircd-25.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 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 )" - -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 - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-25-fix-gcc-10.patch" - "${FILESDIR}/${PN}-25-make-env.patch" -) - -# Flaky test needs investigation (bug 719256) -RESTRICT="test" - -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 PAMOnly by default, please change this option." - elog "You may not be able to login until you change this." - fi -} diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest index 2bff2104a732..10ee01d233af 100644 --- a/net-irc/polari/Manifest +++ b/net-irc/polari/Manifest @@ -1,5 +1,5 @@ DIST polari-3.34.1.tar.xz 1270300 BLAKE2B 37a7a5bd5e1850b03100d8465aeddb4f558ec94ae334a5b3f16b54b591404102bc505c3254fe353aaf8174031b8b7eb67b5f85468367eeded44400d704889d92 SHA512 99cdf95b248322e69f0fee99110598c0c1d9ceb8e7377db8eb319645090c5b56ca09e1c55e1ef2e98ae546e01b796aabe31c9362f69907d641a20cc8a588aa4d DIST polari-3.36.3.tar.xz 1030640 BLAKE2B 72cee290c21cd0a1f96d25e02993dadba14247bb3b38d2ce62ebbe8670a9c7498e7dd123bef2ab3ffaea78019109697186cee409dd78a554afbbc5b5c4db56b5 SHA512 dcf8018ffdaffe2867ab7c3bbc1c874090df0ff5435ec16746780ae081dc61a0b7ec0e58d706b6e7eb8957b1f3fe9c24b586db831ab8b0565fa05c1bf3adae38 EBUILD polari-3.34.1.ebuild 1064 BLAKE2B b424c2334847d4156c39f7b65927007981ede1066a8682da0645e78c6c02f1062653e66bc177a273c63cba152b21aa3e53d1d221d0a898a6457e7a60b20d88ae SHA512 56ce22cb2d90b93099cfb8170962d0acbbf5bde9b670adebeea74ed631d1184c9a67d2c9b211c95173246fbcb31abe9a1adaf32d8e05211af53f6d294dd3e44a -EBUILD polari-3.36.3.ebuild 1066 BLAKE2B 82d5120e3af5687f5523e1bafb788e9a78caac814b11bffd33ae482aa4a8da19570933af23da79235c6118baefa0b8a567809c0fa619e1a7747c16d8d96e8c35 SHA512 8eeb1e6e6264ea480f11889adf2b9bf5733a86a7454c0b76c3afe3559da1f7f55e9d632cdda450e4d5030955980ea90bda19e65536b3f02327a02f81120cd800 +EBUILD polari-3.36.3.ebuild 1064 BLAKE2B b424c2334847d4156c39f7b65927007981ede1066a8682da0645e78c6c02f1062653e66bc177a273c63cba152b21aa3e53d1d221d0a898a6457e7a60b20d88ae SHA512 56ce22cb2d90b93099cfb8170962d0acbbf5bde9b670adebeea74ed631d1184c9a67d2c9b211c95173246fbcb31abe9a1adaf32d8e05211af53f6d294dd3e44a MISC metadata.xml 383 BLAKE2B fe4acd5e1d8f9336124e6a8588c3d25df25d7a60fac88b1eb637a1b169fd0805bc59030ec776257bfd664df72e6a3dfefcbde1d60bd08384281587ec062f2ad7 SHA512 98707a009259fafe782cd442524620d79465fadf8304becb5c4de4e15763245bd7c21fda7081749a7bfb551e1dd9d3168236862bb704bfb9091ca087ce348deb diff --git a/net-irc/polari/polari-3.36.3.ebuild b/net-irc/polari/polari-3.36.3.ebuild index 61f877b7ed7a..dad3791fcd02 100644 --- a/net-irc/polari/polari-3.36.3.ebuild +++ b/net-irc/polari/polari-3.36.3.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Polari" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest index d5eb214aaca8..c593ebf2f1c2 100644 --- a/net-irc/psybnc/Manifest +++ b/net-irc/psybnc/Manifest @@ -10,4 +10,4 @@ AUX psybnc.confd 113 BLAKE2B e4fddc3cb37c5b9defea0d4d6e6c2b26f34bf50fbbe51679b8f AUX psybnc.initd 898 BLAKE2B 7be60ef0dda81cb917e23e06e3fec88af952d71c2eef4255c316baf5a218e8bdc2d8d8bc4eb353ab7c19a697e97685441ec2a0c3503e4f22adf0d55c9a895e13 SHA512 2ea77dfd515b81d53d7fe1b38fe3069d7d2081d939fdbb2c6ff97cd859a86ad8a52dd1b40e0b592a9368488759a3fb35741e25c6a5ade3045eb7159acd64bbbd DIST psyBNC-2.3.2-9.tar.gz 318676 BLAKE2B 0197aa3bc8c770738a7d4d5a5a79b77f7a0cafeef60ccca1167172b28af05c0cd9836f7e9816c873dafa2e55b0bf9ce54cfbe3958939405f58f7f3874ec7ea64 SHA512 b664f57610e54fadd938b359a0e8052b8fe3dd36bd1ee339f36ee22ae4d36a76e803425c5133f925ac18c01767ffbc8a2f471c014b5b76b05894cfea9fe5416b EBUILD psybnc-2.3.2.9-r3.ebuild 4615 BLAKE2B bcb79a60491e976cfe5965d7cbdb9c730ace03aa418fc6fd3786b857963c02475b23e1af19e741d77ff3c593d6aad900bf8d5d59c37ac05f8849f22dd679fae3 SHA512 e2d1b8e401ef8362bc6ce5ceffd5a5a0d5b3b5e5826ded3c9a0832068375fba86279eb0094df8b4058d4870048ea6358a67e8cba33f5eaf3b52f9c90ba3751fc -MISC metadata.xml 460 BLAKE2B 9554a25262c0fdd96e72775c6a91ec6aa8fee77165662bb9f212b6528ca08e467a43348bb811edef351a0bf5fd9340041a4137cad3e905e8aeb9df32fb447733 SHA512 f76632eec835a8c915dab631fbe0cf0f5bb1f9bb7bedce8d83f4ee2035cb05e754ee3ff6372fd9886a2a5d99957193446f6b0f8a31811ce2f9a1895c7361f5d1 +MISC metadata.xml 360 BLAKE2B c3cbefd59c47603f27e542da342a855416fd79da62af69f30721929a7e25055ed5f5d46a2b99259589a0d0584fe68a837a4abdf2f0722d0eb3a1d02215f387a7 SHA512 7bcf4c1c7acd11782e8c2f19a179ac753967d4b6609aaf15b3b41ce7a492312db6006ba229b0169976f013d440f46d65c39cfa8f6276ef195339ff858958c135 diff --git a/net-irc/psybnc/metadata.xml b/net-irc/psybnc/metadata.xml index 403e7c957a67..cb2540fa5671 100644 --- a/net-irc/psybnc/metadata.xml +++ b/net-irc/psybnc/metadata.xml @@ -7,5 +7,4 @@ Adds scripting support Adds support for multiple networks - psyBNC is a multi-user and multi-server gateway to IRC networks diff --git a/net-irc/quasselgrep/Manifest b/net-irc/quasselgrep/Manifest index 96e29146e202..dc31d12cabd5 100644 --- a/net-irc/quasselgrep/Manifest +++ b/net-irc/quasselgrep/Manifest @@ -1,3 +1,3 @@ DIST quasselgrep-0_p20190211.tar.gz 29954 BLAKE2B 33862b642d6a24bd7ab8cc4f3628e19cf332feb24e0dba17849f4ee85af4d1d17a641e6ccaef89bcb44c47f28a674ab620610b8b624f9de71b8460b197953e27 SHA512 0d2bfccb87b7463ba032b9515c4a089518a3ca57f9ef6cbb0f00db9c5d0404cc9fe128329b12e1dbe022cbddeb6a3db473564ee734ddc30be56d4c1da5036f56 EBUILD quasselgrep-0_p20190211.ebuild 893 BLAKE2B 65db422640071f6757ba7d562c7723fded623d2fe7ac67ae8392abf61921db8d39fbd6343feb224da9b62936cfa688e2e72b4dc4ab827baaece79b9b70074daa SHA512 704f8b1b61bc1111d2d510449094f8baa1132bc72b0efe3365a6fa5c7a31b61fb4ef5359ce095f93b16252bed0472881928fc2ca7b2f7e489d797c29407ac56b -MISC metadata.xml 540 BLAKE2B 21eee2edee345166e7191d71bfa727b2154d34bf0d7f839b1e6eca4ce5b65380ce96e25a35bf614a64a0e29edf30a4c860ec1b4ca364ffdc1563515e0169278a SHA512 67258ac5217d9338c963a9970eb556497643eac6b743c033d964164127bad7411918b870d63885863ce09bbbd2fe5a0623a58eba1dc68d9432401e5dd971ceef +MISC metadata.xml 337 BLAKE2B c37cb1554be7305dd495441947f001f72094595dea87cc7b1da483f6f57b40ca227ff0635ec594f3943384e0980a624418ed633de8f7c582458ec34e84f0212c SHA512 e17f17fadcbc243db54d9db5a49d9720feff4bfd92e3ea91526600e46bc6c96b3b79c1491146356287893ca71dfee73336d8c88b7e7047d8f5d41d3d1a5e6bf1 diff --git a/net-irc/quasselgrep/metadata.xml b/net-irc/quasselgrep/metadata.xml index d238c6f6507a..eb320bd71e29 100644 --- a/net-irc/quasselgrep/metadata.xml +++ b/net-irc/quasselgrep/metadata.xml @@ -1,14 +1,7 @@ - - om@organizedmagnetism.com - Scott Martin - - - proxy-maint@gentoo.org - Proxy Maintainers - + https://github.com/fish-face/quasselgrep/issues https://github.com/fish-face/quasselgrep/blob/master/README.md diff --git a/net-irc/scrollz/Manifest b/net-irc/scrollz/Manifest index a370b4882db5..bc63161c9ff3 100644 --- a/net-irc/scrollz/Manifest +++ b/net-irc/scrollz/Manifest @@ -1,3 +1,4 @@ +AUX scrollz-2.3-fcommon.patch 566 BLAKE2B 454bbb7beec42378855dd64cd4a9826dd39deb549a75006dda80cec99463b45eaacf666c2ac25b3285ab71e2a57256e8c640c427373f56c6780d3172257c1071 SHA512 839109aaf8bc3429e7a215de5b7018dbcb718181d9e4026bd918fbb86665df20542d0f5e7884bf582cbd63238185d9e4fb180c6b16797200dd972ee1ea679dd4 DIST ScrollZ-2.3.tar.gz 981707 BLAKE2B ee7c1955dbd2515204d805052d091274c3c7e08257a798c357c5a195c12d7ebc85a160cd40ddf1b2aa87a1b628bebf630c3b7428bde1f230bf9b372f74cc74d2 SHA512 cb3dc2f462452c605c688805ed5128e0197eb4daae895c03f00631c4e9a0994f89a9c55b7e0591588f3f313dab66fcbeb1683b42ef75c3b714185b40703b1979 -EBUILD scrollz-2.3.ebuild 1143 BLAKE2B ffa1e5be97f837e55335a41c1908f6188b6df8b7caff8f8468e25660f0c1eebb56c87be4be5ec37c674e0de6dda9e76bacf7e4a7b446015ffac5dbece2f37d7f SHA512 9244ac7e58ed293eae4023d29f56cb59e9549e0336ab8ffc25fbdd435ad13f5b7b8b26c434a4996d915ecb34a174873b574ad6e4ea649f69e246c85a040cc47e +EBUILD scrollz-2.3.ebuild 1173 BLAKE2B 3a82216bbc79ed79e0875c2e77898ca9aa49de9ec3f7dd1484f7d6b9a6d94be3abf44ae96e41d4d345c6874575f9165d32aa545127bc078b8a25144425b5e7da SHA512 68e1022b504437b0ea4c80f1d2e5c16a3330d60ec8125a9b49e19cc868735c2e3265324428db307961d4be88c083333b4464e76c27a26783e6bc36e0571aa06f MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-irc/scrollz/files/scrollz-2.3-fcommon.patch b/net-irc/scrollz/files/scrollz-2.3-fcommon.patch new file mode 100644 index 000000000000..2c0c85f0b96b --- /dev/null +++ b/net-irc/scrollz/files/scrollz-2.3-fcommon.patch @@ -0,0 +1,17 @@ +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/scrollz-2.3.ebuild b/net-irc/scrollz/scrollz-2.3.ebuild index b45a5957d957..a76e2d53cdc3 100644 --- a/net-irc/scrollz/scrollz-2.3.ebuild +++ b/net-irc/scrollz/scrollz-2.3.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit toolchain-funcs MY_P="ScrollZ-${PV}" @@ -14,23 +15,26 @@ LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="gmp gnutls ipv6 socks5 ssl" +IUSE="gmp gnutls ipv6 ssl" REQUIRED_USE="gnutls? ( ssl )" -RDEPEND=" +BDEPEND="virtual/pkgconfig" +DEPEND=" sys-libs/ncurses:0= gmp? ( dev-libs/gmp:0= ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) - ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig + ) " +RDEPEND="${DEPEND}" S="${WORKDIR}/ScrollZ-${MY_P}" +PATCHES=( + "${FILESDIR}/${PN}-2.3-fcommon.patch" +) + src_configure() { local _myssl @@ -45,7 +49,6 @@ src_configure() { tc-export CC #397441, ancient autoconf econf \ --with-default-server="irc.gentoo.org" \ - $(use_with socks5) \ $(use_enable ipv6) \ --enable-regexp \ $(use_enable gmp fish) \ @@ -54,7 +57,7 @@ src_configure() { src_install() { emake \ - DESTDIR="${D}" \ + DESTDIR="${ED}" \ mandir="${EPREFIX}/usr/share/man/man1" \ install diff --git a/net-irc/sic/Manifest b/net-irc/sic/Manifest index f2813e5d40ee..cc31c5580e54 100644 --- a/net-irc/sic/Manifest +++ b/net-irc/sic/Manifest @@ -1,3 +1,5 @@ +AUX sic-1.2-include-path.patch 389 BLAKE2B 19db083e02aa4c287c4cc517f437bc73820bf9cf13c1f070174195c9492a4e406bd40b953d8a2e7d545cd04d0a622d2fd987a797f93690b57713d7b2e7ced6d7 SHA512 f2b53e187ab943f90d8340008d78aa2649c4e4be8da7319879cde89b8dc0961407a0887f3c6c7df0e30e7ce6ab9dce6fab3fe350f93bb25c6df0721e5c068951 +AUX sic-1.2-musl-time-include.patch 805 BLAKE2B 90f78b0d4ccca4030f00bf9edb82fe5de2acb4a9a4cfb5feb63943105b5ea91cf67bfeb0d7ec11b2e5232f6691fd95e8bd8cf1a568a673d2944925253465046d SHA512 90d7615d3e7e404b5788882b24edf85f9142c9f04ce986683f46ef798d5c1a4a6a1579f11cbc8ca44a19c55d1d4dea78dddf135c838782923a7a2e9c341c6d57 DIST sic-1.2.tar.gz 4563 BLAKE2B 63c70aa6e6e9da4c7c0a282ca1a407b9b9c4d02e764490a8b7ff1967a848ffe78c52700e6e895252c0807212eb80e0baeca5b338ead8da4ea9a0946d81b8c5b8 SHA512 5659ed9d8a5986dda90dbe1155c27a5fd0ab4b1fcad2c1a20997c530bf03864e6c08bdeffc025c728629ab11872af6a1250761160b91f148dc37d77a49046dc9 -EBUILD sic-1.2-r1.ebuild 640 BLAKE2B f3a968fe055e12e76e17752c3e8d6bedd743f9569e2412f122190cb8e3f5f5ca8ec51567beb9a0f4fa80cecf9eab79d35080c02978c5938f56160f4bff30bab1 SHA512 847c391640e10767bddde501abec4312399135cef22c9661e3f900f960f333af1ca788179fc8e41f47ef0f79e4d9c8a3fadf96a9c6224854e5767e1695f83327 +EBUILD sic-1.2-r1.ebuild 746 BLAKE2B a6d3bcbc76225bcb1bb616d683b93a85cfcbcd366f9912f310290ad81572b1866b9ab98df0bb1bb60943af9c71e18e90d47387c2c63932c5b14e0388d64ee60d SHA512 f1ca4836633a27a35bfe1807f6851237a0af264ceee18eedee07cd7dd46e794e372344a13e325751e714c431372b37608be8b0943ad9584c113567d8f22769c2 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-irc/sic/files/sic-1.2-include-path.patch b/net-irc/sic/files/sic-1.2-include-path.patch new file mode 100644 index 000000000000..3f8296097496 --- /dev/null +++ b/net-irc/sic/files/sic-1.2-include-path.patch @@ -0,0 +1,16 @@ +Drop unnecessary include path to workaround possible ldd bug +https://bugs.gentoo.org/731168 +---- +diff --git a/config.mk b/config.mk +index 5d42b38..61d085a 100644 +--- a/config.mk ++++ b/config.mk +@@ -9,7 +9,7 @@ MANPREFIX = ${PREFIX}/share/man + + # includes and libs + INCS = -I. -I/usr/include +-LIBS = -L/usr/lib -lc ++LIBS = -lc + + # flags + CPPFLAGS = -DVERSION=\"${VERSION}\" -D_GNU_SOURCE diff --git a/net-irc/sic/files/sic-1.2-musl-time-include.patch b/net-irc/sic/files/sic-1.2-musl-time-include.patch new file mode 100644 index 000000000000..bbeaed72a571 --- /dev/null +++ b/net-irc/sic/files/sic-1.2-musl-time-include.patch @@ -0,0 +1,32 @@ +https://git.alpinelinux.org/aports/plain/main/sic/musl-fix.patch?id=4b6138a5f4f5cd11d49d7f96e13da661fd37655e +https://bugs.gentoo.org/712732 +---- +From d8e9e4a013196b98576a3a759b4b27c3edb2a0d2 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Tue, 4 Feb 2014 10:06:53 +0000 +Subject: [PATCH] build fix for musl libc + +It fixes the following compile error with musl libc: +sic.c:137:17: error: storage size of 'tv' isn't known + struct timeval tv; + ^ +--- + sic.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sic.c b/sic.c +index d93c2ec..e4bdb74 100644 +--- a/sic.c ++++ b/sic.c +@@ -8,6 +8,8 @@ + #include + #include + ++#include ++ + static char *host = "irc.oftc.net"; + static char *port = "6667"; + static char *password; +-- +1.8.5.3 + diff --git a/net-irc/sic/sic-1.2-r1.ebuild b/net-irc/sic/sic-1.2-r1.ebuild index 42dfb660ec7b..8ca301bc99ac 100644 --- a/net-irc/sic/sic-1.2-r1.ebuild +++ b/net-irc/sic/sic-1.2-r1.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit toolchain-funcs -DESCRIPTION="An extremly simple IRC client" +DESCRIPTION="An extremely simple IRC client" HOMEPAGE="https://tools.suckless.org/sic" SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" @@ -12,6 +13,11 @@ LICENSE="MIT" SLOT="0" KEYWORDS="amd64 x86" +PATCHES=( + "${FILESDIR}/${PN}-1.2-include-path.patch" + "${FILESDIR}/${PN}-1.2-musl-time-include.patch" +) + src_prepare() { default @@ -30,5 +36,5 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install + emake DESTDIR="${ED}" PREFIX="/usr" install } diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest index 11e89cd32c76..d712bbd7e858 100644 --- a/net-irc/unrealircd/Manifest +++ b/net-irc/unrealircd/Manifest @@ -6,5 +6,5 @@ DIST unrealircd-5.0.5.1.tar.gz 4957950 BLAKE2B 7e92f941662cec0a202589aecf372578e DIST unrealircd-5.0.6.tar.gz 4975195 BLAKE2B 3ba459e0ec932e9f240825ba9f1fa40e300fe7958f999de86d5653f2e6e4940be8b8da9c885c97bd738abefef601d61da6c4e6c7199c7052d29a74fcf5048828 SHA512 7532e9ab2e039f21796ae813881aec9d34b502ab64efc4323c938232c8901ce882dbcce497ad93df270e4b5fa2e9633c0971f2a6b3213ad458756aea92aa1612 EBUILD unrealircd-4.2.4.1.ebuild 5452 BLAKE2B 356dfc371b2c8757cd710ba93401f4a34e069b545cc77573b9942ac1672e0a4367be3fb1a47fdf9ef7cdee3a1ba40bc57d0ae0366c16262665a03cdc63fae242 SHA512 b875c731c0712ab570b1d18fe0ca30abe5ed235d24a3beafa169f98d94cc6f52130d935d21ba732bbf74b368adfd9754283e61688339b1a2599523fd3e3d3d98 EBUILD unrealircd-5.0.5.1.ebuild 5090 BLAKE2B 2403730ad38e5220d43b6227385deb58546293602c727438232ee4fd1910a9863b0fd78c1adbc6f43fe9cd32a256b67c08c43d495a03dc8e9b90c4c955e97309 SHA512 4ca8d90ddc7182b54b24153de1b30ffb3cae9298cfe664b4d914471603aa62bd50d1d4c4f1dd3e4346c1f40a239317efc8209bf29435041e578ecfb6fef452f6 -EBUILD unrealircd-5.0.6.ebuild 5090 BLAKE2B 2403730ad38e5220d43b6227385deb58546293602c727438232ee4fd1910a9863b0fd78c1adbc6f43fe9cd32a256b67c08c43d495a03dc8e9b90c4c955e97309 SHA512 4ca8d90ddc7182b54b24153de1b30ffb3cae9298cfe664b4d914471603aa62bd50d1d4c4f1dd3e4346c1f40a239317efc8209bf29435041e578ecfb6fef452f6 +EBUILD unrealircd-5.0.6.ebuild 5088 BLAKE2B 3d48ec8f3b4c69c55c185aee4409772bd686070ec6dc02029d48fd01420456605f55bcf6a4324514c7973a2dc9703844be05133f9f0a223a1b828023adbff125 SHA512 00832d5357e4f8e37df531eb1e563db8a5d5c20dbf404a8826f8ac72774432e5cafe64c417d22cdbaf08f54845409cfb6aa0bd02fc38b85d8ad4986540c08654 MISC metadata.xml 1048 BLAKE2B 23fc4e5fd19084a8cb4157d14318d00952b61914d1d26137ee93ee866b394ac8bc0471110903806bb94f60141ef5a12c436816ce1cac55ab2e84db30ebdb1a36 SHA512 6f87be3568418355d74b9f8839f5640fe6299e8ee2b1de2ea0f83ac1a93ec9ab150b437e327d8543a815761389773dd8e8149cba023395893c9313d8b3d46102 diff --git a/net-irc/unrealircd/unrealircd-5.0.6.ebuild b/net-irc/unrealircd/unrealircd-5.0.6.ebuild index d2f7a8a96ec9..af6bd63d0f52 100644 --- a/net-irc/unrealircd/unrealircd-5.0.6.ebuild +++ b/net-irc/unrealircd/unrealircd-5.0.6.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux" +KEYWORDS="amd64 ~ppc x86 ~amd64-linux" IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes" RDEPEND=" diff --git a/net-irc/znc-clientbuffer/Manifest b/net-irc/znc-clientbuffer/Manifest new file mode 100644 index 000000000000..f9098fc0f3b7 --- /dev/null +++ b/net-irc/znc-clientbuffer/Manifest @@ -0,0 +1,3 @@ +DIST znc-clientbuffer-1.0.48.tar.gz 5602 BLAKE2B 16a2c807df7371619f9e8456e3a65226dfd60e37872a86af11861d2130aa75fbfcfdc1c326baa0676cc253f27dda32893110638d4747a283e224bd672a49e0b1 SHA512 eac4d748b670a8e3563a424fcb5c9c411af6c9b1f9965f065936ddfcfbff946783e34e0d6b32de18fb3b87fb27db129ff58bedfb179473c804750a9b770897f6 +EBUILD znc-clientbuffer-1.0.48.ebuild 631 BLAKE2B 930e00213b4bc809065c099fe177aeece25d4df7f81e44d2eecb7d8e01613f4d9f293ac4fd287f67e89020fc798c0870a3c78066abb9f75e185558218f08b05d SHA512 f3fa7f4c26f28f77ee227c75e12e1ca1253d73da37f66a6bb6e2109064f6ecf56caee94aa2731b0907a7ffb6736b631c8670f11338325aa16727f43b1c5772b9 +MISC metadata.xml 407 BLAKE2B 0f1d392ab0bfdbe65deef5bafc459dcd46391c600f9174a2059796cd05694693f8f6885038fdfaf72d31ea17aee42f43f791f6a8c09e19fe046cd896ed3e7e67 SHA512 23d636b7561109fde6eb12d50461b9538f2a2e3b0564273b4cf2df73a4b64e7b296e65da119442b5a589adf71a51487868f7becbe3f69ae6134a189c2cc80ecf diff --git a/net-irc/znc-clientbuffer/metadata.xml b/net-irc/znc-clientbuffer/metadata.xml new file mode 100644 index 000000000000..b18a0ff2536e --- /dev/null +++ b/net-irc/znc-clientbuffer/metadata.xml @@ -0,0 +1,12 @@ + + + + + whissi@gentoo.org + Thomas Deutschmann + + + https://git.jordanko.ch/Igloo/Push/issues + CyberShadow/znc-clientbuffer + + diff --git a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild new file mode 100644 index 000000000000..7ad332d77a02 --- /dev/null +++ b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild @@ -0,0 +1,37 @@ +# Copyright 2020 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" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + net-irc/znc:=" + +RDEPEND="${DEPEND}" + +DOCS=( README.md ) + +_emake() { + emake \ + -j1 \ + PREFIX=${EPREFIX}/usr \ + LIBDIR=/$(get_libdir) \ + "$@" +} + +src_compile() { + _emake +} + +src_install() { + _emake DESTDIR=${ED} install + + einstalldocs +} diff --git a/net-irc/znc-igloo-push/Manifest b/net-irc/znc-igloo-push/Manifest new file mode 100644 index 000000000000..5fcb5ed7f211 --- /dev/null +++ b/net-irc/znc-igloo-push/Manifest @@ -0,0 +1,3 @@ +DIST znc-igloo-push-20200520.tar.gz 12071 BLAKE2B 41272e479b8a6e201e3981e04f88a216aee9ed7051ae5573ea5266d74219a0a3f441ccf5621e040d4feb4bb81c349dfdc73357d7d43cf3f358a181a52bf79be7 SHA512 aaf23e1ffec4c0b5e14d9abc7ce276cc27f342e24f32fdd54f451d53729ce24fbf3665f2ad266bf38bbea2485386045c1cbc46593ed2eb6b87ac8889b8b7772e +EBUILD znc-igloo-push-20200520.ebuild 667 BLAKE2B 20f470a8ae102dfc4ca5c8dd9d0a84ee78f14f3ed9431b8c34d350c65866638785913871a2b5a5e31ee1e874dc1cecb9942e67dacbba573a2064c2cb2deb8ddc SHA512 9e653b40fab185d202a4e2e83615a75ac714911abca0a845660866faaa044646ceb7c38f9e470ae7a1f4683a288b9b34075e644e0b32c711285d17d5ea5b00be +MISC metadata.xml 498 BLAKE2B 546089b789d6fd4232143fe8c14466d06eb3d11d332538299b87f90ac400779992cf8ff46e3c180351fc6a0fc19214e3d58393061c784def6ef75ea5873691aa SHA512 24aab9d0db5c6ea81bea6dd298672ef75a8bccc9fc69756cb47b45cc2b509ccbc1581003cf9961f578a665321b5e98b9ea9d8f4e3cbbfd3cd70769c9e1ffdbc1 diff --git a/net-irc/znc-igloo-push/metadata.xml b/net-irc/znc-igloo-push/metadata.xml new file mode 100644 index 000000000000..65e385ef1366 --- /dev/null +++ b/net-irc/znc-igloo-push/metadata.xml @@ -0,0 +1,15 @@ + + + + + whissi@gentoo.org + Thomas Deutschmann + + + A ZNC module which provides push notifications through ZNC + for the iOS Igloo App while being disconnected from IRC. + + + https://git.jordanko.ch/Igloo/Push/issues + + diff --git a/net-irc/znc-igloo-push/znc-igloo-push-20200520.ebuild b/net-irc/znc-igloo-push/znc-igloo-push-20200520.ebuild new file mode 100644 index 000000000000..4022d504d1af --- /dev/null +++ b/net-irc/znc-igloo-push/znc-igloo-push-20200520.ebuild @@ -0,0 +1,37 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_COMMIT="f952b87a1fc235917a28fbabbe8626719d622e4c" + +DESCRIPTION="A ZNC module which provides push notifications for Igloo client" +HOMEPAGE="https://git.jordanko.ch/Igloo/Push" +SRC_URI="https://git.jordanko.ch/Igloo/Push/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + net-irc/znc:=[ssl]" + +RDEPEND="${DEPEND}" + +DOCS=( README.md ) + +S="${WORKDIR}/push" + +src_prepare() { + default + + # No parallel build support + MAKEOPTS=-j1 +} + +src_install() { + insinto /usr/$(get_libdir)/znc + doins push.so + + einstalldocs +} diff --git a/net-irc/znc-palaver/Manifest b/net-irc/znc-palaver/Manifest new file mode 100644 index 000000000000..daca1bdc69e3 --- /dev/null +++ b/net-irc/znc-palaver/Manifest @@ -0,0 +1,5 @@ +AUX znc-palaver-1.2.1-python310.patch 2084 BLAKE2B c764435ddcbe2ae6a00b4c937e030b5bb9f8c5f612d97dab6c655c4658523b66dcd8b0bf99a00dbcaffca704e61e191b2bcce43abbd79952b1f156e47bff2564 SHA512 171307c0cc374fe88bb59f5c344d14fc85088edc34b8ff2d85efb731efdeff8159a6ac640e36aec308b1bb3a39d8991323f956937482636aec46ffd6ee379f56 +AUX znc-palaver-1.2.1-xunit2.patch 803 BLAKE2B c56e25f2961257f2a02e6f50d22542c484285460c51cba2b7e7ae9b115a182d79a2f1f2785f5bbc64381bf33062c0d2ffcad2569670e139f8360c769470fe136 SHA512 d37c7ef8e50852096ac152a984a67802ff65002ce94ae0d3e8fed76ebed8aa3b79f04cbc6587b316522cbb1d12f69e82693892e5f273600c5ce72553d03dc032 +DIST znc-palaver-1.2.1.tar.gz 13302 BLAKE2B 0a46e4dd93f06a2b1705d619b0960a246ebf326fe4ca1afdc152a90274984421478ff52bd942a09dffe58349477d622b2839b2e1af0cb11b5bc8c7a329d3b3a4 SHA512 0cfa4dfcebca79ed0aaa9b44c7395318782237a8752e26810686276587004ab95342f5983e6c9a74950da062c34e634d8a4bf502977289e59686eef069dca84a +EBUILD znc-palaver-1.2.1.ebuild 1128 BLAKE2B dd573e514eab21e07ad7943481645f631569850efc145660b8b12d8c81bdd3217f7634cdacdb11bd35a4c644a652a862921cb6f5607ba2091065f3f8fec6ed74 SHA512 b25a09298ca4bcfcc7a2ea3478842df9b4d40e94adf164220408d98e293ce2bf417ce949d09175f40af84a963f13b6a8db6e8fcfba48c87d6d12bc3d523da480 +MISC metadata.xml 572 BLAKE2B fad08970b057379dcfe02d6450cbe7a67f4d5f9470bf575c0eb2de733e7ac63fe2d620f8df5e923b23335ccadac1569da7ee2783d08d1e33c466b05dea36c6ac SHA512 6eca6cd820299e817e07720dc21c9843af259467fce8a79a6f76cca3bc0ed7b3ab03757c91ffe15429780f8f54a372d9e54111d9f7d18672337b71314a05229c 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 new file mode 100644 index 000000000000..79e06f30a5ef --- /dev/null +++ b/net-irc/znc-palaver/files/znc-palaver-1.2.1-python310.patch @@ -0,0 +1,48 @@ +From 3d5a1a3c2a7cb3de82c618b1e70618195ec4a1e7 Mon Sep 17 00:00:00 2001 +From: Conrad Kostecki +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 +--- + 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 new file mode 100644 index 000000000000..ffbb2ad4543b --- /dev/null +++ b/net-irc/znc-palaver/files/znc-palaver-1.2.1-xunit2.patch @@ -0,0 +1,23 @@ +From 3be5f33d76d4e34b1bc2671f7dbbc6c5fc3ccadd Mon Sep 17 00:00:00 2001 +From: Conrad Kostecki +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 +--- + 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 new file mode 100644 index 000000000000..b0e19e1bdc90 --- /dev/null +++ b/net-irc/znc-palaver/metadata.xml @@ -0,0 +1,16 @@ + + + + + conikost@gentoo.org + Conrad Kostecki + + + The Palaver ZNC module provides push notifications through ZNC + for the iOS Palaver APP while being disconnected from IRC. + + + https://github.com/cocodelabs/znc-palaver/issues + cocodelabs/znc-palaver + + diff --git a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild new file mode 100644 index 000000000000..45c850d4f1f7 --- /dev/null +++ b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild @@ -0,0 +1,60 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) + +inherit python-single-r1 toolchain-funcs + +DESCRIPTION="A ZNC module which provides push notifications to Palaver" +HOMEPAGE="https://github.com/cocodelabs/znc-palaver" +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 )" + +RDEPEND=" + ${PYTHON_DEPS} + net-irc/znc:=[ssl]" + +BDEPEND=" + ${RDEPEND} + $(python_gen_cond_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-asyncio[${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 + + # Building znc modules by 'znc-buildmod' + # does not support multiple threads. + emake -j1 +} + +src_test() { + default + + emake test-integration +} + +src_install() { + insinto /usr/$(get_libdir)/znc + doins palaver.so + + einstalldocs +} diff --git a/net-irc/znc-playback/Manifest b/net-irc/znc-playback/Manifest new file mode 100644 index 000000000000..4001a9fdd25e --- /dev/null +++ b/net-irc/znc-playback/Manifest @@ -0,0 +1,3 @@ +DIST znc-playback-20200510.tar.gz 3139 BLAKE2B b074fb2cf98dcde39a5ec51a625196b61d7a540cbbdae374268f576756b876967a1be72f78e6ee5cf62d284c0cbfc3034d78678772cd975eb38f4757712bbabe SHA512 50e924574c71fb6ace98c654201040aa2c193f4f1f811aa2ea26ad6ce6ced21bafe61c207936164125d84509e252890b383b21d904fe4cd46490711073052daf +EBUILD znc-playback-20200510.ebuild 673 BLAKE2B 02145d6e2dff2c5045cc30005426d070c8b6999990b18e2d0bac7a0b61a6b10c7b4b12d2f28138f4f130cf0ffabc7fa7becaa96d239ac9aacb40b721deb13d11 SHA512 7d3d3f4b4672bc50da971a750540f984439ac987014eceb77c8eb8333ae7d7090f82ff09b74cd7237499cbe1a44962c2027ff7e22e84879d1d2daa4b1efa6b73 +MISC metadata.xml 766 BLAKE2B b069fd34ae5a2fb2943bce00797c131c3d33b2ad96264757e48d93a0c42891df939bfe85e3ddee1ba03f2b5f2f1db2efb2ff4e37aad8b53adc0f81b0f472a871 SHA512 7a89a75dd76c6d0f2bd2c5d91896929e21e070b9b033978963de05c630fe439809a0aa285daafc31ebbdda169f34e049672d87d6eba234f3ca9407f3df6c7725 diff --git a/net-irc/znc-playback/metadata.xml b/net-irc/znc-playback/metadata.xml new file mode 100644 index 000000000000..af3b27264758 --- /dev/null +++ b/net-irc/znc-playback/metadata.xml @@ -0,0 +1,19 @@ + + + + + whissi@gentoo.org + Thomas Deutschmann + + + The advanced playback module for ZNC makes it possible for IRC clients + to avoid undesired repetitive buffer playback. IRC clients may request + the module to send a partial buffer playback starting from and ending + to a certain point of time. The detailed instructions are available + at https://wiki.znc.in/Playback. + + + https://github.com/jpnurmi/znc-playback/issues + jpnurmi/znc-playback + + diff --git a/net-irc/znc-playback/znc-playback-20200510.ebuild b/net-irc/znc-playback/znc-playback-20200510.ebuild new file mode 100644 index 000000000000..5e8fda1097df --- /dev/null +++ b/net-irc/znc-playback/znc-playback-20200510.ebuild @@ -0,0 +1,37 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_COMMIT="8dd128bfe2b24b2cc6a9ea2e2d28bfaa28d2a833" + +DESCRIPTION="A ZNC module to control buffer playback" +HOMEPAGE="https://github.com/jpnurmi/znc-playback" +SRC_URI="https://github.com/jpnurmi/znc-playback/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + net-irc/znc:=" + +RDEPEND="${DEPEND}" + +DOCS=( README.md ) + +S="${WORKDIR}/${PN}-${MY_COMMIT}" + +src_prepare() { + default + + # No parallel build support + MAKEOPTS=-j1 +} + +src_install() { + insinto /usr/$(get_libdir)/znc + doins playback.so + + einstalldocs +} -- cgit v1.2.3