From 43ceaf84adc61f8ba0e0bcbaf8d63465d052b8a3 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Tue, 12 Feb 2019 22:19:16 +0100 Subject: net-irc/irssi: Disable automagic dep on dev-libs/libutf8proc Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Lars Wendler --- .../irssi-1.2.0-fix-libutf8proc-include.patch | 25 -------- net-irc/irssi/irssi-1.2.0-r1.ebuild | 68 --------------------- net-irc/irssi/irssi-1.2.0-r2.ebuild | 71 ++++++++++++++++++++++ 3 files changed, 71 insertions(+), 93 deletions(-) delete mode 100644 net-irc/irssi/files/irssi-1.2.0-fix-libutf8proc-include.patch delete mode 100644 net-irc/irssi/irssi-1.2.0-r1.ebuild create mode 100644 net-irc/irssi/irssi-1.2.0-r2.ebuild (limited to 'net-irc') diff --git a/net-irc/irssi/files/irssi-1.2.0-fix-libutf8proc-include.patch b/net-irc/irssi/files/irssi-1.2.0-fix-libutf8proc-include.patch deleted file mode 100644 index 019c2660eeca..000000000000 --- a/net-irc/irssi/files/irssi-1.2.0-fix-libutf8proc-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 138596d84dfa060b5d035b96e7d1a57a7cbcd7b0 Mon Sep 17 00:00:00 2001 -From: Mikle Kolyada -Date: Tue, 12 Feb 2019 19:38:36 +0300 -Subject: [PATCH] wcwidth-wrapper.c: fix libutf8proc include path - ---- - src/core/wcwidth-wrapper.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/wcwidth-wrapper.c b/src/core/wcwidth-wrapper.c -index 03d0dc0c..b0df662f 100644 ---- a/src/core/wcwidth-wrapper.c -+++ b/src/core/wcwidth-wrapper.c -@@ -27,7 +27,7 @@ - #include "utf8.h" - - #ifdef HAVE_LIBUTF8PROC --#include -+#include - #endif - - /* wcwidth=2 since unicode 5.2.0 */ --- -2.19.2 - diff --git a/net-irc/irssi/irssi-1.2.0-r1.ebuild b/net-irc/irssi/irssi-1.2.0-r1.ebuild deleted file mode 100644 index 79724a44e3b3..000000000000 --- a/net-irc/irssi/irssi-1.2.0-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GENTOO_DEPEND_ON_PERL="no" - -inherit ltprune perl-module - -# Keep for _rc compability -MY_P="${P/_/-}" - -DESCRIPTION="A modular textUI IRC client with IPv6 support" -HOMEPAGE="https://irssi.org/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="otr +perl selinux socks5 +proxy libressl" - -COMMON_DEPEND=" - sys-libs/ncurses:0= - >=dev-libs/glib-2.6.0 - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) - otr? ( >=dev-libs/libgcrypt-1.2.0:0= - >=net-libs/libotr-4.1.0 ) - perl? ( dev-lang/perl:= ) - socks5? ( >=net-proxy/dante-1.1.18 )" - -DEPEND=" - ${COMMON_DEPEND} - virtual/pkgconfig" - -RDEPEND=" - ${COMMON_DEPEND} - dev-libs/libutf8proc - selinux? ( sec-policy/selinux-irc ) - perl? ( !net-im/silc-client )" - -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - eapply "${FILESDIR}"/${P}-fix-libutf8proc-include.patch - if has_version '>=dev-libs/libressl-2.7.3'; then - eapply "${FILESDIR}"/libressl.patch - fi -} - -src_configure() { - econf \ - --with-perl-lib=vendor \ - --enable-true-color \ - $(use_with otr) \ - $(use_with proxy) \ - $(use_with perl) \ - $(use_with socks5 socks) -} - -src_install() { - default - use perl && perl_delete_localpod - prune_libtool_files --modules -} diff --git a/net-irc/irssi/irssi-1.2.0-r2.ebuild b/net-irc/irssi/irssi-1.2.0-r2.ebuild new file mode 100644 index 000000000000..eaa6be9d5a33 --- /dev/null +++ b/net-irc/irssi/irssi-1.2.0-r2.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +GENTOO_DEPEND_ON_PERL="no" + +inherit ltprune perl-module + +# Keep for _rc compability +MY_P="${P/_/-}" + +DESCRIPTION="A modular textUI IRC client with IPv6 support" +HOMEPAGE="https://irssi.org/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="otr +perl selinux socks5 +proxy libressl" + +COMMON_DEPEND=" + sys-libs/ncurses:0= + >=dev-libs/glib-2.6.0 + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + otr? ( >=dev-libs/libgcrypt-1.2.0:0= + >=net-libs/libotr-4.1.0 ) + perl? ( dev-lang/perl:= ) + socks5? ( >=net-proxy/dante-1.1.18 )" + +DEPEND=" + ${COMMON_DEPEND} + virtual/pkgconfig" + +RDEPEND=" + ${COMMON_DEPEND} + selinux? ( sec-policy/selinux-irc ) + perl? ( !net-im/silc-client )" + +RESTRICT="test" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + if has_version '>=dev-libs/libressl-2.7.3' ; then + eapply "${FILESDIR}"/libressl.patch + fi +} + +src_configure() { + # Disable automagic dependency on dev-libs/libutf8proc (bug #677804) + export ac_cv_lib_utf8proc_utf8proc_version=no + + local myeconfargs=( + --with-perl-lib=vendor + --enable-true-color + $(use_with otr) + $(use_with proxy) + $(use_with perl) + $(use_with socks5 socks) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + use perl && perl_delete_localpod + prune_libtool_files --modules +} -- cgit v1.2.3-65-gdbad