From e5206efa6e88d32e3819685adee35c49124ccf0e Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 2 Sep 2023 16:16:36 +0100
Subject: gentoo auto-resync : 02:09:2023 - 16:16:36

---
 net-misc/Manifest.gz                               | Bin 54267 -> 54267 bytes
 net-misc/babeld/Manifest                           |   2 -
 net-misc/babeld/babeld-1.8.2.ebuild                |  23 ------
 net-misc/gallery-dl/Manifest                       |   6 --
 net-misc/gallery-dl/gallery-dl-1.25.5.ebuild       |  40 ----------
 net-misc/gallery-dl/gallery-dl-1.25.6.ebuild       |  40 ----------
 net-misc/gallery-dl/gallery-dl-1.25.7.ebuild       |  40 ----------
 net-misc/geoipupdate/Manifest                      |   4 -
 net-misc/geoipupdate/geoipupdate-2.3.1.ebuild      |  26 -------
 net-misc/geoipupdate/geoipupdate-3.1.1.ebuild      |  26 -------
 net-misc/oidentd/Manifest                          |   5 +-
 .../oidentd/files/oidentd-2.5.0-respect-ar.patch   |  12 ---
 net-misc/oidentd/oidentd-2.5.0.ebuild              |  55 --------------
 net-misc/oidentd/oidentd-3.1.0.ebuild              |  57 +++++++++++++++
 net-misc/pedro/Manifest                            |   4 -
 net-misc/pedro/files/pedro-1.6-portage.patch       |  20 -----
 net-misc/pedro/pedro-1.6-r1.ebuild                 |  52 -------------
 net-misc/whois/Manifest                            |   4 +-
 net-misc/whois/whois-5.5.17-r1.ebuild              |  81 +++++++++++++++++++++
 net-misc/whois/whois-5.5.17.ebuild                 |  81 ---------------------
 net-misc/whois/whois-5.5.18-r1.ebuild              |  81 +++++++++++++++++++++
 net-misc/whois/whois-5.5.18.ebuild                 |  81 ---------------------
 22 files changed, 223 insertions(+), 517 deletions(-)
 delete mode 100644 net-misc/babeld/babeld-1.8.2.ebuild
 delete mode 100644 net-misc/gallery-dl/gallery-dl-1.25.5.ebuild
 delete mode 100644 net-misc/gallery-dl/gallery-dl-1.25.6.ebuild
 delete mode 100644 net-misc/gallery-dl/gallery-dl-1.25.7.ebuild
 delete mode 100644 net-misc/geoipupdate/geoipupdate-2.3.1.ebuild
 delete mode 100644 net-misc/geoipupdate/geoipupdate-3.1.1.ebuild
 delete mode 100644 net-misc/oidentd/files/oidentd-2.5.0-respect-ar.patch
 delete mode 100644 net-misc/oidentd/oidentd-2.5.0.ebuild
 create mode 100644 net-misc/oidentd/oidentd-3.1.0.ebuild
 delete mode 100644 net-misc/pedro/files/pedro-1.6-portage.patch
 delete mode 100644 net-misc/pedro/pedro-1.6-r1.ebuild
 create mode 100644 net-misc/whois/whois-5.5.17-r1.ebuild
 delete mode 100644 net-misc/whois/whois-5.5.17.ebuild
 create mode 100644 net-misc/whois/whois-5.5.18-r1.ebuild
 delete mode 100644 net-misc/whois/whois-5.5.18.ebuild

(limited to 'net-misc')

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index cc016682bfbd..10ac5962140d 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/babeld/Manifest b/net-misc/babeld/Manifest
index 60fbad1636d1..7199a79c5acf 100644
--- a/net-misc/babeld/Manifest
+++ b/net-misc/babeld/Manifest
@@ -1,6 +1,4 @@
 AUX babeld 314 BLAKE2B c0bf51460d6de136acf70533f9da0a59dc3e5cbdcc49ba05cdfbd134d37655fa12f929b1f5860390fe836e988b70e00d5b05bca0b7dcabfd0807126307b4e6e5 SHA512 bcde060f79bc37f3179d1ce2ca396f8200d0f4df24b2c51e2def44567071f8e38a9562ed72f48875ff195aadf6ab49c50616a828b4ed01d4963facde25a65897
-DIST babeld-1.8.2.tar.gz 92852 BLAKE2B ddf64558ebe2c96812e0b68382cda118539a1221fa15df7ee5d6aa67cdb5e1da556e4518371580bfb9df61780f559892787057605a02b8870c0a8e1f2018fc5d SHA512 08ef0747a672e7a3f2e06d4082da0d021378cea94633fdddf7de38178552bc5a587852fdb5c8bfdeeb6897ba4fd61c78e6ee4d19523a6c3e60d0e3c150418319
 DIST babeld-1.9.1.tar.gz 94668 BLAKE2B 169932e8d37d683bfa7e945e313d17c3ee633d11031d940ef3f5be3e0a9fbaffb28d47cf9f6d6ef6b25130af9a485ac4a629d0009485021d6f2fe19ec5382788 SHA512 433a9a2da02c56e93f5fc5f9399320f7f4dbac8d87eff9a539300d5740269eeda6be1302a2cf4a4b9c524780b286d9eb7898585fc530129a1f84341faf1e6fd0
