1 |
scarabeus 10/11/05 12:11:55 |
2 |
|
3 |
Modified: xorg-2.eclass |
4 |
Log: |
5 |
Append eautoreconf depstring to archs where it is mandatory to run eautoreconf. (this is required for cache) |
6 |
|
7 |
Revision Changes Path |
8 |
1.19 eclass/xorg-2.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.19&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.19&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?r1=1.18&r2=1.19 |
13 |
|
14 |
Index: xorg-2.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v |
17 |
retrieving revision 1.18 |
18 |
retrieving revision 1.19 |
19 |
diff -u -r1.18 -r1.19 |
20 |
--- xorg-2.eclass 1 Nov 2010 12:37:58 -0000 1.18 |
21 |
+++ xorg-2.eclass 5 Nov 2010 12:11:55 -0000 1.19 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2010 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.18 2010/11/01 12:37:58 scarabeus Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.19 2010/11/05 12:11:55 scarabeus Exp $ |
27 |
# |
28 |
# @ECLASS: xorg-2.eclass |
29 |
# @MAINTAINER: |
30 |
@@ -93,20 +93,26 @@ |
31 |
# are under the MIT license. (This is what Red Hat does in their rpms) |
32 |
: ${LICENSE:=MIT} |
33 |
|
34 |
-# Set up shared dependencies |
35 |
-if [[ ${XORG_EAUTORECONF} != no ]]; then |
36 |
- DEPEND+=" |
37 |
- >=sys-devel/libtool-2.2.6a |
38 |
- sys-devel/m4" |
39 |
- # This MUST BE STABLE |
40 |
- if [[ ${PN} != util-macros ]] ; then |
41 |
- DEPEND+=" >=x11-misc/util-macros-1.11.0" |
42 |
- # Required even by xorg-server |
43 |
- [[ ${PN} == "font-util" ]] || DEPEND+=" >=media-fonts/font-util-1.1.1-r1" |
44 |
- fi |
45 |
- WANT_AUTOCONF="latest" |
46 |
- WANT_AUTOMAKE="latest" |
47 |
+# Set up autotools shared dependencies |
48 |
+# Remember that all versions here MUST be stable |
49 |
+XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt" |
50 |
+EAUTORECONF_DEPEND+=" |
51 |
+ >=sys-devel/libtool-2.2.6a |
52 |
+ sys-devel/m4" |
53 |
+if [[ ${PN} != util-macros ]] ; then |
54 |
+ EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.11.0" |
55 |
+ # Required even by xorg-server |
56 |
+ [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.1.1-r1" |
57 |
fi |
58 |
+WANT_AUTOCONF="latest" |
59 |
+WANT_AUTOMAKE="latest" |
60 |
+for arch in ${XORG_EAUTORECONF_ARCHES}; do |
61 |
+ EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )" |
62 |
+done |
63 |
+DEPEND+=" ${EAUTORECONF_DEPENDS}" |
64 |
+[[ ${XORG_EAUTORECONF} != no ]] && DEPEND+=" ${EAUTORECONF_DEPEND}" |
65 |
+unset EAUTORECONF_DEPENDS |
66 |
+unset EAUTORECONF_DEPEND |
67 |
|
68 |
if [[ ${FONT} == yes ]]; then |
69 |
RDEPEND+=" media-fonts/encodings |