gentoo resync : 22.10.2018

3 files changed, 65 insertions, 0 deletions

diff --git a/app-arch/afio/Manifest b/app-arch/afio/Manifest
index e7070037ae8c..7ab27d994e42 100644
--- a/app-arch/afio/Manifest
+++ b/app-arch/afio/Manifest
@@ -1,4 +1,6 @@
+AUX afio-2.5.1-control-file-warning-fix.patch 776 BLAKE2B 6502ffa8200ef12394fe68678b7dd0ed8d61c8ab326eae660cfd1ea91d8c031dd8fe0895dfe41917add268ea3be2d053a5f132dd0033898eab8b606d346b407d SHA512 842c9bac9af3e5ece8c4bab55d5c1fd8f43585eb69e3f689d124e92e1972c5259510a206ba8c34d70f49f8e191ad1ad9b09a1b25efb63ed870c3322d00d6d249
 AUX afio-2.5.1-fix-build-system.patch 725 BLAKE2B 3ec8c1068d60db73727fabb02eae50005c1aef8db39df977add2ab312d627fbc16b107b1f007fad9be5b97d1afe02ec0fd38c97c80a804464f1e3985868a3f67 SHA512 ccf6af4e1591d9c8e519dcb9016c49c0a8601f2a03949270b205560bb13e90bdbd50079c4e0abcc3e6290a809ffb24455c00ee5cd70c0168b31b1c01b9bfc093
 DIST afio-2.5.1.tgz 191765 BLAKE2B 48a590c1180942444eb8fc17701563ee822cad9d0ae423e12996e7b3dff16ab7ba13d8041b78fb6415d1a422d14be8ba3443910ae1a57290dca801334ced7ffe SHA512 afa4e01cc9e7da5bff7c96d2da9a41c296e7b89c50484f58a8b011173a99a144a9e77d3ee8136622e490287b99a7ae76c6eba901a2186b5a3a6bab164a37c864
 EBUILD afio-2.5.1-r1.ebuild 687 BLAKE2B 8c2a97cccf64764bffcb2bc2f48f427f31d66b8a866629ec0e37f96196799bdf818c4afbd631a3d7caed2025d6a98b5897598b0f1afed133113e11d1453d4208 SHA512 f7a87a25cb38074faee92f6a6952b7060d73dd2311c7792f459b45419a995490a8686666525576c0a53300a003d51142fc50295ef105841369c2657cdd07c77e
+EBUILD afio-2.5.1-r2.ebuild 747 BLAKE2B f0e15e42aea6cde81bbec46cedff260505c10939d6710973cafe6733090790ba6336b591662bf46928ad8daedce763c56ddc8db99a629210a3f26073b0c78d5c SHA512 2c4e948401e1db29a8f80443a1c39941ec236db5c702f49d2621d107ea7953d2d3b2c84872f9525990dcf36b41d41141b5d9c1e17436fb1d945014652567fd00
 MISC metadata.xml 591 BLAKE2B 1f4dfca240f8986aba12ac0ee887fc49ccb50248c300d318e09807aa2552f6dc642f0f8a629fd34f1156b9e8407f7a429245893f999afc87db90cb9860329fc7 SHA512 ecde4bb37f668f30eedbb5b07a648fa23183d64593595948e6caf575fa78f8c666a406ed33b4d590190203920e1db7368dfc99b95948a7ab7896d12490f50760
diff --git a/app-arch/afio/afio-2.5.1-r2.ebuild b/app-arch/afio/afio-2.5.1-r2.ebuild
new file mode 100644
index 000000000000..fced7417de80
--- /dev/null
+++ b/app-arch/afio/afio-2.5.1-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Afio creates cpio-format archives."
+HOMEPAGE="http://members.chello.nl/k.holtman/afio.html https://github.com/kholtman/afio"
+SRC_URI="http://members.chello.nl/k.holtman/${P}.tgz"
+
+LICENSE="Artistic LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.1-fix-build-system.patch
+	"${FILESDIR}"/${PN}-2.5.1-control-file-warning-fix.patch
+)
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin "${PN}"
+	doman "${PN}.1"
+	dodoc ANNOUNCE-* HISTORY README SCRIPTS
+
+	local i
+	for i in {1..4}; do
+		docinto "script${i}"
+		dodoc -r "script${i}"/.
+	done
+}
diff --git a/app-arch/afio/files/afio-2.5.1-control-file-warning-fix.patch b/app-arch/afio/files/afio-2.5.1-control-file-warning-fix.patch
new file mode 100644
index 000000000000..f1c93c8e914c
--- /dev/null
+++ b/app-arch/afio/files/afio-2.5.1-control-file-warning-fix.patch
@@ -0,0 +1,29 @@
+Only in b: 1
+diff -ubBr a/afio.c b/afio.c
+--- a/afio.c	2018-03-23 09:16:07.230401966 -0400
++++ b/afio.c	2018-03-23 09:20:05.614421756 -0400
+@@ -3724,7 +3724,8 @@
+ 	
+ 	/* ASX check if file changed between the begining 
+ 	   and end of the backup */
+-	if (*fsname)
++        /* if *fsname==0, it was a control file, so do not check then */
++	if (*fsname!=0)
+ 	{
+ 	    struct stat st;
+ 	    /* I must check fsname ! 
+@@ -3739,13 +3740,10 @@
+ 	        if (st.st_mtime!=sb.sb_mtime)
+ 	        {
+ 	            warn (fsname, "File was modified during its backup");
++		    if(index(ignorewarnings,(int)'d')) warnings--;
+ 	        }
+ 	    }
+ 	}
+-	else
+-	{
+-	    warn (name, "ASX no fsname for this name ??");
+-        }
+ 	
+ 	if(aflag && *fsname && ((sb.sb_mode & S_IFMT)==S_IFREG))
+ 	{