use the wxwidgets USE flag instead of wxwindows, see bug 305349 by Ciprian Ciubotariu...
authorChristian Faulhammer <fauli@gentoo.org>
Sun, 21 Feb 2010 14:43:00 +0000 (14:43 +0000)
committerChristian Faulhammer <fauli@gentoo.org>
Sun, 21 Feb 2010 14:43:00 +0000 (14:43 +0000)
Package-Manager: portage-2.1.7.17/cvs/Linux i686

dev-lang/erlang/ChangeLog
dev-lang/erlang/Manifest
dev-lang/erlang/erlang-13.2.2.ebuild
dev-lang/erlang/erlang-13.2.3.ebuild

index 0dab9146ca0b46c6bb965a274b30f7f9d0f72d3e..ca7843640e9d94405f9b2c1ed6fffd88c863e16d 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/erlang
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.179 2009/12/29 18:23:34 fauli Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.180 2010/02/21 14:43:00 fauli Exp $
+
+  21 Feb 2010; Christian Faulhammer <fauli@gentoo.org> erlang-13.2.2.ebuild,
+  erlang-13.2.3.ebuild:
+  use the wxwidgets USE flag instead of wxwindows, see bug 305349 by Ciprian
+  Ciubotariu <cheepeero AT gmx DOT net>
 
   29 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
   -erlang-12.2.5-r1.ebuild, -files/erlang-12.2.5-amd64_segfault.patch,
index d4d7d4e67687fe12482f37acd9acac51a3f6ed15..6567eb02169f2b526293d8194329b4926543b003 100644 (file)
@@ -8,14 +8,14 @@ DIST otp_doc_man_R13B02-1.tar.gz 979461 RMD160 288b20fdd92675dc4d7b980ea291f79d6
 DIST otp_doc_man_R13B03.tar.gz 1108822 RMD160 8d6af7ea55fe6d8696fd28c563f9c4e5d9aee779 SHA1 2241651db8c4bce02fc5d34d63c983a3d55d1011 SHA256 c06967938826be25babaaecce8673738aef2093e8bbd66e5f66335455d5ae9f7
 DIST otp_src_R13B02-1.tar.gz 55081355 RMD160 6db3370ff574559fe510e1116ade18d35537c74f SHA1 943715019f479cc48e160cfbfc2ddf60aa921185 SHA256 7aef33e50c492cf8320197c0870fb3bfdad13e68d2f513ecac9aee95b0ac120d
 DIST otp_src_R13B03.tar.gz 57524485 RMD160 7cf3d1cf6cdf73ff19f5a416396c4024e641ec29 SHA1 161f22d498da244d4b32181a78b04d97523857d1 SHA256 e7c46c8b2778f22064a3b369c1a1b572a1cc0e8a2198166858d4b9a1b488d662
-EBUILD erlang-13.2.2.ebuild 4678 RMD160 1ce7648c20919a9fe249273905247111414c5fad SHA1 3dc124e2d0fdbf6ef8dc6b91715a6b9283e8305f SHA256 b301eeabb4976a7fcf8d6f0424d62c74e32653287939dd89cc0476f5ac9af588
-EBUILD erlang-13.2.3.ebuild 4670 RMD160 dd125995a25c1a2c163207430041d7c5bad1ca76 SHA1 21388dd80c040ad3dad36e3214e61f423ecd7fcb SHA256 3b5e82ed4e08275fbb4aabc20ee25fb82af83908d40e441df3fea20b1419845f
-MISC ChangeLog 29072 RMD160 64cd4bbabd9b3ab6af6aede1d94b747cd38e7f93 SHA1 f44e83a428d7b93993e1cf2dbbb6b578f3272ea8 SHA256 0dbf50fc5d6c138e3cbb09ce055e8641787fbb5d5481f6118b4bfd4825c6c25e
+EBUILD erlang-13.2.2.ebuild 4676 RMD160 22fa4ae057a1d4d89a103719545eb968161428a2 SHA1 c1ec334fe80f65f7fc799092a31b75ecb2761295 SHA256 57ed621d933ea68e993b7046875ff963ab6e3bac98c4ae26db29cdac9d409794
+EBUILD erlang-13.2.3.ebuild 4670 RMD160 2c08e3ce3dc2b894f7908c774dbdd6c47e992b2d SHA1 cb0fc3c53398bb80c42c34d2c4602dff1e1bfaa2 SHA256 38c0806f613ed46264a73a7c734be27da5f277102c78400c9ddc4e0f899df879
+MISC ChangeLog 29291 RMD160 f299595ab9112215154f21c4548f2cdca926d674 SHA1 767d7602685a1d80a6b700859b9913f40444ef99 SHA256 a934d767c74394ec4127b823bd73a8fb5d1f03b262a072d5211a8aa0f92a1655
 MISC metadata.xml 693 RMD160 6c8d43bd35549421b055b468c45f1f2e5d39357d SHA1 7c778bbc7faf1dfdc11a6155e1c525e42d63ebb5 SHA256 ee0ac0699562802a5191deaef78770c25a342875a3b363ea95a0b92da6f107e3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAks6STcACgkQNQqtfCuFneMKYQCglxejHpJ6gJyl0l4UezpVxaoj
