summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2012-07-29 19:53:42 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2012-07-29 19:53:42 +0000
commit46818a428f7a90f267f3d35d523f89e5a25932c8 (patch)
treed2a210b4d49c094bed64e4cdcc861dfa976e4c2b /dev-lang
parentVersion bump. (diff)
downloadgentoo-2-46818a428f7a90f267f3d35d523f89e5a25932c8.tar.gz
gentoo-2-46818a428f7a90f267f3d35d523f89e5a25932c8.tar.bz2
gentoo-2-46818a428f7a90f267f3d35d523f89e5a25932c8.zip
Impose -odbc for wxGTK because of conflicting types between GDL types and SQL types
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/gdl/ChangeLog7
-rw-r--r--dev-lang/gdl/gdl-0.9.2-r2.ebuild4
2 files changed, 7 insertions, 4 deletions
diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index dea01f60d3d0..8ec9df9de7dc 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/gdl
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.32 2012/06/21 18:32:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.33 2012/07/29 19:53:42 bicatali Exp $
+
+ 29 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> gdl-0.9.2-r2.ebuild:
+ Impose -odbc for wxGTK because of conflicting types between GDL types and SQL
+ types
*gdl-0.9.2-r2 (21 Jun 2012)
@@ -184,4 +188,3 @@
<seb@ist.utl.pt>, Jose Marino <braket@hotmail.com>, Steven Rieder
<steven@rieder.nl>, and Daniel Veillette <danielv@snet.net> for
their ebuilds and testing.
-
diff --git a/dev-lang/gdl/gdl-0.9.2-r2.ebuild b/dev-lang/gdl/gdl-0.9.2-r2.ebuild
index 5a40f10e813b..1859e364b413 100644
--- a/dev-lang/gdl/gdl-0.9.2-r2.ebuild
+++ b/dev-lang/gdl/gdl-0.9.2-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.2-r2.ebuild,v 1.1 2012/06/21 18:32:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.2-r2.ebuild,v 1.2 2012/07/29 19:53:42 bicatali Exp $
EAPI=4
@@ -39,7 +39,7 @@ RDEPEND="sci-libs/gsl
postscript? ( dev-libs/pslib )
python? ( dev-python/numpy )
udunits? ( sci-libs/udunits )
- wxwidgets? ( x11-libs/wxGTK:2.8[X] )"
+ wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
DEPEND="${RDEPEND}
>=dev-java/antlr-2.7.7-r5:0[cxx,script]"