-EBUILD babeld-1.8.2.ebuild 529 BLAKE2B c5b9c2705ae547218d13c27f14089b0fbb0a3d28e80a61b503eb13e0a63e135b32b2b7b101e1c4a5ed11478453246066e68d45410868a69fa8ad599df5bdb2e5 SHA512 3cf5949df5005e96e2e952c75a6ad4029757de6fe76e51f1a79a016f5e7acae917e04a92b2ad02a733c89b23a1a7cb0d0141e52d97a9a277f929e1979bc6cfd9
 EBUILD babeld-1.9.1.ebuild 529 BLAKE2B c5b9c2705ae547218d13c27f14089b0fbb0a3d28e80a61b503eb13e0a63e135b32b2b7b101e1c4a5ed11478453246066e68d45410868a69fa8ad599df5bdb2e5 SHA512 3cf5949df5005e96e2e952c75a6ad4029757de6fe76e51f1a79a016f5e7acae917e04a92b2ad02a733c89b23a1a7cb0d0141e52d97a9a277f929e1979bc6cfd9
 MISC metadata.xml 214 BLAKE2B f45e459d617f3b145e80c1232c73ddb707b189f3e2df479ea549b45ff2843f810a537186760e8b6deebcffc55a8deef702ef56dc6ef9da61e6e68a1acb8f866d SHA512 70e86291e5d1b2ba3e96641f18a86346e9cfa01e66099fddf1ad12bc88c1227737b62467867c569ab61fe940e3cdc5d068bacc4e96690c1b97d0d252cc115166
diff --git a/net-misc/babeld/babeld-1.8.2.ebuild b/net-misc/babeld/babeld-1.8.2.ebuild
deleted file mode 100644
index a0e8e1da80bc..000000000000
--- a/net-misc/babeld/babeld-1.8.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="a loop-free distance-vector routing protocol"
-HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/babel/"
-SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_compile() {
-	emake CDEBUGFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake "TARGET=${D}"  PREFIX="${EPREFIX}"/usr install
-	dodoc CHANGES README
-	doinitd "${FILESDIR}"/${PN}
-}
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 67530de42d51..a535ee0d3e8c 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,10 +1,4 @@
-DIST gallery-dl-1.25.5.gh.tar.gz 563928 BLAKE2B d8308233fc4e59da466825f5063556bffb31f8f710a75dca23b710244c1702569ffc46f41d0721e6bdcfd1ce5471d30872f8f931388db82a7ce918564d84ae75 SHA512 ed2e18a9220eb68bd93009b12212c4052893277cb585ded8b5c513c764d3efec348c0340360b5ccac6f98527fb0a9ddb93167e942e3151419169a4ad7353157f
-DIST gallery-dl-1.25.6.gh.tar.gz 567710 BLAKE2B 85f4fe19a09d1569e431e18c821db6d7f581760f2065138a36f2c8523c632aac0f6bd2fc18154f9a9524e158525b604b67240fe139a97f1407d2178e9f668d99 SHA512 2ae93401598ca46458c22bca7f2a53fe611519c24c88156c6566b45a5073336e92310b7c60939782b619ede59c8b2862a0ed9811dd7f9307f8a080e5fbfdf3bc
-DIST gallery-dl-1.25.7.gh.tar.gz 570326 BLAKE2B b499d9dad019b6a209cb4ce1c6ef64867d0ab6327ca2131631ad7abf52c7541187886c0d3674152cea24d7cafb1c508c7c22ffd14a94737759beda3bffb38d4e SHA512 0fb86b074c54db615cc8fd276160ef42a5a58e839a88fe0acb24d3f27d3002f90d28e7e0eb6ca3606e3c4c7c8f56b7d8a103898ba375dd63ffea27e4c422b4c1
 DIST gallery-dl-1.25.8.gh.tar.gz 570435 BLAKE2B 33cd558c0f30cc31adbd0a51365b9501309be001cb0f7a3bb83e21dc797ca7e097b94e1575e4c0342fad44a5fca07a486d1e44db1a12d90ade06d0bc4acf8384 SHA512 22bd9e330efe24cb56e7b9b3eb219094aa897bb620253c4dd3fcda33df82fc021f1151dd9a6aff1f762c3ed4d426aadc75a398a659b30f64f254780554f46687
-EBUILD gallery-dl-1.25.5.ebuild 1030 BLAKE2B f8eee827828a8096cb6ed53104a861a301744f3e443daf3f266b3fa608a5d0942a8b20ad7218ab121e8ec211ec33a1c1eee4f937c88824b2920fe6979c022be3 SHA512 78712cbe3a8bcda690528ceda50de032ca877e4101f989b66b9876980844240aec4c561eee93ebbfaf4b475a4965237effabf5d95b4f271c36cefc335a308c47
-EBUILD gallery-dl-1.25.6.ebuild 1030 BLAKE2B f8eee827828a8096cb6ed53104a861a301744f3e443daf3f266b3fa608a5d0942a8b20ad7218ab121e8ec211ec33a1c1eee4f937c88824b2920fe6979c022be3 SHA512 78712cbe3a8bcda690528ceda50de032ca877e4101f989b66b9876980844240aec4c561eee93ebbfaf4b475a4965237effabf5d95b4f271c36cefc335a308c47
-EBUILD gallery-dl-1.25.7.ebuild 1030 BLAKE2B f8eee827828a8096cb6ed53104a861a301744f3e443daf3f266b3fa608a5d0942a8b20ad7218ab121e8ec211ec33a1c1eee4f937c88824b2920fe6979c022be3 SHA512 78712cbe3a8bcda690528ceda50de032ca877e4101f989b66b9876980844240aec4c561eee93ebbfaf4b475a4965237effabf5d95b4f271c36cefc335a308c47
 EBUILD gallery-dl-1.25.8.ebuild 1030 BLAKE2B f8eee827828a8096cb6ed53104a861a301744f3e443daf3f266b3fa608a5d0942a8b20ad7218ab121e8ec211ec33a1c1eee4f937c88824b2920fe6979c022be3 SHA512 78712cbe3a8bcda690528ceda50de032ca877e4101f989b66b9876980844240aec4c561eee93ebbfaf4b475a4965237effabf5d95b4f271c36cefc335a308c47
 EBUILD gallery-dl-9999.ebuild 1037 BLAKE2B d0a577a5e71be88d28c735580b24617e1d87bac48ed8ce1044991fc8eddf1044d1cb69d2bccbf40843fe0b99877cce069ae048d43f1016bd687f5a7ab8589298 SHA512 8b209c0d297af4f95c9dea25e22df7a4f3323ac1396c644b07e99a782d42f343065c846dbbc9b0c05a98d20e4b456ab5509ff7ff91b0904668509efb26425f26
 MISC metadata.xml 747 BLAKE2B bb63a74ca71891f1e937e6bd41b4cef50f1e1d459ab389f83f881cbfcc5c39bf5c4b8e999ea6cab7406a97f3dca9644380eaf1930d811746c5b893b948085ecd SHA512 302b9f3cde6c404de62347415c1f02d6884a9327c88871ea67b986ac7eaadac6b79018d919f5e6a2d8dde5dfd9e12d6c7c4702120fb08bfbfa291df4d1baecae