-gnwAoI9MNwsCh6GVv8S3zIcvgSWgD2N8
-=5EtE
+iEYEARECAAYFAkuBRoQACgkQNQqtfCuFneMr3wCfcN3gUy6k7MiRF+epJoAxLHss
+JiYAn2JacCsstBJPoQlVasHicrVB+Lqd
+=4+jv
 -----END PGP SIGNATURE-----
index 9ed792803da86fab1f177eeea2a1697656b45b87..71a7060babc3c12e43065f394510b753fb5a8fb5 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.2.ebuild,v 1.8 2009/12/29 17:48:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.2.ebuild,v 1.9 2010/02/21 14:43:00 fauli Exp $
 
 EAPI=2
 WX_GTK_VER="2.8"
@@ -30,7 +30,7 @@ SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz
 LICENSE="EPL"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc emacs hipe java kpoll odbc smp sctp ssl tk wxwindows"
+IUSE="doc emacs hipe java kpoll odbc smp sctp ssl tk wxwidgets"
 
 RDEPEND=">=dev-lang/perl-5.6.1
        ssl? ( >=dev-libs/openssl-0.9.7d )
@@ -38,7 +38,7 @@ RDEPEND=">=dev-lang/perl-5.6.1
        java? ( >=virtual/jdk-1.2 )
        odbc? ( dev-db/unixODBC )"
 DEPEND="${RDEPEND}
-       wxwindows? ( x11-libs/wxGTK:2.8[opengl] )
+       wxwidgets? ( x11-libs/wxGTK:2.8[opengl] )
        sctp? ( net-misc/lksctp-tools )
        tk? ( dev-lang/tk )"
 
@@ -47,13 +47,13 @@ S="${WORKDIR}/${MY_P}"
 SITEFILE=50${PN}-gentoo.el
 
 pkg_setup() {
-       use wxwindows && wxwidgets_pkg_setup
+       use wxwidgets && wxwidgets_pkg_setup
 }
 
 src_prepare() {
        use odbc || sed -i 's: odbc : :' lib/Makefile
 
-       if ! use wxwindows; then
+       if ! use wxwidgets; then
                sed -i 's: wx : :' lib/Makefile
                rm -rf lib/wx
        fi
index f214f67ec8209e23f37df7a00926759a5ff07db2..bd148b09b027df237cf14c4d518ce39852eb4c61 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.3.ebuild,v 1.1 2009/12/10 21:58:07 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.3.ebuild,v 1.2 2010/02/21 14:43:00 fauli Exp $
 
 EAPI=2
 WX_GTK_VER="2.8"
@@ -30,7 +30,7 @@ SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz
 LICENSE="EPL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc emacs hipe java kpoll odbc smp sctp ssl tk wxwindows"
+IUSE="doc emacs hipe java kpoll odbc smp sctp ssl tk wxwidgets"
 
 RDEPEND=">=dev-lang/perl-5.6.1
        ssl? ( >=dev-libs/openssl-0.9.7d )
@@ -38,7 +38,7 @@ RDEPEND=">=dev-lang/perl-5.6.1
        java? ( >=virtual/jdk-1.2 )
        odbc? ( dev-db/unixODBC )"
 DEPEND="${RDEPEND}
-       wxwindows? ( x11-libs/wxGTK:2.8[opengl] )
+       wxwidgets? ( x11-libs/wxGTK:2.8[opengl] )
        sctp? ( net-misc/lksctp-tools )
        tk? ( dev-lang/tk )"
 
@@ -47,13 +47,13 @@ S="${WORKDIR}/${MY_P}"
 SITEFILE=50${PN}-gentoo.el
 
 pkg_setup() {
-       use wxwindows && wxwidgets_pkg_setup
+       use wxwidgets && wxwidgets_pkg_setup
 }
 
 src_prepare() {
        use odbc || sed -i 's: odbc : :' lib/Makefile
 
-       if ! use wxwindows; then
+       if ! use wxwidgets; then
                sed -i 's: wx : :' lib/Makefile
                rm -rf lib/wx
        fi