1 |
flameeyes 12/03/21 17:12:01 |
2 |
|
3 |
Modified: ChangeLog autotools.eclass |
4 |
Log: |
5 |
Go back to use a variable rather than an array for _LATEST_AUTOMAKE, use versionator eclass to go back to the full version instead, so that it's clear what's going on and other developers don't misread the code. It's only perfect for EAPI >= 0 but it's not broken on EAPI=0 anyway. |
6 |
|
7 |
Revision Changes Path |
8 |
1.177 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.177&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.177&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.176&r2=1.177 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.176 |
18 |
retrieving revision 1.177 |
19 |
diff -u -r1.176 -r1.177 |
20 |
--- ChangeLog 20 Mar 2012 20:37:21 -0000 1.176 |
21 |
+++ ChangeLog 21 Mar 2012 17:12:01 -0000 1.177 |
22 |
@@ -1,6 +1,12 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.176 2012/03/20 20:37:21 floppym Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.177 2012/03/21 17:12:01 flameeyes Exp $ |
27 |
+ |
28 |
+ 21 Mar 2012; Diego E. Pettenò <flameeyes@g.o> autotools.eclass: |
29 |
+ Go back to use a variable rather than an array for _LATEST_AUTOMAKE, use |
30 |
+ versionator eclass to go back to the full version instead, so that it's clear |
31 |
+ what's going on and other developers don't misread the code. It's only |
32 |
+ perfect for EAPI >= 0 but it's not broken on EAPI=0 anyway. |
33 |
|
34 |
20 Mar 2012; Mike Gilbert <floppym@g.o> python.eclass: |
35 |
Define _python_implementation() earlier. |
36 |
|
37 |
|
38 |
|
39 |
1.127 eclass/autotools.eclass |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.127&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.127&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.126&r2=1.127 |
44 |
|
45 |
Index: autotools.eclass |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v |
48 |
retrieving revision 1.126 |
49 |
retrieving revision 1.127 |
50 |
diff -u -r1.126 -r1.127 |
51 |
--- autotools.eclass 21 Mar 2012 08:19:22 -0000 1.126 |
52 |
+++ autotools.eclass 21 Mar 2012 17:12:01 -0000 1.127 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2012 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.126 2012/03/21 08:19:22 ssuominen Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.127 2012/03/21 17:12:01 flameeyes Exp $ |
58 |
|
59 |
# @ECLASS: autotools.eclass |
60 |
# @MAINTAINER: |
61 |
@@ -16,7 +16,7 @@ |
62 |
if [[ ${___ECLASS_ONCE_AUTOTOOLS} != "recur -_+^+_- spank" ]] ; then |
63 |
___ECLASS_ONCE_AUTOTOOLS="recur -_+^+_- spank" |
64 |
|
65 |
-inherit eutils libtool |
66 |
+inherit eutils libtool versionator |
67 |
|
68 |
# @ECLASS-VARIABLE: WANT_AUTOCONF |
69 |
# @DESCRIPTION: |
70 |
@@ -37,13 +37,11 @@ |
71 |
# @INTERNAL |
72 |
# @DESCRIPTION: |
73 |
# CONSTANT! |
74 |
-# The latest major version/slot of automake available on each arch. #312315 |
75 |
-# If a newer version is stable on any arch, and is NOT reflected in this list, |
76 |
+# The latest major-minor version/slot of automake available on each arch. #312315 |
77 |
+# If a newer slot is stable on any arch, and is NOT reflected in this list, |
78 |
# then circular dependencies may arise during emerge @system bootstraps. |
79 |
-# If you want to force a newer minor version, you can specify the correct |
80 |
-# WANT value by using a colon: <PV>[:<WANT_AUTOMAKE>] |
81 |
# Do NOT change this variable in your ebuilds! |
82 |
-_LATEST_AUTOMAKE=( 1.11.1:1.11 ) |
83 |
+_LATEST_AUTOMAKE=1.11.1 |
84 |
|
85 |
_automake_atom="sys-devel/automake" |
86 |
_autoconf_atom="sys-devel/autoconf" |
87 |
@@ -52,8 +50,15 @@ |
88 |
none) _automake_atom="" ;; # some packages don't require automake at all |
89 |
# if you change the "latest" version here, change also autotools_run_tool |
90 |
# this MUST reflect the latest stable major version for each arch! |
91 |
- latest) _automake_atom="|| ( `printf '>=sys-devel/automake-%s ' ${_LATEST_AUTOMAKE[@]/%:*}` )" ;; |
92 |
- *) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;; |
93 |
+ latest) |
94 |
+ if [[ ${EAPI:-0} != 0 ]]; then |
95 |
+ _automake_atom=">=sys-devel/automake-${_LATEST_AUTOMAKE}:$(get_version_component_range 1-2 ${_LATEST_AUTOMAKE})" |
96 |
+ else |
97 |
+ _automake_atom=">=sys-devel/automake-${_LATEST_AUTOMAKE} =sys-devel/automake-$(get_version_component_range 1-2 ${_LATEST_AUTOMAKE})*" |
98 |
+ fi |
99 |
+ ;; |
100 |
+ *) |
101 |
+ _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;; |
102 |
esac |
103 |
export WANT_AUTOMAKE |
104 |
fi |
105 |
@@ -346,12 +351,10 @@ |
106 |
# We do the "latest" → version switch here because it solves |
107 |
# possible order problems, see bug #270010 as an example. |
108 |
if [[ ${WANT_AUTOMAKE} == "latest" ]]; then |
109 |
- local pv |
110 |
- for pv in ${_LATEST_AUTOMAKE[@]/#*:} ; do |
111 |
- # has_version respects ROOT, but in this case, we don't want it to, |
112 |
- # thus "ROOT=/" prefix: |
113 |
- ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" |
114 |
- done |
115 |
+ # has_version respects ROOT, but in this case, we don't want it to, |
116 |
+ # thus "ROOT=/" prefix: |
117 |
+ ROOT=/ has_version "=sys-devel/automake-$(get_version_component_range 1-2 ${_LATEST_AUTOMAKE})*" && export WANT_AUTOMAKE="$(get_version_component_range 1-2 ${_LATEST_AUTOMAKE})" |
118 |
+ |
119 |
[[ ${WANT_AUTOMAKE} == "latest" ]] && \ |
120 |
die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE}" |
121 |
fi |