From 15a3dcefa0543f673defa18c52dc07b543ff49d6 Mon Sep 17 00:00:00 2001
From: "Andreas Billmeier (@STR/VW3)" <andreas.billmeier@streicher.de>
Date: Fri, 27 Oct 2023 16:19:21 +0200
Subject: [PATCH] net-misc/rancid: bump, EAPI8

---
 net-misc/rancid/Manifest                      |  3 +-
 net-misc/rancid/rancid-3.13-r3.ebuild         | 43 -------------------
 ...d-3.13-r2.ebuild => rancid-3.13-r4.ebuild} | 21 +++++----
 3 files changed, 11 insertions(+), 56 deletions(-)
 delete mode 100644 net-misc/rancid/rancid-3.13-r3.ebuild
 rename net-misc/rancid/{rancid-3.13-r2.ebuild => rancid-3.13-r4.ebuild} (88%)

diff --git a/net-misc/rancid/Manifest b/net-misc/rancid/Manifest
index d207b3e..dee1510 100644
--- a/net-misc/rancid/Manifest
+++ b/net-misc/rancid/Manifest
@@ -1,4 +1,3 @@
 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-r2.ebuild 2858 BLAKE2B 242cbbeeec4f7df06d823f91c85082417070a13f841ecd78a8593987997975065acc0cfd79ca70d92f3d4e8283d6377c139608c5f7cee476ab1c9afaa0020f69 SHA512 0cd1488a991504a667ced27878573fa1f5652dff422c9c938003b7da30f4349db92603fa4c6d28a139fb5ebd40c9dbe24feed71ef6a3abe00e8a764a9e15c4b2
-EBUILD rancid-3.13-r3.ebuild 851 BLAKE2B a50e023833962464e2ea815c26c7a7313f09b1501d87812cf1339c225b694629cea6cfbb51c30cf2617cca2210d12e178bd063e66945ceab122c961b7989c4c2 SHA512 687637f37fa1658805a557970d5ca9698fdfa101e4241eefa6ed33ed8cfdd28ae82d864ce31834363397d12fd8cb0b09971ecb72c82c7c24df3846f656bb8577
+EBUILD rancid-3.13-r4.ebuild 2749 BLAKE2B 344124d3b53ddfe28404979e2eb9ca0e02a954fb6fee6f2da4b92828f83c6487b7bbf410db8f45185e4e594c5ee688e6ff9fecc10d4c7e467744750d10c174c4 SHA512 01ba8b68cefb56a88036241713c9d0d466c17a451f42d6856091ca6342939b59329935f203cb92105a6e41b0c8a5d2d6456b5a494ebf743dad9e6bfb84d1560d
diff --git a/net-misc/rancid/rancid-3.13-r3.ebuild b/net-misc/rancid/rancid-3.13-r3.ebuild
deleted file mode 100644
index ed92f38..0000000
--- a/net-misc/rancid/rancid-3.13-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Really Awesome New Cisco confIg Differ"
-HOMEPAGE="https://shrubbery.net/rancid/"
-SRC_URI="https://shrubbery.net/pub/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	acct-group/rancid
-	acct-user/rancid
-	dev-tcltk/expect
-	net-misc/iputils
-	net-misc/openssh
-	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir="/var/lib/${PN}"
-		--sysconfdir="/etc/${PN}"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-#src_install() {
-#	default
-#	insinto "/etc/cron.d/"
-#	newins "${FILESDIR}/${PN}-cron" "${PN}"
-#}
-
-pkg_postinst() {
-	optfeature "cvs" dev-vcs/cvs
-	optfeature "git" dev-vcs/git
-	optfeature "subversion" dev-vcs/subversion
-}
diff --git a/net-misc/rancid/rancid-3.13-r2.ebuild b/net-misc/rancid/rancid-3.13-r4.ebuild
similarity index 88%
rename from net-misc/rancid/rancid-3.13-r2.ebuild
rename to net-misc/rancid/rancid-3.13-r4.ebuild
index 734c48f..e7ee636 100644
--- a/net-misc/rancid/rancid-3.13-r2.ebuild
+++ b/net-misc/rancid/rancid-3.13-r4.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-
-inherit autotools eutils
+EAPI="8"
 
 DESCRIPTION="Really Awesome New Cisco confIg Differ"
-HOMEPAGE="http://www.shrubbery.net/rancid/"
-SRC_URI="ftp://ftp.shrubbery.net/pub/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.shrubbery.net/rancid/"
+SRC_URI="https://shrubbery.net/pub/${PN}/${P}.tar.gz"
 LICENSE="BSD-4"
 
 SLOT="0"
@@ -17,12 +15,10 @@ REQUIRED_USE="^^ ( git cvs subversion )"
 
 # app-arch/par is blocker, due to bug #455838
 DEPEND="
-	!app-arch/par
-	acct-group/rancid
 	acct-user/rancid
 	dev-lang/perl
 	dev-lang/tcl:0=
-	=dev-tcltk/expect-5.45.4-r1
+	dev-tcltk/expect
 	sys-apps/diffutils
 	git? ( dev-vcs/git )
 	cvs? ( dev-vcs/cvs )
@@ -33,10 +29,13 @@ DEPEND="
 	)"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-no_network_in_sandbox.patch" )
+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'
 }
@@ -61,12 +60,12 @@ src_install() {
 	echo "CONFIG_PROTECT=\"${EPREFIX}/var/rancid/.cloginrc\"" > "${T}"/99${PN}
 	doenvd "${T}"/99${PN}
 
-	readme.gentoo_src_install
 }
 
 pkg_preinst() {
 	keepdir /var/${PN}{,/logs}
 	touch 	"${ED}"/var/${PN}/.cloginrc
+
 	fperms ug=rwX,o= /var/${PN}/{,logs,.cloginrc}
 	fowners ${PN}:${PN} /var/${PN}/{,logs,.cloginrc}
 }