From dc7ff5ee50d15fd657780184e7b8d4c8b23d62aa Mon Sep 17 00:00:00 2001 From: Alastair Tse Date: Wed, 8 Oct 2003 00:04:35 +0000 Subject: small touchup --- x11-libs/wxGTK/Manifest | 2 +- x11-libs/wxGTK/wxGTK-2.4.2.ebuild | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'x11-libs') diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index 10649cab730a..6f298e87ebc6 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -3,7 +3,7 @@ MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162 MD5 f2c6a482f909a8b55480b1ba1cb662f3 wxGTK-2.4.0.ebuild 2697 MD5 5930febd267796b3c7bef3c18132ffeb wxGTK-2.4.1-r1.ebuild 2683 MD5 4d34b0942b01217ef99c488f6c42c79c wxGTK-2.4.1.ebuild 2497 -MD5 88a8ce35ecee60253c0ff415359bad5e wxGTK-2.4.2.ebuild 2281 +MD5 9ba40725b8334e44a6bfef21af45c848 wxGTK-2.4.2.ebuild 2328 MD5 16ea0622454512339b2c613af61a9aa4 files/digest-wxGTK-2.4.0 65 MD5 86ee1d94ec752953d445a824f643fef5 files/digest-wxGTK-2.4.1 65 MD5 86ee1d94ec752953d445a824f643fef5 files/digest-wxGTK-2.4.1-r1 65 diff --git a/x11-libs/wxGTK/wxGTK-2.4.2.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2.ebuild index ddd4aca6573c..6bfef5dc2503 100644 --- a/x11-libs/wxGTK/wxGTK-2.4.2.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2.ebuild,v 1.1 2003/10/07 23:49:33 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2.ebuild,v 1.2 2003/10/08 00:04:29 liquidx Exp $ DESCRIPTION="GTK+ version of wxWindows, a cross-platform C++ GUI toolkit." SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2" @@ -42,7 +42,6 @@ src_unpack() { src_compile() { local myconf - myconf="${myconf} `use_with odbc`" myconf="${myconf} `use_with opengl`" myconf="${myconf} --with-gtk" myconf="${myconf} `use_enable debug`" @@ -55,10 +54,12 @@ src_compile() { # # bug #20116 - liquidx@gentoo.org (07 May 2003) - #use gtk2 && myconf="${myconf} --enable-gtk2 --enable-unicode" use gtk2 && myconf="${myconf} --enable-gtk2" + # only allow unicode if using gtk2 use gtk2 && use unicode && myconf="${myconf} --enable-unicode" - + # only enable odbc if unicode is not enabled. + ( use gtk2 && use unicode ) || myconf="${myconf} --with-odbc" + econf ${myconf} emake || die "make failed" -- cgit v1.2.3-65-gdbad