1 |
pinkbyte 14/05/03 21:25:46 |
2 |
|
3 |
Modified: ChangeLog leechcraft.eclass |
4 |
Log: |
5 |
Omit some obsolete version checks |
6 |
|
7 |
Revision Changes Path |
8 |
1.1238 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1238&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1238&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1237&r2=1.1238 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1237 |
18 |
retrieving revision 1.1238 |
19 |
diff -u -r1.1237 -r1.1238 |
20 |
--- ChangeLog 2 May 2014 16:16:37 -0000 1.1237 |
21 |
+++ ChangeLog 3 May 2014 21:25:46 -0000 1.1238 |
22 |
@@ -1,6 +1,9 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1237 2014/05/02 16:16:37 mgorny Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1238 2014/05/03 21:25:46 pinkbyte Exp $ |
27 |
+ |
28 |
+ 03 May 2014; Sergey Popov <pinkbyte@g.o> leechcraft.eclass: |
29 |
+ Omit some obsolete version checks |
30 |
|
31 |
02 May 2014; Michał Górny <mgorny@g.o> autotools-multilib.eclass, |
32 |
multilib-minimal.eclass: |
33 |
|
34 |
|
35 |
|
36 |
1.15 eclass/leechcraft.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/leechcraft.eclass?rev=1.15&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/leechcraft.eclass?rev=1.15&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/leechcraft.eclass?r1=1.14&r2=1.15 |
41 |
|
42 |
Index: leechcraft.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/leechcraft.eclass,v |
45 |
retrieving revision 1.14 |
46 |
retrieving revision 1.15 |
47 |
diff -u -r1.14 -r1.15 |
48 |
--- leechcraft.eclass 15 Apr 2014 16:06:56 -0000 1.14 |
49 |
+++ leechcraft.eclass 3 May 2014 21:25:46 -0000 1.15 |
50 |
@@ -1,6 +1,6 @@ |
51 |
# Copyright 1999-2014 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/leechcraft.eclass,v 1.14 2014/04/15 16:06:56 maksbotan Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/leechcraft.eclass,v 1.15 2014/05/03 21:25:46 pinkbyte Exp $ |
55 |
# |
56 |
# @ECLASS: leechcraft.eclass |
57 |
# @MAINTAINER: |
58 |
@@ -42,11 +42,7 @@ |
59 |
fi |
60 |
|
61 |
HOMEPAGE="http://leechcraft.org/" |
62 |
-if version_is_at_least 0.5.95; then |
63 |
- LICENSE="Boost-1.0" |
64 |
-else |
65 |
- LICENSE="GPL-3" |
66 |
-fi |
67 |
+LICENSE="Boost-1.0" |
68 |
|
69 |
# @ECLASS-VARIABLE: LEECHCRAFT_PLUGIN_CATEGORY |
70 |
# @DEFAULT_UNSET |
71 |
@@ -72,13 +68,11 @@ |
72 |
leechcraft_pkg_pretend() { |
73 |
debug-print-function ${FUNCNAME} "$@" |
74 |
|
75 |
- if version_is_at_least 0.5.85; then |
76 |
- # 0.5.85 and later requires at least gcc 4.6 |
77 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
78 |
- [[ $(gcc-major-version) -lt 4 ]] || \ |
79 |
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ |
80 |
- && die "Sorry, but gcc 4.6 or higher is required." |
81 |
- fi |
82 |
+ # 0.5.85 and later requires at least gcc 4.6 |
83 |
+ if [[ ${MERGE_TYPE} != binary ]]; then |
84 |
+ [[ $(gcc-major-version) -lt 4 ]] || \ |
85 |
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ |
86 |
+ && die "Sorry, but gcc 4.6 or higher is required." |
87 |
fi |
88 |
if version_is_at_least 0.6.66 || ( [[ ${PN} == lc-monocle ]] && version_is_at_least 0.6.65 ); then |
89 |
# 0.6.65 monocle and all later plugins require at least gcc 4.8 |