diff options
Diffstat (limited to 'net-irc')
20 files changed, 575 insertions, 232 deletions
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz Binary files differindex 00397e5bb2cd..d11fb9282e08 100644 --- a/net-irc/Manifest.gz +++ b/net-irc/Manifest.gz diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest index 8dfb0e23e4f9..2e3df49fdb36 100644 --- a/net-irc/atheme-services/Manifest +++ b/net-irc/atheme-services/Manifest @@ -1,6 +1,5 @@ AUX atheme-services-7.2.10_p2-configure-logdir.patch 833 BLAKE2B 3809ea93546547de99b41ff19547b027102706e5e06e40333491440a1f09b0e78e31f5956def37ea1f6b067876a72f54a275d428332f2f479c7dace476bdc200 SHA512 43ca2af5aec6a1ea4b08564c62a21ae762fd01f2c177dbf8f7c6ebb238b9302b8310f2fe96ce2b20a7f7014c488a02177d1e583aa438ceff7576e4880ca2f62f -AUX atheme-services-7.2.10_p2-fix-backtrace-compat-detection.patch 377 BLAKE2B 068127c36f21614cf8322fcd550c4c1bb5aecc9f692796da960a0544ede5572ddce64b8cca2b2243c2ba0296f78d1dcde8bed92100c55679d69cf3ed9e66645a SHA512 d70e3df0662f0a4e20af45ccfde94a61acf3102d55d1432597a732e93c1bafd2fbec0e37b4d74125147adfc8506c96f3da2564ca6e7155c56916a6abf1e46de7 AUX atheme-services.initd 524 BLAKE2B 1388771d1d086baee885598eb448ee3daf1031e120cd21947a344aa72b24b969a5e9c6c5705b72c30a78020fbc2f27e56e0fbc618f58e8aae14c6fcae4b049c5 SHA512 3b90f60677088384c3f69b9dde40d18f4829d3435da0cdfbab003db3b68b6462ef31635b5fe4ed59d56745df9aa95a0690586b56d2f91e621aa2e708cb289cc1 -DIST atheme-services-7.2.10_p2.tar.xz 21061364 BLAKE2B e02ea3b9b55c0a02bfd354da65ed45318c2f0a5d5d35cabe7984760cfe1683b9856cc779754f1de8861816b5b2d2323c898100697e8d365ffed039e90b42cde6 SHA512 c7e6654ddbf515b1565b77f0659cd9a77787d004fb532ecdee638189e823ec65afc283cbeafc6d7625ed6c210835e5546c5e33718e08ad0b280ccc7a2df7be48 -EBUILD atheme-services-7.2.10_p2-r2.ebuild 2287 BLAKE2B cf9e63e6511c708a0cac4c06f7f70ddd00fc06306b5cee1c8fe4e14c0c49199205e79b41397b8996148ef8aa454b200e64fdbca2aadd532987d3556031eed05d SHA512 2c6873981b724e7256efead03c9b7ce01b699ffae2b0d8c7c28c0e2bfb2fb1a6d18c12f34f7d5899f6014590aaee4f676bda471f7ad2e65d82bb5f570988a7bb +DIST atheme-services-7.2.11.tar.xz 1051436 BLAKE2B 99624c21adf820c8ef8e33aa9ae9036c701c4a9218e225e7871717c86010fbed56d00da43cd2ffb79a46074a5602260fabbbaf769407a00175b5127c18913c1c SHA512 adcc189b61efe295997a7456022a7595df5b14b55c2139794d380e57fe77efd42221316558391b5440f077fd951143905454b0e9893deec89108fa671b44ef2f +EBUILD atheme-services-7.2.11.ebuild 2192 BLAKE2B ca910460545073820d4d6d8a2e425a11a328b9aeb231d5c9efefa65ba135ea46a5ba6cb2eba8bdd235aa05174ae3c8799e742022cef5c0a13ed36e9a25b067c8 SHA512 7ef63bcfbd30237ccfebb55f2dacb0c00b16c39c2c1b52b51624e1734403259f4110d4eb3dca17c6681df2cf7f1654afce129e04b30f269042faa4d57654be8a MISC metadata.xml 721 BLAKE2B cab35add2ea8e919feee82480bd106479b29de57733ae46b18ebac83bbefde0f9e9d1479db8f59c4be4d60383805f969378a4a33b36976ac9bcae99ea8e7dd96 SHA512 bc64eb444e7f6166a81a832c005bd6acb582c9dda7471b057756ede11531290645ef6d9d4c664a87405200190ed4a51678403691e5863cc0af2a408741bd7d15 diff --git a/net-irc/atheme-services/atheme-services-7.2.10_p2-r2.ebuild b/net-irc/atheme-services/atheme-services-7.2.11.ebuild index 820dfd3bd2f6..b547246f6bfa 100644 --- a/net-irc/atheme-services/atheme-services-7.2.10_p2-r2.ebuild +++ b/net-irc/atheme-services/atheme-services-7.2.11.ebuild @@ -1,22 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit flag-o-matic perl-functions -MY_PN="atheme" -MY_PV="7.2.10-r2" - 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" 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 @@ -34,8 +31,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. 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/eggdrop/Manifest b/net-irc/eggdrop/Manifest index 0d1095533ad3..02069435ebb8 100644 --- a/net-irc/eggdrop/Manifest +++ b/net-irc/eggdrop/Manifest @@ -4,6 +4,6 @@ AUX eggdrop-installer 2149 BLAKE2B a9b2d7887732f1b6cabb6998ea7c128b52308a70fc465 DIST eggdrop-1.8.3.tar.gz 1756536 BLAKE2B c2693bc383e1d857fe784d54f34479e73902064196021788ddf21f0bb2910977c643d820d2f6b640bb459b2acbfad8158fc0b29b4d76c588dfd76fee09a6fa25 SHA512 ad3b93d18aaa05d0eb00f1089b68d1f077f316042e64fff511ad1bbac06d35105adcb503490faaac4c9fe720dd45a9f350115b6c5d0f41fe198f228213a7a3a3 DIST eggdrop-1.8.4.tar.gz 1784738 BLAKE2B a86cdc681ebd9c779b7da20f80ff312e4fc848e0cb0a0b9fa34941c91e1b89db1430126e3d0b94c7b4346c0bde099a6ddd343270943570744c46fc4ddd451540 SHA512 d08af09dc83045bf89eae957e7817591f16456f83ba3efe6b361fd421a3d4068348543275c26b27b006f09f06344c04cdf58ee4231f1aee0e7537ec39bc24b49 EBUILD eggdrop-1.8.3.ebuild 1720 BLAKE2B c10f202e1ef55e875b1182d50240f2f1555e13d7d357202dd682d55866eabee4660695f5711139b11ada087dfb47e1367b7ddc55ff6bbee9f4a303b0b177e165 SHA512 8ebf2205e9bbd244a99bd3b9af23ec423bd773f77978d2cf9cf46e174cdd3a01868aad71781175e97d27d5fd5ce609d0aff872e217a4eeafc5acdd8ff70883ba -EBUILD eggdrop-1.8.4-r1.ebuild 1597 BLAKE2B 0065b8ad7eb64ec7e4b292d436ee3bc11d8d90ea9544309479673a7d02aa7e86cea6f2e0728295e5a08baa3ced51aecffaabbe4caf7e4a641d63a838dff2e8a1 SHA512 e4ef8727085f68f35ff2a7b4ec4cd8ed524175cd82eed85f18e26a3708a8aa030bc94dd8e03ed9dfe8ad5eb02da4ef0062066a22367c47951422c76cf7811116 +EBUILD eggdrop-1.8.4-r1.ebuild 1604 BLAKE2B 021484a3fd61e38f6dc68f4d17054935590255a05cfba9b69e912a44e90ed9fee806416c0d1b7b6953bbb4558b4ad20b2cc67ab8d5affdd91281330d919fd94c SHA512 2be5f820597450688778c9f2ae1a999f1be85dfc105ee80d66d6d182f55df32c2d6514dd4196aeec5459b3b85bad504aac4ef14369b92fbdc2f086ce61a97bbe EBUILD eggdrop-1.8.4.ebuild 1399 BLAKE2B f9815ed0c9b1fa803c0816ff4628af510623f9ca042b1ce76db6d197723c55a8ea96e681a0b2fb1dd175807f3c29925dcd814740d09791ed3d38039020dc3822 SHA512 bd6df9a7c19e318b210720a5669d142646ac18116a483509decf72468c47bfd81d3a024d4de92987fdd6218990d8a4efe02fb300c62edb0ac134802a1d57f61f MISC metadata.xml 390 BLAKE2B 1eb2981f9dc0339c56fd6a88c09b16c4ceeea6cecb6635f31c7b89d714a529d14ca8a9431d4003075e13a061fd8121e4d654299f2e5c48f6b12311f6f2b9371f SHA512 50fea1a13e327df7612a08b8ac6c5f8cd3ff76a69640ff045cc11e4da482ba6c67d893179d434106f4c739184be0de40a7e20b5717ac51b281ec728595f12708 diff --git a/net-irc/eggdrop/eggdrop-1.8.4-r1.ebuild b/net-irc/eggdrop/eggdrop-1.8.4-r1.ebuild index 9ca61a7717c9..e1c6469a9632 100644 --- a/net-irc/eggdrop/eggdrop-1.8.4-r1.ebuild +++ b/net-irc/eggdrop/eggdrop-1.8.4-r1.ebuild @@ -9,7 +9,7 @@ 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" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc sparc x86" LICENSE="GPL-2+" SLOT="0" IUSE="debug doc ipv6 ssl static" diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest index 1f4e8553580e..9da2b4987370 100644 --- a/net-irc/inspircd/Manifest +++ b/net-irc/inspircd/Manifest @@ -1,6 +1,9 @@ AUX inspircd-3.7.0-fix-path-builds.patch 16417 BLAKE2B 9961fa65037cd34eec1cd07ad6093d0cded8d6a148bec41ac396dc67329ec97f3533aeab4cb38be0c2c0c783659b603e6d69e7b9a01faf81a9b2dfe5214288a6 SHA512 a74516ef425269d15beee9568cc8ecb3016c595f1c1a5157848ab81c9644aaeb8cb61899f81b426485881e27c4564373519d1a36412816d97bde168d138b449b +AUX inspircd-3.9.0-fix-path-builds.patch 18793 BLAKE2B b6744e19cf9efa8b48683b5c38399ef628cbd7e81ead724f35791100fe26fa8312568359e74add1e38f442f4e077ab8c47d4e1b87b35c86b4355aac322158fb8 SHA512 c869313f49c95e5ac035f65965a3830b68ec2a08efbad2e439766e313c1aee78e007d0d098886f2ece1a4e8f075a51c7b1b14a84e5948d079617adfc1c8609f3 AUX inspircd.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951aa0a952b4dfa270f5738a5016fe64057791f2b4002ce207fb42ff8128734cab4ab9b856c8a0ebda4 SHA512 5c47c8588bf39e33e07584492fc672ffe5529b80d7d357ff48d7b6b3bd89a58915c856eeb78d7a68aa2897760a086c193b661641d8a0741c602010d9d0d0efd2 AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff DIST inspircd-3.8.1.tar.gz 850997 BLAKE2B aebf085b21b99fae989d5d75c28223cf5ef5aa8f872886af099800683718e51aa3650a8968968e2434de738a5d5770a26f84a02c9b1270dffdc9efdd2e8c9f86 SHA512 be16dd18882bdb424ebeb131e382db073adaf37914e7c8333bd1c266242f2c48e6c721f0ecae72159bca229790413dabee67fd4a4a3c83588c48c8bb15e604fa +DIST inspircd-3.9.0.tar.gz 853862 BLAKE2B 68134412f12ac06dc5ab5f9ffc94cb6053d88430210cb516e3569aad5e06dacd985038f51e057c9d7bd88179f472f685be5cd6fb31031e79948b0d3aee60eac3 SHA512 2adc4c39fc80d0095a9157a4c72f1df8288c364d909b2200eb04fb7e6bf5eb6172fe80153b79fdd437882d0b252999abad5912cef28f29cbceb9ab540df8db70 EBUILD inspircd-3.8.1.ebuild 3617 BLAKE2B 05ecb591fe2351b28b0a3b23cd5bcf36c83ca04579f417eb183e8e12ebfa2385d2e31f870748229bf5b31b29759aebe605eb5978140da4e6db7989015ac285cb SHA512 acd5e6aa35dc2d9dcaeb2cab798db031ff7d25eac05318ce53e29fc76f746a1bfd1b2951ad2a3ffd552a7604558a24ab921548bc2e77cf05e2218c451bc31de9 +EBUILD inspircd-3.9.0.ebuild 3612 BLAKE2B 4cdef520df508d23db93e25aed8a732b58944ae680e6f926ba96eb32b39b925ce43a10a85e72eb30a827c6257bca57ac13758002406434592d71448f48882c2e SHA512 11e8cc3a56a200904317eca4e597a232d3e006a7f88764e65eb5d292fef74d9f52d45f77558f54453f99f8659b30f508a1e6bc9adc2c530eb82ef5f6bdf70e34 MISC metadata.xml 1847 BLAKE2B cc3736547cc080f27ac421bba35aee729750ad3a88727fdf3a091641662ee7099a7b736393ec48f97b91d5801cde731e81c433f36dac6bfe1b7195f4a558c33b SHA512 bf96f8b7fbb64c07543f3f89dbfc31b16486a32ba6aba5c30cd90f10ee1c3f97e7d92139f84a985fc0a9f73bec7cd64bc767a33fcf06b1762129a6bd977a94c4 diff --git a/net-irc/inspircd/files/inspircd-3.9.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.9.0-fix-path-builds.patch new file mode 100644 index 000000000000..2c821586bbf4 --- /dev/null +++ b/net-irc/inspircd/files/inspircd-3.9.0-fix-path-builds.patch @@ -0,0 +1,384 @@ +From 675020067b59575c3bef2185aad42f046ea0c83d Mon Sep 17 00:00:00 2001 +From: Wade Cline <wadecline@hotmail.com> +Date: Mon, 3 Feb 2020 19:10:54 -0800 +Subject: [PATCH] Fix build paths + +--- + .../{ascii.conf.example => ascii.conf} | 0 + .../{latin1.conf.example => latin1.conf} | 2 +- + .../{rfc1459.conf.example => rfc1459.conf} | 0 + ...c1459.conf.example => strict-rfc1459.conf} | 0 + .../conf/{filter.conf.example => filter.conf} | 0 + .../conf/{helpop.conf.example => helpop.conf} | 0 + .../{inspircd.conf.example => inspircd.conf} | 20 +++++++++---------- + docs/conf/{links.conf.example => links.conf} | 2 +- + .../{modules.conf.example => modules.conf} | 20 +++++++++---------- + docs/conf/{motd.txt.example => motd.txt} | 2 +- + .../{opermotd.txt.example => opermotd.txt} | 2 +- + docs/conf/{opers.conf.example => opers.conf} | 2 +- + .../{irccloud.conf.example => irccloud.conf} | 0 + docs/conf/{quotes.txt.example => quotes.txt} | 0 + .../{anope.conf.example => anope.conf} | 2 +- + .../{atheme.conf.example => atheme.conf} | 2 +- + .../{generic.conf.example => generic.conf} | 0 + make/template/main.mk | 19 +++++++++--------- + 18 files changed, 36 insertions(+), 37 deletions(-) + rename docs/conf/codepages/{ascii.conf.example => ascii.conf} (100%) + rename docs/conf/codepages/{latin1.conf.example => latin1.conf} (97%) + rename docs/conf/codepages/{rfc1459.conf.example => rfc1459.conf} (100%) + rename docs/conf/codepages/{strict-rfc1459.conf.example => strict-rfc1459.conf} (100%) + rename docs/conf/{filter.conf.example => filter.conf} (100%) + rename docs/conf/{helpop.conf.example => helpop.conf} (100%) + rename docs/conf/{inspircd.conf.example => inspircd.conf} (99%) + rename docs/conf/{links.conf.example => links.conf} (98%) + rename docs/conf/{modules.conf.example => modules.conf} (99%) + rename docs/conf/{motd.txt.example => motd.txt} (96%) + rename docs/conf/{opermotd.txt.example => opermotd.txt} (96%) + rename docs/conf/{opers.conf.example => opers.conf} (99%) + rename docs/conf/providers/{irccloud.conf.example => irccloud.conf} (100%) + rename docs/conf/{quotes.txt.example => quotes.txt} (100%) + rename docs/conf/services/{anope.conf.example => anope.conf} (86%) + rename docs/conf/services/{atheme.conf.example => atheme.conf} (98%) + rename docs/conf/services/{generic.conf.example => generic.conf} (100%) + +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 cdfb6f3c2..f0d17ceff 100644 +--- a/docs/conf/inspircd.conf.example ++++ b/docs/conf/inspircd.conf +@@ -242,7 +242,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 @@ + # default of 'inspircd.pid' is used. # + # # + +-#<pid file="/path/to/inspircd.pid"> ++#<pid file="/var/run/inspircd/inspircd.pid"> + + #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-# + # # +@@ -698,7 +698,7 @@ + # - 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 and + # even negate the configured exemptions below. +- # See exemptchanops in modules.conf.example for more details. ++ # See 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. +@@ -1041,7 +1041,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 #-#-#-#-#-#-#-#-#-#-#-# + # # +@@ -1050,13 +1050,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 3b25e86f4..1208253a6 100644 +--- a/docs/conf/links.conf.example ++++ b/docs/conf/links.conf +@@ -143,4 +143,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 d236d6cb9..8c80c5352 100644 +--- a/docs/conf/modules.conf.example ++++ b/docs/conf/modules.conf +@@ -617,10 +617,10 @@ + #<module name="codepage"> + # + # 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: +@@ -904,7 +904,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> # + # Furthermore, the exemptions configured in <options:exemptchanops> # +@@ -942,7 +942,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 -#-#-#-#-#-#-#-#-#-#-#-# +@@ -951,7 +951,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)# +@@ -1041,7 +1041,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- +@@ -1646,7 +1646,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. +@@ -2260,7 +2260,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 cd993e9a3..0687a8aa0 100644 +--- a/docs/conf/motd.txt.example ++++ b/docs/conf/motd.txt +@@ -21,7 +21,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 b0d9b4816..b0d37f385 100644 +--- a/docs/conf/opermotd.txt.example ++++ b/docs/conf/opermotd.txt +@@ -21,7 +21,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 a8783aa05..de9bbaa4e 100644 +--- a/make/template/main.mk ++++ b/make/template/main.mk +@@ -214,10 +214,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) +@@ -238,11 +238,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) @CONFIGURE_DIRECTORY@/*.pem $(CONPATH) 2>/dev/null + @echo "" +@@ -256,7 +256,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 +-- +2.26.2 + diff --git a/net-irc/inspircd/inspircd-3.9.0.ebuild b/net-irc/inspircd/inspircd-3.9.0.ebuild new file mode 100644 index 000000000000..3dfa1dea335f --- /dev/null +++ b/net-irc/inspircd/inspircd-3.9.0.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2021 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}"/${P}-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/irker/Manifest b/net-irc/irker/Manifest index 75644a3f2fc7..a51c644cebd2 100644 --- a/net-irc/irker/Manifest +++ b/net-irc/irker/Manifest @@ -1,5 +1,5 @@ -AUX irkerd.confd 474 BLAKE2B 150e953ff1db373cb2b9010d4136866156fac7b6816ea12041bbb7d49862e93288d329605da5e935ec92f809d8b9774b5086cb910d1e9741efff707d8fde0edb SHA512 62e2242cbacd6ed35419b6ef78b969602c2c091e0500bf00d989444d96551087a4eef80ec5b70b5a8f88ecfebb633eb628f7912678862fde8ce7bddb75c87010 -AUX irkerd.initd 1125 BLAKE2B 4675bb07c523414810432b22954629e80758745b3ebcd8d9b6e203a699d776066871819a505cc4c249425b01fe04b4e818365d78bb2161f92cac89f3e62fe592 SHA512 c22838ef63cd2165af958724b4306a260018104224969e612b7175d63619f12a18908c155e94210030f0ada6dcedaabaee6eb0690bd6e327a65ee9934b8d4368 +AUX irkerd.confd 535 BLAKE2B fe8484cee8e5d443c3019c9915553e503164a2e5e965b44e89200fd71c8a2152bf5ca0dc43e5e93b46dfff6e683d8fc2d364dd27048d16642c4043a4f936d3af SHA512 00656916acb9fa2cbee57442a7a90bfbc7213c03ad3ee38b01314679b66177fa6152400ad3401e87be3711e6e38e09b084ea90cb71ae5774c8eba5cf9ab8e070 +AUX irkerd.initd 963 BLAKE2B 33e4b654eb908d5d2b5c086d821f81d959bcb71ec93b80c7aa38ffaf75f011d41f43b9369115d0ac463ecdc3781ee7360d06fa8afe9c7e66a79fc55e8340d338 SHA512 fa9247c207f4a21611e51477c31556114d83899ea7adcc8bf8f3bb3edafaa8db84b4764ac5704dfe7abff2e5f9727610b71609a620432dc939a81d2ab7fcf818 DIST irker-2.19.tar.gz 44502 BLAKE2B d777ed3b4308dca7f6bb2483bc03ba8ba50a55574da3e4de63138fe88483ae6d3ac46f414a94801d7f27c740e38ddcde494cea4c846fbc59d736441b692747f4 SHA512 7516ebe8adc74902eacc657f0a1d421c285a72f4ce08b84fd93b22635d49ba52acf7aedd03dde9012bc16496be3162bda9fa8486af3df1657af4cabf8719d7c7 EBUILD irker-2.19.ebuild 1524 BLAKE2B c8c35c008025017eac7eea89a0c1fc5e3066134dda5b4d462ae5f5ddac5a29fca5a2fe04707c7682234f2a598e2345a50fec05a0663831716e476592b1e09587 SHA512 566e2531236ddba05058bad5d5368fd6c312d075cd1969163f774dde9990143d4702604cb2a18c5d7a75420f44681782d232e7f21d41978dbba3d70138efbbdb MISC metadata.xml 445 BLAKE2B ea6b8447fcdd793e0e13d49c545ee8496a82ef50929fa405aeb4b3afc192dbed4636bc23840ca8131ca7d31891f765b25dbed475eb607a5a2b2fd9f70e1a4f51 SHA512 9de852aad0221fb33017a9cd424f9125313bcb367fed5ebadf53cda3b6eba40a2f78c22154f9569e7ac38b2f3c2ab7168807d726aa94fc240a292a3cfed18c26 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/psybnc/Manifest b/net-irc/psybnc/Manifest index c593ebf2f1c2..82394e8102c3 100644 --- a/net-irc/psybnc/Manifest +++ b/net-irc/psybnc/Manifest @@ -9,5 +9,5 @@ AUX psybnc.conf 313 BLAKE2B c56022b42942b100479b6c539e9da85178db679b6596fc2b4162 AUX psybnc.confd 113 BLAKE2B e4fddc3cb37c5b9defea0d4d6e6c2b26f34bf50fbbe51679b8f0e686b504c2caf980c5a97864fac86a251431126c5a0338bb50a8eba9d3976156cf1eaf1b7681 SHA512 e58704dec299271d9a450eb243d0af1323aca58d555b61fc3aa899324a6bdc9aa82afc0597c190dc07c278f22c7cb448592a271e9ee6e4aa3552518ce6254753 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 +EBUILD psybnc-2.3.2.9-r3.ebuild 4673 BLAKE2B 7755b8b8b6eab39fb4720e304ff51622dad4dccac092488a181e6459efba499a81e50f8abd399834a6b361a3b2343ec4d40c112add1b67db234d2cce0a54fb83 SHA512 ab1d4a4e25085a63c35802da6930e8cf12f5bb09e0bd87bedc07a94535608ffec7b95672025bfc3d53a88de74f85fd2225c4e399f654de105e03a1933f16408c MISC metadata.xml 360 BLAKE2B c3cbefd59c47603f27e542da342a855416fd79da62af69f30721929a7e25055ed5f5d46a2b99259589a0d0584fe68a837a4abdf2f0722d0eb3a1d02215f387a7 SHA512 7bcf4c1c7acd11782e8c2f19a179ac753967d4b6609aaf15b3b41ce7a492312db6006ba229b0169976f013d440f46d65c39cfa8f6276ef195339ff858958c135 diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild b/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild index b6593d48d197..5a3deaeb55fe 100644 --- a/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild +++ b/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,16 +11,18 @@ 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" +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=" + ssl? ( >=dev-libs/openssl-0.9.7d:= ) + oidentd? ( >=net-misc/oidentd-2.0 ) +" RDEPEND="${DEPEND}" -S="${WORKDIR}"/"${PN}" pkg_setup() { enewgroup psybnc @@ -37,14 +39,15 @@ 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" @@ -65,6 +68,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 @@ -118,7 +122,7 @@ src_install() { 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 +131,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 +146,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/rbot/Manifest b/net-irc/rbot/Manifest index f8596ebb0dde..2546fa892fec 100644 --- a/net-irc/rbot/Manifest +++ b/net-irc/rbot/Manifest @@ -4,5 +4,5 @@ AUX rbot.conf2 1111 BLAKE2B 22cfbcb92f8d0df664a03b26db6027837463c5f8f543829b772d AUX rbot.init 1459 BLAKE2B 3b58ca09d2073ef01f94ae1980ed9203d4cadc1a9512842e1ce53709ddb1cfab15228b41656aca5e69999ca933bfe45c94ac18af214b0e890f04912a56830ba8 SHA512 57f5504829ed7524b70102833a5de168f7ea08e594a92ece6d7c0f2eab7de8c9dd14a6d199c5e63b6298209bdf5de4adcb06aded0c23d05c35f7e9774742ecea AUX rbot.init2 1345 BLAKE2B 137df6384fde1e3ee9501ce38b31470605bf308827213924033b291f8aa567e90cb8421be6865f4df269aa9b8cc3b20c4b729f3cc4aaaa90959dec39382752ea SHA512 b3d8b83eea4d429a47657f4f9b6cb0aed6c283aa4e7535307305f33bc84c53c0c82e2b76a7cf45ec192c7db68c71e70ee5b000ffbd6f0ff59039de8f69f88dff DIST rbot-0.9.15_p20160325.tar.gz 762685 BLAKE2B 68146d241bd57198e0a7a9e5ae033827116bbe31d3bdc05bf42aa644c5dd900254bbe7317461aa553ad92daac299439721a85cd8dd41033cf38b9e97b268e1ee SHA512 b0bc90ee2c6ddb3cdd92cdd5f3a45520d20bc97327b3d694235f7ba94f13ef3c884d4658b083f71bfee2cbeff3cbc7a57c251c4d28bfee293e2556f64e7b4160 -EBUILD rbot-0.9.15_p20160325-r1.ebuild 5291 BLAKE2B 0dbbb3716bf4006e695205307fbbb7575150e39af3c307cead9e6e1703ea373632e1098fe2d4ecffb6e17563fe13e88545d2d64fcf65980b3ddc33d180bb650d SHA512 a2578990be0dbc2c18a9fb10f7f0c346236c818fca69ceec2c4deed3c4950083093402f651974aad0c256cf60ba30b3a34a7709c4cf5eac929ea199df89aabff -MISC metadata.xml 2656 BLAKE2B 47090f64bb983dfca142443a0f35ae99fa57927781177255e375e414c61a7555507d0110259f3a9ace86e42fadb237bbb5aecc251371bee9ff8ddaf1d414ea36 SHA512 03c3fc8b4f700eb1039feb5f656f772a55c3b928658e494c542cf69d3325d08b2723e23cfb753afe5ea3bad240011e642a4923e9a84673cba1e06b24cfc60918 +EBUILD rbot-0.9.15_p20160325-r2.ebuild 5218 BLAKE2B e6cf5c29ef591bf25665364673b11793b36df4b73f68965fcbc56d0e484886406242ccb4deb39b68586864591c555029e6ab878d95db3e653ce4db4292f346e9 SHA512 fea97215f7a921cf9cbd55c5223c5ecfdacd79d2abc508341bbb4ab69a65d6430f0af4d3608d0528077267426539ccdda784aefa06c83cc548f5f2e748e616a6 +MISC metadata.xml 2429 BLAKE2B 194f36624f9ae791b43994d7b1779b3e74b29aab2e9cedd57f6d2e33c6acc3b06e364cd2071f085d35fa8836c26940a9f8ab6be42a9f2a3bf9081f7279c606d2 SHA512 ddaf26be4e591045bf3ecb8151111cc140a9fded5ce2b3e425f445ffdddfa42d267e3cf38236fe2d43ecf6261492f51b9f2249785b0f7ec371c3f314e8124591 diff --git a/net-irc/rbot/metadata.xml b/net-irc/rbot/metadata.xml index 9be5ac250eb4..c24f8a726305 100644 --- a/net-irc/rbot/metadata.xml +++ b/net-irc/rbot/metadata.xml @@ -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_p20160325-r2.ebuild index 495f009bcfe2..d4bbfeb5e719 100644 --- a/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild +++ b/net-irc/rbot/rbot-0.9.15_p20160325-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -USE_RUBY="ruby23 ruby24 ruby25" +EAPI=7 +USE_RUBY="ruby25 ruby26 ruby27" GITHUB_COMMIT="e358601cc521d8aced941eb928fae2d8c53cf0c2" -inherit ruby-ng eutils user +inherit ruby-ng l10n user DESCRIPTION="A ruby IRC bot" HOMEPAGE="https://ruby-rbot.org/" @@ -14,13 +14,11 @@ 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 ) - RDEPEND+=" spell? ( aspell? ( app-text/aspell ) @@ -46,7 +44,6 @@ 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 ) " @@ -55,6 +52,8 @@ pkg_setup() { } 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 @@ -104,7 +103,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/weechat/Manifest b/net-irc/weechat/Manifest index c3246b69d974..04ae787e4772 100644 --- a/net-irc/weechat/Manifest +++ b/net-irc/weechat/Manifest @@ -1,10 +1,9 @@ AUX weechat-3.0-cmake_lua_version.patch 272 BLAKE2B 3c88a0aad5d0ad9c5067062039fd147c9356923324089d74ebd5987e6f5a67bc1da785a12b863dffafc8e63af18b52b5ed6aba97cacec105b04f7b70ac0b3e5c SHA512 81a3143acfeb35ccd8e913efa0b881165459049bdbb3e7bf96b41c7f764fe37647349599d3bceadb966ae52f2156cba5170926ba7af7ed667f7664f8adb920aa -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 -EBUILD weechat-2.9.ebuild 3864 BLAKE2B f5a7ffca93c5845c31fda18107cd9d2f49c74b9c3d318bf6002e117a1c59bb8ca0fe04f7e2956b51e7f3d953b7d7aeaec35ca19795fb5b3b4f9cf749d2c44e65 SHA512 825f3681db2792bc4d4112796f2ca524302ed32df718902fcd787e79bd0f162425e8940f316e090e1d6ec3ff0ecb3e5b4b232a4c2e4c971163d315752ed7ba50 +DIST weechat-3.1.tar.xz 2230316 BLAKE2B 95ce8c6107351676b64c368484baf2245bd17093c90552339d35d058a3caff7a0c4bb8e7692757bcf8c2d7617621961b5bc118806c5084cc212283d6982bd896 SHA512 1eb3f5a0e4d3f6777970fc60c816e7bc9be5e5cf91b9e072f6c77003f284c7bdbabfae7058cb5083915a2adf7f4c651a9afb8cc8ae17cac950e7f2ef9608ed78 EBUILD weechat-3.0-r100.ebuild 4186 BLAKE2B a39dcccb10b695521bc7fbe5aa311608df46e274b3a372390a23f93d55dad7717fda9c7c8375ebdf6ce5a0b5d949b7a1ef3a97e23c6eca8be2bcee5ed92bdc3d SHA512 04f04f13668a40e6e0d9f9f3d7a1d00d067291812e9855bc51c552768626933acafbd81bc5287f6d4efc445c7d6649e4a53c991a4d086e8eadb151725e6e951a EBUILD weechat-3.0.1.ebuild 4189 BLAKE2B 86c80cf608e648b059e65f2cc562ee096609966752c3009791189227e744f1c4fe7dfad22efe9a31423f05893ef1cfa31153b30d354789db3da9aa41a13386e1 SHA512 68c4d25c1f800d4d804ff305cdba2ff4f6fc124b180aa5db349fa64a736469bd1899ec4bf7da507d87b774c1f8b3b231f5420a4f8b339f2cfa6f5f95aa1a2145 -EBUILD weechat-3.0.ebuild 4029 BLAKE2B 5ba766edfd551f4dde7d04c923aea4657d7107e3e32a85701c68ec7b81700c6842fd36f6bbf4c1ea629db7759faed1e7ade0181e24f3290cdebc6684d53a7bdb SHA512 9ed9379cebedc21a72e13740d3325175181ae72da664dfd7cecd9a12a082d3d823d9a30dbde9aa8338c19d9d9d15540a8d6c23345a327ca6bd04e715c3777239 +EBUILD weechat-3.1.ebuild 4189 BLAKE2B 86c80cf608e648b059e65f2cc562ee096609966752c3009791189227e744f1c4fe7dfad22efe9a31423f05893ef1cfa31153b30d354789db3da9aa41a13386e1 SHA512 68c4d25c1f800d4d804ff305cdba2ff4f6fc124b180aa5db349fa64a736469bd1899ec4bf7da507d87b774c1f8b3b231f5420a4f8b339f2cfa6f5f95aa1a2145 EBUILD weechat-9999.ebuild 4189 BLAKE2B dd2b47e18560aa368222ff5ced136c3d58f5a0d05e958560095eb004f00fdd509457ce920ebbea9bf4162edc15155d47515814fe97d6236afc8b554ee24cccf6 SHA512 b6ad28286bf87e8081b7dab73a752f16d77b742622da0ac3205332f0e516a11ac3b61e2766ef35ed9ba799948177d85aef0555d537daac97559108f58dff22ea MISC metadata.xml 934 BLAKE2B a848491f3855ff1d5911c1e5d2f875cacb1bf1f6df9fa31a3ba9fce80012d33f21992faf6a4748a2f134fd532cf99d58909fa1b0da06d6d7d09982438032324f SHA512 eec6d712307496df84f6294158fddfbe0865dfdbaeedef08231bfeaf0ce9a1b25fc7c163add36c1cdfc24fffdfbbf90063771693bf0d829c82b5886eb6899197 diff --git a/net-irc/weechat/weechat-2.9.ebuild b/net-irc/weechat/weechat-2.9.ebuild deleted file mode 100644 index ac03ee6e739b..000000000000 --- a/net-irc/weechat/weechat-2.9.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_7,3_8} ) - -inherit cmake python-single-r1 xdg-utils - -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" -fi - -DESCRIPTION="Portable and multi-interface IRC client" -HOMEPAGE="https://weechat.org/" - -LICENSE="GPL-3" -SLOT="0" - -NETWORKS="+irc" -PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer" -# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support -SCRIPT_LANGS="guile lua +perl php +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} )" - -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 ) - lua? ( dev-lang/lua:0 ) - nls? ( virtual/libintl ) - perl? ( dev-lang/perl:= ) - php? ( >=dev-lang/php-7.0:*[embed] ) - python? ( ${PYTHON_DEPS} ) - ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) - spell? ( app-text/aspell ) - tcl? ( >=dev-lang/tcl-8.4.15:0= ) -" -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 ) -" - -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" - -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 - 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 - done - - # install docs in correct directory - sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/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=/usr/$(get_libdir) - -DENABLE_JAVASCRIPT=OFF - -DENABLE_LARGEFILE=ON - -DENABLE_NCURSES=ON - -DENABLE_ALIAS=$(usex alias) - -DENABLE_BUFLIST=$(usex buflist) - -DENABLE_CHARSET=$(usex charset) - -DENABLE_DOC=$(usex doc) - -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_PHP=$(usex php) - -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_XFER=$(usex xfer) - ) - 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 -} diff --git a/net-irc/weechat/weechat-3.0.ebuild b/net-irc/weechat/weechat-3.1.ebuild index b33c433ae6d2..f8abf272affc 100644 --- a/net-irc/weechat/weechat-3.0.ebuild +++ b/net-irc/weechat/weechat-3.1.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +LUA_COMPAT=( lua5-{1..4} ) PYTHON_COMPAT=( python3_{7..9} ) -inherit cmake python-single-r1 xdg-utils +inherit cmake lua-single python-single-r1 xdg-utils if [[ ${PV} == "9999" ]] ; then inherit git-r3 @@ -29,6 +30,7 @@ LANGS=" cs de es fr it ja pl ru" IUSE="doc man nls test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) test? ( nls ) " @@ -41,7 +43,7 @@ RDEPEND=" net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) - lua? ( dev-lang/lua:0 ) + lua? ( ${LUA_DEPS} ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) @@ -62,11 +64,16 @@ BDEPEND=" nls? ( >=sys-devel/gettext-0.15 ) " +PATCHES=( + "${FILESDIR}"/${PN}-3.0-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 } |