gentoo (valentine's day) resync : 14.02.2021

11 files changed, 132 insertions, 56 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 1504bd74badd..4dbf78511912 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest
index 0dd86b1c76fb..ba6ec9ca398c 100644
--- a/net-firewall/ebtables/Manifest
+++ b/net-firewall/ebtables/Manifest
@@ -1,8 +1,9 @@
 AUX ebtables-2.0.11-ebt-save.patch 865 BLAKE2B 39ba29e026ad8f7fa825546cbb106b120a018c7763018ef588968238b09c30040d1d1b11e33fddcfc1e4ff425c4c3928dee0f5a1061e97cc1142c18ce08763e8 SHA512 b059fa5c67e4ec36537e361f0924153fadec482604039f6fd09ab5c1dbd518da0f8e0fd4ccba00d1952cf66136377e357f06a5669746ff42d031f32a211457b5
 AUX ebtables-2.0.11-makefile.patch 495 BLAKE2B 213fe84dcdb82b55e074ba7015b8cf20213fe4ece62a493acf0533c46b70369165d0dd1974a1e14f82e8ce946450e9a3d8968886c93f7c3f9cbcf1386602b52e SHA512 f61d8f07e3276aa6a8d4ae9bb91b4bc227390d25b9822ed3e70e9a07f4da60b7c5262617f291d602c6bb55f5869f090ebe5ee41ba23c19d860260afd1d95d9b2
 AUX ebtables-2.0.11-remove-stray-atsign.patch 1120 BLAKE2B 14bac4aec87d44e5ca166418abf39368f7b7e45922d8371f6dd469a2d1963fef7c9f8d960c78d72153d9b4f307491f8498a0460b4d150468f8848c3dd4b973bf SHA512 8094f6aee009880c79e8476d29dcb90c1682922f27ed7ab0a4ae7175e7efc46f035d228586895f4e6793876f944010abd72ee7102be31962bd832070be7db14e
-AUX ebtables.confd-r1 288 BLAKE2B 72e0ad40f53058f1ede8a4d049badde04e69e307e9c24ffe5cdc7f61d918b0e1b3296f793c4dd46389b2dee69ad4730f563bd3891569612d7f9f8c7b39641a84 SHA512 088308eba077fcec35299c8aaad0492024173504a361c2ba7e29dce106888a78c72818a791f3d3655aed3f6df26a3319c42e2b2c54760cdbad036d46b89b97f3
-AUX ebtables.initd-r1 1991 BLAKE2B d044278249406982a7f1b83edab498ecad6368462451890d137bb3f03a404334b8e1f77bb4eef49375090b7499010dc4a4318caf53c9edd78b0fda73c8620c29 SHA512 82fa6298595ffdf0c286940f7a77b8246e274c3dc3f8c7448c1b36114cb9c8725b0466ba9feb34bd521bc3f7d9ae049ceae557a059d23acf2a2a97a167647b73
+AUX ebtables.confd-r1 685 BLAKE2B 647eeb26f9c046341c79d450fa5771480cbd9047b063b2e6c32aedeaa669f8c6f73dd317731eac86bfb85f352aec23969af505a461e7f307cf6538cb9c6b21ff SHA512 5bb7ac7aa1a723a7b71f26fbc0337f3cb5b4efd700b95695ab47ac7edc9de7ab0190591d0f56db8e461be93a79cb3ce534335c8ce13a6a6773ff5229c0959033
+AUX ebtables.initd-r1 2020 BLAKE2B f73f5904690c5c6344f0668c8327de5605b41ca5a699b3076f3b30545bbea19ff125c5c21d18a73e3bb2cc2986fbf74e7cad5757ced38887551ff59f2ca81dda SHA512 8d4c56102a2a4771e7a0d3a62ddbc4c82eba640ea6d5cba2e55ae2c2d7d0fe2621bcb81a4fa6aebdd1674ac55bb88beb964a89b521d8e684fc02f4b9da555823
 DIST ebtables-2.0.11.tar.gz 428411 BLAKE2B 62af4c38ad21498e43f41ef96c8abb5704e8d8a48f1327c587b664f36fdfa9849a9a37e59958db56d38019465d8bf1775914f7387fde99a441615913702cf504 SHA512 43a04c6174c8028c501591ef260526297e0f018016f226e2a3bcf80766fddf53d4605c347554d6da7c4ab5e2131584a18da20916ffddcbf2d26ac93b00c5777f
-EBUILD ebtables-2.0.11-r2.ebuild 2516 BLAKE2B 4191cbaef5d9728a31d69af5ee9b5023f5ad7e93eaf7e633392ce3fa7f3c8870f7c25a5cbb9fcfb55b92b1d52d8f86cc0323049953b4d35c0350c6cef2bf815b SHA512 722620358c898567cc0286d2cecdf72a05542861197bd2721185eb205414708e4d20da9e15b21834be9b6d56d1e4687c090299245ed40f2d41286a0ca8bf9ad1
+EBUILD ebtables-2.0.11-r2.ebuild 2539 BLAKE2B a4f30ce91013488ba7ec7355bb862df614edef50b7a731e8dce4af5ef3a3ec1c86c7373acbf77935560b65deffb9b2be48400a4dd8c824fd1c6be4c7cd6db045 SHA512 08ebda29d93efc3ab9110841379c2a75f07d17cc152f63feacb1e488c68fe72f42bb6d0d4eb4374be147998f0439bfc8f9092326c5367ac770e8e22571c3e296
+EBUILD ebtables-2.0.11-r3.ebuild 2493 BLAKE2B cafbd261f146bc85da470b6eec2a228adbf5a97da43ffb1d29efa5a6e465c8a4493a6d5add52662eecd67f311b1a256f58a84671a7f68c525637dad9111636f6 SHA512 f92e97f0951432551dc61a146a924566f2b160f9c49b14e2f309231d6c56850d48663c67b80d76f206c22cdb17f45a5760109bf78da014addff779e3e83f3fe3
 MISC metadata.xml 488 BLAKE2B 683d7552083e64daf3e41f9c1e7c53033ac4059a1f3ae248e666001424725f21efb1ec0d35c28492ac80c19998692c00e795818501b0c9f0df1037175b8bda93 SHA512 88d08269d25c3f4a22d89b5774e21c4af048c2e39beba41514780d3dac72494cb39e993becd49b0a73cb9c2d0b2e7e46c7bbe1b3a40fe6d7094431a9fb384f35
diff --git a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
index b4d908e63ccc..2e2c4a000704 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ MY_PV="$(ver_rs 3 '-' )"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Controls Ethernet frame filtering on a Linux bridge, MAC NAT and brouting"
-HOMEPAGE="http://ebtables.sourceforge.net/"
+HOMEPAGE="https://ebtables.netfilter.org/"
 SRC_URI="http://ftp.netfilter.org/pub/${PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
@@ -44,11 +44,12 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# don't install perl scripts if USE=perl is disabled
+	# Don't install perl scripts if USE=perl is disabled.
 	if ! use perl; then
 		sed -e '/sbin_SCRIPTS/ d' -i Makefile.am || die
 	fi
 
+	# The bundled autotools are borked, so force a rebuild.
 	eautoreconf
 }
 
