diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2009-05-03 07:12:52 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2009-05-03 07:12:52 +0000 |
| commit | a48f8e8572632c93deabfc4d9057da50a5609b6b (patch) | |
| tree | 1d5381d412399cd818bc7527c6bfc85891a8ba57 /app-arch/p7zip/p7zip-4.65.ebuild | |
| parent | EAPI=2; work around parallel-make bugs without -j1 (diff) | |
| download | gentoo-2-a48f8e8572632c93deabfc4d9057da50a5609b6b.tar.gz gentoo-2-a48f8e8572632c93deabfc4d9057da50a5609b6b.tar.bz2 gentoo-2-a48f8e8572632c93deabfc4d9057da50a5609b6b.zip | |
Fix build error when wxGTK built with odbc support (bug #267698) and
checking wxGTK USE flags even when USE="-wxwidgets" (bug #267803).
Also, depend on the correct SLOT.
(Portage version: 2.2_rc32/cvs/Linux x86_64)
Diffstat (limited to 'app-arch/p7zip/p7zip-4.65.ebuild')
| -rw-r--r-- | app-arch/p7zip/p7zip-4.65.ebuild | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app-arch/p7zip/p7zip-4.65.ebuild b/app-arch/p7zip/p7zip-4.65.ebuild index 52e10ff8dd53..225b189a2a66 100644 --- a/app-arch/p7zip/p7zip-4.65.ebuild +++ b/app-arch/p7zip/p7zip-4.65.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild,v 1.5 2009/05/01 20:52:19 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild,v 1.6 2009/05/03 07:12:52 dirtyepic Exp $ EAPI="2" WX_GTK_VER="2.8" @@ -16,12 +16,16 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="doc kde rar static wxwidgets" -RDEPEND="kde? ( x11-libs/wxGTK[X] || ( kde-base/konqueror kde-base/kdebase-meta kde-base/kdebase ) ) - wxwidgets? ( x11-libs/wxGTK[X] )" +RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] || ( kde-base/konqueror kde-base/kdebase-meta kde-base/kdebase ) ) + wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )" DEPEND="${RDEPEND}" S=${WORKDIR}/${PN}_${PV} +pkg_setup() { + use wxwidgets && wxwidgets_pkg_setup +} + src_prepare() { if use kde && ! use wxwidgets ; then einfo "USE-flag kde needs wxwidgets flag" |