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 72819138334 for ; Wed, 6 Nov 2019 06:23:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9BEB8E0A03; Wed, 6 Nov 2019 06:23:52 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 65983E09D5 for ; Wed, 6 Nov 2019 06:23:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 927A934C939 for ; Wed, 6 Nov 2019 06:23:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28B68824 for ; Wed, 6 Nov 2019 06:23:48 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1573021401.cb8d3b90e28402c3c172209c57c1b787899791ed.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/lrzsz/, net-dialup/lrzsz/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dialup/lrzsz/files/lrzsz-0.12.20-gettext-0.20.patch net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild X-VCS-Directories: net-dialup/lrzsz/ net-dialup/lrzsz/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: cb8d3b90e28402c3c172209c57c1b787899791ed X-VCS-Branch: master Date: Wed, 6 Nov 2019 06:23:48 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5cca440b-202f-4335-b3a8-25628e6f6d84 X-Archives-Hash: 1c94742a729c67878349f4d0c3fc0cbb commit: cb8d3b90e28402c3c172209c57c1b787899791ed Author: Conrad Kostecki kostecki com> AuthorDate: Wed Oct 23 18:48:35 2019 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Wed Nov 6 06:23:21 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb8d3b90 net-dialup/lrzsz: fix compilation with gettext-0.20 Thanks to Felix J. Ogris for the patch! Closes: https://bugs.gentoo.org/685696 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Conrad Kostecki kostecki.com> Closes: https://github.com/gentoo/gentoo/pull/13400 Signed-off-by: Joonas Niilola gentoo.org> .../lrzsz/files/lrzsz-0.12.20-gettext-0.20.patch | 23 ++++++++++++++++++++++ net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild | 9 ++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/net-dialup/lrzsz/files/lrzsz-0.12.20-gettext-0.20.patch b/net-dialup/lrzsz/files/lrzsz-0.12.20-gettext-0.20.patch new file mode 100644 index 00000000000..3c58bd18091 --- /dev/null +++ b/net-dialup/lrzsz/files/lrzsz-0.12.20-gettext-0.20.patch @@ -0,0 +1,23 @@ +diff -udr a/configure.in b/configure.in +--- a/configure.in 1998-12-30 08:50:07.000000000 +0100 ++++ b/configure.in 2019-06-01 20:38:54.918650170 +0200 +@@ -1,3 +1,4 @@ ++m4_pattern_allow(.*) + dnl Process this file with autoconf to produce a configure script. + AC_INIT(src/crctab.c) + AM_INIT_AUTOMAKE(lrzsz, 0.12.20) +diff -udr lrzsz-0.12.20.orig/po/Makefile.in.in lrzsz-0.12.20/po/Makefile.in.in +--- a/po/Makefile.in.in 1998-04-26 15:22:40.000000000 +0200 ++++ b/po/Makefile.in.in 2019-06-01 20:48:09.020703542 +0200 +@@ -110,9 +110,9 @@ + install-data-no: all + install-data-yes: all + if test -r $(MKINSTALLDIRS); then \ +- $(MKINSTALLDIRS) $(datadir); \ ++ $(MKINSTALLDIRS) $(DATADIR); \ + else \ +- $(top_srcdir)/mkinstalldirs $(datadir); \ ++ $(top_srcdir)/mkinstalldirs $(DATADIR); \ + fi + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild index c89d4506098..e41f957e5b6 100644 --- a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild +++ b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,10 +16,13 @@ IUSE="nls" DEPEND="nls? ( virtual/libintl )" -PATCHES=( "${FILESDIR}"/${PN}-autotools.patch +PATCHES=( + "${FILESDIR}"/${PN}-autotools.patch "${FILESDIR}"/${PN}-implicit-decl.patch "${FILESDIR}"/${P}-automake-1.12.patch - "${FILESDIR}"/${P}-automake-1.13.patch ) + "${FILESDIR}"/${P}-automake-1.13.patch + "${FILESDIR}"/${P}-gettext-0.20.patch +) DOCS=( AUTHORS COMPATABILITY ChangeLog NEWS \ README{,.cvs,.gettext,.isdn4linux,.tests} THANKS TODO )