diff options
| author |   Alastair Tse <liquidx@gentoo.org> | 2003-03-26 03:30:48 +0000 |
|---|---|---|
| committer | Alastair Tse <liquidx@gentoo.org> | 2003-03-26 03:30:48 +0000 |
| commit | 5f32bf6d0cb61ccce4151ff3ec1c17a12f816443 (patch) | |
| tree | 16336cacbede4caabad07b8c39235492b9b7941d | |
| parent | deps and sanity check (diff) | |
| download | gentoo-2-5f32bf6d0cb61ccce4151ff3ec1c17a12f816443.tar.gz gentoo-2-5f32bf6d0cb61ccce4151ff3ec1c17a12f816443.tar.bz2 gentoo-2-5f32bf6d0cb61ccce4151ff3ec1c17a12f816443.zip | |
deps fixup
| -rw-r--r-- | x11-libs/wxGTK/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.4.0.ebuild | 24 |
2 files changed, 10 insertions, 19 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog index ef9eba12e3e7..41b9cfd740dc 100644 --- a/x11-libs/wxGTK/ChangeLog +++ b/x11-libs/wxGTK/ChangeLog @@ -1,9 +1,12 @@ # ChangeLog for x11-libs/wxGTK # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.27 2003/02/12 09:24:51 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.28 2003/03/26 03:30:48 liquidx Exp $ *wxGTK-2.4.0 (01 Jan 2003) + 26 Mar 2003; Alastair Tse <liquidx@gentoo.org> wxGTK-2.4.0.ebuild: + reorder gtk2 deps to make sure gtk1 and gtk2 deps are mutually exclusive + 04 Feb 2003; Nick Hadaway <raker@gentoo.org> wxGTK-2.4.0.ebuild : If odbc and gtk2 are both specified, disable odbc and enable gtk2. They are not compatible. diff --git a/x11-libs/wxGTK/wxGTK-2.4.0.ebuild b/x11-libs/wxGTK/wxGTK-2.4.0.ebuild index 598282610f04..1466a79057a6 100644 --- a/x11-libs/wxGTK/wxGTK-2.4.0.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.4.0.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.0.ebuild,v 1.8 2003/02/13 17:03:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.0.ebuild,v 1.9 2003/03/26 03:30:48 liquidx Exp $ DESCRIPTION="GTK+ version of wxWindows, a cross-platform C++ GUI toolkit." SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2" @@ -9,7 +9,7 @@ HOMEPAGE="http://www.wxwindows.org/" LICENSE="LGPL-2" SLOT="0" KEYWORDS="x86 ~ppc ~sparc" -IUSE="nls odbc opengl gtk gtk2" +IUSE="nls odbc opengl gtk2" DEPEND="virtual/glibc virtual/x11 @@ -21,8 +21,8 @@ DEPEND="virtual/glibc sys-libs/zlib odbc? ( dev-db/unixODBC ) opengl? ( virtual/opengl ) - gtk? ( =x11-libs/gtk+-1.2* ) - gtk2? ( >=x11-libs/gtk+-2.0* dev-libs/libunicode )" + gtk2? ( >=x11-libs/gtk+-2.0* dev-libs/libunicode ) : ( =x11-libs/gtk+-1.2* )" + RDEPEND="nls? ( sys-devel/gettext )" pkg_setup() { @@ -68,20 +68,8 @@ src_compile() { && myconf="${myconf} --with-opengl" \ || myconf="${myconf} --without-opengl" - use X && myconf="${myconf} --with-x" - - # here we specify our own preference of which toolkit to build ... - # but only gtk seems to work atm ... -# if [ `use gtk` ] ; then - myconf="${myconf} --with-gtk" -# elif [ `use X` ] ; then -# myconf="${myconf} --with-x11" -# elif [ `use motif` ] ; then -# myconf="${myconf} --with-motif" -# else -# eerror "You must have either gtk, X, or motif in your USE variable" -# die "could not specify toolkit" -# fi + myconf="${myconf} --with-x --with-gtk" + use gtk2 && myconf="${myconf} --enable-gtk2 --enable-unicode" econf ${myconf} |