gentoo resync : 14.05.2020

3 files changed, 4 insertions, 40 deletions

diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index a7e2f624eb26..839020e95aeb 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -1,5 +1,3 @@
-DIST slirp4netns-1.0.0.tar.gz 51919 BLAKE2B 9d2d95de80e644981f185a6c243949e55761b25cb908c1ee727f06264d08e794e8228a197e0cc858f81f582d3ddb349c5d6cd2566944c63f41299fb2a5a0d3d2 SHA512 fe0256f0b91647b361999915c6c2b975ee33c437afef3cf490f5e33f582da4db97e360e86654831d7e9b2a8b0d78c91080874a9377247693ac54ffdb60ca6fb9
 DIST slirp4netns-1.0.1.tar.gz 51911 BLAKE2B d125dd2c24fd7a817d2b8f16c6bac66399a4a0f37c49d43541f336e7ff09673bca2d6ed2c62cc856034b8e2f6e11ac1ff3753d3546148e68ddf085e8b9aca354 SHA512 4947e32d88c3c8f1b7b2e94a1e73041a48cc8ddf75ffaf691d44cb6ebeaef5cf0b0abb7a8df8919682dfc854a76d73fc5bdebcf01b3ace97be187068d704bf63
-EBUILD slirp4netns-1.0.0.ebuild 783 BLAKE2B 93a68b4f0ddc4b385d120b2c782d93349e03fe0098bce11a426e8fa53ee6cd049337688aa581c87307c57b59e4e5ada8656b24d89ef6da3dbbf360ab54167a5c SHA512 bbf7d29b57ea330aff86edc3547a08ffa13ca247d3e0f1979be201b27568c70cf714b9d8fb6c16b81886a4583a3d7c042476b9b61815b9f202e1f8a468a7c5e2
-EBUILD slirp4netns-1.0.1.ebuild 783 BLAKE2B 93a68b4f0ddc4b385d120b2c782d93349e03fe0098bce11a426e8fa53ee6cd049337688aa581c87307c57b59e4e5ada8656b24d89ef6da3dbbf360ab54167a5c SHA512 bbf7d29b57ea330aff86edc3547a08ffa13ca247d3e0f1979be201b27568c70cf714b9d8fb6c16b81886a4583a3d7c042476b9b61815b9f202e1f8a468a7c5e2
+EBUILD slirp4netns-1.0.1.ebuild 942 BLAKE2B 970fc2e131a194f9387230c3ce6b2516797f9cf72a0e9a7456068716cc3cff9cad4df827b55f751b44497a253eba9566bd3b175963c28f4fa7c3637553560f15 SHA512 340f4ec282e903a44770c10b7b74580bf14562f627a8fcf53b148a37d55ea85da8849960a9ebcd69a146f7a9ee1fe95c87a374c36da32149234a9eef0a86aa2b
 MISC metadata.xml 601 BLAKE2B eac6bf1b21371c913f648e944a1ba75314e772c1f0f5fdeda9d4c49cf279a15c19c9f6347ec1a3df236a6147c3d01f4084e161a81c2ee1e4db55cc9f8508d26f SHA512 d81b6889e71bf3fdc539f6c5ca057a8900f13009eafb711c4d83bb0cb349cf49f9253c0b8207a4c1f4c3b084bc9c9b0b91e75109843662fb72d25a2485cbf7dd
diff --git a/app-emulation/slirp4netns/slirp4netns-1.0.0.ebuild b/app-emulation/slirp4netns/slirp4netns-1.0.0.ebuild
deleted file mode 100644
index 4aaf598fb7e5..000000000000
--- a/app-emulation/slirp4netns/slirp4netns-1.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="User-mode networking for unprivileged network namespaces"
-HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/glib:2=
-	dev-libs/libpcre:=
-	net-libs/libslirp:=
-	sys-libs/libseccomp:=
-	sys-libs/libcap:="
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RESTRICT="test"
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You need to have the tun kernel module loaded in order to have"
-		elog "slirp4netns working"
-	fi
-}
diff --git a/app-emulation/slirp4netns/slirp4netns-1.0.1.ebuild b/app-emulation/slirp4netns/slirp4netns-1.0.1.ebuild
index 4aaf598fb7e5..2d9af4a06ab7 100644
--- a/app-emulation/slirp4netns/slirp4netns-1.0.1.ebuild
+++ b/app-emulation/slirp4netns/slirp4netns-1.0.1.ebuild
@@ -25,6 +25,9 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 src_prepare() {
+	# Respect AR variable for bug 722162.
+	sed -e 's|^AC_PROG_CC$|AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])\nAC_PROG_AR\n\0|' \
+		-i configure.ac || die
 	eautoreconf
 	default
 }