@@ -78,8 +79,6 @@ src_install() {
 	else
 		into /
 		newsbin static ebtables
-		insinto /etc
-		doins ethertypes
 	fi
 
 	newman ebtables-legacy.8 ebtables.8
diff --git a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
new file mode 100644
index 000000000000..467b9d7f3fdb
--- /dev/null
+++ b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+MY_PV="$(ver_rs 3 '-' )"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Controls Ethernet frame filtering on a Linux bridge, MAC NAT and brouting"
+HOMEPAGE="https://ebtables.netfilter.org/"
+SRC_URI="http://ftp.netfilter.org/pub/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+perl static"
+
+BDEPEND=">=app-eselect/eselect-iptables-20200508"
+# The ebtables-save script is written in perl.
+RDEPEND="${BDEPEND}
+	perl? ( dev-lang/perl )
+	net-misc/ethertypes"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.11-makefile.patch"
+
+	# Enhance ebtables-save to take table names as parameters bug #189315
+	"${FILESDIR}/${PN}-2.0.11-ebt-save.patch"
+
+	# from upstream git
+	"${FILESDIR}/ebtables-2.0.11-remove-stray-atsign.patch"
+)
+
+pkg_setup() {
+	if use static; then
+		ewarn "You've chosen static build which is useful for embedded devices."
+		ewarn "It has no init script. Make sure that's really what you want."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Don't install perl scripts if USE=perl is disabled.
+	if ! use perl; then
+		sed -i -e '/^sbin_SCRIPTS/ d' Makefile.am || die
+	fi
+
+	# The bundled autotools are borked, so force a rebuild.
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--bindir="/bin" \
+		--sbindir="/sbin" \
+		--libdir="/$(get_libdir)/${PN}" \
+		$(use_enable static)
+}
+
+src_compile() {
+	emake $(usex static 'static ebtables-legacy.8' '')
+}
+
+src_install() {
+	local -a DOCS=( ChangeLog THANKS )
+
+	if ! use static; then
+		emake DESTDIR="${D}" install
+		newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables
+		newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables
+
+		find "${D}" -name '*.la' -type f -delete || die
+
+		# The ethertypes package installs this for us.
+		rm "${ED}"/etc/ethertypes || die
+	else
+		into /
+		newsbin static ebtables
+	fi
+
+	newman ebtables-legacy.8 ebtables.8
+	einstalldocs
+}
+
+pkg_postinst() {
+	if ! eselect ebtables show &>/dev/null; then
+		elog "Current ebtables implementation is unset, setting to ebtables-legacy"
+		eselect ebtables set ebtables-legacy
+	fi
+
+	eselect ebtables show
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] && has_version 'net-firewall/iptables[nftables]'; then
+		elog "Resetting ebtables symlinks to xtables-nft-multi before removal"
+		eselect ebtables set xtables-nft-multi
+	else
+		elog "Unsetting ebtables symlinks before removal"
+		eselect ebtables unset
+	fi
+}
diff --git a/net-firewall/ebtables/files/ebtables.confd-r1 b/net-firewall/ebtables/files/ebtables.confd-r1
index 645b26edae99..8e83c81b9f84 100644
--- a/net-firewall/ebtables/files/ebtables.confd-r1
+++ b/net-firewall/ebtables/files/ebtables.confd-r1
@@ -9,3 +9,11 @@ SAVE_RESTORE_OPTIONS=""
 
 # Save state on stopping ebtables
 SAVE_ON_STOP="yes"
