gentoo resync : 09.12.2017

5 files changed, 79 insertions, 10 deletions

diff --git a/app-arch/pax/Manifest b/app-arch/pax/Manifest
index 57cb29c31189..c49835f12aee 100644
--- a/app-arch/pax/Manifest
+++ b/app-arch/pax/Manifest
@@ -1,10 +1,12 @@
-AUX pax-20160306-glibc-to-linux.patch 932 BLAKE2B 65fb9122aa89eeb14df5f73b08649b8240bcccd81ac02c5b189441762566fa9d7c15cc5765187023b6c852c5cc84665333e463ffc1a9fb44b432b46105da1917 SHA512 96d018bd1be2b0d22c9c5e11a92d8cf7ef9bc72d1b13686e572aa15935f2fda9d507baf1e0eb916fec776c2f9d7bab458c203cab64446eed34b70f544109d1d7
+AUX pax-20160306-glibc-to-linux.patch 852 BLAKE2B ebca2d148954e511d3a4f79ef96cadad0eb93c35e9959a2fe6833c8371aa8c2d20f2a471ef3e8e19efbebd2f15ae1ff66ab976191166603998cf4b4ccbc705ce SHA512 f6ee4abbc2f9a422a735fc6a09098a6bec9b855211bcdce088cc7362cb88def65ec574d91ad7cc48ee055e0438d481ed1e4b6ff650419ce3c7c09449ab82b69a
 AUX pax-3.4-fix-fts-includes.patch 709 BLAKE2B 74d067cbab62d012df9779d97e7d8b6da3274ad145547ed76f02c57c95197b9349012796d0715165b85ce9dc0f0a5ad2be3748177ebae8d33a7758026dfabab0 SHA512 16acd8b4f479a401e93a0bac6dc2436d0da833de697fd0b374c3293a429bcece18ba8344d5be043353664caec25f1e7717312870f07132b571d5000a5b0c10d6
 AUX pax-3.4-sysmacros.patch 204 BLAKE2B 88a56b40d4903f8c47d180fabe57e625f8f07e78962530424e0ca0dbbd86f9ef22bf700518622c4adb80f9926a63fbfdbfc9352b88ce286b02353a2c54631fa5 SHA512 9f99e0943aa243aeb026f23686bd09a3ded69903010495cfbee22eaac4b4c586103884e6275c63510bcd82d5cbbce13b4276996cfae5c6e522ec75bc3902a0d7
 AUX pax-3.4-x32.patch 6252 BLAKE2B 27ea01a3fd2935642f0d819e5acda87889d6f9fccea8d940e6acf301de2fcfc45e90d3162620d4eac0786e792af9ff1bb5fb97a3556733ca20ba7113b85fa8bd SHA512 048a450eecf25333a9f4b20a1cf20c088636dd579b0ee37517e378793360429c8e0c86a4ebebb47ef15005ee10a265e359932deab970b86e35a2743d86e43d08
