[gentoo-commits] repo/gentoo:master commit in: net-irc/irssi/

[Patrice Clement]

commit:     daff5816d12a0ac3158d81686abf0998bad1bcdb
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 24 10:02:14 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Aug 24 10:02:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daff5816

net-irc/irssi: finally remove Perl unconditional build dependency.

GENTOO_DEPEND_ON_PERL="no" is now set just before the inherit phase to
allow irssi to be built without linking to Perl unconditionally.

Also swapped the eutils eclass inherit in favour of ltprune.

Courtesy of Brian Evans <grknight <AT> gentoo.org>.

Closes: https://bugs.gentoo.org/664386
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../{irssi-9999.ebuild => irssi-1.0.7-r1.ebuild}   | 39 +++++++++-------------
 .../{irssi-9999.ebuild => irssi-1.1.1-r1.ebuild}   | 39 +++++++++-------------
 net-irc/irssi/irssi-9999.ebuild                    |  4 ++-
 3 files changed, 35 insertions(+), 47 deletions(-)

diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-1.0.7-r1.ebuild
similarity index 57%
copy from net-irc/irssi/irssi-9999.ebuild
copy to net-irc/irssi/irssi-1.0.7-r1.ebuild
index 7c30d8608ca..5dfd52eed6e 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-1.0.7-r1.ebuild
@@ -1,20 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
-inherit autotools perl-module git-r3
+GENTOO_DEPEND_ON_PERL="no"
 
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+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=""
+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=
+CDEPEND="
+	sys-libs/ncurses:0=
 	>=dev-libs/glib-2.6.0
 	!libressl? ( dev-libs/openssl:= )
 	libressl? ( dev-libs/libressl:= )
@@ -23,25 +29,16 @@ CDEPEND="sys-libs/ncurses:0=
 
 DEPEND="
 	${CDEPEND}
-	virtual/pkgconfig
-	dev-lang/perl
-	|| (
-		www-client/lynx
-		www-client/elinks
-	)"
+	virtual/pkgconfig"
 
 RDEPEND="
 	${CDEPEND}
 	selinux? ( sec-policy/selinux-irc )
 	perl? ( !net-im/silc-client )"
 
-src_prepare() {
-	sed -i -e /^autoreconf/d autogen.sh || die
-	NOCONFIGURE=1 ./autogen.sh || die
+RESTRICT="test"
 
-	eapply_user
-	eautoreconf
-}
+S="${WORKDIR}/${MY_P}"
 
 src_configure() {
 	econf \
@@ -53,11 +50,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
+	default
 	use perl && perl_delete_localpod
-
 	prune_libtool_files --modules
-
-	dodoc AUTHORS ChangeLog README.md TODO NEWS
 }

diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-1.1.1-r1.ebuild
similarity index 57%
copy from net-irc/irssi/irssi-9999.ebuild
copy to net-irc/irssi/irssi-1.1.1-r1.ebuild
index 7c30d8608ca..5dfd52eed6e 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-1.1.1-r1.ebuild
@@ -1,20 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
-inherit autotools perl-module git-r3
+GENTOO_DEPEND_ON_PERL="no"
 
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+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=""
+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=
+CDEPEND="
+	sys-libs/ncurses:0=
 	>=dev-libs/glib-2.6.0
 	!libressl? ( dev-libs/openssl:= )
 	libressl? ( dev-libs/libressl:= )
@@ -23,25 +29,16 @@ CDEPEND="sys-libs/ncurses:0=
 
 DEPEND="
 	${CDEPEND}
-	virtual/pkgconfig
-	dev-lang/perl
-	|| (
-		www-client/lynx
-		www-client/elinks
-	)"
+	virtual/pkgconfig"
 
 RDEPEND="
 	${CDEPEND}
 	selinux? ( sec-policy/selinux-irc )
 	perl? ( !net-im/silc-client )"
 
-src_prepare() {
-	sed -i -e /^autoreconf/d autogen.sh || die
-	NOCONFIGURE=1 ./autogen.sh || die
+RESTRICT="test"
 
-	eapply_user
-	eautoreconf
-}
+S="${WORKDIR}/${MY_P}"
 
 src_configure() {
 	econf \
@@ -53,11 +50,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
+	default
 	use perl && perl_delete_localpod
-
 	prune_libtool_files --modules
-
-	dodoc AUTHORS ChangeLog README.md TODO NEWS
 }

diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index 7c30d8608ca..127644c7dd8 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
+GENTOO_DEPEND_ON_PERL="no"
+
 inherit autotools perl-module git-r3
 
 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"