commit: c7194a7ea3cc290575537323eccc8aad7adc2e72 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Aug 30 04:29:03 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Aug 30 04:29:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7194a7e
net-irc/scrollz: fix gcc 10 build Closes: https://bugs.gentoo.org/708640 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James <sam <AT> gentoo.org> net-irc/scrollz/files/scrollz-2.3-fcommon.patch | 17 +++++++++++++++++ net-irc/scrollz/scrollz-2.3.ebuild | 16 ++++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/net-irc/scrollz/files/scrollz-2.3-fcommon.patch b/net-irc/scrollz/files/scrollz-2.3-fcommon.patch new file mode 100644 index 00000000000..2c0c85f0b96 --- /dev/null +++ b/net-irc/scrollz/files/scrollz-2.3-fcommon.patch @@ -0,0 +1,17 @@ +https://svnweb.freebsd.org/ports/head/irc/scrollz/files/patch-a8b05aab?view=markup&pathrev=545768 +https://bugs.gentoo.org/708640 +---- +--- a/include/ircterm.h ++++ b/include/ircterm.h +@@ -89,9 +89,9 @@ extern char *CM, + extern int SG; + /**************************** PATCHED by Flier ******************************/ + #ifdef WANTANSI +-char *SETAF, ++extern char *SETAF, + *SETAB; +-int NUMCOLORS; ++extern int NUMCOLORS; + #endif /* WANTANSI */ + /****************************************************************************/ + diff --git a/net-irc/scrollz/scrollz-2.3.ebuild b/net-irc/scrollz/scrollz-2.3.ebuild index b45a5957d95..08015a0442d 100644 --- a/net-irc/scrollz/scrollz-2.3.ebuild +++ b/net-irc/scrollz/scrollz-2.3.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit toolchain-funcs MY_P="ScrollZ-${PV}" @@ -17,20 +18,23 @@ KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="gmp gnutls ipv6 socks5 ssl" REQUIRED_USE="gnutls? ( ssl )" -RDEPEND=" +BDEPEND="virtual/pkgconfig" +DEPEND=" sys-libs/ncurses:0= gmp? ( dev-libs/gmp:0= ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) - ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig + ) " +RDEPEND="${DEPEND}" S="${WORKDIR}/ScrollZ-${MY_P}" +PATCHES=( + "${FILESDIR}/${PN}-2.3-fcommon.patch" +) + src_configure() { local _myssl @@ -54,7 +58,7 @@ src_configure() { src_install() { emake \ - DESTDIR="${D}" \ + DESTDIR="${ED}" \ mandir="${EPREFIX}/usr/share/man/man1" \ install