-DIST pax-3.4-12.fc16.src.rpm 171016 SHA256 b86ca0556b12600d3dd4777900baae5118e71ce9e026e42e3bb51aed23853932 SHA512 78704cd1b66288acdaa8fdf4ca0a97c12b1e843e024be4d3fac88a6b42049928c6bfe69a72a58a00a9bf755c23e1e8e0b7d30bc72ba08a83830495dd5f6d9be1 WHIRLPOOL 8a674356efa939ceff0f502de926688d81f17da48c98f24674a76f11043f420c33aa9f47eb66fb1e896ddc4ca4c64cec554d7397379d1ccc884bf02b37eb9b29
-DIST paxmirabilis-20160306.cpio.gz 147448 SHA256 4e36fabfabc01a15e0d01eee0306cef79a7f374586f46254dae139eb866ae81b SHA512 65c9613f235d973f23d829d87b93963f4b21beca4d7158abb8243f7f0ba8eb883544bbd0c16bde82f0e55ab2fbf33e3dfb155a50c0f5be3bf6d88eaf95e1037f WHIRLPOOL 5945f45cc69cfd25d7754a9b6b25db98170de2fc926ffe3a661402d95bc41517e40ff059998d682cc65e32fd7e70a78e222525012eb98dde54c1d67c0c6c2277
+DIST pax-3.4-12.fc16.src.rpm 171016 BLAKE2B 94332a7cd24613c4488c1f00de3bcebeba9a82bc948b3cf83274c5a8d3efb5f687f1363376c40e5dc17a001a2f8c677b49d219a9530ece1710d2f7ddd60a9f44 SHA512 78704cd1b66288acdaa8fdf4ca0a97c12b1e843e024be4d3fac88a6b42049928c6bfe69a72a58a00a9bf755c23e1e8e0b7d30bc72ba08a83830495dd5f6d9be1
+DIST paxmirabilis-20160306.cpio.gz 147448 BLAKE2B b2a9bcfbb6d2007b8a4162b8d010c2a34f7ebc8595a8c20f6b8e973d85421a7f21f24d90b3d0228e5c9921b69dec1ef0ddcd4ee540f95072237255ecf309016d SHA512 65c9613f235d973f23d829d87b93963f4b21beca4d7158abb8243f7f0ba8eb883544bbd0c16bde82f0e55ab2fbf33e3dfb155a50c0f5be3bf6d88eaf95e1037f
+DIST paxmirabilis-20161104.cpio.gz 148061 BLAKE2B 997a126d3048488e1a4e49ff9753de2ebdbe75b7daedbea8c95ab5f1902d4768d4b12b13fa684cb2a7c2fe8470ab60e19ea3f9430429a6a4e6e1d57993130fd4 SHA512 42ec8365a5efb9ffb9d383cece39ffaac85c1c8d69856ec557a5567cf0d28d98a0f2d4b7fed53572366eba12c71111cc80b591d51c6a19a3e6437efb62af33ce
 EBUILD pax-20160306.ebuild 1423 BLAKE2B b53926a547d5969dfc9350ade35551912b8fd6c2498f67531a5102fbee0637662e69c115a7bceaf694aebc50769f9014de6d295aecef08c61f86aed7384932a3 SHA512 f1845f4921f165c8ba3130edd20fc3972c701caeec35fdbca0898faddc23c08c076a290a983786ff4e28f9ceb1fa1d5af3b230bad3701dfdc990720cc35e0cfc
-EBUILD pax-3.4.12.16-r1.ebuild 1093 BLAKE2B 9eba254c208bfce28f5b3945010a6779230fd2259d4662dd2dffc54a604e82b96c598fe257d38f34db60f6cfc579cd37568871521631ce61b84633f5e23acff8 SHA512 0eb424739cece9e87e6c8154733dd2035248f1f64b713dd532e4c342c10b4eb0b917e9aa548363a20314f2c01d1669bb781aa6836143849020473fe1340aa935
-EBUILD pax-3.4.12.16.ebuild 978 BLAKE2B 333adc4ae045d51c8b5c9ff6d90d5a8f97a57c1216adc48bc21187f0db4812d75cdd316e22bd8ccea928eeb3c800047acab623093e6752b7d44ac3c91dc291b5 SHA512 641c0574dd68f22aab3bf9d9c1c1ef28369e06c082af391eb6aded79225f23549712e7b4d999b92bee42eabb1b49205cc0f458cc5fbb1d02e774f6c9249ddea6
+EBUILD pax-20161104.ebuild 1465 BLAKE2B 11f30cd858cda8fae6c83dd3a9e348573e264b36e3cfbb55dcaa7b827511836b115b986a9854ff15dce222469f882965076ec06cea7838d2a3426235044d37e3 SHA512 8ff16c279547707525d74e9d03c5b4757614b37afa39c33b315d3d05ce4ee37c2b63f26d9d32126a22681eb966cfb6752035b67f1596353bb345945a2ecda7cf
+EBUILD pax-3.4.12.16-r1.ebuild 1115 BLAKE2B 6f7bf0b2542e19ff6384f974c91856236571ed8ef63f3ff08a66292c73893f853f9a04be1354625478d714a428d2d2e0ef18554499b6fe4dbd17aa739af7a0fe SHA512 e8c555c337a83262a42be1074ec25cc471e08b03217254bddb3d0953ba6ba1e1aa2ea3c741d88face59e026b1ba1e8ffaf2a06840ab72da249a475be1f5d7547
+EBUILD pax-3.4.12.16.ebuild 1008 BLAKE2B 4ef6727535ef6773796832fa9cfe05565b23f2335754396939c1c621d8984e53fd0395275f47f4d071203bbb7a6fa68603e00d096467883434e89370d0a2e517 SHA512 c08f62d99219a9e9bf991be56c1c425c1ba595e9413814f91e7357b9ea6337404922952a39f4da3202c5ef00ef5807e225b97ce7611b2cd6590c0e90685fc51a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/pax/files/pax-20160306-glibc-to-linux.patch b/app-arch/pax/files/pax-20160306-glibc-to-linux.patch
index f864729cc4fe..eec6624eedc2 100644
--- a/app-arch/pax/files/pax-20160306-glibc-to-linux.patch
+++ b/app-arch/pax/files/pax-20160306-glibc-to-linux.patch
@@ -1,5 +1,5 @@
---- pax/cache.c.old	2016-03-06 08:12:52.000000000 -0600
-+++ pax/cache.c	2016-04-17 13:01:26.461307830 -0500
+--- a/cache.c
++++ b/cache.c
 @@ -195,7 +195,7 @@
  	 * No entry for this uid, we will add it
  	 */
