Gentoo Archives: gentoo-commits

From: "Ryan Hill (dirtyepic)" <dirtyepic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog wxwidgets.eclass
Date: Mon, 30 Dec 2013 08:25:39
Message-Id: 20131230082535.EFB1A2004C@flycatcher.gentoo.org
1 dirtyepic 13/12/30 08:25:35
2
3 Modified: ChangeLog wxwidgets.eclass
4 Log:
5 Add 3.0 support.
6
7 Revision Changes Path
8 1.1104 eclass/ChangeLog
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1104&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1104&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1103&r2=1.1104
13
14 Index: ChangeLog
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
17 retrieving revision 1.1103
18 retrieving revision 1.1104
19 diff -u -r1.1103 -r1.1104
20 --- ChangeLog 30 Dec 2013 03:24:04 -0000 1.1103
21 +++ ChangeLog 30 Dec 2013 08:25:35 -0000 1.1104
22 @@ -1,6 +1,9 @@
23 # ChangeLog for eclass directory
24 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1103 2013/12/30 03:24:04 dirtyepic Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1104 2013/12/30 08:25:35 dirtyepic Exp $
27 +
28 + 30 Dec 2013; Ryan Hill <dirtyepic@g.o> wxwidgets.eclass:
29 + Add 3.0 support.
30
31 30 Dec 2013; Ryan Hill <dirtyepic@g.o> toolchain.eclass:
32 For 4.8+ C++ is always enabled. We should eventually drop the cxx USE flag,
33
34
35
36 1.38 eclass/wxwidgets.eclass
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/wxwidgets.eclass?rev=1.38&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/wxwidgets.eclass?rev=1.38&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/wxwidgets.eclass?r1=1.37&r2=1.38
41
42 Index: wxwidgets.eclass
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v
45 retrieving revision 1.37
46 retrieving revision 1.38
47 diff -u -r1.37 -r1.38
48 --- wxwidgets.eclass 16 Nov 2013 13:05:11 -0000 1.37
49 +++ wxwidgets.eclass 30 Dec 2013 08:25:35 -0000 1.38
50 @@ -1,6 +1,6 @@
51 # Copyright 1999-2013 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 -# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.37 2013/11/16 13:05:11 dirtyepic Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.38 2013/12/30 08:25:35 dirtyepic Exp $
55
56 # @ECLASS: wxwidgets.eclass
57 # @MAINTAINER:
58 @@ -94,10 +94,10 @@
59 die
60 fi
61
62 - if [[ ${WX_GTK_VER} != 2.8 && ${WX_GTK_VER} != 2.9 ]]; then
63 - eerror "Invalid WX_GTK_VER: ${WX_GTK_VER} - must be set to a valid wxGTK SLOT."
64 - echo
65 - die
66 + if [[ ${WX_GTK_VER} != 2.8 && ${WX_GTK_VER} != 2.9 && ${WX_GTK_VER} != 3.0 ]]; then
67 + eerror "Invalid WX_GTK_VER: ${WX_GTK_VER} - must be set to a valid wxGTK SLOT."
68 + echo
69 + die
70 fi
71
72 case $1 in
73 @@ -115,7 +115,7 @@
74 wxtoolkit="base"
75 fi
76
77 - # 2.8 has a separate debug tuple
78 + # 2.8 has a separate debug element
79 if [[ ${WX_GTK_VER} == 2.8 ]]; then
80 if has_version "x11-libs/wxGTK:${WX_GTK_VER}[debug]"; then
81 wxdebug="debug-"