commit:     3947cb6565e006bd389aa2f3ca6a6e165111b36d
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 15:12:14 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 15:12:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3947cb65

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 <AT> gentoo.org>

 sys-apps/pciutils/pciutils-3.5.6-r1.ebuild | 6 +++---
 sys-apps/pciutils/pciutils-3.6.1.ebuild    | 6 +++---
 sys-apps/pciutils/pciutils-3.6.2-r1.ebuild | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild 
b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
index 6f9475350b3..972c45769c0 100644
--- 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 2a1f547edb3..587b417565a 100644
--- 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 2a1f547edb3..587b417565a 100644
--- 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

Reply via email to