diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /net-irc | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'net-irc')
37 files changed, 589 insertions, 426 deletions
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz Binary files differindex dfbe4b1e5c63..55ba1da0e037 100644 --- a/net-irc/Manifest.gz +++ b/net-irc/Manifest.gz diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest index 771acb82828c..692e0ca2399e 100644 --- a/net-irc/anope/Manifest +++ b/net-irc/anope/Manifest @@ -7,4 +7,4 @@ DIST anope-2.0.6-source.tar.gz 1792912 BLAKE2B 00c70723c887821d2dda065f9fdb4c4fc 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 1766 BLAKE2B 468c8eada20fc23455d92c612f3268876d812a7c7a87a593f896fe8fa7246dbb75441430a2e0cb4d6a1fa36b611553c0df43de2edda195a51b390c70712d7ab9 SHA512 b40ef7336a091b3211826a3b2b1e51c0586187b903b3aa34e4d9e3df0194ae3ce92964d490e77b5d679aaaa76eadf40af5b1d785d6540a23c2b832474f0a5a03 +MISC metadata.xml 1649 BLAKE2B 8d692618d256a242f3314f3bf1df6825e487771dced98ac88d3bc1f697f35d716e514f4789357eaef053a925bc51dbfeb3bcd4144fe31aaa70c11c83b2241a72 SHA512 8622b5d345ec80b7ef759a02bf74690c4755cc10d169d2f61718893d620611012fc98fc85ca912c6ce4a8294df6f69e8129a8649433de7d274ae1e171af15c44 diff --git a/net-irc/anope/metadata.xml b/net-irc/anope/metadata.xml index 0ca16f3bed07..9826ad83c454 100644 --- a/net-irc/anope/metadata.xml +++ b/net-irc/anope/metadata.xml @@ -2,13 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>sam@cmpct.info</email> + <email>sam@gentoo.org</email> <name>Sam James</name> </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <longdescription> Anope IRC Services provide user and channel management services for an IRC server. It is a well-known package which continues to be actively diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest index 9566f4e0b578..fe1daf7402b7 100644 --- a/net-irc/eggdrop/Manifest +++ b/net-irc/eggdrop/Manifest @@ -1,6 +1,9 @@ +AUX eggdrop-1.8.4-fix-array-bounds-warning.patch 864 BLAKE2B d35686e21c7a531b25ba6b06420dfd45914d4aff5321ccd9129239e7f66182d91800371f14c81ee4ac6eb39ad96063d7750a40a25e1eccb9dcebbe50502f0bc9 SHA512 de10ae6d6328da636afd8ec0de187b3f29677c3854e111a64df9b15c9d41ef8ec92f2efd65bc361b2fb6b879016b44e2ce9639da937370d71781aca569991d75 +AUX eggdrop-1.8.4-respect-ldflags.patch 1316 BLAKE2B 43c0ca341a328f08fe8beb735c678bcf0c8fd547acbc7c1614995d5fc75261924cb435b0c0fc4d9f94c2fee3781aba407f3cb09e26958d1e09e1338e7e1781fb SHA512 f0d7c699d648f4a89d622f3f2238b967cae7ff139f25390853b195efd3a76c74af80389c20fcd2c1203fc33d006e7e27d9bdfcab4772c7a688fce7d0649d28be AUX eggdrop-installer 2149 BLAKE2B a9b2d7887732f1b6cabb6998ea7c128b52308a70fc46521521d92c1c3bb9f78fd2b32866c62fd0e67b360cfb32921ea900983e2892a9e37d3316364bdaabe26f SHA512 e9a99daff0e73344ab6cf73bb28fa26309b6ec85bcb5cfb84c343fe439a7e1e927960462b5f500af077a7470809d8fe4a2771f34c0727728121d9ba06792c715 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 1601 BLAKE2B 0e2fce2a0939ac790860f8ad8eb5c41cd64111bba9a6fc6372d21301b9372ee791b87057375cafd03bad37a8824edc28a75e7768c44a9e0eed98b53a36124cdd SHA512 1ff8ae7165dee88c9c8ca0af807d86e2bcc6bbfacfc74e31d89fa90396045f41741b380a2ec060fd83210734f79d7761f8578b237afffca69774f2ab29b65673 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 new file mode 100644 index 000000000000..1ddb84ab8e16 --- /dev/null +++ b/net-irc/eggdrop/eggdrop-1.8.4-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit readme.gentoo-r1 + +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" +LICENSE="GPL-2+" +SLOT="0" +IUSE="debug doc ipv6 ssl static" + +DEPEND=" + dev-lang/tcl:0= + ssl? ( dev-libs/openssl:0= ) +" +RDEPEND=" + sys-apps/gentoo-functions + ${DEPEND} +" + +PATCHES=( + # https://github.com/eggheads/eggdrop/pull/986 + "${FILESDIR}/${P}-respect-ldflags.patch" + # https://github.com/eggheads/eggdrop/pull/841 + "${FILESDIR}/${P}-fix-array-bounds-warning.patch" +) + +DOCS=( AUTHORS FEATURES INSTALL NEWS README THANKS UPGRADING ) + +src_configure() { + econf $(use_enable ssl tls) \ + $(use_enable ipv6 ipv6) + + emake config +} + +src_compile() { + local target + + if use static && use debug; then + target="sdebug" + elif use static; then + target="static" + elif use debug; then + target="debug" + fi + + emake ${target} +} + +src_install() { + emake DEST="${D}"/opt/eggdrop install + + use doc && HTML_DOCS=( doc/html/. ) + rm -r "${D}"/opt/eggdrop/doc/html || die + DOC_CONTENTS=" + Additional documentation can be found + in ${EPREFIX}/opt/eggdrop/doc + " + readme.gentoo_create_doc + einstalldocs + + dobin "${FILESDIR}"/eggdrop-installer + doman doc/man1/eggdrop.1 +} + +pkg_postinst() { + # Only display this for new installs + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "Please run ${EPREFIX}/usr/bin/eggdrop-installer to install your eggdrop bot." + fi +} diff --git a/net-irc/eggdrop/files/eggdrop-1.8.4-fix-array-bounds-warning.patch b/net-irc/eggdrop/files/eggdrop-1.8.4-fix-array-bounds-warning.patch new file mode 100644 index 000000000000..7c6c2d6dae69 --- /dev/null +++ b/net-irc/eggdrop/files/eggdrop-1.8.4-fix-array-bounds-warning.patch @@ -0,0 +1,24 @@ +diff --git a/src/flags.c b/src/flags.c +index 8cecd2898..3f0a7ea32 100644 +--- a/src/flags.c ++++ b/src/flags.c +@@ -403,7 +403,10 @@ void break_down_flags(const char *string, struct flag_record *plus, + which = plus; + mode++; + if ((mode == 2) && !(flags & (FR_CHAN | FR_BOT))) +- string = ""; ++ goto breakout; /* string = ""; does not work here because we need to ++ break out of while() / nested switch(), see ++ "string++;" below and string = "\0"; is worse than ++ goto */ + else if (mode == 3) + mode = 1; + break; +@@ -447,6 +450,7 @@ void break_down_flags(const char *string, struct flag_record *plus, + } + string++; + } ++breakout: + for (which = plus; which; which = (which == plus ? minus : 0)) { + which->global &=USER_VALID; + diff --git a/net-irc/eggdrop/files/eggdrop-1.8.4-respect-ldflags.patch b/net-irc/eggdrop/files/eggdrop-1.8.4-respect-ldflags.patch new file mode 100644 index 000000000000..e41dbd664c51 --- /dev/null +++ b/net-irc/eggdrop/files/eggdrop-1.8.4-respect-ldflags.patch @@ -0,0 +1,39 @@ +From 36f2df10c6c39290f6896f9ad5eb9d1419a1abe3 Mon Sep 17 00:00:00 2001 +From: Michael Ortmann <41313082+michaelortmann@users.noreply.github.com> +Date: Tue, 26 May 2020 01:08:03 +0200 +Subject: [PATCH] Respect LDFLAGS + +--- + src/Makefile.in | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index 6757bbc8c..c9605a049 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -16,6 +16,7 @@ LD = @CC@ + STRIP = @STRIP@ + CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @SSL_INCLUDES@ @DEFS@ $(CFLGS) + CPPFLAGS = @CPPFLAGS@ ++LDFLAGS = @LDFLAGS@ + + eggdrop_objs = bg.o botcmd.o botmsg.o botnet.o chanprog.o cmds.o dcc.o \ + dccutil.o dns.o flags.o language.o match.o main.o mem.o misc.o misc_file.o \ +@@ -41,7 +42,7 @@ linkstart: + touch mod/mod.xlibs + + link: +- $(LD) $(CFLAGS) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs` ++ $(LD) $(CFLAGS) $(LDFLAGS) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs` + + linkfinish: + @$(STRIP) ../$(EGGEXEC) && \ +@@ -63,7 +64,7 @@ clean: + main.o: + $(CC) $(CFLAGS) $(CPPFLAGS) \ + '-DCCFLAGS="$(CC) $(CFLAGS) $(CPPFLAGS)"' \ +- '-DLDFLAGS="$(LD)"' \ ++ '-DLDFLAGS="$(LD) $(LDFLAGS)"' \ + '-DSTRIPFLAGS="$(STRIP)"' -c $(srcdir)/main.c + + compatibility: diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest index 885aa51e6047..3d09f504e7fa 100644 --- a/net-irc/inspircd/Manifest +++ b/net-irc/inspircd/Manifest @@ -1,12 +1,12 @@ AUX inspircd-2.0.27-fix-path-builds.patch 9655 BLAKE2B eaf233df43b48a156bee13e8113ff185b9fd3fb04686620e4759a5cc3a1d055f984b8cfe2ba32e2ad48d32386c34579b37161f7a1a82b9aa9e2356263f865314 SHA512 86117ecf4cdbec2181b48ff3737c6c4eda71d7bfdd3c6b3b6a195a79cfc6c884b5d6b9e7ba41a1943c39458e1d69a3a0f2e6b6338da7b846230e50f51064b402 AUX inspircd-3.4.0-fix-path-builds.patch 12942 BLAKE2B 7fe7bc904331f2cff3a27268af3a0bfe4db6fdec57ca3b846af43d8949aa047340cdc5c7d858fa96527aa3fa8af0774dbe2a8b3035f17962511b21ab94707b07 SHA512 54c773df0c4b48af2f83bcf6923c2679a9c46ac57232834cb1157b9d6528f39b2de1187e6b6989046509d434b3cfa427b77ff80b33b58b88c72d73087dc7a14b -AUX inspircd-3.5.0-fix-path-builds.patch 16773 BLAKE2B 0cd63c080579fab035e44c965c56be5c57a738dad8cb2e118e96889a5e7413d7bf7a0a322132e6e47965aacd815e2b4b65fd17335f3baeaadf4bc0891391f597 SHA512 e45dffd981aa129d8628cd5272de4dd252763c4932b8b7d852eeab6f8590a046c173479b72f199604976d33a343d8055ae34c0354209c683b1aa6f56750a1f39 +AUX inspircd-3.7.0-fix-path-builds.patch 16417 BLAKE2B 9961fa65037cd34eec1cd07ad6093d0cded8d6a148bec41ac396dc67329ec97f3533aeab4cb38be0c2c0c783659b603e6d69e7b9a01faf81a9b2dfe5214288a6 SHA512 a74516ef425269d15beee9568cc8ecb3016c595f1c1a5157848ab81c9644aaeb8cb61899f81b426485881e27c4564373519d1a36412816d97bde168d138b449b AUX inspircd.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951aa0a952b4dfa270f5738a5016fe64057791f2b4002ce207fb42ff8128734cab4ab9b856c8a0ebda4 SHA512 5c47c8588bf39e33e07584492fc672ffe5529b80d7d357ff48d7b6b3bd89a58915c856eeb78d7a68aa2897760a086c193b661641d8a0741c602010d9d0d0efd2 AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff DIST inspircd-2.0.29.tar.gz 736116 BLAKE2B bd634b81e5a21f4d5e12a4057c4dfb65a241b696be373d24a047594d1d175028dcabff2f28defcf4c340859cfc50637afec755f399c24366e1134c7d69c843f2 SHA512 83da7b089dca8035ffa4f30a2e757661150bb9337aa8124958daa317b44a98fb15fdcb872f8512737b5a39f1b641616eb27c4398d4c8d8fcd40d1f8872bd2052 DIST inspircd-3.4.0.tar.gz 809845 BLAKE2B 6529d53c3cbff07727eceea5e1eb321bb8b7f6b231b3d5ea3ed0ced01fe5b66c2da83039a1ac11ff49e6536ef482483a9be26762feb30511a0016bab07d6790a SHA512 871fefff5e337dc6228fae223ff7ac534e159b5bfb838419247b1d16339c860b0b939a28dd4610cf3b8c37328b5e6ccba2ddd80adbd27638f4f3fa28e4f99066 -DIST inspircd-3.6.0.tar.gz 851768 BLAKE2B e1cbad4e5f00e769e804abc432dbac24ae4c988aac690d009dd87f28d75c4229a174c1703395cae42306b45ba167268c2032a3c2533fdde8154a67f53f2e18f8 SHA512 b1feaf983f30aa3192860d931f85bb2e5b5f10d3b7582b7e5faa8fc16a349c79506f5a7ba9e1f4f8b24d62639c0e0e88f2d97a3130473ee10eda93dd5c131630 +DIST inspircd-3.7.0.tar.gz 855041 BLAKE2B 8b65c6d29ecf448503201d6d3d9b5416775f7ea97dd3e3acb947cbfcecd4a137f5c4dfd5902f8de43c03b5c5d799acc4a833631982f9815053beec07366a7ccb SHA512 d683d54a046f9bf17ae1a7bb1e2ce94000455c0249478250fd7263f8ede12048ce3982b990bb47461a1c7d9ea5fc20836b3dd255924e72d187eb3a6d591fd51d EBUILD inspircd-2.0.29.ebuild 3142 BLAKE2B 6a7434a1bf5841638268931c4106c2ff684ba00a7c6887a5d665632bd97ac99f1a38210cd0217c4951ec7a4585397685a3effe3298f9902b020c872056964cf1 SHA512 b0c245ef1d277fd8b9d728a98cef25b30e593faa847b6d5032d606957f5c2b77157dd4878baa8c20bc48ade6a9d471b49b159d2f7d6f5759cd519b6d6fe2d4b8 EBUILD inspircd-3.4.0-r1.ebuild 3620 BLAKE2B b7e49e080ce8d5a7b418ec12462ebf53af247c494d9c299027d952eede5e9cce243f53ccbd90e000aac7e2a4c490fd6f54228a92943a0093a033e918f169afba SHA512 e0809008918e85cf50af088e13d1c09953fb88416bcb9d63f009ef339ab420329cb7a4eea9189bde9bad1eb51fe3ef7c97d49ce53d2b471e09962ccddafedf76 -EBUILD inspircd-3.6.0.ebuild 3622 BLAKE2B 4ed8b42b32fcdb354add43029533c45a5ae35300564d93699c5d114d167670593f6a23ae8bb212b8367ab611af7ca18c26ba547c410decf839d050aa7e401311 SHA512 2c940d423fd048d8857f07df0617071beb925bfc6d8684df41882ecb6d13f291d9435986f2c74a0fdd6c5b0fd49b910316a67b122e915f28b2ae66b2c2e062d7 +EBUILD inspircd-3.7.0.ebuild 3622 BLAKE2B 6418faafa0282e095add6dfa6f5ba4601cf3df33d50e3a9e957cfde7a475edee1cc40c9ccecd0f3bb2f21e0b5efde1645efdde1b57dddb73c776e5ad06a723b5 SHA512 0595ddf6fce1510bf5800490d357da72027d242454a484c3d03ff5f478220e43fdebf3329486d63bb54dd13fe47d742ed8d86fcea4ee6ec18ac25d6ff6fa1c97 MISC metadata.xml 1847 BLAKE2B cc3736547cc080f27ac421bba35aee729750ad3a88727fdf3a091641662ee7099a7b736393ec48f97b91d5801cde731e81c433f36dac6bfe1b7195f4a558c33b SHA512 bf96f8b7fbb64c07543f3f89dbfc31b16486a32ba6aba5c30cd90f10ee1c3f97e7d92139f84a985fc0a9f73bec7cd64bc767a33fcf06b1762129a6bd977a94c4 diff --git a/net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.7.0-fix-path-builds.patch index 578453934c8f..92e1c4b6032f 100644 --- a/net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch +++ b/net-irc/inspircd/files/inspircd-3.7.0-fix-path-builds.patch @@ -32,23 +32,19 @@ 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 98% +similarity index 99% rename from docs/conf/inspircd.conf.example rename to docs/conf/inspircd.conf -index dbd56d2fe..665d4dfb5 100644 +index d678b5be3..607141381 100644 --- a/docs/conf/inspircd.conf.example +++ b/docs/conf/inspircd.conf -@@ -247,10 +247,10 @@ +@@ -250,7 +250,7 @@ # This can be done by using <connect registered="no"> # # To enable IRCCloud on your network uncomment this: -#<include file="examples/providers/irccloud.conf.example"> +#<include file="/etc/inspircd/providers/irccloud.conf"> - # To enable KiwiIRC.com on your network uncomment this: --#<include file="examples/providers/kiwiirc-com.conf.example"> -+#<include file="/etc/inspircd/providers/kiwiirc-com.conf"> - # A connect class with <connect:deny> set denies connections from the specified host/IP range. <connect @@ -494,11 +494,11 @@ @@ -79,11 +75,11 @@ index dbd56d2fe..665d4dfb5 100644 # # -#<pid file="/path/to/inspircd.pid"> -+<pid file="/var/run/inspircd/inspircd.pid"> ++#<pid file="/var/run/inspircd/inspircd.pid"> #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-# # # -@@ -693,7 +693,7 @@ +@@ -697,7 +697,7 @@ # messages (requires the stripcolor module). # - topiclock Channel mode +t - limits changing the topic to (half)ops # You can also configure this on a per-channel basis with a channel mode. @@ -92,7 +88,7 @@ index dbd56d2fe..665d4dfb5 100644 exemptchanops="censor:o filter:o nickflood:o nonick:v regmoderated:o" # invitebypassmodes: This allows /INVITE to bypass other channel modes. -@@ -1041,7 +1041,7 @@ +@@ -1045,7 +1045,7 @@ # provide almost all the features of InspIRCd. :) # # # # The default does nothing -- we include it for simplicity for you. # @@ -101,7 +97,7 @@ index dbd56d2fe..665d4dfb5 100644 #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION #-#-#-#-#-#-#-#-#-#-#-# # # -@@ -1050,13 +1050,13 @@ +@@ -1054,13 +1054,13 @@ # exemptions for services pseudoclients: # # # Anope users should uncomment this: @@ -122,7 +118,7 @@ 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 09b3bb3d5..22db1bdab 100644 +index 256ac10f9..40f5be35d 100644 --- a/docs/conf/links.conf.example +++ b/docs/conf/links.conf @@ -121,4 +121,4 @@ @@ -135,7 +131,7 @@ 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 d68248163..b55d368fb 100644 +index 2e50977bd..315d376cf 100644 --- a/docs/conf/modules.conf.example +++ b/docs/conf/modules.conf @@ -576,10 +576,10 @@ @@ -189,7 +185,7 @@ index d68248163..b55d368fb 100644 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Hide chans module: Allows users to hide their channels list from non- -@@ -1575,7 +1575,7 @@ +@@ -1581,7 +1581,7 @@ # onoper - If on, the message is sent on /OPER, otherwise it's # # only sent when /OPERMOTD is used. # # # @@ -198,9 +194,9 @@ index d68248163..b55d368fb 100644 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Override module: Adds support for oper override. -@@ -2153,7 +2153,7 @@ +@@ -2172,7 +2172,7 @@ # connections in order to oper up. It is highly recommended to load - # this module if you use SSL on your network. + # 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. @@ -243,10 +239,10 @@ 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 7cad2589c..082009da9 100644 +index d8c266b1f..9517b3685 100644 --- a/docs/conf/opers.conf.example +++ b/docs/conf/opers.conf -@@ -178,4 +178,4 @@ +@@ -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. @@ -256,10 +252,6 @@ diff --git a/docs/conf/providers/irccloud.conf.example b/docs/conf/providers/irc similarity index 100% rename from docs/conf/providers/irccloud.conf.example rename to docs/conf/providers/irccloud.conf -diff --git a/docs/conf/providers/kiwiirc-com.conf.example b/docs/conf/providers/kiwiirc-com.conf -similarity index 100% -rename from docs/conf/providers/kiwiirc-com.conf.example -rename to docs/conf/providers/kiwiirc-com.conf diff --git a/docs/conf/quotes.txt.example b/docs/conf/quotes.txt similarity index 100% rename from docs/conf/quotes.txt.example @@ -301,10 +293,10 @@ 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 a57595c9d..42fef2563 100644 +index 9f905f970..c87da5d73 100644 --- a/make/template/main.mk +++ b/make/template/main.mk -@@ -220,10 +220,10 @@ install: target +@@ -221,10 +221,10 @@ install: target @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH) @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH) @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH) @@ -319,10 +311,10 @@ index a57595c9d..42fef2563 100644 @-$(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) -@@ -240,11 +240,11 @@ endif - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null +@@ -244,11 +244,11 @@ endif + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-testssl.1 $(MANPATH) 2>/dev/null -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/testssl $(BINPATH)/inspircd-testssl 2>/dev/null - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH) - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/*.example $(EXAPATH)/codepages - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers @@ -333,10 +325,10 @@ index a57595c9d..42fef2563 100644 + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/* $(CONPATH)/providers + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/* $(CONPATH)/services + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/sql + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH) -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null @echo "" - @echo "*************************************" -@@ -258,7 +258,6 @@ endif +@@ -263,7 +263,6 @@ endif @echo ' Data:' $(DATPATH) @echo 'To start the ircd, run:' $(SCRPATH)/inspircd start @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf diff --git a/net-irc/inspircd/inspircd-3.6.0.ebuild b/net-irc/inspircd/inspircd-3.7.0.ebuild index 92c0dfe18f1a..60448a5f4f90 100644 --- a/net-irc/inspircd/inspircd-3.6.0.ebuild +++ b/net-irc/inspircd/inspircd-3.7.0.ebuild @@ -32,7 +32,7 @@ RDEPEND=" DEPEND="${RDEPEND}" DOCS=( docs/. ) -PATCHES=( "${FILESDIR}"/${PN}-3.5.0-fix-path-builds.patch ) +PATCHES=( "${FILESDIR}"/${PN}-3.7.0-fix-path-builds.patch ) src_prepare() { default diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest index 3302830320cc..6d1c1ce9d7f4 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 -DIST irker-2.18.tar.gz 44284 BLAKE2B 355d9004c77c7635e5ee068d6521b2d1b8c3e0ae4b0d2fa39e71c16a4ecc2272c5a487dafd296a3d02aa5072c734f454875939b99f66c4321ab2970da78216ef SHA512 215f0ab3be03b615f2bb24e04a5e5f6688634c4fb994b5384106b7f3eae62967ac45b2a14d08eee8dbed886dbb0578e077fa19597db599ea9562a67797f75606 -EBUILD irker-2.18-r2.ebuild 1345 BLAKE2B 2b4f67d28725a42b7a0c57fe55d61c14495b8523d47863efb3135c05d3af9cd72725c048e55f44d828d3bc82a0d67a34afda40d5af956292873551e75eb2f9ab SHA512 ce50c953d64f3396e210722998bf7c90d4b5f1625af141d6a40578af6caade752ef385bfe3a51da30bf86296aafa2ff793b69ee07c6069f2f314f07235478287 -MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 +DIST irker-2.19.tar.gz 44502 BLAKE2B d777ed3b4308dca7f6bb2483bc03ba8ba50a55574da3e4de63138fe88483ae6d3ac46f414a94801d7f27c740e38ddcde494cea4c846fbc59d736441b692747f4 SHA512 7516ebe8adc74902eacc657f0a1d421c285a72f4ce08b84fd93b22635d49ba52acf7aedd03dde9012bc16496be3162bda9fa8486af3df1657af4cabf8719d7c7 +EBUILD irker-2.19.ebuild 1513 BLAKE2B 3ae54a387df16313cfce2423d444b275f135d31b4d0feb0b296830dbf40e58f5e880a2f8d780424c27cc33af93a90f87b12273ac2412dfb8e865203d87c46138 SHA512 8b93a6fe5cc45271c1d950f85864044cfe2ca126e4c101c0f7048f729fa6886ef424aa1e4d81055bf3fef41bac9ebcf437b948d6f2a49b830ab67e5c053b34b3 +MISC metadata.xml 445 BLAKE2B ea6b8447fcdd793e0e13d49c545ee8496a82ef50929fa405aeb4b3afc192dbed4636bc23840ca8131ca7d31891f765b25dbed475eb607a5a2b2fd9f70e1a4f51 SHA512 9de852aad0221fb33017a9cd424f9125313bcb367fed5ebadf53cda3b6eba40a2f78c22154f9569e7ac38b2f3c2ab7168807d726aa94fc240a292a3cfed18c26 diff --git a/net-irc/irker/irker-2.18-r2.ebuild b/net-irc/irker/irker-2.19.ebuild index df9f62a09166..308db034b269 100644 --- a/net-irc/irker/irker-2.18-r2.ebuild +++ b/net-irc/irker/irker-2.19.ebuild @@ -1,33 +1,34 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python2_7 ) # Doesn't work with python3 bug #619700 +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) PYTHON_REQ_USE="ssl" -inherit python-single-r1 systemd +inherit eutils python-single-r1 systemd DESCRIPTION="Submission tools for IRC notifications" -HOMEPAGE="http://www.catb.org/esr/irker/" +HOMEPAGE="http://www.catb.org/esr/irker/ https://gitlab.com/esr/irker" SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz" -LICENSE="BSD" +LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="socks5" +KEYWORDS="amd64 arm arm64 ppc ppc64 x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="${PYTHON_DEPS}" -DEPEND="${RDEPEND} +# Dependency notes: +# NOTE: No pkgconfig dep here because of the systemd sed below +# NOTE: No need for asciidoc here as it's only used for the +# 'release' makefile target. +BDEPEND=" app-text/docbook-xml-dtd:4.1.2 app-text/xmlto - socks5? ( - $(python_gen_cond_dep ' - dev-python/PySocks[${PYTHON_MULTI_USEDEP}] - ') - )" + ${PYTHON_DEPS} +" +RDEPEND="${PYTHON_DEPS}" -DOCS=( NEWS README hacking.txt security.txt ) +DOCS=( NEWS README hacking.adoc security.adoc ) HTML_DOCS=( irkerd.html irkerhook.html ) src_prepare() { @@ -38,14 +39,14 @@ src_prepare() { || die "sed failed" # Prefix support - sed -i -e "/^ExecStart=/ s:=/:=${EPREFIX}:" irkerd.service \ + sed -i -e "/^ExecStart=/ s:=/:=${EPREFIX}/:" irkerd.service \ || die "sed failed" } src_install() { default - python_doscript "${ED%/}/usr/bin/irkerd" + python_doscript "${ED}/usr/bin/irkerd" # Not installed with the default Makefile python_doscript irk irkerhook.py @@ -57,3 +58,7 @@ src_install() { docinto examples dodoc filter-example.py filter-test.py } + +pkg_postinst() { + optfeature "SOCKS5 proxy support" dev-python/PySocks +} diff --git a/net-irc/irker/metadata.xml b/net-irc/irker/metadata.xml index 40aa45df2b01..ee05af555f14 100644 --- a/net-irc/irker/metadata.xml +++ b/net-irc/irker/metadata.xml @@ -2,7 +2,15 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <maintainer type="person"> <email>patrick@gentoo.org</email> <name>Patrick Lauer</name> </maintainer> + <stabilize-allarches/> + <upstream> + <remote-id type="gitlab">esr/irker</remote-id> + </upstream> </pkgmetadata> diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest index 61b10f369cb2..4bc285a9a479 100644 --- a/net-irc/kvirc/Manifest +++ b/net-irc/kvirc/Manifest @@ -1,7 +1,4 @@ -AUX kvirc-5.2_pre20190628041642-python-3.patch 2036 BLAKE2B 71de965fcd6d3ff6ec74c52662d894b60ff15d7b9dd895f18a6c31d4404291c227ae0f15362b0eebd86c377adce5ebd1a6a65975c40d2a391c928748dcb144d1 SHA512 3dcdf021f9c78df31031f25a86dea332996d489e482ba3da867856f262fd001c7858da51f5cb9dc0a3c208674a60105e484c3426d73816c61f0fbdca0a88b3cb -DIST kvirc-5.2_pre20190628041642.tar.gz 5967194 BLAKE2B b1a2e2775056e2db058f82656ac90e43828d497019e9c6ae0431a1092423425558c6eb91a3a8301616cc4cdc7ef1acbab3729702484d703e00dc8e09f7cf243f SHA512 5f532739d9837f357a36fa1df67db0fbf8d8eddb990e686224e53c5678d26ba18c6c7c60422cef4e08ee587156638b278f534b1be1d49251fdeea19858227a5f -DIST kvirc-5.2_pre20191202122540.tar.gz 5967654 BLAKE2B 059e57f0b8a789388f351c536dc3b57a7fc119cc78206a6a42266a1296e1edc6410ab9f564959d77aabb98ca55c9d4ec63505b4c1d46ad27a7f0f2ee748eae55 SHA512 2e3b7683070446a80642ef07abbc69912e47af59966cbc95698f5b8b1a1726b85ae78890dcc85d3f546f32b3c5f2a6c64ec4049467c6b336798ad91542d48c42 -EBUILD kvirc-5.2_pre20190628041642.ebuild 4318 BLAKE2B dc65b96a97b9e8c8fed70e6b740d51d2e2e3d186ecb584b0d310994ea4f5b471414bbb765ed16ecf74479d3c3d6ad4c5c0cb00748c0a4dc5d49f3f66eda0723c SHA512 4cb5fd86446d65335a1f1882b6576c348da53e191fa61095f8aa96bd2ca9227bacbb7314a8905a807a14263f47cd282e19877864fa52c5d7f90d9560f177f6ae -EBUILD kvirc-5.2_pre20191202122540.ebuild 4325 BLAKE2B 7af23814810c6863700412b5307c4e6df818fd09ef859365ba1d8eae2172d896c408f4bcdbbfdca0e03c46c9445ea8154fe81877a17280a2ec042da6beaa5ce1 SHA512 b3dcb64f67dd31d4bdb80070c0de988c29855298e866c1d4c4e20752380b86440ff1d6e7fc451d2806cf75c9e0f31805d97152972046afb5c610b23f0c4667b0 -EBUILD kvirc-9999.ebuild 4403 BLAKE2B 1568a27b1fbef54ebae71cb8d4829e8bb5d49cc7275f4ae5abe4621fdd3e4fe8ca7665a8cf25dcda854449a2515fc8ab4cfa9b120370542256d3ab0c89da9f3f SHA512 632e450166c175f25c905790d643488b62f65da5298473877099b40b82e11f651bd944b0d0c2f45d637e26bb7b62f4ba8d15d43574084704ea7e23284f80323a +DIST kvirc-5.2_pre20200605155236.tar.gz 6170072 BLAKE2B 2652bcae16263615ccbf494d8265a1ecf997525dbfa70d4ace0c3f6ae58231ce575dfe444a60e2751bb7741445bf44297fafb260c05bad6d637f8dc89eb254b4 SHA512 84499fe13337f114587ff267d5e85e39ef61d99e88c84cfc9f0341a5db2e17b50d644bf8483de420c3629f073d6e3eeb81e25de357a723f54e39f154cb4b7da1 +EBUILD kvirc-5.2_pre20200605155236.ebuild 4528 BLAKE2B 874a2c26cc792f36ccb6eb35d5dd8fd9fbd93e67540242ca4b378179327bfe6a3e3a7a6db077589148ddbb0911746b3a3a503899211abedfff7c5198d5357a02 SHA512 51ffa855b9e97f4824f216c2ce3ecc119a189a146b9bda5e9aa364f72227b91a1c0ce13f742eba42ec4ee59800527719b09059495d9b26e96e3a127dae09b721 +EBUILD kvirc-9999.ebuild 4467 BLAKE2B 981e92e8fe2d3395d7c1f147859408de5de19bb7ed1457594cd4aab1eea32c02dd72808fb06762de8798f03fbce8f1b982af84c97bc50ee81ed24a56f47594e7 SHA512 6f30e5285cba65fd3ce42f4f931b78e0f4367274b7960079ca43ede98e4ac990c2d97069ff4108ed6f6946f2c08f53245fec078a3513ae7bb1c1a152a86c8f9b MISC metadata.xml 643 BLAKE2B 820a98f07a4cfb58e857d5c7b863ed7adc174497a7ea05e66245a2c40c328ee0bdb644b98ba1d923834ccf05f23f8128abfe462d433fe2136078225b152a633f SHA512 3dd50caac7ff50679cabad216d4ec28b60351febc419f5d32f60b785043eba6f2f379c06e5af28af26355845ebcfe8439bca9d141bc3b9d0401fb0ee0a0c704c diff --git a/net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch b/net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch deleted file mode 100644 index 14e9e6f795c7..000000000000 --- a/net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch +++ /dev/null @@ -1,53 +0,0 @@ -https://github.com/kvirc/KVIrc/pull/2269 - ---- /CMakeLists.txt -+++ /CMakeLists.txt -@@ -67,9 +67,6 @@ - set(CMAKE_KVIRC_BUILD_COMPILER ${CMAKE_CXX_COMPILER}) - set(CMAKE_KVIRC_BUILD_COMPILER_FLAGS ${CMAKE_CXX_FLAGS}) - --# Prefer Python 2.7 over 3.x (which is currently incompatible) - GitHub issue #2020 --set(Python_ADDITIONAL_VERSIONS "2.7") -- - # Suffix for GNU/Linux - set(LIB_SUFFIX - CACHE STRING "Define suffix of directory name (32/64)" -@@ -751,10 +748,10 @@ - # Check for Python support - option(WANT_PYTHON "Compile Python support" ON) - if(WANT_PYTHON) -- find_package(PythonLibs 2.7) -+ find_package(PythonLibs) - if(PYTHONLIBS_FOUND) - set(COMPILE_PYTHON_SUPPORT 1) -- set(CMAKE_STATUS_PYTHON_SUPPORT "Yes") -+ set(CMAKE_STATUS_PYTHON_SUPPORT "Yes, Python ${PYTHONLIBS_VERSION_STRING}") - list(APPEND LIBS ${PYTHON_LIBRARIES}) - include_directories(${PYTHON_INCLUDE_DIRS}) - else() ---- /src/modules/pythoncore/kvircmodule.cpp -+++ /src/modules/pythoncore/kvircmodule.cpp -@@ -413,7 +413,7 @@ - else - { - // Create a CObject containing the API pointer array's address -- PyObject * pC_API_Object = PyCObject_FromVoidPtr(PyKVIrc_API, nullptr); -+ PyObject * pC_API_Object = PyCapsule_New((void *)PyKVIrc_API, "kvirc._C_API", nullptr); - if(pC_API_Object) - PyModule_AddObject(pModule, "_C_API", pC_API_Object); - } ---- /src/modules/pythoncore/pythonheaderwrapper.h -+++ /src/modules/pythoncore/pythonheaderwrapper.h -@@ -1,6 +1,12 @@ - #ifndef _PYTHONHEADERWRAPPER_H_ - #define _PYTHONHEADERWRAPPER_H_ - -+// As of Python 3, something inside <Python.h> defines a struct with a member -+// called "slots" which conflicts with the builtin Qt keyword. But since we -+// include stuff from KVIrc itself back into the python module, we can't just -+// use QT_NO_KEYWORDS. -+#undef slots -+ - // See http://stackoverflow.com/questions/16200997/why-doesnt-include-python-h-work and http://stackoverflow.com/questions/19716859/puzzling-dependency-of-boost-python-1-54-debug-build-to-python27-lib-on-window - - #if defined(_DEBUG) && defined(_MSC_VER) diff --git a/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild b/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild deleted file mode 100644 index 43699ea71e58..000000000000 --- a/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 2009-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -CMAKE_MAKEFILE_GENERATOR="emake" -PYTHON_COMPAT=(python{3_6,3_7}) - -inherit cmake-utils flag-o-matic python-single-r1 xdg-utils - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/kvirc/KVIrc" - KVIRC_GIT_REVISION="" - KVIRC_GIT_SOURCES_DATE="" -else - KVIRC_GIT_REVISION="2fe1a3bcac42349967e27b3f7098c25f34efca1d" - KVIRC_GIT_SOURCES_DATE="${PV#*_pre}" - KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}" -fi - -DESCRIPTION="Advanced IRC Client" -HOMEPAGE="http://www.kvirc.net/ https://github.com/kvirc/KVIrc" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit" -REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )" - -BDEPEND="dev-lang/perl:0 - virtual/pkgconfig - doc? ( app-doc/doxygen ) - kde? ( kde-frameworks/extra-cmake-modules:5 ) - nls? ( sys-devel/gettext )" -DEPEND="dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - sys-libs/zlib:0= - x11-libs/libX11 - x11-libs/libXScrnSaver - audiofile? ( media-libs/audiofile ) - dbus? ( dev-qt/qtdbus:5 ) - dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) - kde? ( - kde-frameworks/kcoreaddons:5 - kde-frameworks/ki18n:5 - kde-frameworks/knotifications:5 - kde-frameworks/kservice:5 - kde-frameworks/kwindowsystem:5 - kde-frameworks/kxmlgui:5 - ) - perl? ( dev-lang/perl:0= ) - phonon? ( media-libs/phonon[qt5(+)] ) - python? ( ${PYTHON_DEPS} ) - spell? ( app-text/enchant:0= ) - ssl? ( dev-libs/openssl:0= ) - theora? ( - media-libs/libogg - media-libs/libtheora - media-libs/libvorbis - ) - webkit? ( dev-qt/qtwebkit:5 )" -RDEPEND="${DEPEND} - gsm? ( media-sound/gsm )" - -if [[ "${PV}" != "9999" ]]; then - S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}" -fi - -PATCHES=( - "${FILESDIR}/${PN}-5.2_pre20190628041642-python-3.patch" -) - -DOCS=() - -pkg_setup() { - if use python; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - cmake-utils_src_prepare - - if [[ "${PV}" == "9999" ]]; then - KVIRC_GIT_REVISION="$(git show -s --format=%H)" - KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)" - fi - einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}" - sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed" -} - -src_configure() { - append-flags -fno-strict-aliasing - - local libdir="$(get_libdir)" - local mycmakeargs=( - -DLIB_SUFFIX=${libdir#lib} - -DMANUAL_REVISION=${KVIRC_GIT_REVISION} - -DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/} - -DWANT_ENV_FLAGS=ON - -DWANT_VERBOSE=ON - - -DWANT_CRYPT=ON - -DWANT_DCC_VOICE=ON - -DWANT_IPC=ON - -DWANT_IPV6=ON - -DWANT_TRANSPARENCY=ON - - -DWANT_AUDIOFILE=$(usex audiofile ON OFF) - -DWANT_DCC_VIDEO=$(usex dcc_video ON OFF) - -DWANT_DEBUG=$(usex debug ON OFF) - -DWANT_DOXYGEN=$(usex doc ON OFF) - -DWANT_GETTEXT=$(usex nls ON OFF) - -DWANT_GSM=$(usex gsm ON OFF) - -DWANT_KDE=$(usex kde ON OFF) - -DWANT_MEMORY_PROFILE=$(usex profile ON OFF) - -DWANT_OGG_THEORA=$(usex theora ON OFF) - -DWANT_OPENSSL=$(usex ssl ON OFF) - -DWANT_OSS=$(usex oss ON OFF) - -DWANT_PERL=$(usex perl ON OFF) - -DWANT_PHONON=$(usex phonon ON OFF) - -DWANT_PYTHON=$(usex python ON OFF) - -DWANT_QTDBUS=$(usex dbus ON OFF) - -DWANT_QTWEBKIT=$(usex webkit ON OFF) - -DWANT_SPELLCHECKER=$(usex spell ON OFF) - - # COMPILE_SVG_SUPPORT not used in source code. - -DWANT_QTSVG=OFF - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - cmake-utils_src_compile devdocs - fi -} - -src_install() { - cmake-utils_src_install - - if use doc; then - ( - docinto html - dodoc -r "${BUILD_DIR}/doc/api/html/"* - ) - fi -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/net-irc/kvirc/kvirc-5.2_pre20191202122540.ebuild b/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild index 5a3b79274188..50ee9d0c832f 100644 --- a/net-irc/kvirc/kvirc-5.2_pre20191202122540.ebuild +++ b/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild @@ -1,11 +1,11 @@ -# Copyright 2009-2019 Gentoo Authors +# Copyright 2009-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" CMAKE_MAKEFILE_GENERATOR="emake" PYTHON_COMPAT=(python{3_6,3_7,3_8}) -inherit cmake-utils flag-o-matic python-single-r1 xdg-utils +inherit cmake flag-o-matic python-single-r1 xdg-utils if [[ "${PV}" == "9999" ]]; then inherit git-r3 @@ -14,7 +14,7 @@ if [[ "${PV}" == "9999" ]]; then KVIRC_GIT_REVISION="" KVIRC_GIT_SOURCES_DATE="" else - KVIRC_GIT_REVISION="0df9f22f2f4d013b91d5a8905cbd47c32e8fb9e5" + KVIRC_GIT_REVISION="e66a5106ef55a92e2532c38aa255ac376ba6afe1" KVIRC_GIT_SOURCES_DATE="${PV#*_pre}" KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}" fi @@ -29,11 +29,12 @@ fi LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit" +KEYWORDS="amd64 ~ppc ~ppc64 x86" +IUSE="audiofile +dbus dcc_video debug doc gsm kde libressl +nls oss +perl +phonon profile +python spell +ssl theora webkit" REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )" BDEPEND="dev-lang/perl:0 + >=dev-util/cmake-3.16 virtual/pkgconfig doc? ( app-doc/doxygen ) kde? ( kde-frameworks/extra-cmake-modules:5 ) @@ -65,7 +66,10 @@ DEPEND="dev-qt/qtcore:5 phonon? ( media-libs/phonon[qt5(+)] ) python? ( ${PYTHON_DEPS} ) spell? ( app-text/enchant:0= ) - ssl? ( dev-libs/openssl:0= ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) theora? ( media-libs/libogg media-libs/libtheora @@ -79,10 +83,6 @@ if [[ "${PV}" != "9999" ]]; then S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}" fi -PATCHES=( - "${FILESDIR}/${PN}-5.2_pre20190628041642-python-3.patch" -) - DOCS=() pkg_setup() { @@ -92,7 +92,7 @@ pkg_setup() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare if [[ "${PV}" == "9999" ]]; then KVIRC_GIT_REVISION="$(git show -s --format=%H)" @@ -140,20 +140,28 @@ src_configure() { # COMPILE_SVG_SUPPORT not used in source code. -DWANT_QTSVG=OFF ) + if use python; then + local PYTHON_INCLUDEDIR PYTHON_LIBPATH + python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH + mycmakeargs+=( + -DPython3_INCLUDE_DIR="${PYTHON_INCLUDEDIR}" + -DPython3_LIBRARY="${PYTHON_LIBPATH}" + ) + fi - cmake-utils_src_configure + cmake_src_configure } src_compile() { - cmake-utils_src_compile + cmake_src_compile if use doc; then - cmake-utils_src_compile devdocs + cmake_src_compile devdocs fi } src_install() { - cmake-utils_src_install + cmake_src_install if use doc; then ( diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild index 8be4b3e7e2e9..c7a673bfd4ad 100644 --- a/net-irc/kvirc/kvirc-9999.ebuild +++ b/net-irc/kvirc/kvirc-9999.ebuild @@ -30,7 +30,7 @@ fi LICENSE="GPL-2+" SLOT="0" KEYWORDS="" -IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit" +IUSE="audiofile +dbus dcc_video debug doc gsm kde libressl +nls oss +perl +phonon profile +python spell +ssl theora webkit" REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )" BDEPEND="dev-lang/perl:0 @@ -66,7 +66,10 @@ DEPEND="dev-qt/qtcore:5 phonon? ( media-libs/phonon[qt5(+)] ) python? ( ${PYTHON_DEPS} ) spell? ( app-text/enchant:0= ) - ssl? ( dev-libs/openssl:0= ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) theora? ( media-libs/libogg media-libs/libtheora diff --git a/net-irc/limnoria/Manifest b/net-irc/limnoria/Manifest index d054844de3d0..f46d47539bbe 100644 --- a/net-irc/limnoria/Manifest +++ b/net-irc/limnoria/Manifest @@ -1,4 +1,4 @@ DIST limnoria-20191123.tar.gz 975077 BLAKE2B b5bc425013a30043c79a5dc53fc346e3b65cafbae154789f43634fc8beb4c7dcfaea34b0c1e22eae28e044eaa2801b0c29ef106fd6e2cc0095e6acbf4c4bf931 SHA512 5822f83a5d7fae0e45e526d9a72c1bbfd2acb7f625cff38e4d6e59222aca4c68204ae03069e991e274b108391cd4feff85783805657554771a7d24789589d14b -EBUILD limnoria-20191123.ebuild 2406 BLAKE2B 3f8b9d5d46788918183d170c42ee8c87fc605096958c81f78e5b9dfc02554615e37bfbce52bb2311c366cf068dab39896a6964c8da21f0946d2231be38a23f00 SHA512 37a70838d4be56a9a3c16efbffa3204224ab9d67e5501c3d8030eb4ad3094ed8c6fb729c781906ba5c426301345fa8e4009760aade6f18293d1ad2f9f7e802e9 -EBUILD limnoria-99999999.ebuild 2406 BLAKE2B 3f8b9d5d46788918183d170c42ee8c87fc605096958c81f78e5b9dfc02554615e37bfbce52bb2311c366cf068dab39896a6964c8da21f0946d2231be38a23f00 SHA512 37a70838d4be56a9a3c16efbffa3204224ab9d67e5501c3d8030eb4ad3094ed8c6fb729c781906ba5c426301345fa8e4009760aade6f18293d1ad2f9f7e802e9 +EBUILD limnoria-20191123.ebuild 2371 BLAKE2B 93eae4f4a6d04ee4ec0069a0a4cc333644eb31dc6d39d83119472dadb572378bcf8a5949f5adc0ed2bc0a876fc29b0b15c6eafda2190174462c2b2ee385129b9 SHA512 90eda4a6d42a18343e05d6dc82df7218deb71ffcd24c51faa6b1ab70cd08005bb1c9b46e2e4c2972c20678a21996b0be090e3c774e35b30dd829eccbde08751b +EBUILD limnoria-99999999.ebuild 2371 BLAKE2B 93eae4f4a6d04ee4ec0069a0a4cc333644eb31dc6d39d83119472dadb572378bcf8a5949f5adc0ed2bc0a876fc29b0b15c6eafda2190174462c2b2ee385129b9 SHA512 90eda4a6d42a18343e05d6dc82df7218deb71ffcd24c51faa6b1ab70cd08005bb1c9b46e2e4c2972c20678a21996b0be090e3c774e35b30dd829eccbde08751b MISC metadata.xml 408 BLAKE2B 5328f97d256c4e5dc340d7ce1c6090983c84948326bff34ee0a94c6dd644fb72b5bf348a10e841e520ccf80d1238f159af64e5a3dc1991b9646da17baf3ff0d0 SHA512 6be6681e4b0f8555cd0e769937580068315acae5b1d1c722c354748b8c0a16c0146950b716a1b7b46f0230623580b2576f53c757b13125577698f458f824732e diff --git a/net-irc/limnoria/limnoria-20191123.ebuild b/net-irc/limnoria/limnoria-20191123.ebuild index f9e493b70c74..9c1aeabf03a1 100644 --- a/net-irc/limnoria/limnoria-20191123.ebuild +++ b/net-irc/limnoria/limnoria-20191123.ebuild @@ -51,11 +51,9 @@ src_unpack() { } python_prepare() { - if python_is_python3; then - einfo "Removing the RSS plugin because of clashes between libxml2's Python3" - einfo "bindings and feedparser." - rm -rf "plugins/RSS" || die - fi + einfo "Removing the RSS plugin because of clashes between libxml2's Python3" + einfo "bindings and feedparser." + rm -rf "plugins/RSS" || die } python_install_all() { diff --git a/net-irc/limnoria/limnoria-99999999.ebuild b/net-irc/limnoria/limnoria-99999999.ebuild index f9e493b70c74..9c1aeabf03a1 100644 --- a/net-irc/limnoria/limnoria-99999999.ebuild +++ b/net-irc/limnoria/limnoria-99999999.ebuild @@ -51,11 +51,9 @@ src_unpack() { } python_prepare() { - if python_is_python3; then - einfo "Removing the RSS plugin because of clashes between libxml2's Python3" - einfo "bindings and feedparser." - rm -rf "plugins/RSS" || die - fi + einfo "Removing the RSS plugin because of clashes between libxml2's Python3" + einfo "bindings and feedparser." + rm -rf "plugins/RSS" || die } python_install_all() { diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest index 38df8c72b344..4b75a46a6d8d 100644 --- a/net-irc/ngircd/Manifest +++ b/net-irc/ngircd/Manifest @@ -4,5 +4,5 @@ AUX ngircd.init-r1.d 388 BLAKE2B 10b6d4eb2cd39fe4e3087461cdc15f2ee8f1002e826552e 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 2190 BLAKE2B dad5fdf6f9ec88b6c706f60aea17f6a61e917e90668cb861005b1c530627c54ec091baa09b06daee67134f0cdb831c627d55c74c3c8a8a2cef8ddf5db5d4472a SHA512 cbd0ec09e22d43dda8228135cb22a57015f1f8631750636b2f4340954948c4c89b2032012d2588fa85842b6a9187d0cbcbcf857c9b699dff262186f33a0462be -MISC metadata.xml 632 BLAKE2B c27dd54558ef8f4670a5c888fbe81fffd77c20eb8e487a45bd61cfe8703fb3c379217e3ee8a0304a1b27eddc3a9fea0826b1cacd8c464a20fbd0bce43a109074 SHA512 27891662b1e62cd3d19faf621a3e06efcc0b51ad092cde32cf7cbf5817b7e7840cb57e948389547ecfbe70a022419dbe23b46870117ccb9c26da6581da426eb9 +EBUILD ngircd-26.ebuild 2187 BLAKE2B de64499c0448af9ef9bf156ef4c5fa71ca6573a71baf3bd187ccd440ac27f0d6cfb5cefcf2f9357d57f57077e0b6951916fd946bbff2de01a76ca8e40d2760e9 SHA512 d5bd6005b284b90643fe3444c6cc1a9fec6ef0a5550f9747a803c413625ac17377c33c117d836ccdbcac5e49cd79bae5c897bc13409c00c82b22f5ad8dd2b807 +MISC metadata.xml 650 BLAKE2B dd80efa442d59f04e26bb338e371ffa8380a4cdbb630db30e25adbaa930d9f0e4a486bbd05321b8185c23558ad4e29023153a69d1214294c345b46685eb7de86 SHA512 9b8879892c2edc6c7792c22a684f87ae559a43b034ee66f6242e73075012e1f53a33a63fc3ffa62c41f5fd620a4be6c1ffc57a1b62cf42ffa3c032cec4ff743b diff --git a/net-irc/ngircd/metadata.xml b/net-irc/ngircd/metadata.xml index fe32ef1d9ca8..92912912526f 100644 --- a/net-irc/ngircd/metadata.xml +++ b/net-irc/ngircd/metadata.xml @@ -2,16 +2,16 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>sam@cmpct.info</email> + <email>sam@gentoo.org</email> <name>Sam James</name> </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <use> <flag name="ident">Enables support for <pkg>net-libs/libident</pkg></flag> <flag name="irc-plus">Enables support for the IRC+ protocol (needs <pkg>virtual/libiconv</pkg>)</flag> <flag name="strict-rfc">Strict RFC compliance; may harm compatibility</flag> </use> + <upstream> + <remote-id type="cpe">cpe:/a:barton:ngircd</remote-id> + <remote-id type="github">ngircd/ngircd</remote-id> + </upstream> </pkgmetadata> diff --git a/net-irc/ngircd/ngircd-26.ebuild b/net-irc/ngircd/ngircd-26.ebuild index 06a17a180d81..c81dba3e9fa6 100644 --- a/net-irc/ngircd/ngircd-26.ebuild +++ b/net-irc/ngircd/ngircd-26.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos" +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 )" diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest index c82847c51233..2bff2104a732 100644 --- a/net-irc/polari/Manifest +++ b/net-irc/polari/Manifest @@ -1,5 +1,5 @@ -DIST polari-3.30.2.tar.xz 1153792 BLAKE2B 992f39e989179617164fb9d955a5211aa466293882d773c5783792503741cf62ae7fa848697046f2888bdc04c083e0b3fef0be18055e2d2c2607cc029eb2c816 SHA512 4aae1bd70498ddbddab494c9484c039bc5fabc13860ddd6a2001858808baea004c9f463b37c9392eaac62cf951867ea6e24e77053976bd4524dd711ac52a5b4d DIST polari-3.34.1.tar.xz 1270300 BLAKE2B 37a7a5bd5e1850b03100d8465aeddb4f558ec94ae334a5b3f16b54b591404102bc505c3254fe353aaf8174031b8b7eb67b5f85468367eeded44400d704889d92 SHA512 99cdf95b248322e69f0fee99110598c0c1d9ceb8e7377db8eb319645090c5b56ca09e1c55e1ef2e98ae546e01b796aabe31c9362f69907d641a20cc8a588aa4d -EBUILD polari-3.30.2.ebuild 1146 BLAKE2B e8775c613efc0361b613b35cc11b83808a518c39716c10490794081d34d22be42376c194d847cc2e639fb3c5dd7df20f8acfc8130088db7351a606f0b4f47eba SHA512 1aa4b700329cacd07cadc7bfa1bd85567dba50c43a5a4a16b97cdf816bd9ee8f34584d3bede96cc8e131d90043a71d3822f2a91bb6c4acc8bc2aa088b59467c2 +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 MISC metadata.xml 383 BLAKE2B fe4acd5e1d8f9336124e6a8588c3d25df25d7a60fac88b1eb637a1b169fd0805bc59030ec776257bfd664df72e6a3dfefcbde1d60bd08384281587ec062f2ad7 SHA512 98707a009259fafe782cd442524620d79465fadf8304becb5c4de4e15763245bd7c21fda7081749a7bfb551e1dd9d3168236862bb704bfb9091ca087ce348deb diff --git a/net-irc/polari/polari-3.30.2.ebuild b/net-irc/polari/polari-3.36.3.ebuild index 73f90a880739..61f877b7ed7a 100644 --- a/net-irc/polari/polari-3.30.2.ebuild +++ b/net-irc/polari/polari-3.36.3.ebuild @@ -1,7 +1,7 @@ -# 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 gnome.org gnome2-utils meson xdg @@ -10,16 +10,16 @@ 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 )" -COMMON_DEPEND=" +DEPEND=" >=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3[introspection] net-libs/telepathy-glib[introspection] >=dev-libs/gobject-introspection-1.50:= - >=dev-libs/gjs-1.53.90 + >=dev-libs/gjs-1.57.3 x11-libs/gdk-pixbuf:2[introspection] >=app-text/gspell-1.4.0[introspection] @@ -28,10 +28,10 @@ COMMON_DEPEND=" net-libs/libsoup:2.4[introspection] net-im/telepathy-logger[introspection] " -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} >=net-irc/telepathy-idle-0.2 " -DEPEND="${COMMON_DEPEND} +BDEPEND=" dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/itstool @@ -42,12 +42,10 @@ DEPEND="${COMMON_DEPEND} pkg_postinst() { xdg_pkg_postinst - gnome2_icon_cache_update gnome2_schemas_update } pkg_postrm() { xdg_pkg_postrm - gnome2_icon_cache_update gnome2_schemas_update } diff --git a/net-irc/quasselgrep/Manifest b/net-irc/quasselgrep/Manifest index 2d5a558aed9b..96e29146e202 100644 --- a/net-irc/quasselgrep/Manifest +++ b/net-irc/quasselgrep/Manifest @@ -1,6 +1,3 @@ -DIST quasselgrep-0_p20170411.tar.gz 29117 BLAKE2B e55ef14015d1139dd967d1855a2994d47f189cb02b0b89dc1130a8d0756b137ddd58366c3cb87927cb6400b715efafe042ec929978a71d527ad640129d50cb71 SHA512 b216c49e340cddfeb4fe28046c698a5517a873602a4303c7c6976d6d7f0bfffbb78f170a33126a16089e239a67e1624410f8e727b5ed6ab977f78745362db0e2 DIST quasselgrep-0_p20190211.tar.gz 29954 BLAKE2B 33862b642d6a24bd7ab8cc4f3628e19cf332feb24e0dba17849f4ee85af4d1d17a641e6ccaef89bcb44c47f28a674ab620610b8b624f9de71b8460b197953e27 SHA512 0d2bfccb87b7463ba032b9515c4a089518a3ca57f9ef6cbb0f00db9c5d0404cc9fe128329b12e1dbe022cbddeb6a3db473564ee734ddc30be56d4c1da5036f56 -EBUILD quasselgrep-0_p20170411.ebuild 896 BLAKE2B 138a77936b0a4c3111e4f7711f449ea421b7af520774fe065f49b7308eb443892df2e53f52f04da9477f06f3d3a02553e0be89547688e7a4240aec0a9b4b3305 SHA512 b3a7f851099f7b8d061058c25e5a39091936d3e96e97b3bb54d47631f97d95cbdf9ae9eaa0f37580a9df79bf7408b84f69722f28162f0bdda8a3b601a8a03050 EBUILD quasselgrep-0_p20190211.ebuild 893 BLAKE2B 65db422640071f6757ba7d562c7723fded623d2fe7ac67ae8392abf61921db8d39fbd6343feb224da9b62936cfa688e2e72b4dc4ab827baaece79b9b70074daa SHA512 704f8b1b61bc1111d2d510449094f8baa1132bc72b0efe3365a6fa5c7a31b61fb4ef5359ce095f93b16252bed0472881928fc2ca7b2f7e489d797c29407ac56b -EBUILD quasselgrep-9999.ebuild 896 BLAKE2B 138a77936b0a4c3111e4f7711f449ea421b7af520774fe065f49b7308eb443892df2e53f52f04da9477f06f3d3a02553e0be89547688e7a4240aec0a9b4b3305 SHA512 b3a7f851099f7b8d061058c25e5a39091936d3e96e97b3bb54d47631f97d95cbdf9ae9eaa0f37580a9df79bf7408b84f69722f28162f0bdda8a3b601a8a03050 MISC metadata.xml 540 BLAKE2B 21eee2edee345166e7191d71bfa727b2154d34bf0d7f839b1e6eca4ce5b65380ce96e25a35bf614a64a0e29edf30a4c860ec1b4ca364ffdc1563515e0169278a SHA512 67258ac5217d9338c963a9970eb556497643eac6b743c033d964164127bad7411918b870d63885863ce09bbbd2fe5a0623a58eba1dc68d9432401e5dd971ceef diff --git a/net-irc/quasselgrep/quasselgrep-0_p20170411.ebuild b/net-irc/quasselgrep/quasselgrep-0_p20170411.ebuild deleted file mode 100644 index efe0f9483d65..000000000000 --- a/net-irc/quasselgrep/quasselgrep-0_p20170411.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit distutils-r1 - -MY_COMMIT=502c88bdc7613abb68e868eb520e39ec8a5cf6dd - -DESCRIPTION="Tool for searching quassel logs from the commandline" -HOMEPAGE="https://github.com/fish-face/quasselgrep" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/fish-face/quasselgrep" - inherit git-r3 -else - SRC_URI="https://github.com/fish-face/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz" - S="${WORKDIR}/fish-face-${PN}-${MY_COMMIT:0:7}" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" - -RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/pycryptodome[${PYTHON_USEDEP}] - >=dev-python/psycopg-2.5.3[${PYTHON_USEDEP}]" - -src_configure() { - sed -i 's/pycrypto/pycryptodome/g' "${S}"/setup.py || die "sed failed" -} diff --git a/net-irc/quasselgrep/quasselgrep-9999.ebuild b/net-irc/quasselgrep/quasselgrep-9999.ebuild deleted file mode 100644 index efe0f9483d65..000000000000 --- a/net-irc/quasselgrep/quasselgrep-9999.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit distutils-r1 - -MY_COMMIT=502c88bdc7613abb68e868eb520e39ec8a5cf6dd - -DESCRIPTION="Tool for searching quassel logs from the commandline" -HOMEPAGE="https://github.com/fish-face/quasselgrep" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/fish-face/quasselgrep" - inherit git-r3 -else - SRC_URI="https://github.com/fish-face/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz" - S="${WORKDIR}/fish-face-${PN}-${MY_COMMIT:0:7}" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" - -RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/pycryptodome[${PYTHON_USEDEP}] - >=dev-python/psycopg-2.5.3[${PYTHON_USEDEP}]" - -src_configure() { - sed -i 's/pycrypto/pycryptodome/g' "${S}"/setup.py || die "sed failed" -} diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest index 797a9e4cf64c..11e89cd32c76 100644 --- a/net-irc/unrealircd/Manifest +++ b/net-irc/unrealircd/Manifest @@ -3,6 +3,8 @@ AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af0070 AUX unrealircd.service 177 BLAKE2B 9a58ce4e7785a66beac53afa2ecd276dd6f8e9927de8dfc3e9eab968008ad681a8b9f353bff4951bba8023d5c04affda6b58fde5db8232d0f1f9ae3e470424f0 SHA512 99163776104f2f27a585332004221fac16a9fbf9c8930b0603b5f33aca4c5ac13bdded4d5917143796b3893a19d2f709b0c4d4d635d85bd681f643b3b59131f5 DIST unrealircd-4.2.4.1.tar.gz 6090725 BLAKE2B 817a7c2a13a495944676d08ed90b36f6795fe43ee171efc6661980e6da9a8cc8d98c4fb0eb8221ac6af85ab1a9b5578a2e992d7b41696434430e58918bc30145 SHA512 752573c4af1f92a10739bb2b0cdaade1948207b46d28ae5177e1dfd6b0663044bc22dce5ffe8549882cd70325e3ef7e3296182fffbb84e08d59dbbdd6551a686 DIST unrealircd-5.0.5.1.tar.gz 4957950 BLAKE2B 7e92f941662cec0a202589aecf372578e568559360761e17735d4637785ff737ec24c07593b666dd830b0fc1f36293a700693134c34ad32095839a73e7368677 SHA512 57272afa9b758c71522730a5a5a45819731271c02b25f6e0b9da30671d38ecfbc1adc0e91eef9dc4c1d67b2e1fa4fc9a09377152f2b0e3e97e8f7fe4f144288b +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 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 new file mode 100644 index 000000000000..d2f7a8a96ec9 --- /dev/null +++ b/net-irc/unrealircd/unrealircd-5.0.6.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +SSL_CERT_MANDATORY=1 +inherit ssl-cert systemd + +DESCRIPTION="An advanced Internet Relay Chat daemon" +HOMEPAGE="https://www.unrealircd.org/" +SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux" +IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes" + +RDEPEND=" + acct-group/unrealircd + acct-user/unrealircd + >=app-crypt/argon2-20171227-r1:= + dev-libs/libpcre2 + >=net-dns/c-ares-1.7:= + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + curl? ( net-misc/curl[adns] ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} ) + +src_prepare() { + # QA check against bundled pkgs + rm -r extras || die + + # building third-party modules (which we don't do) cause a sandbox violation + # bug 704444 + echo "" > src/buildmod || die + + if use class-nofakelag; then + sed -i -e 's:#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die + fi + + eapply_user +} + +src_configure() { + # Default value for privatelibdir adds a build path to -Wl,-rpath. + econf \ + --with-bindir="${EPREFIX}"/usr/bin \ + --with-cachedir="${EPREFIX}"/var/lib/${PN} \ + --with-confdir="${EPREFIX}"/etc/${PN} \ + --with-datadir="${EPREFIX}"/var/lib/${PN} \ + --with-docdir="${EPREFIX}"/usr/share/doc/${PF} \ + --with-logdir="${EPREFIX}"/var/log/${PN} \ + --with-modulesdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \ + --without-privatelibdir \ + --with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \ + --with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \ + --with-maxconnections=1024 \ + --with-nick-history=2000 \ + --with-permissions=0640 \ + --with-system-argon2 \ + --with-system-cares \ + --with-system-pcre2 \ + --enable-dynamic-linking \ + --enable-ssl="${EPREFIX}"/usr \ + $(use_enable curl libcurl "${EPREFIX}"/usr) \ + $(use_enable prefixaq) \ + $(use_with showlistmodes) \ + $(use_with !operoverride no-operoverride) \ + $(use_with operoverride-verify) +} + +src_install() { + keepdir /var/log/${PN} + keepdir /var/lib/${PN}/tmp + + newbin src/ircd ${PN} + + ( + cd src/modules || die + for subdir in $(find . -type d -print); do + if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then + exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}" + doexe "${subdir}"/*.so + fi + done + ) + + insinto /etc/${PN} + # Purposefully omitting the examples/ and ssl/ subdirectories. ssl + # is redundant with app-misc/ca-certificates and examples will all + # be in docs anyway. + doins -r doc/conf/{aliases,help} + doins doc/conf/*.conf + newins doc/conf/examples/example.conf ${PN}.conf + keepdir /etc/${PN}/tls + + einstalldocs + + newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN} + newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN} + + # config should be read-only + fperms -R 0640 /etc/${PN} + fperms 0750 /etc/${PN}{,/aliases,/help} + fperms 0750 /etc/${PN}/tls + # state is editable but not owned by unrealircd directly + fperms 0770 /var/log/${PN} + fperms 0770 /var/lib/${PN}{,/tmp} + fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN} + + # By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix + # that to look for ca-certificates-provided file instead. %s is + # CONFDIR. #618066 + dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt + + insinto $(systemd_get_systemunitdir) + doins "${FILESDIR}"/${PN}.service +} + +pkg_postinst() { + # Move docert call from src_install() to install_cert in pkg_postinst for + # bug #201682 + if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then + if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then + ewarn "The location ${PN} looks for SSL certificates has changed" + ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls." + ewarn "Please move your existing certificates." + else + ( + umask 0037 + install_cert /etc/${PN}/tls/server.cert + chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.* + ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/server.key.pem + ) + fi + fi + + local unrealircd_conf="${EROOT}"/etc/${PN}/${PN}.conf + # Fix up the default cloak keys. + if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then + ebegin "Generating cloak-keys" + local keys=( + $(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3") + ) + [[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]] + eend $? + + ebegin "Substituting cloak-keys into ${unrealircd_conf}" + sed -i \ + -e '/cloak-keys/ { +n +s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/ +n +s/"and another one";/"'"${keys[1]}"'";/ +n +s/"and another one";/"'"${keys[2]}"'";/ +}' \ + "${unrealircd_conf}" + eend $? + fi + + elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf" + elog + elog "You can also configure ${PN} start at boot with rc-update(1)." + elog "It is recommended to run unrealircd as an unprivileged user." + elog "The provided init.d script does this for you." +} diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest index 5db11da15e66..4363ca620669 100644 --- a/net-irc/weechat/Manifest +++ b/net-irc/weechat/Manifest @@ -1,4 +1,6 @@ DIST weechat-2.8.tar.xz 2248868 BLAKE2B 756ce1719ecaa351a2780641758bb7587b45b8e6b16e5a82833009ddb27f71783a461cf89662e04118c75e2d372103eda5a11c98feb62d624b330b223bf22ede SHA512 3bebb42118fca6b601f1de8f4d52378619a10e5c490f5b46f86d27a9680f00a56d48a1ade729e78d965cae589e6c80647c22414393000c7d3cfcc94a1e41c4df -EBUILD weechat-2.8.ebuild 4038 BLAKE2B 6121de5bbcaaf326916f7ada4dd370f1b1994b79221cb25243ef9fe9532130b0449e0ba8d02c0af74d4db28be62a01b6030b94b89ced69b44980599962cde445 SHA512 60e77e01f0ea4aa6b3d3e44fa4a9bbd4a975ac9e19314dbd51107e33528810e6aa2372b64f0c5105126d8751457b411d31658dc6d75261a6a74c25c4f9c5bd7d -EBUILD weechat-9999.ebuild 3964 BLAKE2B 6d017e33ee5f49c90aaa65dc7debb53aa106df4caf2d67d71e90b8f4ea4d6700fcdaeed1c8fe0fb033b52cd28ed7e3a98a40beb0338b26cfc96b71a35d5028a0 SHA512 ad48f552017c801c6ecd6e403b4ae4991e9dbc71e3daba4edc18fd1ebda63f0a999aee992a116308362957e31735b9b48fd523b98d3c19db314a1174b858ddae +DIST weechat-2.9.tar.xz 2206584 BLAKE2B 8089cd846ca192ec666a50e8071ed57e1c2518b2d5ea98733b8e3fa6c8c684e8ed14253d787b3f9995a8f481a7413444c3ba262dcb6c100283192bcafb502627 SHA512 c4a5723accb417c0496b5427ee58fbf5d3e842e6d79a7988f8680cd605534cfc9d30f6f4844afe45f5223458f28b8deff1284fff2fb5b7d04cb99a81cde4e13e +EBUILD weechat-2.8.ebuild 3951 BLAKE2B bac3b0c695d3f2a09514d20af581eb4d1ac442e8cd8fc9e124eb972220c69d38a0fb3981bc6088df8884c73dde26f9136cc3fc15895b98174b8267192bcb9824 SHA512 41ed688abdd5dbacce66e4ec50e8edcd204411ea64514691c6141b32edf29ca04a2454537fd38aa01aa0cbe809dc6c13d10172b3149a492453d4decb0cc22b44 +EBUILD weechat-2.9.ebuild 3884 BLAKE2B 09cb1759e3b1fb8e7da5a142f9cd2c1b075e26a01260419fee92c9fab736697204a2a1bb88eb2b2df482b9c02974733b0e41dff23352f718e29b6d0b1a60b1b8 SHA512 809fe6481d81d171391db677a9bd19a8f9f5ae7d677e2725e21846f1729ee87cd231bba8db75f7db9643de7fab536b678c0b58618cfd45ab45b5f5cd827d9809 +EBUILD weechat-9999.ebuild 3884 BLAKE2B 09cb1759e3b1fb8e7da5a142f9cd2c1b075e26a01260419fee92c9fab736697204a2a1bb88eb2b2df482b9c02974733b0e41dff23352f718e29b6d0b1a60b1b8 SHA512 809fe6481d81d171391db677a9bd19a8f9f5ae7d677e2725e21846f1729ee87cd231bba8db75f7db9643de7fab536b678c0b58618cfd45ab45b5f5cd827d9809 MISC metadata.xml 988 BLAKE2B 26997114f73adc3dc8758a9241009fe8fd84c9856bbccdc31fc0ad7e8d26b20656c27451cb4475fe60421069e1df43ed5f1bd39cdf493cc47622796f20d79487 SHA512 2463ed39fd434c3dac81c46525907c76a0cdba7d321029cf8b165ee62b003ab1e7153d714b4f71664ffd758572b89db4b0d7c30280f56acd7708668d54a17046 diff --git a/net-irc/weechat/weechat-2.8.ebuild b/net-irc/weechat/weechat-2.8.ebuild index e7f1ef5f7341..115554943a06 100644 --- a/net-irc/weechat/weechat-2.8.ebuild +++ b/net-irc/weechat/weechat-2.8.ebuild @@ -135,11 +135,6 @@ src_configure() { -DENABLE_TRIGGER=$(usex trigger) -DENABLE_XFER=$(usex xfer) ) - - if use python; then - python_is_python3 || mycmakeargs+=( -DENABLE_PYTHON2=ON ) - fi - cmake-utils_src_configure } diff --git a/net-irc/weechat/weechat-2.9.ebuild b/net-irc/weechat/weechat-2.9.ebuild new file mode 100644 index 000000000000..7ea49b6dc653 --- /dev/null +++ b/net-irc/weechat/weechat-2.9.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_6,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 ~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 dev-lang/ruby:2.4 ) ) + 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-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild index a63694304e87..7ea49b6dc653 100644 --- a/net-irc/weechat/weechat-9999.ebuild +++ b/net-irc/weechat/weechat-9999.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/weechat/weechat.git" else SRC_URI="https://weechat.org/files/src/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-macos" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos" fi DESCRIPTION="Portable and multi-interface IRC client" @@ -134,11 +134,6 @@ src_configure() { -DENABLE_TRIGGER=$(usex trigger) -DENABLE_XFER=$(usex xfer) ) - - if use python; then - python_is_python3 || mycmakeargs+=( -DENABLE_PYTHON2=ON ) - fi - cmake_src_configure } diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest index 2e5c8d38e8cc..13877ce28daa 100644 --- a/net-irc/znc/Manifest +++ b/net-irc/znc/Manifest @@ -6,6 +6,6 @@ DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac8760 DIST znc-1.7.5.tar.gz 2170656 BLAKE2B af5548bff1d9c6e740e668f467f52e8540a59bec9363fb4a17c594e1a9638417f75321b074e2aad6380769a594fc134543681928a7a33d00083ba9babc441a69 SHA512 f067503e5f45499c0acd687ef66266c4a65b80048e2a5835d3f9dfc4cd69b35890abdc3457726d7a7b25909f507349770eec43d9941bd62094c3527e64fbd825 DIST znc-1.8.1.tar.gz 2161359 BLAKE2B 5b9026156a62748659ae0496f9d799e7d1e0815358fa59f7538ca9d750b8f418fe8a57362b5b5bba40cfb00c2adc5fdc3eee0b56ebde50565c97d158296b827e SHA512 87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16 EBUILD znc-1.7.5.ebuild 5143 BLAKE2B 5007171b6bc56fd4ef00e28d8f386b052be58a82518261f30a8d45b08415c149c44fd51dd69c93574610b4bb5e34c6e6b09559c34059812eab48497d5ced61ad SHA512 6eb198b56afe1f8783eb345cefc6adbb4cdc885f1e5eb863ad81186399ceca51dc88e7df15a9df2d8df9b655dccb5d508948cdab2d1b704d13a748788cd688f3 -EBUILD znc-1.8.1.ebuild 4715 BLAKE2B 571f20a718346d7d22a8ae8f01b536faf5ab2479541f231eee3461b13db1d0b10bf9c1d5b92ed10ad8c2430e9a2c2ce1597cb4d4300a25ab976549ca058bce4e SHA512 9e0099d64e848c9d9c7ab03246811ea5dbefb98f614b70c50eb39399465a3a1693ee2792512b5f5e5925b8547380a7571b484ce068a826ba6b6b4ea47f3ecfd9 +EBUILD znc-1.8.1.ebuild 4711 BLAKE2B 8b8182c6627e7aa58d56b5575d1e8e615adc5beff9639b04e5cea2821b20bea48f3449adffab0deed76b073ff3cf97b4d9f10abe1577a50d969c57beef9b6e86 SHA512 6acb23f885ebcdcd38fee1f8df5e43a4cb66b32f9c644c2848c75c0f84e10b017ea0acf7a8f49d9e78a810dbe1cf4f73d7696df9caeb79ae83cef71d59c9fe1a EBUILD znc-9999.ebuild 4715 BLAKE2B 571f20a718346d7d22a8ae8f01b536faf5ab2479541f231eee3461b13db1d0b10bf9c1d5b92ed10ad8c2430e9a2c2ce1597cb4d4300a25ab976549ca058bce4e SHA512 9e0099d64e848c9d9c7ab03246811ea5dbefb98f614b70c50eb39399465a3a1693ee2792512b5f5e5925b8547380a7571b484ce068a826ba6b6b4ea47f3ecfd9 MISC metadata.xml 507 BLAKE2B c8926f6668f57c84f5715156a424b18f7cb01f0ea9ac6a499550f731a00c7de035ec270f89297bda07ac3115292deffdcd0f3a339484c9de5d8bd7170be00de6 SHA512 d69af8535c2e409e6b6e65bfd279d74bd89ce01e911e0d21b4079bd13328e47f3b959ef82531b833c702955225e01db6915f4fb3f94d048a05ce2107b61bf1a6 diff --git a/net-irc/znc/znc-1.8.1.ebuild b/net-irc/znc/znc-1.8.1.ebuild index fa6a8f89ce81..6d5ad64431ad 100644 --- a/net-irc/znc/znc-1.8.1.ebuild +++ b/net-irc/znc/znc-1.8.1.ebuild @@ -22,7 +22,7 @@ else https://znc.in/releases/archive/${MY_P}.tar.gz test? ( ${GTEST_URL} ) " - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 arm arm64 x86" S=${WORKDIR}/${MY_P} fi |