Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/pciutils/
Date: Sun, 12 Jan 2020 15:12:49
Message-Id: 1578841959.3947cb6565e006bd389aa2f3ca6a6e165111b36d.polynomial-c@gentoo
1 commit: 3947cb6565e006bd389aa2f3ca6a6e165111b36d
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 12 15:12:14 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 12 15:12:39 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3947cb65
7
8 sys-apps/pciutils: Don't use lexicographical version compare
9
10 Closes: https://bugs.gentoo.org/705274
11 Package-Manager: Portage-2.3.84, Repoman-2.3.20
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 sys-apps/pciutils/pciutils-3.5.6-r1.ebuild | 6 +++---
15 sys-apps/pciutils/pciutils-3.6.1.ebuild | 6 +++---
16 sys-apps/pciutils/pciutils-3.6.2-r1.ebuild | 6 +++---
17 3 files changed, 9 insertions(+), 9 deletions(-)
18
19 diff --git a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
20 index 6f9475350b3..972c45769c0 100644
21 --- a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
22 +++ b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
23 @@ -1,9 +1,9 @@
24 -# Copyright 1999-2019 Gentoo Authors
25 +# Copyright 1999-2020 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=6
29
30 -inherit multilib toolchain-funcs multilib-minimal flag-o-matic
31 +inherit eapi7-ver multilib toolchain-funcs multilib-minimal flag-o-matic
32
33 DESCRIPTION="Various utilities dealing with the PCI bus"
34 HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
35 @@ -113,7 +113,7 @@ multilib_src_install_all() {
36 }
37
38 pkg_postinst() {
39 - if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
40 + if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 3.2.0 ; then
41 elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
42 elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
43 fi
44
45 diff --git a/sys-apps/pciutils/pciutils-3.6.1.ebuild b/sys-apps/pciutils/pciutils-3.6.1.ebuild
46 index 2a1f547edb3..587b417565a 100644
47 --- a/sys-apps/pciutils/pciutils-3.6.1.ebuild
48 +++ b/sys-apps/pciutils/pciutils-3.6.1.ebuild
49 @@ -1,9 +1,9 @@
50 -# Copyright 1999-2019 Gentoo Authors
51 +# Copyright 1999-2020 Gentoo Authors
52 # Distributed under the terms of the GNU General Public License v2
53
54 EAPI=6
55
56 -inherit multilib toolchain-funcs multilib-minimal flag-o-matic
57 +inherit eapi7-ver multilib toolchain-funcs multilib-minimal flag-o-matic
58
59 DESCRIPTION="Various utilities dealing with the PCI bus"
60 HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
61 @@ -113,7 +113,7 @@ multilib_src_install_all() {
62 }
63
64 pkg_postinst() {
65 - if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
66 + if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 3.2.0 ; then
67 elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
68 elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
69 fi
70
71 diff --git a/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild b/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
72 index 2a1f547edb3..587b417565a 100644
73 --- a/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
74 +++ b/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
75 @@ -1,9 +1,9 @@
76 -# Copyright 1999-2019 Gentoo Authors
77 +# Copyright 1999-2020 Gentoo Authors
78 # Distributed under the terms of the GNU General Public License v2
79
80 EAPI=6
81
82 -inherit multilib toolchain-funcs multilib-minimal flag-o-matic
83 +inherit eapi7-ver multilib toolchain-funcs multilib-minimal flag-o-matic
84
85 DESCRIPTION="Various utilities dealing with the PCI bus"
86 HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
87 @@ -113,7 +113,7 @@ multilib_src_install_all() {
88 }
89
90 pkg_postinst() {
91 - if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
92 + if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 3.2.0 ; then
93 elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
94 elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
95 fi