From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AA207138330 for ; Mon, 26 Sep 2016 14:42:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6506BE0BC9; Mon, 26 Sep 2016 14:42:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B70B3E0BC9 for ; Mon, 26 Sep 2016 14:42:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7AFC534072E for ; Mon, 26 Sep 2016 14:42:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A3A2245E for ; Mon, 26 Sep 2016 14:42:29 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1474900829.1ef5fafcec31a7df61c8500750a9cd1bdfa9ef43.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/irssi/files/, net-irc/irssi/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/irssi/files/irssi-0.8.20-tinfo.patch net-irc/irssi/irssi-0.8.20.ebuild X-VCS-Directories: net-irc/irssi/files/ net-irc/irssi/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 1ef5fafcec31a7df61c8500750a9cd1bdfa9ef43 X-VCS-Branch: master Date: Mon, 26 Sep 2016 14:42:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5cb6460f-0277-41d9-be3d-aac087140b26 X-Archives-Hash: 94423e15962096ca7963812542d447ac commit: 1ef5fafcec31a7df61c8500750a9cd1bdfa9ef43 Author: William Hubbs gentoo org> AuthorDate: Sat Sep 24 18:45:27 2016 +0000 Commit: William Hubbs gentoo 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 }