public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-irc/irssi/files/, net-irc/irssi/
@ 2016-09-26 14:42 William Hubbs
  0 siblings, 0 replies; 4+ messages in thread
From: William Hubbs @ 2016-09-26 14:42 UTC (permalink / raw
  To: gentoo-commits

commit:     1ef5fafcec31a7df61c8500750a9cd1bdfa9ef43
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 18:45:27 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 14:40:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ef5fafc

net-irc/irssi: clean up 0.8.20 ebuild

- don't quote eapi
- munge the patch so the default src_prepare can be used

This change was approved by monsieurp.

Package-Manager: portage-2.2.28

 net-irc/irssi/files/irssi-0.8.20-tinfo.patch | 21 +++++++++++++++++++++
 net-irc/irssi/irssi-0.8.20.ebuild            | 11 ++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/net-irc/irssi/files/irssi-0.8.20-tinfo.patch b/net-irc/irssi/files/irssi-0.8.20-tinfo.patch
new file mode 100644
index 00000000..346c6e9
--- /dev/null
+++ b/net-irc/irssi/files/irssi-0.8.20-tinfo.patch
@@ -0,0 +1,21 @@
+--- a/m4/curses.m4	2010-04-04 02:19:58.000000000 +1000
++++ b/m4/curses.m4	2014-03-06 16:36:12.404404130 +1100
+@@ -218,9 +218,17 @@
+ 			CURSES_LIBS="$CHECKLIBS"
+ 		],, $CHECKLIBS)
+ 	    ], $CURSES_LIBS)
++	    AC_CHECK_LIB(ncurses, tputs, [
++	        true;
++	    ], [
++                CHECKLIBS=`echo "$3"|sed 's/-lncurses/-lncurses -ltinfo/g'`
++		AC_CHECK_LIB(tinfo, tputs, [
++			CURSES_LIBS="$CHECKLIBS"
++		],, $CHECKLIBS)
++	    ], $CURSES_LIBS)
+ 	    CURSES_INCLUDEDIR="$4"
+ 	    search_ncurses=false
+-	    screen_manager="$5"
++	    screen_manager=$5
+             AC_DEFINE(HAS_CURSES)
+             has_curses=true
+ 	    has_ncurses=true

diff --git a/net-irc/irssi/irssi-0.8.20.ebuild b/net-irc/irssi/irssi-0.8.20.ebuild
index 20e7b3c..65b6f23 100644
--- a/net-irc/irssi/irssi-0.8.20.ebuild
+++ b/net-irc/irssi/irssi-0.8.20.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="6"
+EAPI=6
 
 inherit autotools eutils flag-o-matic perl-module toolchain-funcs
 
