Gentoo Archives: gentoo-commits

From: "Christian Faulhammer (fauli)" <fauli@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/erlang: ChangeLog erlang-13.2.2.ebuild erlang-13.2.3.ebuild
Date: Sun, 21 Feb 2010 14:43:04
Message-Id: E1NjD1R-0006tX-L6@stork.gentoo.org
1 fauli 10/02/21 14:43:01
2
3 Modified: ChangeLog erlang-13.2.2.ebuild erlang-13.2.3.ebuild
4 Log:
5 use the wxwidgets USE flag instead of wxwindows, see bug 305349 by Ciprian Ciubotariu <cheepeero AT gmx DOT net>
6 (Portage version: 2.1.7.17/cvs/Linux i686)
7
8 Revision Changes Path
9 1.180 dev-lang/erlang/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/erlang/ChangeLog?rev=1.180&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/erlang/ChangeLog?rev=1.180&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/erlang/ChangeLog?r1=1.179&r2=1.180
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v
18 retrieving revision 1.179
19 retrieving revision 1.180
20 diff -u -r1.179 -r1.180
21 --- ChangeLog 29 Dec 2009 18:23:34 -0000 1.179
22 +++ ChangeLog 21 Feb 2010 14:43:00 -0000 1.180
23 @@ -1,6 +1,11 @@
24 # ChangeLog for dev-lang/erlang
25 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.179 2009/12/29 18:23:34 fauli Exp $
27 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.180 2010/02/21 14:43:00 fauli Exp $
29 +
30 + 21 Feb 2010; Christian Faulhammer <fauli@g.o> erlang-13.2.2.ebuild,
31 + erlang-13.2.3.ebuild:
32 + use the wxwidgets USE flag instead of wxwindows, see bug 305349 by Ciprian
33 + Ciubotariu <cheepeero AT gmx DOT net>
34
35 29 Dec 2009; Christian Faulhammer <fauli@g.o>
36 -erlang-12.2.5-r1.ebuild, -files/erlang-12.2.5-amd64_segfault.patch,
37
38
39
40 1.9 dev-lang/erlang/erlang-13.2.2.ebuild
41
42 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/erlang/erlang-13.2.2.ebuild?rev=1.9&view=markup
43 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/erlang/erlang-13.2.2.ebuild?rev=1.9&content-type=text/plain
44 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/erlang/erlang-13.2.2.ebuild?r1=1.8&r2=1.9
45
46 Index: erlang-13.2.2.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.2.ebuild,v
49 retrieving revision 1.8
50 retrieving revision 1.9
51 diff -u -r1.8 -r1.9
52 --- erlang-13.2.2.ebuild 29 Dec 2009 17:48:57 -0000 1.8
53 +++ erlang-13.2.2.ebuild 21 Feb 2010 14:43:00 -0000 1.9
54 @@ -1,6 +1,6 @@
55 -# Copyright 1999-2009 Gentoo Foundation
56 +# Copyright 1999-2010 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.2.ebuild,v 1.8 2009/12/29 17:48:57 armin76 Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.2.ebuild,v 1.9 2010/02/21 14:43:00 fauli Exp $
60
61 EAPI=2
62 WX_GTK_VER="2.8"
63 @@ -30,7 +30,7 @@
64 LICENSE="EPL"
65 SLOT="0"
66 KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
67 -IUSE="doc emacs hipe java kpoll odbc smp sctp ssl tk wxwindows"
68 +IUSE="doc emacs hipe java kpoll odbc smp sctp ssl tk wxwidgets"
69
70 RDEPEND=">=dev-lang/perl-5.6.1
71 ssl? ( >=dev-libs/openssl-0.9.7d )
72 @@ -38,7 +38,7 @@
73 java? ( >=virtual/jdk-1.2 )
74 odbc? ( dev-db/unixODBC )"
75 DEPEND="${RDEPEND}
76 - wxwindows? ( x11-libs/wxGTK:2.8[opengl] )
77 + wxwidgets? ( x11-libs/wxGTK:2.8[opengl] )
78 sctp? ( net-misc/lksctp-tools )
79 tk? ( dev-lang/tk )"
80
81 @@ -47,13 +47,13 @@
82 SITEFILE=50${PN}-gentoo.el
83
84 pkg_setup() {
85 - use wxwindows && wxwidgets_pkg_setup
86 + use wxwidgets && wxwidgets_pkg_setup
87 }
88
89 src_prepare() {
90 use odbc || sed -i 's: odbc : :' lib/Makefile
91
92 - if ! use wxwindows; then
93 + if ! use wxwidgets; then
94 sed -i 's: wx : :' lib/Makefile
95 rm -rf lib/wx
96 fi
97
98
99
100 1.2 dev-lang/erlang/erlang-13.2.3.ebuild
101
102 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/erlang/erlang-13.2.3.ebuild?rev=1.2&view=markup
103 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/erlang/erlang-13.2.3.ebuild?rev=1.2&content-type=text/plain
104 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/erlang/erlang-13.2.3.ebuild?r1=1.1&r2=1.2
105
106 Index: erlang-13.2.3.ebuild
107 ===================================================================
108 RCS file: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.3.ebuild,v
109 retrieving revision 1.1
110 retrieving revision 1.2
111 diff -u -r1.1 -r1.2
112 --- erlang-13.2.3.ebuild 10 Dec 2009 21:58:07 -0000 1.1
113 +++ erlang-13.2.3.ebuild 21 Feb 2010 14:43:00 -0000 1.2
114 @@ -1,6 +1,6 @@
115 -# Copyright 1999-2009 Gentoo Foundation
116 +# Copyright 1999-2010 Gentoo Foundation
117 # Distributed under the terms of the GNU General Public License v2
118 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.3.ebuild,v 1.1 2009/12/10 21:58:07 fauli Exp $
119 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.3.ebuild,v 1.2 2010/02/21 14:43:00 fauli Exp $
120
121 EAPI=2
122 WX_GTK_VER="2.8"
123 @@ -30,7 +30,7 @@
124 LICENSE="EPL"
125 SLOT="0"
126 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
127 -IUSE="doc emacs hipe java kpoll odbc smp sctp ssl tk wxwindows"
128 +IUSE="doc emacs hipe java kpoll odbc smp sctp ssl tk wxwidgets"
129
130 RDEPEND=">=dev-lang/perl-5.6.1
131 ssl? ( >=dev-libs/openssl-0.9.7d )
132 @@ -38,7 +38,7 @@
133 java? ( >=virtual/jdk-1.2 )
134 odbc? ( dev-db/unixODBC )"
135 DEPEND="${RDEPEND}
136 - wxwindows? ( x11-libs/wxGTK:2.8[opengl] )
137 + wxwidgets? ( x11-libs/wxGTK:2.8[opengl] )
138 sctp? ( net-misc/lksctp-tools )
139 tk? ( dev-lang/tk )"
140
141 @@ -47,13 +47,13 @@
142 SITEFILE=50${PN}-gentoo.el
143
144 pkg_setup() {
145 - use wxwindows && wxwidgets_pkg_setup
146 + use wxwidgets && wxwidgets_pkg_setup
147 }
148
149 src_prepare() {
150 use odbc || sed -i 's: odbc : :' lib/Makefile
151
152 - if ! use wxwindows; then
153 + if ! use wxwidgets; then
154 sed -i 's: wx : :' lib/Makefile
155 rm -rf lib/wx
156 fi