diff --git a/net-misc/gallery-dl/gallery-dl-1.25.5.ebuild b/net-misc/gallery-dl/gallery-dl-1.25.5.ebuild
deleted file mode 100644
index e83e798733f1..000000000000
--- a/net-misc/gallery-dl/gallery-dl-1.25.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite,ssl,xml(+)"
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download image galleries and collections from several image hosting sites"
-HOMEPAGE="https://github.com/mikf/gallery-dl"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
-else
-	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# Tests require network access.
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
-
-python_compile_all() {
-	emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
-}
-
-pkg_postinst() {
-	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
-	optfeature "video downloads" net-misc/yt-dlp
-}
diff --git a/net-misc/gallery-dl/gallery-dl-1.25.6.ebuild b/net-misc/gallery-dl/gallery-dl-1.25.6.ebuild
deleted file mode 100644
index e83e798733f1..000000000000
--- a/net-misc/gallery-dl/gallery-dl-1.25.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite,ssl,xml(+)"
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download image galleries and collections from several image hosting sites"
-HOMEPAGE="https://github.com/mikf/gallery-dl"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
-else
-	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# Tests require network access.
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
-
-python_compile_all() {
-	emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
-}
-
-pkg_postinst() {
-	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
-	optfeature "video downloads" net-misc/yt-dlp
-}
diff --git a/net-misc/gallery-dl/gallery-dl-1.25.7.ebuild b/net-misc/gallery-dl/gallery-dl-1.25.7.ebuild
deleted file mode 100644
index e83e798733f1..000000000000
--- a/net-misc/gallery-dl/gallery-dl-1.25.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite,ssl,xml(+)"
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download image galleries and collections from several image hosting sites"
-HOMEPAGE="https://github.com/mikf/gallery-dl"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
-else
-	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# Tests require network access.
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
-
-python_compile_all() {
-	emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
-}
-
-pkg_postinst() {
-	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
-	optfeature "video downloads" net-misc/yt-dlp
-}
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index 9b10a44d4bb9..c710c82f794d 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -1,8 +1,4 @@
-DIST geoipupdate-2.3.1.tar.gz 362497 BLAKE2B e07eb22d6b4897d735af0c354f99111931646e8d194d493cf6992ac76a065a02816e5eaf0c974f752aeabb9cde7e7f8ec70d70529402b0b58072c44994e39e53 SHA512 98537e17ea03dbc0e377bf3fd045a96cbcf2f36f1fbcdf494f0a60d15f9ea5d2f0cd5e127245c6425e0ff8b77028147a2a6316034752298c8e9671007b7245a1
-DIST geoipupdate-3.1.1.tar.gz 366789 BLAKE2B 1f823bd51553c9c96ad78bab893a15d4bc3f4ee5cea873f2fd3fbcbe7a38f22d2995558f8196f4c4030fb6f24b179104912af3290d3b7ed9bde9fbe5ff37862c SHA512 24e6a9f72449df1a2763314f188828332b5516962dbd75892689e505516af967bece60cc846fe17cfcc1ddb4d6111c9cd7d5c0ebc9d3e8e7af355f8a1c7f1a2f
 DIST geoipupdate-4.9.0-deps.tar.xz 2894004 BLAKE2B 2995d4f2f8632d232b156294cca8bd76f40373c948df9ca5b4813bf630923168063eb094de52582af5221950343b998afb50c97bfe9077cf952951b00e5b3349 SHA512 c83c05cd5063199b21b8eb621a80da8679ddac2881da53b6914a7cb1419a1a6ef8cabd62562722d61b7e5d05d93f430a707d4e082e126514bfad27537f4e3ff7
 DIST geoipupdate-4.9.0.tar.gz 36646 BLAKE2B 9eb5e16c39e8c599d3b0fa60804f179d1fb726c44f9f4ed4ed6ff3b853c31c9dece809dcd690e14157f1290c4a9088e696e967f3baeeb7f2762638c70aad6b6a SHA512 29d0639fe636885b1527b4cb795332c103c011d028ada80eb7b07805d91f575554fc0b9fa9a506c644236a2ceab5509f54f0cc1a03a300480350c520484d959c
