taylor-uucp: upgraded package to upstream
Upgraded net-misc/taylor-uucp to version 1.07-r3 on amd64
BUG=none
TEST=emerge-amd64-generic -av net-misc/taylor-uucp
Change-Id: I1d74e45950ab4d6eb1dc71d650398128fb903451
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2402999
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Nicolas Boichat <drinkcat@chromium.org>
Commit-Queue: Nicolas Boichat <drinkcat@chromium.org>
diff --git a/metadata/md5-cache/net-misc/taylor-uucp-1.07-r2 b/metadata/md5-cache/net-misc/taylor-uucp-1.07-r2
deleted file mode 100644
index c2ebf74..0000000
--- a/metadata/md5-cache/net-misc/taylor-uucp-1.07-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install preinst unpack
-DEPEND=>=sys-apps/sed-4 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Taylor UUCP
-EAPI=0
-HOMEPAGE=http://www.airs.com/ian/uucp.html
-KEYWORDS=*
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gnu/uucp/uucp-1.07.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=93d44268cb2d815d28303f098f2b1615
diff --git a/metadata/md5-cache/net-misc/taylor-uucp-1.07-r3 b/metadata/md5-cache/net-misc/taylor-uucp-1.07-r3
new file mode 100644
index 0000000..758ecfc
--- /dev/null
+++ b/metadata/md5-cache/net-misc/taylor-uucp-1.07-r3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install preinst prepare
+DEPEND=>=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=Taylor UUCP
+EAPI=5
+HOMEPAGE=https://www.airs.com/ian/uucp.html
+KEYWORDS=*
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gnu/uucp/uucp-1.07.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=74026033f3c49defba7dec06e3699233
diff --git a/net-misc/taylor-uucp/Manifest b/net-misc/taylor-uucp/Manifest
index e2da245..39fdb8b 100644
--- a/net-misc/taylor-uucp/Manifest
+++ b/net-misc/taylor-uucp/Manifest
@@ -1 +1 @@
-DIST uucp-1.07.tar.gz 1013234 RMD160 e265ecd08245dd2510db20430a7a0e387ef4df51 SHA1 e7c93c3aa6468f1b26dd4d9104dbbe8c2949e9ee SHA256 060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c
+DIST uucp-1.07.tar.gz 1013234 BLAKE2B 5734bd1b8afcc9cb9b0dcc25afe73ee89b6007249a73d286bc39975bc0cd7a1907e360dfaa050175d87e34a7d468a70a7cae75124c920f00f03ff52f16629bb3 SHA512 13d215890234e638bed53dce7bab6eb78e0ce6b658f23ac1d7f8abc6e1d97963bef76aa4148ca644f450d5a1678fac940b73fbcd5845d7f5bea3afbd8055229b
diff --git a/net-misc/taylor-uucp/files/taylor-uucp-1.07-fprintf.patch b/net-misc/taylor-uucp/files/taylor-uucp-1.07-fprintf.patch
new file mode 100644
index 0000000..5ac0304
--- /dev/null
+++ b/net-misc/taylor-uucp/files/taylor-uucp-1.07-fprintf.patch
@@ -0,0 +1,11 @@
+--- a/uuconv.c
++++ b/uuconv.c
+@@ -676,7 +676,7 @@
+ {
+ if ((*pz)[0] != '-' && pz != pzarg)
+ fprintf (e, " ");
+- fprintf (e, *pz);
++ fprintf (e, "%s", *pz);
+ }
+ }
+
diff --git a/net-misc/taylor-uucp/metadata.xml b/net-misc/taylor-uucp/metadata.xml
index 4e9d22d..d2ab501 100644
--- a/net-misc/taylor-uucp/metadata.xml
+++ b/net-misc/taylor-uucp/metadata.xml
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
- <email>maintainer-needed@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
<longdescription>The standard UUCP package of the Free Software Foundation.
It provides everything you need to make a UUCP connection.</longdescription>
</pkgmetadata>
diff --git a/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild
deleted file mode 100644
index c6a4925..0000000
--- a/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild,v 1.3 2009/03/06 18:48:28 mrness Exp $
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="Taylor UUCP"
-HOMEPAGE="http://www.airs.com/ian/uucp.html"
-SRC_URI="mirror://gnu/uucp/uucp-${PV}.tar.gz"
-
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-
-DEPEND=">=sys-apps/sed-4"
-RDEPEND=""
-
-S="${WORKDIR}/uucp-1.07"
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
- epatch "${FILESDIR}/${P}-gentoo.patch"
- eautoreconf
-}
-
-src_compile() {
- append-flags -D_GNU_SOURCE -fno-strict-aliasing
- econf --with-newconfigdir=/etc/uucp || die "configure failed"
- make || die "make failed"
-}
-
-src_install() {
- dodir /usr/share/man/man{1,8}
- dodir /usr/share/info
- dodir /etc/uucp
- dodir /usr/bin /usr/sbin
- diropts -o uucp -g uucp -m 0750
- keepdir /var/log/uucp /var/spool/uucp
- diropts -o uucp -g uucp -m 0775
- keepdir /var/spool/uucppublic
-
- make \
- "prefix=${D}/usr" \
- "sbindir=${D}/usr/sbin" \
- "bindir=${D}/usr/bin" \
- "man1dir=${D}/usr/share/man/man1" \
- "man8dir=${D}/usr/share/man/man8" \
- "newconfigdir=${D}/etc/uucp" \
- "infodir=${D}/usr/share/info" \
- install install-info || die "make install failed"
- sed -i -e 's:/usr/spool:/var/spool:g' sample/config
- cp sample/* "${D}/etc/uucp"
- dodoc ChangeLog NEWS README TODO
-}
-
-pkg_preinst() {
- usermod -s /bin/bash uucp
-}
diff --git a/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild
new file mode 100644
index 0000000..730aa45
--- /dev/null
+++ b/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="Taylor UUCP"
+HOMEPAGE="https://www.airs.com/ian/uucp.html"
+SRC_URI="mirror://gnu/uucp/uucp-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+
+S="${WORKDIR}/uucp-${PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+ epatch "${FILESDIR}"/${P}-fprintf.patch
+ mv configure.{in,ac} || die
+ sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags -D_GNU_SOURCE -fno-strict-aliasing
+ econf --with-newconfigdir=/etc/uucp
+}
+
+src_install() {
+ dodir /usr/share/man/man{1,8}
+ dodir /usr/share/info
+ dodir /etc/uucp
+ dodir /usr/bin /usr/sbin
+ diropts -o uucp -g uucp -m 0750
+ keepdir /var/log/uucp /var/spool/uucp
+ diropts -o uucp -g uucp -m 0775
+ keepdir /var/spool/uucppublic
+
+ emake \
+ "prefix=${D}/usr" \
+ "sbindir=${D}/usr/sbin" \
+ "bindir=${D}/usr/bin" \
+ "man1dir=${D}/usr/share/man/man1" \
+ "man8dir=${D}/usr/share/man/man8" \
+ "newconfigdir=${D}/etc/uucp" \
+ "infodir=${D}/usr/share/info" \
+ install install-info
+ sed -i -e 's:/usr/spool:/var/spool:g' sample/config
+ cp sample/* "${ED}/etc/uucp" || die
+ dodoc ChangeLog NEWS README TODO
+}
+
+pkg_preinst() {
+ usermod -s /bin/bash uucp
+}
