Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] eselect r512 - in trunk: . modules
Date: Mon, 27 Apr 2009 07:39:41
Message-Id: E1LyLRD-0004hd-GL@stork.gentoo.org
1 Author: ulm
2 Date: 2009-04-27 07:39:39 +0000 (Mon, 27 Apr 2009)
3 New Revision: 512
4
5 Modified:
6 trunk/ChangeLog
7 trunk/modules/opengl.eselect
8 Log:
9 Don't call portageq directly, use generic has_version function instead.
10
11 Modified: trunk/ChangeLog
12 ===================================================================
13 --- trunk/ChangeLog 2009-04-27 07:08:16 UTC (rev 511)
14 +++ trunk/ChangeLog 2009-04-27 07:39:39 UTC (rev 512)
15 @@ -1,5 +1,8 @@
16 2009-04-27 Ulrich Mueller <ulm@g.o>
17
18 + * modules/opengl.eselect (check_version): Don't call portageq
19 + directly, use generic has_version function instead.
20 +
21 * libs/package-manager.bash.in (get_repositories): In the Portage
22 case, use "portageq get_repos".
23 (get_repo_news_dir): Use "portageq get_repo_path".
24
25 Modified: trunk/modules/opengl.eselect
26 ===================================================================
27 --- trunk/modules/opengl.eselect 2009-04-27 07:08:16 UTC (rev 511)
28 +++ trunk/modules/opengl.eselect 2009-04-27 07:39:39 UTC (rev 512)
29 @@ -1,4 +1,4 @@
30 -# Copyright 1999-2004 Gentoo Foundation
31 +# Copyright 1999-2009 Gentoo Foundation
32 # Distributed under the terms of the GNU General Public License v2
33 # $Id$
34 # Author: Martin Schlemmer <azarah@g.o>
35 @@ -23,8 +23,8 @@
36 USE_PROFILE_HEADERS="no"
37
38 check_version() {
39 - if portageq has_version ${ROOT:-/} 'x11-base/xorg-x11'; then
40 - if ! portageq has_version ${ROOT:-/} '>=x11-base/xorg-x11-6.8.0-r4'; then
41 + if has_version 'x11-base/xorg-x11'; then
42 + if ! has_version '>=x11-base/xorg-x11-6.8.0-r4'; then
43 die -q "This version requires >=x11-base/xorg-x11-6.8.0-r4"
44 fi
45 fi