-EBUILD geoipupdate-2.3.1.ebuild 557 BLAKE2B d10ba07cf135898b205407d4a4a1212a09315dd0ab046b227295c13c15ad0df296f4f1310543e9b082b5899ee2e3eef484ff9a1965b4ad9a2841bd097f2255ba SHA512 75a4de845ad1923a0ad678de9db19213696beba4995b37ff7cab8c887396dff9b5005bd247e72c3ee2d140617718e1fbc3795a1fb70acb9028bd063fbcb48959
-EBUILD geoipupdate-3.1.1.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d646d0a99f4ff9e6f43fa358451126b14474b9d4f233808a6ab44d9e7508db123cc3e4177fd27ad5c07c6ac0f1059 SHA512 36fcff88023b5f46c5528fa30b157fab5a159975ff1c4dbb1d1b69c48a3290c2416aceee3f1ea17b8e447a6524045a6af18646062454b3d80e0924934e4fadd7
 EBUILD geoipupdate-4.9.0.ebuild 1172 BLAKE2B b2f103b2a8ebb3c393941ee89ee1d9a65d9424e95394ccaa7274a8864849ed0f3577cfebf844ed33ec6fd3d6892511a20a2747fd413f4e0ff00d4ff7ebf3b721 SHA512 e35c5e850809341c25db52843ca9bf8531a7caa86d750607f32805ddb5e3c1018ac5d57616d50a0453b5addaa1f701bf8e363a667bfd0d1ef0f75c7e026700b2
 MISC metadata.xml 365 BLAKE2B fe03fdda21f1ab1dcbf3fe2263aabd4a567e0527a33f551a2c9e5883fc9738607705710f10125fd50127d71e86b6a935d955c12dfa588713b40adeb84001a4c0 SHA512 bbf7afa666726fb1b3b9ddc8a899a8fc404c141bdd1c2adc3a458c9a5b4b7b60697fcf3e43df8a5a4ce3cb96db46d92d0af2887bba7aa52d759171dd240c4415
diff --git a/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild b/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild
deleted file mode 100644
index 7d7efeb504fe..000000000000
--- a/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
-HOMEPAGE="https://github.com/maxmind/geoipupdate"
-SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 sparc x86"
-
-DEPEND="
-	net-misc/curl
-	sys-libs/zlib
-"
-RDEPEND="
-	${DEPEND}
-	!<dev-libs/geoip-1.6.0
-"
-
-src_install() {
-	default
-	keepdir /usr/share/GeoIP
-}
diff --git a/net-misc/geoipupdate/geoipupdate-3.1.1.ebuild b/net-misc/geoipupdate/geoipupdate-3.1.1.ebuild
deleted file mode 100644
index b80672ca8484..000000000000
--- a/net-misc/geoipupdate/geoipupdate-3.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
-HOMEPAGE="https://github.com/maxmind/geoipupdate"
-SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-DEPEND="
-	net-misc/curl
-	sys-libs/zlib
-"
-RDEPEND="
-	${DEPEND}
-	!<dev-libs/geoip-1.6.0
-"
-
-src_install() {
-	default
-	keepdir /usr/share/GeoIP
-}
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index 171449dceba7..4d3df45e375f 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -1,9 +1,8 @@
 AUX oidentd-2.0.7-init 837 BLAKE2B ab01ed3d6675f6196edcf7712c9f2e77369edc2481433788e63a3a82e591831869623723002f49a4498ed10ba7657f51dbc795895384213e473eba950e7ba7be SHA512 ebd072d86fa879017bb43f8f9cdd0ea563f337b558552ebdc27c980376889dfd22f2d6bdeb424ca3e2dbe62a78ceb80208ee26398aed0c38c4f973646d6d80d3
 AUX oidentd-2.2.2-confd 69 BLAKE2B 37fac35c28304f92942844ee7652f52496cdc4c66da67d449127c3e9b61c715afb25cae7379137d8b9e2863d44e72535734c595c8edcc18f94b8c3841cd216ab SHA512 639f062b61b3aac829d6d16497d548290d8de3e161a1d8037b689593374b89028243b9369109b1b4b55d125ec665f1433bb971ea873a2e6e1b6b15eabfad8e6a
-AUX oidentd-2.5.0-respect-ar.patch 250 BLAKE2B e756da25bca3a2e98be1a625c99f33b20ebb237cd7a3fe8f6e01664db328636451bd7af70cc16e08e45344511660787836358f92c2fa1806998dcf35f73fdc10 SHA512 6ddb24e88e864359faf8f6aa6a28de01067b0cc20c349e8c9f6ec4dafde26636e7cce3e11e137c12cd868f0de85546462be599333966ad8bf850cea5afc9b62c
 AUX oidentd-3.0.0-ipv6-masquerade.patch 2302 BLAKE2B c291c43037d7b30e15b0c4599614a06fd6a0f3bc66bc2ae83c8c22ace90eda3f4b43b6e9606710fc0fa6eb1baa2aba9b8bbfb65a5be0b774e6cbf0d39e161b9d SHA512 7cfacf126cd2369c71729380d75b662540ae4d7f1e8ee0510fc1d9f99d78d9538aa03d927dbb642c31e36d3d9b9df86fb5036e8abcf3145b9287046189642c9c
-DIST oidentd-2.5.0.tar.xz 195536 BLAKE2B ea6327fc415811b7050503daa393639f5740e9c1681794cfadf447e4968024aed7e0367ba804209d236c295777f856297b62c1d7e307c268c3d9fad9b240b7f5 SHA512 31ff2cad2afaa9f07a0aa35ad904047de78f168f9e6d6a3fcf7397eb89e6b930c30741eb1de44e3c2c24f48ca7d860cafd2771f464b336d400ab6d98384e9320
 DIST oidentd-3.0.0.tar.xz 187088 BLAKE2B ca824119cbb54aee52658c9a167ace88b2ed7f118565d7be043e19534a323772d18a043d803cd553c7408a525e3c717ffb990fb8794b4af4e8ac6c1efe4571c0 SHA512 92e733272979c08bba012f33aa6e0eadc15e18e03c24258b0333f74c201df87cc619012e2d8da69aac10c15684691464f59551c9b9d83e690b3902e47f649c68
