net-misc/rancid: update 3.13-r5, fix network hack

net-misc/rancid/Manifest

@@ -1,3 +1,2 @@
-AUX rancid-3.13-no_network_in_sandbox.patch 1638 BLAKE2B 1f8b827a69f08d524031627b710e5132e7e0293fb11719b2e25c37ddceccf163b517fed1059566fcfc97a123232d64036249df87ac049f1417f30c4dc95773f9 SHA512 9cabb25f1136fb8f61a9caa3d3466651a5ba34bcae7e4419953ee35c7885f8853681ec37e8b15033ce82b83b7c9878d3a271640412e7a0ef5cecba8f5e104cd2
 DIST rancid-3.13.tar.gz 506297 BLAKE2B cb28c03a09ecbc79b55c4962880c54088908598ceaacdc62751fdd2adf08fdb3e38917365c47e95eb7b49671731d8146bb6d6cb2f775cc9ff57c83eed92deb5e SHA512 2dbd8a743a03cd94b474c08b0bb1868a991353690b9f3ff2828d16a3a102ca68e4092cb07f24ec4e57c4436e6657f3f2638f890069fbbd35d6c7a34d5bd55df5
-EBUILD rancid-3.13-r4.ebuild 2749 BLAKE2B 344124d3b53ddfe28404979e2eb9ca0e02a954fb6fee6f2da4b92828f83c6487b7bbf410db8f45185e4e594c5ee688e6ff9fecc10d4c7e467744750d10c174c4 SHA512 01ba8b68cefb56a88036241713c9d0d466c17a451f42d6856091ca6342939b59329935f203cb92105a6e41b0c8a5d2d6456b5a494ebf743dad9e6bfb84d1560d
+EBUILD rancid-3.13-r5.ebuild 2912 BLAKE2B b806f4fe1513a007fe3b1b9329374e37a3bc0fed0112ef2599ec0db4df7a673bff2df40bb2ea26965bf1695c976d1d1fbd9b8b2df7fa0ce3428704b0eb0a93ad SHA512 8665e9a389889286ef8120dd3c89fbf9d9985a1d2587e01c79e22d1da67e6396ffacf77ca9f52ff204197b58fc2b23516b6ed5e1dec496036cb71461eb77b21b

net-misc/rancid/files/rancid-3.13-no_network_in_sandbox.patch

@@ -1,63 +0,0 @@
-diff --git a/configure b/configure
-index 9d32907..a5118bf 100755
---- a/configure
-+++ b/configure
-@@ -5500,24 +5500,7 @@ fi
- # ping seems to take one of two formats for count (N)
- # BSD: ping -c N host
- # SVR: ping host N
--$PING_PATH -c 1 -v 127.0.0.1 > /dev/null 2>&1
--if test $? -eq 0 ; then
--    LG_PING_CMD="$PING_PATH -c 1"
--else
--    $PING_PATH 127.0.0.1 56 1 > /dev/null 2>&1
--    if test $? -eq 0 ; then
--	LG_PING_CMD="$PING_PATH"
--    else
--	# cygwin using windows ping?
--	$PING_PATH -n 1 127.0.0.1 > /dev/null 2>&1
--	if test $? -eq 0 ; then
--	    LG_PING_CMD="$PING_PATH -n 1"
--	else
--            as_fn_error $? "can't figure out how to pass count == 1 to $PING_PATH." "$LINENO" 5
--	    exit 1
--	fi
--    fi
--fi
-+LG_PING_CMD="$PING_PATH -c 1"
- 
- rd_cv_lg_ping_cmd=$LG_PING_CMD
- 
-diff --git a/configure.ac b/configure.ac
-index ad0dd08..1147b36 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -351,26 +351,8 @@ if test $PING_PATH = no; then
-     exit 1
- fi
- # ping seems to take one of two formats for count (N)
--# BSD: ping -c N host
--# SVR: ping host N
--$PING_PATH -c 1 -v 127.0.0.1 > /dev/null 2>&1
--if test $? -eq 0 ; then
--    LG_PING_CMD="$PING_PATH -c 1"
--else
--    $PING_PATH 127.0.0.1 56 1 > /dev/null 2>&1
--    if test $? -eq 0 ; then
--	LG_PING_CMD="$PING_PATH"
--    else
--	# cygwin using windows ping?
--	$PING_PATH -n 1 127.0.0.1 > /dev/null 2>&1
--	if test $? -eq 0 ; then
--	    LG_PING_CMD="$PING_PATH -n 1" 
--	else
--            AC_MSG_ERROR([can't figure out how to pass count == 1 to $PING_PATH.])
--	    exit 1
--	fi
--    fi
--fi
-+LG_PING_CMD="$PING_PATH -c 1"
-+
- AC_SUBST(LG_PING_CMD)
- rd_cv_lg_ping_cmd=$LG_PING_CMD
- 

net-misc/rancid/rancid-3.13-r5.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -29,15 +29,16 @@ DEPEND="
 	)"
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/fix-configure.patch"
-)
-
 src_prepare() {
 	default
 
 	# respect CFLAGS, bug #455840
 	sed -i -e '/^CFLAGS/d' bin/Makefile.am || die 'sed on bin/Makefile.am failed'
+
+	# we have no network in sandbox, and we use -c to pass pingcount
+	# delete the whole unneccesary block
+	sed -i -e '5500,5521d;' configure || die
+	sed -i '5500 i LG_PING_CMD="$PING_PATH -c 1"' configure || die
 }
 
 src_configure() {