diff --git a/app-arch/pax/pax-20161104.ebuild b/app-arch/pax/pax-20161104.ebuild
new file mode 100644
index 000000000000..da9f50e30b24
--- /dev/null
+++ b/app-arch/pax/pax-20161104.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit unpacker toolchain-funcs flag-o-matic
+
+DESCRIPTION="pax (Portable Archive eXchange) is the POSIX standard archive tool"
+HOMEPAGE="https://www.mirbsd.org/pax.htm"
+SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${PV}.cpio.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+RDEPEND="
+	dev-libs/libbsd
+	elibc_musl? ( sys-libs/fts-standalone )
+"
+DEPEND="
+	${RDEPEND}
+	$(unpacker_src_uri_depends)
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-20160306-glibc-to-linux.patch"
+)
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	# Newer C libraries omit this include from sys/types.h.
+	sed -i '1i#include <sys/sysmacros.h>' extern.h || die
+	default
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+	use elibc_musl && append-ldflags "-lfts"
+
+	# We can't rely on LFS flags as it uses the fts.h interface which lacks 64-bit support.
+	set -- \
+		${CC} ${CPPFLAGS} ${CFLAGS} \
+		-DPAX_SAFE_PATH=\"/bin:/usr/bin\" \
+		-DHAVE_STRLCPY -DHAVE_VIS -DHAVE_STRMODE \
+		-DLONG_OFF_T -DHAVE_LINKAT \
+		$(${PKG_CONFIG} --cflags libbsd-overlay) \
+		-Wall ${LDFLAGS} *.c -o ${PN} \
+		$(${PKG_CONFIG} --libs libbsd-overlay)
+	echo "$@"
+	"$@" || die
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+
+	dosym pax /usr/bin/paxcpio
+	newman cpio.1 paxcpio.1
+
+	dosym pax /usr/bin/paxtar
+	newman tar.1 paxtar.1
+}
diff --git a/app-arch/pax/pax-3.4.12.16-r1.ebuild b/app-arch/pax/pax-3.4.12.16-r1.ebuild
index 7962aaaf3f41..2b39f887b604 100644
--- a/app-arch/pax/pax-3.4.12.16-r1.ebuild
+++ b/app-arch/pax/pax-3.4.12.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -28,6 +28,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/pax-3.4-sysmacros.patch
 	sed -i configure.in \
 		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+		-e 's|-Werror||g' \
 		-e '/AC_PROG_RANLIB/a AC_PROG_MKDIR_P' \
 		|| die
 	eautoreconf
diff --git a/app-arch/pax/pax-3.4.12.16.ebuild b/app-arch/pax/pax-3.4.12.16.ebuild
index cdd4636f56d9..42fbe159f96a 100644
--- a/app-arch/pax/pax-3.4.12.16.ebuild
+++ b/app-arch/pax/pax-3.4.12.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -25,7 +25,10 @@ src_prepare() {
 	rpm_spec_epatch ../${PN}.spec
 	epatch "${FILESDIR}"/pax-3.4-x32.patch
 	epatch "${FILESDIR}"/pax-3.4-sysmacros.patch
-	sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+	sed -i configure.in \
+		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+		-e 's|-Werror||g' \
+		|| die
 	eautoreconf
 }