@@ -40,11 +40,12 @@ RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-tinfo.patch"
+)
+
 src_prepare() {
-	pushd m4 > /dev/null || die
-	eapply "${FILESDIR}/${PN}-0.8.15-tinfo.patch"
-	popd > /dev/null || die
-	eapply_user
+	default
 	eautoreconf
 }
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/irssi/files/, net-irc/irssi/
@ 2017-10-19 16:27 Patrice Clement
  0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2017-10-19 16:27 UTC (permalink / raw
  To: gentoo-commits

commit:     0556397f8153373c5a1b8b4716b6142fcb91e7e0
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 19 16:27:08 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Oct 19 16:27:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0556397f

net-irc/irssi: remove vulnerable versions.

Bug: https://bugs.gentoo.org/624100
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-irc/irssi/Manifest                       |  3 --
 net-irc/irssi/files/irssi-0.8.20-tinfo.patch | 21 --------
 net-irc/irssi/irssi-0.8.21.ebuild            | 72 ----------------------------
 net-irc/irssi/irssi-1.0.2.ebuild             | 60 -----------------------
 net-irc/irssi/irssi-1.0.3.ebuild             | 55 ---------------------
 5 files changed, 211 deletions(-)

diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index b2ee333c4e2..5ea66d764d0 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,4 +1 @@
-DIST irssi-0.8.21.tar.xz 1007524 SHA256 e433063b8714dcf17438126902c9a9d5c97944b3185ecd0fc5ae25c4959bf35a SHA512 110934ab85c8574fc76bce367c58378e28603898e63a5014a72170ffe441ffe3dbda432531e899176f5c4126f47d929a3a01a2f87bcacbfe0ba4d6d8cb31e642 WHIRLPOOL 8426a82cbf5b488c1fd9497fdeb69ee98d211aa9775560b9d6efc9645d74926fff6b627c2f681642a0df10e83f68dc4d6403d706faaf677391005af5bdccf143
-DIST irssi-1.0.2.tar.xz 1027912 SHA256 5c1c3cc2caf103aad073fadeb000e0f8cb3b416833a7f43ceb8bd9fcf275fbe9 SHA512 0b5048b1babecaafcd6f2be59523635a3f028c17ceb751776099d74c50fc3daf8fdf52ef5c37f9b765f7a1e5e82f5e41230d14f05530de54386f7190c610d458 WHIRLPOOL 59cd0ee40115f8a93769b693d1d6a3f8f3c004ce03c19c3b87548d6fd5b1313c26b7258049ac2bf6015f3c502d9ba9e773f48b5784b5e8d0f5afb3f4797cef47
-DIST irssi-1.0.3.tar.xz 1029980 SHA256 838220297dcbe7c8c42d01005059779a82f5b7b7e7043db37ad13f5966aff581 SHA512 3a369d9bad4e2016a6a0395b35e3db1f1a6ff7ff6b8361fe5d828c29dd6f81c4b8d1bdfe0304cb05402eecddde97f6d369a5e98f215bfd177287f303d3d714eb WHIRLPOOL 2cdef3c2208cbe93d74298862add82281d36cd518ad5baf9285aa14df8fef263cd857ad39f5058635f9e81938385fc07b6c545685681562ad4f7273b4ca1e6da
 DIST irssi-1.0.4.tar.xz 1030956 SHA256 b85c07dbafe178213eccdc69f5f8f0ac024dea01c67244668f91ec1c06b986ca SHA512 8025c3b90275e5c0b910c08efcac80f56da4400662cd4a9f09cc6035ce23840fe6ed0ac5297b9631a5b28bd798b4ebca2bb5550f9e0e01aefc7a69e9f787195d WHIRLPOOL 27065e67eda3fd09a88989456ba36a748965190a1a808a8dcab9c1170e7d7c856987e98801fdc83cdcced6aa47539410be0c2207fb037454a659b0a3973b6f5f

diff --git a/net-irc/irssi/files/irssi-0.8.20-tinfo.patch b/net-irc/irssi/files/irssi-0.8.20-tinfo.patch
deleted file mode 100644
index 346c6e963e5..00000000000
--- a/net-irc/irssi/files/irssi-0.8.20-tinfo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/m4/curses.m4	2010-04-04 02:19:58.000000000 +1000
-+++ b/m4/curses.m4	2014-03-06 16:36:12.404404130 +1100
-@@ -218,9 +218,17 @@
- 			CURSES_LIBS="$CHECKLIBS"
- 		],, $CHECKLIBS)
- 	    ], $CURSES_LIBS)
-+	    AC_CHECK_LIB(ncurses, tputs, [
-+	        true;
-+	    ], [
-+                CHECKLIBS=`echo "$3"|sed 's/-lncurses/-lncurses -ltinfo/g'`
-+		AC_CHECK_LIB(tinfo, tputs, [
-+			CURSES_LIBS="$CHECKLIBS"
-+		],, $CHECKLIBS)
-+	    ], $CURSES_LIBS)
- 	    CURSES_INCLUDEDIR="$4"
- 	    search_ncurses=false
--	    screen_manager="$5"
-+	    screen_manager=$5
-             AC_DEFINE(HAS_CURSES)
-             has_curses=true
- 	    has_ncurses=true

