sys-apps/pciutils: Don't use lexicographical version compare

Closes: https://bugs.gentoo.org/705274
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
index 6f9475350b3e18e300e6ed5c2bbab030a7b07f5b..972c45769c03fd0a592de34179d25d258e220924 100644 (file)
--- a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit multilib toolchain-funcs multilib-minimal flag-o-matic
+inherit eapi7-ver multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="Various utilities dealing with the PCI bus"
 HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
@@ -113,7 +113,7 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
-       if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
+       if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 3.2.0 ; then
                elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
                elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
        fi

diff --git a/sys-apps/pciutils/pciutils-3.6.1.ebuild b/sys-apps/pciutils/pciutils-3.6.1.ebuild
index 2a1f547edb392329ab88c2d3abb693dfbb80ca70..587b417565abe9cd9b4eeac101f662581a5bb97c 100644 (file)
--- a/sys-apps/pciutils/pciutils-3.6.1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit multilib toolchain-funcs multilib-minimal flag-o-matic
+inherit eapi7-ver multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="Various utilities dealing with the PCI bus"
 HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
@@ -113,7 +113,7 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
-       if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
+       if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 3.2.0 ; then
                elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
                elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
        fi

diff --git a/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild b/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
index 2a1f547edb392329ab88c2d3abb693dfbb80ca70..587b417565abe9cd9b4eeac101f662581a5bb97c 100644 (file)
--- a/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit multilib toolchain-funcs multilib-minimal flag-o-matic
+inherit eapi7-ver multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="Various utilities dealing with the PCI bus"
 HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
@@ -113,7 +113,7 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
-       if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
+       if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 3.2.0 ; then
                elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
                elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
        fi