-EBUILD oidentd-2.5.0.ebuild 1254 BLAKE2B 928c432bef758266ecd842a3aaea3a4fe55468598a4867d1502eec42a73e540b62591f277f96f4874f38c1e9069f3ccdc6a32a8390c0fc619aa8d9a643511bb6 SHA512 0ea39fead9d40f11229831e53551430788baf885b25efa476b7695057a182279b187b142b50113530a3b2177f577ec5a1f0b60dd88346e23fa807b90055b36f8
+DIST oidentd-3.1.0.tar.xz 183596 BLAKE2B ed648b525153437659b9437612eb8023465d6e45a401ba64bda86e82948c588a2da4da877b371a6bb2b6f0e6f29f1a5ec844009bb2bfcf4eb0d830254da03bcd SHA512 03ce6c64a4351cecdc9177e5a035860d433689de4c86d344eab5af9810b03caedface983c4c4fb2e7ae31b7d868bfcbdd15a094a3f79f43c400258c4902a5972
 EBUILD oidentd-3.0.0-r1.ebuild 1278 BLAKE2B 898693a5fb9f881dab4f4e5a8c4cf658058707d74796cb61b5bef8fffa11e0f7acba577386a3ed9c7008d9c170b975b59a9bd67289c061e73f6a029895e25b13 SHA512 960e4631d8c8f67ba582254b17055db710d6c2cb5d36f9df101692624a6ded343120d268681ed35c0ce9f5abfadab4ac65e2ce8e4139391ba3a1d37cbbfd3cac
+EBUILD oidentd-3.1.0.ebuild 1219 BLAKE2B f244d133ed3cbd067aeb50b8d6124230aa379a5a9ebd98988c4c384869b3171eae759056f41361d79054dd22c1ba2aec4afe15b1ad3883dd92e874a4d9318fc9 SHA512 d7d1f875fe328cfde85539e5ae94d02c65727f8dfdcd5d78980499a851accb5b07e0e1da3f90563eaff1514e15242d07865e5b3a37710846639aeb4d83f276b7
 MISC metadata.xml 570 BLAKE2B 13988eee6eb154328c20cc58e0a7fceed6a6cf38811cb33456d154b646ccd2f638c7d9ffcae17552eb2c907a03ef4ca48a01dcaa9ca082bcd86f01f8b8efb811 SHA512 7474d2c67d8aeb05d48a71517b622706906de74d13d42c6e486fee4103470d72da0523d39084e2d304ada98e228c49d14d0befda63fc50102909eb1dcfda611e