diff --git a/net-irc/irssi/irssi-0.8.21.ebuild b/net-irc/irssi/irssi-0.8.21.ebuild
deleted file mode 100644
index a82b29f33ae..00000000000
--- a/net-irc/irssi/irssi-0.8.21.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic perl-module toolchain-funcs
-
-# 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="ipv6 +perl selinux ssl socks5 +proxy libressl"
-
-CDEPEND="sys-libs/ncurses:0=
-	>=dev-libs/glib-2.6.0
-	ssl? (
-		!libressl? ( dev-libs/openssl:= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	perl? ( dev-lang/perl:= )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-irc )
-	perl? ( !net-im/silc-client )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.20-tinfo.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-ncurses="${EPREFIX}"/usr \
-		--with-perl-lib=vendor \
-		--enable-static \
-		--enable-true-color \
-		$(use_with proxy) \
-		$(use_with perl) \
-		$(use_with socks5 socks) \
-		$(use_enable ssl) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use perl && perl_delete_localpod
-
-	prune_libtool_files --modules
-
-	dodoc AUTHORS ChangeLog README.md TODO NEWS
-}

diff --git a/net-irc/irssi/irssi-1.0.2.ebuild b/net-irc/irssi/irssi-1.0.2.ebuild
deleted file mode 100644
index 43b884cd42c..00000000000
--- a/net-irc/irssi/irssi-1.0.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils 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="+perl selinux socks5 +proxy libressl"
-
-CDEPEND="
-	sys-libs/ncurses:0=
-	>=dev-libs/glib-2.6.0
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	perl? ( dev-lang/perl:= )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-irc )
-	perl? ( !net-im/silc-client )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog README.md TODO NEWS )
-
-src_configure() {
-	econf \
-		--with-perl-lib=vendor \
-		--enable-true-color \
-		$(use_with proxy) \
-		$(use_with perl) \
-		$(use_with socks5 socks)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use perl && perl_delete_localpod
-
-	prune_libtool_files --modules
-
-	einstalldocs
-}

diff --git a/net-irc/irssi/irssi-1.0.3.ebuild b/net-irc/irssi/irssi-1.0.3.ebuild
deleted file mode 100644
index 5cf5aa46b11..00000000000
--- a/net-irc/irssi/irssi-1.0.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils 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="+perl selinux socks5 +proxy libressl"
-
-CDEPEND="
-	sys-libs/ncurses:0=
-	>=dev-libs/glib-2.6.0
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	perl? ( dev-lang/perl:= )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-irc )
-	perl? ( !net-im/silc-client )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf \
-		--with-perl-lib=vendor \
-		--enable-true-color \
-		$(use_with proxy) \
-		$(use_with perl) \
-		$(use_with socks5 socks)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use perl && perl_delete_localpod
-	prune_libtool_files --modules
-	einstalldocs
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/irssi/files/, net-irc/irssi/
@ 2019-07-25 17:47 Mikle Kolyada
  0 siblings, 0 replies; 4+ messages in thread