+
+# If you need to log iptables messages as soon as iptables starts,
+# AND your logger does NOT depend on the network, then you may wish
+# to uncomment the next line.
+# If your logger depends on the network, and you uncomment this line
+# you will create an unresolvable circular dependency during startup.
+# After commenting or uncommenting this line, you must run 'rc-update -u'.
+#rc_use="logger"
diff --git a/net-firewall/ebtables/files/ebtables.initd-r1 b/net-firewall/ebtables/files/ebtables.initd-r1
index 6608760110be..bdc0987b1b2b 100644
--- a/net-firewall/ebtables/files/ebtables.initd-r1
+++ b/net-firewall/ebtables/files/ebtables.initd-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="save panic"
@@ -10,10 +10,10 @@ ebtables_save=${EBTABLES_SAVE}
 
 depend() {
 	before net
-	use logger
 }
 
 ebtables_tables() {
+	local table
 	for table in filter nat broute; do
 		if ${ebtables_bin} -t ${table} -L > /dev/null 2>&1; then
 			printf '%s' "${table} "
@@ -80,8 +80,8 @@ reload() {
 
 save() {
 	ebegin "Saving ebtables state"
-	touch "${ebtables_save}"
-	chmod 0600 "${ebtables_save}"
+	checkpath -d -m 0755 "${ebtables_save%/*}"
+	checkpath -f -m 0600 "${ebtables_save}"
 	${ebtables_bin}-save $(ebtables_tables) ${SAVE_RESTORE_OPTIONS} > "${ebtables_save}"
 	eend $?
 }
diff --git a/net-firewall/ferm/Manifest b/net-firewall/ferm/Manifest
index 206ed642ea1f..fe1e968411f7 100644
--- a/net-firewall/ferm/Manifest
+++ b/net-firewall/ferm/Manifest
@@ -1,7 +1,5 @@
-DIST ferm-2.4.1.tar.xz 71324 BLAKE2B 290cd2f6fbb1ca1c1f060f998d84eaed2ba2a6ec8f736375a460a3ae81c6f5e67c174774065a09fbe155347f6dc1b7977321d65ac753f4c28f8a47cda8409dd8 SHA512 beea4b8dd04e00662ef380442f8249c2d2dadf6d35b90e415038df807c8d08295d2575efbf3265f48f5e92afa174135a9c662f74d52545dd3e1c55a1436aa5bb
 DIST ferm-2.5.1.tar.xz 74860 BLAKE2B 8ad76918f45516dcbee18922600690f9d1c418ee62b0edc3eef43c09138fbf3c2d820cb692d855deb779adc183122591e88929f130b25fc658f4e1fae9393430 SHA512 bc7228fbf452722fef54519fec97d3548bc73ec5350aa1f7dd68aa2ac35c233f6fae6aeee6bf687c478cc58f20afab3ce25dd237cd68ebe2eb9b23c77d29e4ab
-DIST ferm-2.5.tar.xz 74052 BLAKE2B daaf7ca8d132fe03b61fdc36aeb4ebe21076928fddf08b7e5be78df80a5759b1947a1c0ee1eff2e92c739b3af64978883bcbb21c4ad0cca9c8556bf9ea2ed6ca SHA512 f456141c939aaac390b27893d88eb5d532139cbe7bc33dd794f6b09b31ff218990c6ba76f2817c531cefeb948d6ee51e4b7ee092492cd9e5e711f794e4005399
-EBUILD ferm-2.4.1.ebuild 799 BLAKE2B 083bb55bc9a5d36c93ad542075115e0102354569917e647843a156fb416da6c3a5b46e64b855c83ecba42e7229e5979359484ae101ffd817ea46080cb8869b49 SHA512 b92cf64e621a7cfe7e4bb47b8016f30e34da39c62db1bc4087a5d0198a07c9f4c1add681724d9ec671317d3be3dcc9e23f18aa9895825613459f720f22ca4d35
+DIST ferm-2.6.tar.xz 76748 BLAKE2B 17c15e9d95c4562d1635715c599ab07fc98d8e9ebfcc332a42953fe279298799f26f7b3679f97e5dc9a82b745f70f54756fe2a9ed5763e91db15f7c0255c179e SHA512 af2bb852630304a86629c2ce3af8f557d17f59c704589ea130d8578f300a606e4fedbd39c88f89646df974947fc27982e3ea21de1187257afc74a6056fdf666c
 EBUILD ferm-2.5.1.ebuild 824 BLAKE2B c359651a2878de6460de812693e7f067f2f25f91a71fb72fd24691ba1351e9103cd17f0563c09e55a43e83d2f8a4c326d4f948a47693aacfc421aba9cd2fffd8 SHA512 c3bd5dd916ed47c90ba58b1a98a234ae4f484c8efc97db6bfae0af584f7df3dd6da3ae0ed17475f390d977e8b6f4c4967d114a0af55bbcdf2fd2621f68d7883f
-EBUILD ferm-2.5.ebuild 802 BLAKE2B 62279cd71da030044ff6fbff6778b1805dbdee96513c507588e651142535ec60b9cc53dd81674722b750ee49d45179bd76cb75fe49b43a9a41605c9b9c04a39d SHA512 9f4405324bde7dd217294de973e58e1d7c36e3cfb9bd60af7163c01e8721f56852ec6a6df38f0e24a37b225237f5de238e5a529faafd22a234606afcb381a274
+EBUILD ferm-2.6.ebuild 802 BLAKE2B 9f5b8cb6f6813dce596c1b8d614bd1db89cede70682fc82167a792801d6ef734f674a135f21e53a12fcbb0398a482952278dbc3ce84bc851e5ebebc0067e876d SHA512 235fa23743ae50c2d8403058a75b62ffeb8b8f1edb63bad3addb10fea2d4a6f8f1cf9716a7d8411f42eb4133b6c5340b2b75dac882b69ce1278b68bd53834b7d
 MISC metadata.xml 450 BLAKE2B a42e7896b2269a0fbb904ced374899d3a3b87d38cb08c0c6f55f570ff476d42ede3b9316b69a86a5d46b64c5d7050348efdb72c2e9b68440c4a991078ae56e42 SHA512 23ffc755aba9f3ce1acb92f3de86ec1f788bd868227b7ace77b3b7accfe891036da7e3e87254fc0bd693d7777e4c932b663e0b1118a8804b0ac2d63624a4ecac
diff --git a/net-firewall/ferm/ferm-2.4.1.ebuild b/net-firewall/ferm/ferm-2.4.1.ebuild
deleted file mode 100644
index 0acff45ec716..000000000000
--- a/net-firewall/ferm/ferm-2.4.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd versionator
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Command line util for managing firewall rules"
-HOMEPAGE="http://ferm.foo-projects.org/"
-SRC_URI="http://ferm.foo-projects.org/download/${MY_PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-# does not install any perl libs
-RDEPEND="dev-lang/perl:*
-	net-firewall/iptables
-	virtual/perl-File-Spec"
-
-DOCS=( AUTHORS NEWS README.rst TODO doc/ferm.txt examples/ )
-HTML_DOCS=( doc/ferm.html )
-
-src_install() {
-	dosbin src/{,import-}ferm
-	systemd_dounit ferm.service
-
-	einstalldocs
-	doman doc/*.1
-}
-
-pkg_postinst() {
-	elog "See ${EROOT}usr/share/doc/${PF}/examples for sample configs"
-}
diff --git a/net-firewall/ferm/ferm-2.5.ebuild b/net-firewall/ferm/ferm-2.6.ebuild
index 532055e4fd1b..fe419f389e4c 100644
--- a/net-firewall/ferm/ferm-2.5.ebuild
+++ b/net-firewall/ferm/ferm-2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index a6023749851f..f5445df03f0d 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -22,5 +22,5 @@ DIST shorewall-init-5.2.8.tar.bz2 42589 BLAKE2B 74e265ed9d938b6130800f548f5f4765
 DIST shorewall-lite-5.2.8.tar.bz2 47250 BLAKE2B 2fff00d7a6248a3db0aa5d6b3ed041b06bdfa35b71195088659afd4036cf61c6bc2f3de739803d4e26e56785aa90c87ec6a2120239183351fae7a54065f1a629 SHA512 d72f260b095f1dfb2b0a0c967ae80bfd7f5f3469a08eb446c0b3e1b1e662cb500510b75f2979a00a9ef57b16e6a23a95483c34e2a5c5d2d090bc1e071ea87292
 DIST shorewall6-5.2.8.tar.bz2 203102 BLAKE2B d9117d42cd25e18aa1104ec3f4498227eedcce5c3531623e2e4d6ec27ba5221f98e1ae2e596ac90d7415cd366b2dbfdd024adaaef0c1c2756900188bde105903 SHA512 7044efe84b2c585fcd0bfb661666c71cea140157f22ba7d4881006e24d785eb0091c071c825fa5948bc1383e7fd4617cc8f3d4e68865cf472ddea3811bf1833d
 DIST shorewall6-lite-5.2.8.tar.bz2 47178 BLAKE2B 47026c3fdab7564c8e48b653a4c67db99fe5ff07de723169f65185aea563691806164a637a38c419d19619cf1380462fa7287b0993d9389dd311393bac911602 SHA512 a80ffc7baf7800e024e41a0f9736543b15d10f2d403540e48e8a2cd2ba0196ce04ff01ac98fc03852c7d268bb4954714dd428375e768b80aa4792683b8775935
-EBUILD shorewall-5.2.8.ebuild 16950 BLAKE2B 4902057f397f18376a18dda99a3a1d7ea1e0fa1d72c6152326ce350cd982c9bc2f153bca737ec8463ab5cb7f85a978ee1a59a9687054e77455754bb8f0c33946 SHA512 f219befed5ff5c4a9635bbd5404e276abc241ca91eac03724de03748854ed5227297b489e0f03796e5662e3c59572ccd6f46c4411da08906bd2af657976c19c7
+EBUILD shorewall-5.2.8.ebuild 16943 BLAKE2B 33ce7acd62973b90205a85616f31b0bcbe4655222110e00c5bb7312e51b5d66acbeff1ddb125b59a48e6c4b8311bb6055e7e9579acb84a35c3ef62cc705ccd4d SHA512 b450c0060aa58829a4001431145635fc128006b80af3104f4ab42a6916b6cda576310b4adc520fd6b25ac0a0ad505fb1c9d758ce88c717ea5d1f7520f01a0445
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/shorewall-5.2.8.ebuild b/net-firewall/shorewall/shorewall-5.2.8.ebuild
index a388cba86f32..566917fbfb31 100644
--- a/net-firewall/shorewall/shorewall-5.2.8.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -428,7 +428,7 @@ pkg_postinst() {
 
 	local v
 	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
+		if ! ver_test ${v} -ge ${MY_MAJOR_RELEASE_NUMBER}; then
 			# This is an upgrade
 
 			elog "You are upgrading from a previous major version. It is highly recommended that you read"