lrzsz: upgraded package to upstream
Upgraded net-dialup/lrzsz to version 0.12.20-r4 on amd64, arm, arm64.
This was necessary to pull in fixes for gettext-0.20.
https://gitweb.gentoo.org/repo/gentoo.git/commit/net-dialup/lrzsz?id=cb8d3b90e28402c3c172209c57c1b787899791ed
This commit was generated by running the following command.
cros_portage_upgrade --unstable-ok --upgrade \
--board=volteer:arm64-generic:arm-generic \
net-dialup/lrzsz
BUG=b:167535714
TEST=PowerTOP builds and runs
emerge-volteer powertop
cros deploy ${DUT_IP} powertop
Change-Id: I3b2bbf0292d2d9204c97e7bdbf627270a204c58e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2420141
Reviewed-by: Manoj Gupta (OoO) <manojgupta@chromium.org>
Tested-by: Manoj Gupta (OoO) <manojgupta@chromium.org>
Commit-Queue: Manoj Gupta (OoO) <manojgupta@chromium.org>
diff --git a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r3 b/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r3
deleted file mode 100644
index 6354e51..0000000
--- a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=nls? ( virtual/libintl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Communication package providing the X, Y, and ZMODEM file transfer protocols
-EAPI=2
-HOMEPAGE=http://www.ohse.de/uwe/software/lrzsz.html
-IUSE=nls
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=http://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=c102e86d5f445875f9a74e4ae86c68f8
diff --git a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4 b/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4
new file mode 100644
index 0000000..aca3bee
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare test
+DEPEND=nls? ( virtual/libintl ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Communication package providing the X, Y, and ZMODEM file transfer protocols
+EAPI=7
+HOMEPAGE=https://www.ohse.de/uwe/software/lrzsz.html
+IUSE=nls
+KEYWORDS=*
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=b4b2d02203d1b4aa2d09c9885e3016bc
diff --git a/net-dialup/lrzsz/Manifest b/net-dialup/lrzsz/Manifest
index 3c136db..77293a9 100644
--- a/net-dialup/lrzsz/Manifest
+++ b/net-dialup/lrzsz/Manifest
@@ -1 +1 @@
-DIST lrzsz-0.12.20.tar.gz 280938 SHA256 c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1
+DIST lrzsz-0.12.20.tar.gz 280938 BLAKE2B 86511ab112da849f5894f18c045f2c8a9dd4c4e97426c1d98c5b91aade6c39e26f4a7e5674e057c9596a240dfd3ef32053fcdc8ee58b33654cf15eec64779b1e SHA512 9bce64036f1f1c65f5910f19802aecaf3dc5ffeab0feeca10fa8d2fe1b83e212391cce23056d22fd0eda52df89e12ede68eb5d22ffcf22f935910d2af7399f12
diff --git a/net-dialup/lrzsz/files/lrzsz-0.12.20-AR.patch b/net-dialup/lrzsz/files/lrzsz-0.12.20-AR.patch
new file mode 100644
index 0000000..fd923d5
--- /dev/null
+++ b/net-dialup/lrzsz/files/lrzsz-0.12.20-AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -95,6 +95,7 @@ AC_PROG_GCC_TRADITIONAL
+ dnl AC_PROG_INSTALL included in AM_INIT_AUTOMAKE
+ dnl AC_PROG_MAKE_SET included in AM_INIT_AUTOMAKE
+ AC_PROG_RANLIB
++AM_PROG_AR
+ AC_ISC_POSIX
+ AC_USE_SYSTEM_EXTENSIONS
+ AM_GNU_GETTEXT
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 0000000..3c58bd1
--- /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-r3.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
deleted file mode 100644
index fd34508..0000000
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild,v 1.12 2014/08/03 05:59:41 tgall Exp $
-
-EAPI="2"
-
-inherit autotools flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols"
-HOMEPAGE="http://www.ohse.de/uwe/software/lrzsz.html"
-SRC_URI="http://www.ohse.de/uwe/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE="nls"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-autotools.patch
- epatch "${FILESDIR}"/${PN}-implicit-decl.patch
- epatch "${FILESDIR}"/${P}-automake-1.12.patch
- epatch "${FILESDIR}"/${P}-automake-1.13.patch
-
- # automake is unhappy if this is missing
- >> config.rpath
- # This is too old. Remove it so automake puts in a newer copy.
- rm -f missing
- # Autoheader does not like seeing this file.
- rm -f acconfig.h
-
- eautoreconf
-}
-
-src_configure() {
- tc-export CC
- append-flags -Wstrict-prototypes
- econf $(use_enable nls) || die "econf failed"
-}
-
-src_test() {
- #Don't use check target.
- #See bug #120748 before changing this function.
- make vcheck || die "tests failed"
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- install || die "make install failed"
-
- local x
- for x in {r,s}{b,x,z} ; do
- dosym l${x} /usr/bin/${x}
- dosym l${x:0:1}z.1 /usr/share/man/man1/${x}.1
- [ "${x:1:1}" = "z" ] || dosym l${x:0:1}z.1 /usr/share/man/man1/l${x}.1
- done
-
- dodoc AUTHORS COMPATABILITY ChangeLog NEWS README* THANKS TODO
-}
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
new file mode 100644
index 0000000..7d28beb
--- /dev/null
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols"
+HOMEPAGE="https://www.ohse.de/uwe/software/lrzsz.html"
+SRC_URI="https://www.ohse.de/uwe/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+IUSE="nls"
+
+DEPEND="nls? ( virtual/libintl )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-autotools.patch
+ "${FILESDIR}"/${PN}-implicit-decl.patch
+ "${FILESDIR}"/${P}-automake-1.12.patch
+ "${FILESDIR}"/${P}-automake-1.13.patch
+ "${FILESDIR}"/${P}-gettext-0.20.patch
+ "${FILESDIR}"/${P}-AR.patch
+)
+
+DOCS=( AUTHORS COMPATABILITY ChangeLog NEWS \
+ README{,.cvs,.gettext,.isdn4linux,.tests} THANKS TODO )
+
+src_prepare() {
+ default
+ # automake is unhappy if this is missing
+ >> config.rpath || die
+ # This is too old. Remove it so automake puts in a newer copy.
+ rm -f missing || die
+ # Autoheader does not like seeing this file.
+ rm -f acconfig.h || die
+
+ eautoreconf
+}
+
+src_configure() {
+ tc-export CC
+ append-flags -Wstrict-prototypes
+ econf $(use_enable nls)
+}
+
+src_test() {
+ #Don't use check target.
+ #See bug #120748 before changing this function.
+ make vcheck || die "tests failed"
+}
+
+src_install() {
+ default
+
+ local x
+ for x in {r,s}{b,x,z} ; do
+ dosym l${x} /usr/bin/${x}
+ dosym l${x:0:1}z.1 /usr/share/man/man1/${x}.1
+ [ "${x:1:1}" = "z" ] || dosym l${x:0:1}z.1 /usr/share/man/man1/l${x}.1
+ done
+}
diff --git a/net-dialup/lrzsz/metadata.xml b/net-dialup/lrzsz/metadata.xml
index a46ef86..71b1461 100644
--- a/net-dialup/lrzsz/metadata.xml
+++ b/net-dialup/lrzsz/metadata.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>net-dialup</herd>
-<longdescription>Communication package providing the X, Y, and ZMODEM file transfer protocols</longdescription>
+<maintainer type="project">
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+</maintainer>
</pkgmetadata>