From: Mikle Kolyada @ 2019-07-25 17:47 UTC (permalink / raw
  To: gentoo-commits

commit:     869ea2afd9c64135f6f391bc2cf40830549ee635
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 17:47:31 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 17:47:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=869ea2af

net-irc/irssi: Drop old

Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-irc/irssi/Manifest              |  2 --
 net-irc/irssi/files/libressl.patch  | 33 -------------------
 net-irc/irssi/irssi-1.1.2.ebuild    | 63 -----------------------------------
 net-irc/irssi/irssi-1.2.0-r2.ebuild | 65 -------------------------------------
 4 files changed, 163 deletions(-)

diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 1b19968bb4c..66e2ff62e1e 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,3 +1 @@
-DIST irssi-1.1.2.tar.xz 1084328 BLAKE2B 6f4e49097d97a511d0fd679806bfa3d261c26f9160ed66d34e7d314b3f330accf90c5e019c31dafd5418c25d538fcb44fc35fcdf6210370f640ff95743556a9a SHA512 706f811c810b976888101a29bab6ff6b9aa6116678994b3710d6b266bfbc0ae2be1d4fd889aedfbf0a13a2e3da3f1affcce0018346ecc582865eaccd8cc79f84
-DIST irssi-1.2.0.tar.xz 1138984 BLAKE2B 940b8fb0c6633ea82ccd242241a39b67fa1a356aa58758ca9e0388971ccaabbdfe954140d27abd06d1ca36d0aac14decbb1fd0929d969305abfaa9c9dbeafd24 SHA512 343530ca63355dd6683e84f31602c9162e1e3158e52ce81e37519d1e42abbdcb621fb710fcb605fcafd7e7ea3f2c30ed62607d4ea91d8c8dc29bf893e54aee40
 DIST irssi-1.2.1.tar.xz 1140380 BLAKE2B 11ab48ce6d7efa0a4c33f823dd414660107d94b9f00c863feb8377f4586e6c62043932bdcf35f1f4e9e9ab545ccc3bb0bfd207727e55856243c8494ae6172cf9 SHA512 67c4501b5a0055c1b24fa6753305658de809cd66e952e6f9233701a112989fd8721a065b1c681725b82346b40b53a29bd2b6b8b8315ac0ad196235a9e5156d5a

diff --git a/net-irc/irssi/files/libressl.patch b/net-irc/irssi/files/libressl.patch
deleted file mode 100644
index 644c73be32f..00000000000
--- a/net-irc/irssi/files/libressl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 25a44dacf4114f33f3a887f358c02f4fd9938427 Mon Sep 17 00:00:00 2001
-From: Dorian Harmans <dorian@woohooyeah.nl>
-Date: Fri, 23 Mar 2018 21:35:35 +0100
-Subject: [PATCH] fix build with LibreSSL 2.7.0
-
----
- src/core/network-openssl.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
-index 9fddf073e..692c7e716 100644
---- a/src/core/network-openssl.c
-+++ b/src/core/network-openssl.c
-@@ -35,7 +35,8 @@
- #include <openssl/err.h>
- 
- /* OpenSSL 1.1.0 introduced some backward-incompatible changes to the api */
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
-+    (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- /* The two functions below could be already defined if OPENSSL_API_COMPAT is
-  * below the 1.1.0 version so let's do a clean start */
- #undef  X509_get_notBefore
-@@ -47,7 +48,8 @@
- 
- /* OpenSSL 1.1.0 also introduced some useful additions to the api */
- #if (OPENSSL_VERSION_NUMBER >= 0x10002000L)
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
-+    (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- static int X509_STORE_up_ref(X509_STORE *vfy)
- {
-     int n;

diff --git a/net-irc/irssi/irssi-1.1.2.ebuild b/net-irc/irssi/irssi-1.1.2.ebuild
deleted file mode 100644
index a431ec54825..00000000000
--- a/net-irc/irssi/irssi-1.1.2.ebuild
+++ /dev/null
@@ -1,63 +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 ~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="+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:= )
-	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() {
-	econf \
-		--with-perl-lib=vendor \
-		--enable-true-color \
-		$(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
deleted file mode 100644
index 83dffcd5041..00000000000
--- a/net-irc/irssi/irssi-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,65 +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 ~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
-	!net-irc/irssi-otr
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( >=dev-libs/libressl-2.7.4:= )
-	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_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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/irssi/files/, net-irc/irssi/
@ 2023-07-06 21:00 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-07-06 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     ff77eb3bccbb3e458eb5ecfd5ffec7903acd27a3
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Thu Jul  6 16:19:37 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul  6 20:59:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff77eb3b

net-irc/irssi: Fix usage of $type in ExtUtils::ParseXS 3.50

With recent dev-lang/perl upgrade, some of the scripts are failing to
load. This patch taken from upstream should fix that.

Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31781
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...irssi-1.4.4-fix-usage-of-type-in-ExtUtils.patch | 43 ++++++++++++++++++++++
 .../{irssi-9999.ebuild => irssi-1.4.4-r1.ebuild}   |  4 ++
 net-irc/irssi/irssi-9999.ebuild                    |  4 ++
 3 files changed, 51 insertions(+)

diff --git a/net-irc/irssi/files/irssi-1.4.4-fix-usage-of-type-in-ExtUtils.patch b/net-irc/irssi/files/irssi-1.4.4-fix-usage-of-type-in-ExtUtils.patch
new file mode 100644
index 000000000000..517618e15098
--- /dev/null
+++ b/net-irc/irssi/files/irssi-1.4.4-fix-usage-of-type-in-ExtUtils.patch
@@ -0,0 +1,43 @@
+https://patch-diff.githubusercontent.com/raw/irssi/irssi/pull/1474.patch
+From: Ailin Nemui <ailin@d5421s.localdomain>
+Date: Tue, 4 Jul 2023 10:27:09 +0200
+Subject: [PATCH] fix usage of $type in ExtUtils::ParseXS 3.50
+
+--- a/src/perl/common/typemap
++++ b/src/perl/common/typemap
+@@ -28,5 +28,5 @@ T_IrssiObj
+ 	$arg = iobject_bless((SERVER_REC *)$var);
+ 
+ T_PlainObj
+-	$arg = plain_bless($var, \"$type\");
++	$arg = plain_bless($var, \"$ntype\");
+ 
+--- a/src/perl/irc/typemap
++++ b/src/perl/irc/typemap
+@@ -36,5 +36,5 @@ T_DccObj
+ 	$arg = simple_iobject_bless((DCC_REC *)$var);
+ 
+ T_PlainObj
+-	$arg = plain_bless($var, \"$type\");
++	$arg = plain_bless($var, \"$ntype\");
+ 
+--- a/src/perl/textui/typemap
++++ b/src/perl/textui/typemap
+@@ -18,7 +18,7 @@ T_BufferLineWrapper
+ OUTPUT
+ 
+ T_PlainObj
+-	$arg = plain_bless($var, \"$type\");
++	$arg = plain_bless($var, \"$ntype\");
+ 
+ T_BufferLineWrapper
+ 	$arg = perl_buffer_line_bless($var);
+--- a/src/perl/ui/typemap
++++ b/src/perl/ui/typemap
+@@ -13,5 +13,5 @@ T_PlainObj
+ OUTPUT
+ 
+ T_PlainObj
+-	$arg = plain_bless($var, \"$type\");
++	$arg = plain_bless($var, \"$ntype\");
+ 

diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-1.4.4-r1.ebuild
similarity index 95%
copy from net-irc/irssi/irssi-9999.ebuild
copy to net-irc/irssi/irssi-1.4.4-r1.ebuild
index 40772b5198b3..0a53a51c01ca 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-1.4.4-r1.ebuild
@@ -39,6 +39,10 @@ BDEPEND="dev-lang/perl
 	virtual/pkgconfig"
 RDEPEND+=" selinux? ( sec-policy/selinux-irc )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-usage-of-type-in-ExtUtils.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}

diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index 40772b5198b3..c5cc0db2269a 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -39,6 +39,10 @@ BDEPEND="dev-lang/perl
 	virtual/pkgconfig"
 RDEPEND+=" selinux? ( sec-policy/selinux-irc )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-usage-of-\$type-in-ExtUtils.patch"
+)
+
 src_configure() {
 	local emesonargs=(
 		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-06 21:00 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-25 17:47 [gentoo-commits] repo/gentoo:master commit in: net-irc/irssi/files/, net-irc/irssi/ Mikle Kolyada
  -- strict thread matches above, loose matches on Subject: below --
2023-07-06 21:00 Sam James
2017-10-19 16:27 Patrice Clement
2016-09-26 14:42 William Hubbs

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox