gentoo resync : 16.09.2020

4 files changed, 97 insertions, 23 deletions

diff --git a/net-misc/taylor-uucp/Manifest b/net-misc/taylor-uucp/Manifest
index feb8ffe4e390..54140e2756f3 100644
--- a/net-misc/taylor-uucp/Manifest
+++ b/net-misc/taylor-uucp/Manifest
@@ -1,5 +1,6 @@
 AUX taylor-uucp-1.07-fprintf.patch 188 BLAKE2B 13900fdaffd964d5e38a4bc3d2acce2675ba74ee008676d97313b4b75ee5625aeff5b56fbdb1a89909fa4cb006102e43f65a2832a1805fb747608eb13054ebfe SHA512 468870a9e64f0ace876bc1254e264e634fc07011b9ffa5ca0ccecb23c925e2a4a5c4463e6741b265bc8df17d0a578710cc8ea135461a1dfcd1c782e991bc7623
-AUX taylor-uucp-1.07-gentoo.patch 5049 BLAKE2B 3d010ff0841df59196d38e7450b85c4d36c2ccd770a4c31d29962e3c3f87d5a264977fa2f715a9bb91fec44f60dd5e045eed440e0fb482be525702497f3ad2a1 SHA512 8d259ddf10c80ff6c349d3bec531f858d561f3f488fd6066d69ddb8d2242e9f22ff8781ce47dcdb10f3dbf4a073bc4bf3492f6fced30d8d129e6f81e860f971a
+AUX taylor-uucp-1.07-gentoo.patch 4895 BLAKE2B ec5faf0eda4ea26da7cbaa9ff2345cfbbc27f9ac99c28c8001da482f9036b6cf6f1c6c65d58354121c9391fd4b482f07103e02d4d8fb9d9687a64d91a0bc5a99 SHA512 93cc02fc476c4471cd057c812314709ad4b8218c653131428c905f6e57ddd57f094b8faef99a4b132352784918f89c94ebdc8ed40059aaf18ed2e1d8e3bf6143
+AUX taylor-uucp-1.07-remove-extern.patch 1852 BLAKE2B ab69378916f3fcde12da9d866ab03b369687f98b1f4363b1551d2806a9c1752078f1b061b5ea067287a8df18a1105eb7efcbc9b797a478130b2582acb0adf277 SHA512 8624fa2507345b162060dae91655ae9a36ac4102cfd43542a1cf735d91cf99a5a1cdefe862ee444634449acc585b69d111d9ffdb5cd9ea492fff11f05be0acda
 DIST uucp-1.07.tar.gz 1013234 BLAKE2B 5734bd1b8afcc9cb9b0dcc25afe73ee89b6007249a73d286bc39975bc0cd7a1907e360dfaa050175d87e34a7d468a70a7cae75124c920f00f03ff52f16629bb3 SHA512 13d215890234e638bed53dce7bab6eb78e0ce6b658f23ac1d7f8abc6e1d97963bef76aa4148ca644f450d5a1678fac940b73fbcd5845d7f5bea3afbd8055229b
-EBUILD taylor-uucp-1.07-r3.ebuild 1368 BLAKE2B af593bd0f85f6fdd57bc1834f3ca36d5a4299d66f4bdf08da2051db4e8d2a313260d29788d921f828a5ab2896be6e746f159f5c4b0456b6c6a406260f04d1c76 SHA512 c992c60e7c5f10f9ba617da965841d6c6c0342da8aa7b612e321e95b1b2bc8d534a351ad3a7e27287ce6604b94a207bd9baf14eaf4d835197e87388a677a07e9
+EBUILD taylor-uucp-1.07-r4.ebuild 1404 BLAKE2B 185747b1ff24b84b5e5e8d5a48f6d0c569657e09b5767948187041f065445c6c9ef6e25bd4a63b760f6486a18f3b05238be0ddf4a53c13d83224403be62ba67c SHA512 cab25c9e694b77e80f767bce1c0add5f2a33be748fa86f4a7d38ba17a3018435570923022d15ddb9c2302895a3f936d498fb99dfa81ae551ef2c2432ef4cb6aa
 MISC metadata.xml 319 BLAKE2B f7bd226c6082b2d19d38b6d20aa6d859e6076e226cf2ae3a4013ee5ff558f7dba27cee1fcd159785679fe03b37082d57232d7ecf6f86e832a60e3d8c4f528d57 SHA512 14fddbb3e6a6f0defe184c909d8ae29072782e3060dd5c91f852572039ca81be95f9cae98f6a4a011711cd991bcfa886638d725372463b3af4ee7f15654ad22d
diff --git a/net-misc/taylor-uucp/files/taylor-uucp-1.07-gentoo.patch b/net-misc/taylor-uucp/files/taylor-uucp-1.07-gentoo.patch
index 42839bab300c..86af851a9020 100644
--- a/net-misc/taylor-uucp/files/taylor-uucp-1.07-gentoo.patch
+++ b/net-misc/taylor-uucp/files/taylor-uucp-1.07-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Nru uucp-1.07.orig/Makefile.am uucp-1.07/Makefile.am
---- uucp-1.07.orig/Makefile.am	2003-05-30 00:10:23.000000000 +0000
-+++ uucp-1.07/Makefile.am	2009-03-06 18:41:48.000000000 +0000
+--- a/Makefile.am	2003-05-30 00:10:23.000000000 +0000
++++ b/Makefile.am	2009-03-06 18:41:48.000000000 +0000
 @@ -78,12 +78,12 @@
  
  install-exec-hook:
@@ -18,9 +17,8 @@ diff -Nru uucp-1.07.orig/Makefile.am uucp-1.07/Makefile.am
  	done
  if HAVE_MKDIR
  else
-diff -Nru uucp-1.07.orig/policy.h uucp-1.07/policy.h
---- uucp-1.07.orig/policy.h	2003-05-29 06:08:45.000000000 +0000
-+++ uucp-1.07/policy.h	2009-03-06 18:41:48.000000000 +0000
+--- a/policy.h	2003-05-29 06:08:45.000000000 +0000
++++ b/policy.h	2009-03-06 18:41:48.000000000 +0000
 @@ -302,8 +302,7 @@
  /* #define LOCKDIR "/usr/spool/locks" */
  /* #define LOCKDIR "/usr/spool/uucp/LCK" */
diff --git a/net-misc/taylor-uucp/files/taylor-uucp-1.07-remove-extern.patch b/net-misc/taylor-uucp/files/taylor-uucp-1.07-remove-extern.patch
new file mode 100644
index 000000000000..4a8efeeb83f3
--- /dev/null
+++ b/net-misc/taylor-uucp/files/taylor-uucp-1.07-remove-extern.patch
@@ -0,0 +1,67 @@
+From 84b5bf1e6b8cfad657b88f8b061e172e327ef970 Mon Sep 17 00:00:00 2001
+From: Nicolas Boichat <drinkcat@chromium.org>
+Date: Thu, 10 Sep 2020 17:06:37 +0800
+Subject: [PATCH] Remove external function declarations
+
+We need to redeclare functions that we already have.
+
+This causes issues with recent toolchains:
+init.c:100:14: error: redeclaration of 'getcwd' must have the 'overloadable' attribute
+extern char *getcwd ();
+             ^
+/build/amd64-generic/usr/include/bits/unistd.h:158:8: note: previous overload of function is here
+__NTH (getcwd (char *const __clang_pass_object_size __buf, size_t __size))
+       ^
+
+And also reduces the number of build warnings.
+
+This forked repo does the same thing in this (large) cleanup patch:
+https://github.com/quinot/taylor-uucp/commit/b599665ae1e085df0f96de5f50a738fceee02150
+---
+ unix/init.c | 30 ------------------------------
+ 1 file changed, 30 deletions(-)
+
+diff --git a/unix/init.c b/unix/init.c
+index d9d2147edd93..a9b7135be9f4 100644
+--- a/unix/init.c
++++ b/unix/init.c
+@@ -81,36 +81,6 @@
+ #endif /* ! defined (MAXPATHLEN) */
+ #endif /* HAVE_GETWD */
+ 
+-/* External functions.  */
+-#ifndef getlogin
+-extern char *getlogin ();
+-#endif
+-#if GETPWNAM_DECLARATION_OK
+-#ifndef getpwnam
+-extern struct passwd *getpwnam ();
+-#endif
+-#endif
+-#if GETPWUID_DECLARATION_OK
+-#ifndef getpwuid
+-extern struct passwd *getpwuid ();
+-#endif
+-#endif
+-#if HAVE_GETCWD
+-#ifndef getcwd
+-extern char *getcwd ();
+-#endif
+-#endif
+-#if HAVE_GETWD
+-#ifndef getwd
+-extern char *getwd ();
+-#endif
+-#endif
+-#if HAVE_SYSCONF
+-#ifndef sysconf
+-extern long sysconf ();
+-#endif
+-#endif
+-
+ /* Initialize the system dependent routines.  We will probably be running
+    suid to uucp, so we make sure that nothing is obviously wrong.  We
+    save the login name since we will be losing the real uid.  */
+-- 
+2.28.0.526.ge36021eeef-goog
+
diff --git a/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.07-r4.ebuild
index c32b453cdeef..40489f01df10 100644
--- a/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild
+++ b/net-misc/taylor-uucp/taylor-uucp-1.07-r4.ebuild
@@ -1,23 +1,28 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils flag-o-matic autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="Taylor UUCP"
 HOMEPAGE="https://www.airs.com/ian/uucp.html"
 SRC_URI="mirror://gnu/uucp/uucp-${PV}.tar.gz"
+S="${WORKDIR}/uucp-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ppc sparc x86"
 
-S="${WORKDIR}/uucp-${PV}"
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-fprintf.patch
+	"${FILESDIR}"/${P}-remove-extern.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-fprintf.patch
+	default
+
 	mv configure.{in,ac} || die
 	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
 	eautoreconf
@@ -31,7 +36,6 @@ src_configure() {
 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
@@ -39,19 +43,23 @@ src_install() {
 	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" \
+		"prefix=${ED}/usr" \
+		"sbindir=${ED}/usr/sbin" \
+		"bindir=${ED}/usr/bin" \
+		"man1dir=${ED}/usr/share/man/man1" \
+		"man8dir=${ED}/usr/share/man/man8" \
+		"newconfigdir=${ED}/etc/uucp" \
+		"infodir=${ED}/usr/share/info" \
 		install install-info
+
 	sed -i -e 's:/usr/spool:/var/spool:g' sample/config
-	cp sample/* "${ED}/etc/uucp" || die
+
+	insinto etc/uucp
+	doins sample/*
+
 	dodoc ChangeLog NEWS README TODO
 }
 
 pkg_preinst() {
-	usermod -s /bin/bash uucp
+	usermod -s /bin/bash uucp || die
 }