1 |
commit: 2f72fa20fea29786e43ccd23395cccf1f53158e7 |
2 |
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Jun 7 15:39:07 2012 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 7 15:39:07 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2f72fa20 |
7 |
|
8 |
[qt4-build.eclass] Sync with portage. |
9 |
|
10 |
--- |
11 |
eclass/qt4-build.eclass | 76 +++++++++++++++++++++++----------------------- |
12 |
1 files changed, 38 insertions(+), 38 deletions(-) |
13 |
|
14 |
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass |
15 |
index a83bd71..5ad78c7 100644 |
16 |
--- a/eclass/qt4-build.eclass |
17 |
+++ b/eclass/qt4-build.eclass |
18 |
@@ -1,6 +1,6 @@ |
19 |
# Copyright 1999-2012 Gentoo Foundation |
20 |
# Distributed under the terms of the GNU General Public License v2 |
21 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.131 2012/05/25 12:06:05 pesa Exp $ |
22 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.132 2012/06/07 15:36:49 pesa Exp $ |
23 |
|
24 |
# @ECLASS: qt4-build.eclass |
25 |
# @MAINTAINER: |
26 |
@@ -58,42 +58,42 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then |
27 |
fi |
28 |
|
29 |
RDEPEND=" |
30 |
- !<x11-libs/qt-assistant-${PV} |
31 |
- !>x11-libs/qt-assistant-${PV}-r9999 |
32 |
- !<x11-libs/qt-bearer-${PV} |
33 |
- !>x11-libs/qt-bearer-${PV}-r9999 |
34 |
- !<x11-libs/qt-core-${PV} |
35 |
- !>x11-libs/qt-core-${PV}-r9999 |
36 |
- !<x11-libs/qt-dbus-${PV} |
37 |
- !>x11-libs/qt-dbus-${PV}-r9999 |
38 |
- !<x11-libs/qt-declarative-${PV} |
39 |
- !>x11-libs/qt-declarative-${PV}-r9999 |
40 |
- !<x11-libs/qt-demo-${PV} |
41 |
- !>x11-libs/qt-demo-${PV}-r9999 |
42 |
- !<x11-libs/qt-gui-${PV} |
43 |
- !>x11-libs/qt-gui-${PV}-r9999 |
44 |
- !<x11-libs/qt-multimedia-${PV} |
45 |
- !>x11-libs/qt-multimedia-${PV}-r9999 |
46 |
- !<x11-libs/qt-opengl-${PV} |
47 |
- !>x11-libs/qt-opengl-${PV}-r9999 |
48 |
- !<x11-libs/qt-openvg-${PV} |
49 |
- !>x11-libs/qt-openvg-${PV}-r9999 |
50 |
- !<x11-libs/qt-phonon-${PV} |
51 |
- !>x11-libs/qt-phonon-${PV}-r9999 |
52 |
- !<x11-libs/qt-qt3support-${PV} |
53 |
- !>x11-libs/qt-qt3support-${PV}-r9999 |
54 |
- !<x11-libs/qt-script-${PV} |
55 |
- !>x11-libs/qt-script-${PV}-r9999 |
56 |
- !<x11-libs/qt-sql-${PV} |
57 |
- !>x11-libs/qt-sql-${PV}-r9999 |
58 |
- !<x11-libs/qt-svg-${PV} |
59 |
- !>x11-libs/qt-svg-${PV}-r9999 |
60 |
- !<x11-libs/qt-test-${PV} |
61 |
- !>x11-libs/qt-test-${PV}-r9999 |
62 |
- !<x11-libs/qt-webkit-${PV} |
63 |
- !>x11-libs/qt-webkit-${PV}-r9999 |
64 |
- !<x11-libs/qt-xmlpatterns-${PV} |
65 |
- !>x11-libs/qt-xmlpatterns-${PV}-r9999 |
66 |
+ !<x11-libs/qt-assistant-${PV}:4 |
67 |
+ !>x11-libs/qt-assistant-${PV}-r9999:4 |
68 |
+ !<x11-libs/qt-bearer-${PV}:4 |
69 |
+ !>x11-libs/qt-bearer-${PV}-r9999:4 |
70 |
+ !<x11-libs/qt-core-${PV}:4 |
71 |
+ !>x11-libs/qt-core-${PV}-r9999:4 |
72 |
+ !<x11-libs/qt-dbus-${PV}:4 |
73 |
+ !>x11-libs/qt-dbus-${PV}-r9999:4 |
74 |
+ !<x11-libs/qt-declarative-${PV}:4 |
75 |
+ !>x11-libs/qt-declarative-${PV}-r9999:4 |
76 |
+ !<x11-libs/qt-demo-${PV}:4 |
77 |
+ !>x11-libs/qt-demo-${PV}-r9999:4 |
78 |
+ !<x11-libs/qt-gui-${PV}:4 |
79 |
+ !>x11-libs/qt-gui-${PV}-r9999:4 |
80 |
+ !<x11-libs/qt-multimedia-${PV}:4 |
81 |
+ !>x11-libs/qt-multimedia-${PV}-r9999:4 |
82 |
+ !<x11-libs/qt-opengl-${PV}:4 |
83 |
+ !>x11-libs/qt-opengl-${PV}-r9999:4 |
84 |
+ !<x11-libs/qt-openvg-${PV}:4 |
85 |
+ !>x11-libs/qt-openvg-${PV}-r9999:4 |
86 |
+ !<x11-libs/qt-phonon-${PV}:4 |
87 |
+ !>x11-libs/qt-phonon-${PV}-r9999:4 |
88 |
+ !<x11-libs/qt-qt3support-${PV}:4 |
89 |
+ !>x11-libs/qt-qt3support-${PV}-r9999:4 |
90 |
+ !<x11-libs/qt-script-${PV}:4 |
91 |
+ !>x11-libs/qt-script-${PV}-r9999:4 |
92 |
+ !<x11-libs/qt-sql-${PV}:4 |
93 |
+ !>x11-libs/qt-sql-${PV}-r9999:4 |
94 |
+ !<x11-libs/qt-svg-${PV}:4 |
95 |
+ !>x11-libs/qt-svg-${PV}-r9999:4 |
96 |
+ !<x11-libs/qt-test-${PV}:4 |
97 |
+ !>x11-libs/qt-test-${PV}-r9999:4 |
98 |
+ !<x11-libs/qt-webkit-${PV}:4 |
99 |
+ !>x11-libs/qt-webkit-${PV}-r9999:4 |
100 |
+ !<x11-libs/qt-xmlpatterns-${PV}:4 |
101 |
+ !>x11-libs/qt-xmlpatterns-${PV}-r9999:4 |
102 |
" |
103 |
|
104 |
S=${WORKDIR}/${MY_P} |
105 |
@@ -106,7 +106,7 @@ qt4-build_pkg_setup() { |
106 |
|
107 |
# Protect users by not allowing downgrades between releases |
108 |
# Downgrading revisions within the same release should be allowed |
109 |
- if has_version '>'${CATEGORY}/${P}-r9999; then |
110 |
+ if has_version ">${CATEGORY}/${P}-r9999:4"; then |
111 |
if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then |
112 |
eerror |
113 |
eerror "Sanity check to keep you from breaking your system:" |