From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- net-irc/irssi/Manifest | 7 +- .../irssi/files/irssi-1.4.1-no-werror-decl.patch | 14 ++++ net-irc/irssi/irssi-1.2.3.ebuild | 4 +- net-irc/irssi/irssi-1.4.1.ebuild | 74 +++++++++++++++++++ net-irc/irssi/irssi-9999.ebuild | 86 +++++++++++----------- 5 files changed, 138 insertions(+), 47 deletions(-) create mode 100644 net-irc/irssi/files/irssi-1.4.1-no-werror-decl.patch create mode 100644 net-irc/irssi/irssi-1.4.1.ebuild (limited to 'net-irc/irssi') diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest index e1271e8be985..28dd8661bd54 100644 --- a/net-irc/irssi/Manifest +++ b/net-irc/irssi/Manifest @@ -1,4 +1,7 @@ +AUX irssi-1.4.1-no-werror-decl.patch 486 BLAKE2B 8999e9e015c642cb79007e419882f59f51ff1faccc32b285fb7b179e2f2d2d54632707fe70fc66d03174590635439e21390c98e0455b4df382a48c4e445ca95d SHA512 b74cc0b10d0d4a138f4f6098e967a27b9c1ada5f1b5159129b7885fb9c736f1766e4a6421eae34cfc1232efed705b26b6f40d712a518a149d987f8b29706baed DIST irssi-1.2.3.tar.xz 1145292 BLAKE2B 7b2b7cb8d1533a06ad3cd5e0b2e45bba636cf19d26c69e19fc7e9408313f80d80a26ff2bf5f21a8763d8adec722bb33f6b076a863e6a55e178a814a3e79c9db7 SHA512 826b7bfd86a54647f2d344b6c461e1118b7382fb1637cf33c395af41a9a4ca5d8a794a415f0f0737178968cf2463bb46a0e7b7fd7014c968668b16183e0644bc -EBUILD irssi-1.2.3.ebuild 1448 BLAKE2B 4679b9db78d0f722062eec6ac6ff1934534682a0c6d52129b5bb73a4542a4b6761d1f5e948e5869eb179ee7b84a7f0553162ab675eecfba767f6eb418510c627 SHA512 daf20def9321082ad72d554982a28c4d5b9eccc037d2e3821254c2720d115c80c077525ff1fb9c985ed51d63cf736c87e6b7cde3d8972a6f013c314cdd7d0752 -EBUILD irssi-9999.ebuild 1393 BLAKE2B 4b9591b2ba11e38df59d713a7977ad78fc6f810a770313cc11d90eb717c00e7814f4e2025c6ede5e08f373ccc7d71721598d9bd5c92fd1699c99f8b2af8284f3 SHA512 dd4ae6574e4571b21403aa8b85c38b8a3eef67968e7f04570c3a52001c751a12ae39fa16c56a1db3aca46d098c462a50423b09b54e4984d3a951d15ea90a1030 +DIST irssi-1.4.1.tar.xz 1210772 BLAKE2B b02dfeae1e3ac5d52c5d22f8d2284e0314d9c39628e5389eed2a90d22904754869567750909b65315472068113f1efa8e304696564e2c2517b7a17219cf92dda SHA512 e0c53c456bd92af60e8845dba6d338bc0f880639ba19118c22324a5044101a16f7a387377f2a15aa74364f75fe9ed0d5fac0f353c3ea2158190f76ed89dfdd22 +EBUILD irssi-1.2.3.ebuild 1455 BLAKE2B ec9f79fb5b19bf8a2f852b66e004b3597edf4c6ff50d1a80e47ebc2ffa1c71ee04d1ce8ee638d82d3e5f59c602d68e1e4ba9c5484a4feae0d4f094ce563aee1f SHA512 f7a49411bfb9ce9dcc421f71ce201b469332e8c79a0665c4572bb4c06d6b0993c868c161213dad0dd7ff784ae79f9a7572855cb4e04829931019f8acbf689c99 +EBUILD irssi-1.4.1.ebuild 1630 BLAKE2B 9fb0f62710324851f370f131780ea6507e7aa05df30ac0ee3e2a0d696e0cb68cf50146d2f584fef467c3f1a629ba40b08a0a117710f41e2ad56309ebea0ae6c2 SHA512 4bffa0e6ad03b578eab9cf047b43bcde4d492054c165c145238b4c1c059dbc5aa38adba8d37eeda0591855621bb18016d1a666f0e8b69fdf32143a825f811d65 +EBUILD irssi-9999.ebuild 1572 BLAKE2B 68ec2faff2ae5ace3b78f304092d3e0de378f8553ef32e0a4490bb0d4d687c7c6cafdff4a7cf8f9a4a9c4cd7e7b1b389fd5cb319f43159d76d3bf23f806ffcf3 SHA512 1eadd661f4f0f407e5e4e15900ee7a9a1117321c7a441ff30c1f03738de8f89bf492745f136b2a0a5c346b029ea6731ea2caa703d5612c54c74cf27f5d11e4dc MISC metadata.xml 701 BLAKE2B a337d1efcdc3f02d98639cf52c0c878408b1675aa261d708fef301ba34734eb296469662c6df53941829af915579cb9b4730e15b5c157839d4633ed940e5a532 SHA512 b9ee2b27c9d3482c29e4960fac77062cbbb9a593eb8576483b49e31e04b941119a5ce56b679da4377f8e488d188061272c25cb8270d948996faeb7b77e7b2a64 diff --git a/net-irc/irssi/files/irssi-1.4.1-no-werror-decl.patch b/net-irc/irssi/files/irssi-1.4.1-no-werror-decl.patch new file mode 100644 index 000000000000..83b03680cd44 --- /dev/null +++ b/net-irc/irssi/files/irssi-1.4.1-no-werror-decl.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/851522 +https://github.com/Perl/perl5/issues/19382 +--- a/meson.build ++++ b/meson.build +@@ -553,9 +553,6 @@ configure_file(output : 'irssi-config.h', + # CFLAGS # + ########## + +-#### warnings #### +-add_project_arguments(cc.get_supported_arguments('-Werror=declaration-after-statement'), language : 'c') +- + #### personality #### + add_project_arguments(cc.get_supported_arguments('-fno-strict-aliasing'), language : 'c') + if get_option('buildtype').contains('debug') diff --git a/net-irc/irssi/irssi-1.2.3.ebuild b/net-irc/irssi/irssi-1.2.3.ebuild index 685df8186024..371f59c83591 100644 --- a/net-irc/irssi/irssi-1.2.3.ebuild +++ b/net-irc/irssi/irssi-1.2.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="otr +perl selinux socks5 +proxy" COMMON_DEPEND=" diff --git a/net-irc/irssi/irssi-1.4.1.ebuild b/net-irc/irssi/irssi-1.4.1.ebuild new file mode 100644 index 000000000000..b16a43f2e55d --- /dev/null +++ b/net-irc/irssi/irssi-1.4.1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GENTOO_DEPEND_ON_PERL="no" +inherit perl-module meson + +DESCRIPTION="A modular textUI IRC client with IPv6 support" +HOMEPAGE="https://irssi.org/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" + inherit git-r3 +else + # Keep for _rc compability + MY_P="${P/_/-}" + + SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="otr +perl selinux +proxy" + +RDEPEND=" + >=dev-libs/glib-2.6.0 + dev-libs/openssl:= + sys-libs/ncurses:= + otr? ( + >=dev-libs/libgcrypt-1.2.0:= + >=net-libs/libotr-4.1.0 + ) + perl? ( dev-lang/perl:= ) +" +DEPEND="${RDEPEND}" +BDEPEND="dev-lang/perl + virtual/pkgconfig" +RDEPEND+=" selinux? ( sec-policy/selinux-irc )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.1-no-werror-decl.patch +) + +src_configure() { + local emesonargs=( + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + -Dwith-perl-lib=vendor + -Dwith-otr=$(usex otr) + -Dwith-proxy=$(usex proxy) + -Dwith-perl=$(usex perl) + + # Carried over from autotools (for now?), bug #677804 + -Ddisable-utf8proc=yes + -Dwith-fuzzer=no + -Dinstall-glib=no + ) + + meson_src_configure +} + +src_test() { + # We don't want perl-module's src_test + meson_src_test +} + +src_install() { + meson_src_install + + use perl && perl_delete_localpod + + dodoc AUTHORS ChangeLog README.md TODO NEWS +} diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild index a73888fc5871..833dab6c2a40 100644 --- a/net-irc/irssi/irssi-9999.ebuild +++ b/net-irc/irssi/irssi-9999.ebuild @@ -1,72 +1,72 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 GENTOO_DEPEND_ON_PERL="no" - -inherit autotools perl-module git-r3 - -EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" +inherit perl-module meson DESCRIPTION="A modular textUI IRC client with IPv6 support" HOMEPAGE="https://irssi.org/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" + inherit git-r3 +else + # Keep for _rc compability + MY_P="${P/_/-}" + + SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + LICENSE="GPL-2" SLOT="0" -IUSE="otr +perl selinux socks5 +proxy" +IUSE="otr +perl selinux +proxy" -COMMON_DEPEND="sys-libs/ncurses:0= +RDEPEND=" >=dev-libs/glib-2.6.0 dev-libs/openssl:= + sys-libs/ncurses:= otr? ( - >=dev-libs/libgcrypt-1.2.0:0= + >=dev-libs/libgcrypt-1.2.0:= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) - socks5? ( >=net-proxy/dante-1.1.18 )" - -DEPEND=" - ${COMMON_DEPEND} - virtual/pkgconfig +" +DEPEND="${RDEPEND}" +BDEPEND=" dev-lang/perl - || ( - www-client/lynx - www-client/elinks - )" - -RDEPEND=" - ${COMMON_DEPEND} - selinux? ( sec-policy/selinux-irc )" + virtual/pkgconfig +" +RDEPEND+=" selinux? ( sec-policy/selinux-irc )" -src_prepare() { - sed -i -e /^autoreconf/d autogen.sh || die - NOCONFIGURE=1 ./autogen.sh || die +src_configure() { + local emesonargs=( + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + -Dwith-perl-lib=vendor + -Dwith-otr=$(usex otr) + -Dwith-proxy=$(usex proxy) + -Dwith-perl=$(usex perl) + + # Carried over from autotools (for now?), bug #677804 + -Ddisable-utf8proc=yes + -Dwith-fuzzer=no + -Dinstall-glib=no + ) - default - eautoreconf + meson_src_configure } -src_configure() { - # Disable automagic dependency on dev-libs/libutf8proc (bug #677804) - export ac_cv_lib_utf8proc_utf8proc_version=no - - local myeconfargs=( - --with-perl-lib=vendor - --enable-true-color - $(use_with otr) - $(use_with proxy) - $(use_with perl) - $(use_with socks5 socks) - ) - econf "${myeconfargs[@]}" +src_test() { + # We don't want perl-module's src_test + meson_src_test } src_install() { - default + meson_src_install use perl && perl_delete_localpod - rm -f "${ED}"/usr/$(get_libdir)/irssi/modules/*.{a,la} || die - dodoc AUTHORS ChangeLog README.md TODO NEWS } -- cgit v1.2.3