diff --git a/net-misc/oidentd/files/oidentd-2.5.0-respect-ar.patch b/net-misc/oidentd/files/oidentd-2.5.0-respect-ar.patch
deleted file mode 100644
index 156b136f7755..000000000000
--- a/net-misc/oidentd/files/oidentd-2.5.0-respect-ar.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index b458d11..b163128 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,6 +32,7 @@ AC_PROG_LEX
- AC_PROG_RANLIB
- AC_PROG_INSTALL
- AC_PATH_PROG(sedpath, sed)
-+AM_PROG_AR
- 
- AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
diff --git a/net-misc/oidentd/oidentd-2.5.0.ebuild b/net-misc/oidentd/oidentd-2.5.0.ebuild
deleted file mode 100644
index fd799d2a1495..000000000000
--- a/net-misc/oidentd/oidentd-2.5.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="Another (RFC1413 compliant) ident daemon"
-HOMEPAGE="https://oidentd.janikrabe.com/"
-SRC_URI="https://files.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2+ MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="debug ipv6 masquerade selinux"
-
-DEPEND="masquerade? ( net-libs/libnetfilter_conntrack )"
-
-RDEPEND="
-	acct-user/oidentd
-	acct-group/oidentd
-	selinux? ( sec-policy/selinux-oident )
-	${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-respect-ar.patch" )
-
-src_prepare() {
-	sed -i '/ExecStart/ s|$| -u oidentd -g oidentd|' contrib/systemd/*.service || die
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug)
-		$(use_enable ipv6)
-		$(use_enable masquerade libnfct)
-		$(use_enable masquerade nat)
-		--enable-xdgbdir
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN}
-	newconfd "${FILESDIR}"/${PN}-2.2.2-confd ${PN}
-
-	systemd_dounit contrib/systemd/${PN}@.service
-	systemd_dounit contrib/systemd/${PN}.socket
-	systemd_dounit contrib/systemd/${PN}.service
-}
diff --git a/net-misc/oidentd/oidentd-3.1.0.ebuild b/net-misc/oidentd/oidentd-3.1.0.ebuild
new file mode 100644
index 000000000000..9b2726b4bcbd
--- /dev/null
+++ b/net-misc/oidentd/oidentd-3.1.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Another (RFC1413 compliant) ident daemon"
+HOMEPAGE="https://oidentd.janikrabe.com/"
+SRC_URI="https://files.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="debug masquerade selinux"
+
+DEPEND="masquerade? ( net-libs/libnetfilter_conntrack )"
+
+RDEPEND="
+	${DEPEND}
+	acct-user/oidentd
+	acct-group/oidentd
+	selinux? ( sec-policy/selinux-oident )
+"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+src_prepare() {
+	sed -i '/ExecStart/ s|$| -u oidentd -g oidentd|' contrib/systemd/*.service || die
+
+	default
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug)
+		$(use_enable masquerade libnfct)
+		$(use_enable masquerade nat)
+		--enable-ipv6
+		--enable-xdgbdir
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN}
+	newconfd "${FILESDIR}"/${PN}-2.2.2-confd ${PN}
+
+	systemd_dounit contrib/systemd/${PN}@.service
+	systemd_dounit contrib/systemd/${PN}.socket
+	systemd_dounit contrib/systemd/${PN}.service
+}
diff --git a/net-misc/pedro/Manifest b/net-misc/pedro/Manifest
index 3f228b1d18ef..fbd26111c8c4 100644
--- a/net-misc/pedro/Manifest
+++ b/net-misc/pedro/Manifest
@@ -1,9 +1,5 @@
 AUX pedro-1.12-portage.patch 1816 BLAKE2B 715c6e17a31d86a3b947fb7be8bfead7e2c4c03daee3fefa203b0c6b3f7a4b77ff11b1537c2b1fd92e044191331b9be86a8b83dd9f05fecac64909e3d37262ab SHA512 a5ddccfb2a64baa6582d176803ce38b687a135d62f923d4779e3bfb4435eefe3a35742113ea05538534a8bc9c2244c66c0bdeafcb304568550b6b9821b6eeb18
-AUX pedro-1.6-portage.patch 719 BLAKE2B ee8a23964e875e271624a2d0f4c06d5cd05e9d78cae4147c2e0d0701d2df816f2e9b90ca0d3919cc03d5a3c3c62bc5fe6ade08f3775b61af23d6a2fdeda67a00 SHA512 10446c0348e20e2ee946544c0947fe4373ee90b9e9ef5524d6743d7be9f13855dee06ed7e011f1d82b321fd0b8594924bf3ae6f4d0744f4d4517910f0f756875
 DIST pedro-1.12.tgz 1181678 BLAKE2B ed882ab3dae0912519283229d10ff6f12ef4f623d72beaf22b8467e8072752fbd57836a0ebbad0f0ce3da1b4837049161bcb12673e3c38c94eb167e16c0c0a1e SHA512 936b2c6cac526d9d3c0e146b53dc65ed0508c6abd1b66c97656fa5b4011d7dd11912d1c0bf091a29b56e13c3e19ec3e0ad7760d44d4887b939699cdd2389c819
-DIST pedro-1.6.tgz 711856 BLAKE2B 5027dd438995e212889786996debb5765d49828d38ce715672e44776b5fb63db0d6bca0e72339fd5067254aed0b731d3f77656ad510d978e4f456af45d6cf008 SHA512 263f53e447d4b3baab405a1d7313fc397f8a62958957688265c7485a5697b642138636659b5515b9010341655ba8045e5d85f69a86c20baa28edc0dcff0aef42
-DIST pedro-manual-1.6.tar.gz 222863 BLAKE2B 085b118585808aced9217a8001080b589d9dad958ad14787f929a4808b10bb2be80ae7bc04c07b676e41aed9e2ec916215c5d15dda2317f71ecebbc7c1737d96 SHA512 87f8e07e3a687d12e366f1974398996f2346e417680ab534622f901c0c7e1efeb171f0c0dadad46b578122c9e98531570c303d2d3ce04b1cd8150816d6138f99
 DIST pedro-manual-1.x.tar.gz 222863 BLAKE2B 085b118585808aced9217a8001080b589d9dad958ad14787f929a4808b10bb2be80ae7bc04c07b676e41aed9e2ec916215c5d15dda2317f71ecebbc7c1737d96 SHA512 87f8e07e3a687d12e366f1974398996f2346e417680ab534622f901c0c7e1efeb171f0c0dadad46b578122c9e98531570c303d2d3ce04b1cd8150816d6138f99
 EBUILD pedro-1.12.ebuild 1022 BLAKE2B 3400d3352b39418879fbd2f64bef187e059bf6ca532930a6e68f47967e13bd98a2d6661f2e2cdb4c707923a0f5c48ba87abaa9b30d78f168f0811f9ea4906f04 SHA512 3866d82975a2b23885a2c33fab507589bca244dd489452b97b864ff810c8ee4c86b2d100dce9bc453b098cf677dca5b7a0367448c407d29e26ed9c85b1a63a9b
-EBUILD pedro-1.6-r1.ebuild 943 BLAKE2B cc7197f5f6a278ec7fd94f633eba135e41594027c8a7ef93c0f40665aa4d1e9df9147fe123ade0e23635a9633d1283e216e5ebb79348f80a4c664e7ee2251f7c SHA512 ac458e6df660d07e0e97fc5fb92b30db3498b07d16202abf5fea6a41fa3a053571c455c92e2e0eda027eab4d73d8be610f3c902e1b070dc53d63323ffa1298a9
 MISC metadata.xml 239 BLAKE2B 49c8aa4d235fd4e079b20b29c08153ff4bf5a118be9d7f90d00328cc07ba453544a3a661a032cc1ddb6d0514fd2d9c1b6b90185e4738b37e67c68b2c349deb57 SHA512 fd7ea3e4f7f83260f8f2d73cacc7e4f4b7e24b401414b69f214590e53b0ddbb3f43cbfaa9722442876d35ca4ed16b071a233fc48ab4eda8fcbf9cf523cfa879e
diff --git a/net-misc/pedro/files/pedro-1.6-portage.patch b/net-misc/pedro/files/pedro-1.6-portage.patch
deleted file mode 100644
index 9c9829129b2b..000000000000
--- a/net-misc/pedro/files/pedro-1.6-portage.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -10478,7 +10478,7 @@
- ac_config_headers="$ac_config_headers config.h"
- 
- #AC_CONFIG_MACRO_DIR([m4])
--CPPFLAGS="-O2 -g `pkg-config --cflags glib-2.0`"
-+CPPFLAGS="`${PKG_CONFIG} --cflags glib-2.0`"
- case "${host}" in
-         i[3456789]86-*-mingw32*)
-                 WIN32="yes"
-@@ -10486,7 +10486,7 @@
-                 ;;
-         *)
-                 WIN32="no"
--                LDFLAGS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm"
-+                LDFLAGS="$LDFLAGS -L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm"
-                 ;;
- esac
- ac_config_files="$ac_config_files Makefile src/Makefile src/server/Makefile src/lib/Makefile src/examples/Makefile doc/Makefile"
diff --git a/net-misc/pedro/pedro-1.6-r1.ebuild b/net-misc/pedro/pedro-1.6-r1.ebuild
deleted file mode 100644
index 0d2ffbd916f8..000000000000
--- a/net-misc/pedro/pedro-1.6-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Pedro is a subscription/notification communications system"
-HOMEPAGE="https://staff.itee.uq.edu.au/pjr/HomePages/PedroHome.html"
-SRC_URI="https://staff.itee.uq.edu.au/pjr/HomePages/PedroFiles/${P}.tgz
-	doc? ( mirror://gentoo/${PN}-manual-${PV}.tar.gz )"
-S="${WORKDIR}"/${P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-portage.patch
-)
-
-src_configure() {
-	tc-export PKG_CONFIG
-
-	default
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		dodoc "${WORKDIR}"/${PN}.pdf
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc src/examples/*.{c,tcl}
-
-		docinto examples/java_api
-		dodoc src/java_api/*.java
-
-		docinto examples/python_api
-		dodoc src/python_api/*.py
-	fi
-}
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 1e2ab12ca23e..6c66fdca2a35 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -3,7 +3,7 @@ AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82
 AUX whois-5.5.6-libxcrypt_automagic.patch 677 BLAKE2B e832e829f97c9b23ca4d62e037f74fdf87225390a399fa240f0789123144f07f3e2d66ec009662c9936d1a0f112998532350a2144d95dc96cac7b22250090fac SHA512 14b2787fc7933eaf21584dc93b84a605a3f593b77767f2b622b906f03c75edd3faee3d39281dc4332bb5b64b24bee07c7ccd1115f2e80ae394637bf093f70305
 DIST whois_5.5.17.tar.xz 90608 BLAKE2B 82793097e421d88130d089fc64bb0bceac0c9170b39388262b45d2bf62fc2f8b7c4e393fc5351bba6be303ced00a00af1972bf73c1c8c7c86c812b19a0a6fb5a SHA512 0ed33edc2005eb51a88bda505cc3f6ebe3966095d6f12c03cfe62c12e7e575e1d008632d12de6f27b4c09b91ce5a45705d57acce88409e573bbd7b5132df7fc6
 DIST whois_5.5.18.tar.xz 90216 BLAKE2B 2098b15d36ee0f99e710fdeb10ce1650eba84da1ce770df46182439a6de07995b79746767968522200f5261490e5ffd262673705b12e1004e1ca0dd1af0b9e15 SHA512 28482a6b84d97e2ff69e7a2d01865d227d76aff41a42511a6ebd4ac636b9054643d1df800e6575fb846712e1473f7a31a211dbc08fbdfaaead443d22138266c7
-EBUILD whois-5.5.17.ebuild 1872 BLAKE2B a5faf0a45a539c58c9087cdd7f5d9c385dcdcb439f4585b8b388e79889ce2cd2130d4364388808115b6fb663b0366054cf52f14c564a986deed0314e13b3e285 SHA512 61dbf76a8b25094310f0b59bef2b7a98123dc8e02499870109070cd4bc535c45c9de0e625916ddb48be54eac1cbf96e82ea100904b78a8e1e989f83140005f6d
-EBUILD whois-5.5.18.ebuild 1879 BLAKE2B daff0a2e3b2448cb772f919a62a55ac8ba6f471ffa529e9d6cbd22818bc74c2ccb1c281ef37e1ca62fa28881c77aa5d733ebb76e229c9f116e12191c7e9a41ee SHA512 29986f05b154c93041ec7f725314fd1fa81ff3a06dc379b954c510c631ec8586e11ba0d9ee35f12369778da74a4e522e5341b146174df253365eeea107924289
+EBUILD whois-5.5.17-r1.ebuild 1872 BLAKE2B a5faf0a45a539c58c9087cdd7f5d9c385dcdcb439f4585b8b388e79889ce2cd2130d4364388808115b6fb663b0366054cf52f14c564a986deed0314e13b3e285 SHA512 61dbf76a8b25094310f0b59bef2b7a98123dc8e02499870109070cd4bc535c45c9de0e625916ddb48be54eac1cbf96e82ea100904b78a8e1e989f83140005f6d
+EBUILD whois-5.5.18-r1.ebuild 1879 BLAKE2B daff0a2e3b2448cb772f919a62a55ac8ba6f471ffa529e9d6cbd22818bc74c2ccb1c281ef37e1ca62fa28881c77aa5d733ebb76e229c9f116e12191c7e9a41ee SHA512 29986f05b154c93041ec7f725314fd1fa81ff3a06dc379b954c510c631ec8586e11ba0d9ee35f12369778da74a4e522e5341b146174df253365eeea107924289
 EBUILD whois-9999.ebuild 1879 BLAKE2B daff0a2e3b2448cb772f919a62a55ac8ba6f471ffa529e9d6cbd22818bc74c2ccb1c281ef37e1ca62fa28881c77aa5d733ebb76e229c9f116e12191c7e9a41ee SHA512 29986f05b154c93041ec7f725314fd1fa81ff3a06dc379b954c510c631ec8586e11ba0d9ee35f12369778da74a4e522e5341b146174df253365eeea107924289
 MISC metadata.xml 439 BLAKE2B 609f61e31ef22ab28f06d9f0b6542a0efbcb8a006b05f14ff6339a332bb3f04996d13c9a62b55765ce4611df0e9efe021b6f5b5060b13d00d72eae71eb9f9e3e SHA512 05bf067e25586b2032b137dae008a4c59aed9e633f37b545d6ccdca6dc3d69d8614d8ad26c34e87d956b93d24b7962c3fe908070dcfd6826c8fe916b51f29d2f
diff --git a/net-misc/whois/whois-5.5.17-r1.ebuild b/net-misc/whois/whois-5.5.17-r1.ebuild
new file mode 100644
index 000000000000..6d1a89e7302c
--- /dev/null
+++ b/net-misc/whois/whois-5.5.17-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 toolchain-funcs
+
+MY_P=${P/-/_}
+DESCRIPTION="Improved Whois Client"
+HOMEPAGE="https://github.com/rfc1036/whois"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
+else
+	SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	#SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}"/${PN}
+
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="iconv idn nls xcrypt"
+
+RDEPEND="
+	iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )
+	xcrypt? ( >=sys-libs/libxcrypt-4.1:= )
+	!xcrypt? ( virtual/libcrypt:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/perl-5
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
+	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
+	"${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch
+)
+
+src_prepare() {
+	default
+
+	if use nls ; then
+		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
+	else
+		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
+	fi
+}
+
+src_configure() { :; } # expected no-op
+
+src_compile() {
+	unset HAVE_ICONV HAVE_LIBIDN
+
+	use iconv && export HAVE_ICONV=1
+	use idn && export HAVE_LIBIDN=1
+	use xcrypt && export HAVE_XCRYPT=1
+
+	tc-export CC
+
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" BASHCOMPDIR="$(get_bashcompdir)" install
+
+	insinto /etc
+	doins whois.conf
+	dodoc README debian/changelog
+}
diff --git a/net-misc/whois/whois-5.5.17.ebuild b/net-misc/whois/whois-5.5.17.ebuild
deleted file mode 100644
index 6d1a89e7302c..000000000000
--- a/net-misc/whois/whois-5.5.17.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="Improved Whois Client"
-HOMEPAGE="https://github.com/rfc1036/whois"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
-else
-	SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
-	#SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	#S="${WORKDIR}"/${PN}
-
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="iconv idn nls xcrypt"
-
-RDEPEND="
-	iconv? ( virtual/libiconv )
-	idn? ( net-dns/libidn2:= )
-	nls? ( virtual/libintl )
-	xcrypt? ( >=sys-libs/libxcrypt-4.1:= )
-	!xcrypt? ( virtual/libcrypt:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/perl-5
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
-	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
-	"${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch
-)
-
-src_prepare() {
-	default
-
-	if use nls ; then
-		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
-	else
-		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
-
-		# don't generate po files when nls is disabled (bug #419889)
-		sed -i -e '/^all:/s/ pos//' \
-			-e '/^install:/s/ install-pos//' Makefile || die
-	fi
-}
-
-src_configure() { :; } # expected no-op
-
-src_compile() {
-	unset HAVE_ICONV HAVE_LIBIDN
-
-	use iconv && export HAVE_ICONV=1
-	use idn && export HAVE_LIBIDN=1
-	use xcrypt && export HAVE_XCRYPT=1
-
-	tc-export CC
-
-	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" BASHCOMPDIR="$(get_bashcompdir)" install
-
-	insinto /etc
-	doins whois.conf
-	dodoc README debian/changelog
-}
diff --git a/net-misc/whois/whois-5.5.18-r1.ebuild b/net-misc/whois/whois-5.5.18-r1.ebuild
new file mode 100644
index 000000000000..73f366159be4
--- /dev/null
+++ b/net-misc/whois/whois-5.5.18-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 toolchain-funcs
+
+MY_P=${P/-/_}
+DESCRIPTION="Improved Whois Client"
+HOMEPAGE="https://github.com/rfc1036/whois"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
+else
+	SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	#SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}"/${PN}
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="iconv idn nls xcrypt"
+
+RDEPEND="
+	iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )
+	xcrypt? ( >=sys-libs/libxcrypt-4.1:= )
+	!xcrypt? ( virtual/libcrypt:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/perl-5
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
+	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
+	"${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch
+)
+
+src_prepare() {
+	default
+
+	if use nls ; then
+		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
+	else
+		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
+	fi
+}
+
+src_configure() { :; } # expected no-op
+
+src_compile() {
+	unset HAVE_ICONV HAVE_LIBIDN
+
+	use iconv && export HAVE_ICONV=1
+	use idn && export HAVE_LIBIDN=1
+	use xcrypt && export HAVE_XCRYPT=1
+
+	tc-export CC
+
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" BASHCOMPDIR="$(get_bashcompdir)" install
+
+	insinto /etc
+	doins whois.conf
+	dodoc README debian/changelog
+}
diff --git a/net-misc/whois/whois-5.5.18.ebuild b/net-misc/whois/whois-5.5.18.ebuild
deleted file mode 100644
index 73f366159be4..000000000000
--- a/net-misc/whois/whois-5.5.18.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="Improved Whois Client"
-HOMEPAGE="https://github.com/rfc1036/whois"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
-else
-	SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
-	#SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	#S="${WORKDIR}"/${PN}
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="iconv idn nls xcrypt"
-
-RDEPEND="
-	iconv? ( virtual/libiconv )
-	idn? ( net-dns/libidn2:= )
-	nls? ( virtual/libintl )
-	xcrypt? ( >=sys-libs/libxcrypt-4.1:= )
-	!xcrypt? ( virtual/libcrypt:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/perl-5
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
-	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
-	"${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch
-)
-
-src_prepare() {
-	default
-
-	if use nls ; then
-		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
-	else
-		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
-
-		# don't generate po files when nls is disabled (bug #419889)
-		sed -i -e '/^all:/s/ pos//' \
-			-e '/^install:/s/ install-pos//' Makefile || die
-	fi
-}
-
-src_configure() { :; } # expected no-op
-
-src_compile() {
-	unset HAVE_ICONV HAVE_LIBIDN
-
-	use iconv && export HAVE_ICONV=1
-	use idn && export HAVE_LIBIDN=1
-	use xcrypt && export HAVE_XCRYPT=1
-
-	tc-export CC
-
-	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" BASHCOMPDIR="$(get_bashcompdir)" install
-
-	insinto /etc
-	doins whois.conf
-	dodoc README debian/changelog
-}
-- 
cgit v1.2.3