diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-05-01 20:52:19 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-05-01 20:52:19 +0000 |
| commit | 19f4c06f76fdbc6f2a97ade77346c2664151a2bf (patch) | |
| tree | 8525e4f644f24a13cbcc16a0fc7d43d51cc51774 | |
| parent | Cleanup (diff) | |
| download | gentoo-2-19f4c06f76fdbc6f2a97ade77346c2664151a2bf.tar.gz gentoo-2-19f4c06f76fdbc6f2a97ade77346c2664151a2bf.tar.bz2 gentoo-2-19f4c06f76fdbc6f2a97ade77346c2664151a2bf.zip | |
Rename "wxwindows" USE flag to "wxwidgets".
(Portage version: 13577-svn/cvs/Linux x86_64)
| -rw-r--r-- | app-arch/p7zip/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/p7zip/p7zip-4.65.ebuild | 21 |
2 files changed, 15 insertions, 12 deletions
diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog index 53d4f2fa1e0a..e603b98d4064 100644 --- a/app-arch/p7zip/ChangeLog +++ b/app-arch/p7zip/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/p7zip # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.107 2009/05/01 13:05:58 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.108 2009/05/01 20:52:19 arfrever Exp $ + + 01 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + p7zip-4.65.ebuild: + Rename "wxwindows" USE flag to "wxwidgets". 01 May 2009; Jeroen Roovers <jer@gentoo.org> p7zip-4.65.ebuild: Restore dropped keywords. diff --git a/app-arch/p7zip/p7zip-4.65.ebuild b/app-arch/p7zip/p7zip-4.65.ebuild index c0f16220597c..52e10ff8dd53 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.4 2009/05/01 13:05:58 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild,v 1.5 2009/05/01 20:52:19 arfrever Exp $ EAPI="2" WX_GTK_VER="2.8" @@ -14,19 +14,18 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2" LICENSE="LGPL-2.1 rar? ( unRAR )" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="wxwindows doc kde rar static" +IUSE="doc kde rar static wxwidgets" -RDEPEND="wxwindows? ( x11-libs/wxGTK[X] ) - kde? ( || ( kde-base/konqueror kde-base/kdebase-meta kde-base/kdebase ) ) - kde? ( !wxwindows? ( x11-libs/wxGTK[X] ) )" +RDEPEND="kde? ( x11-libs/wxGTK[X] || ( kde-base/konqueror kde-base/kdebase-meta kde-base/kdebase ) ) + wxwidgets? ( x11-libs/wxGTK[X] )" DEPEND="${RDEPEND}" S=${WORKDIR}/${PN}_${PV} src_prepare() { - if use kde && ! use wxwindows ; then - einfo "USE-flag kde needs wxwindows flag" - einfo "silently enabling wxwindows flag" + if use kde && ! use wxwidgets ; then + einfo "USE-flag kde needs wxwidgets flag" + einfo "silently enabling wxwidgets flag" fi # remove non-free RAR codec @@ -64,14 +63,14 @@ src_prepare() { src_compile() { emake all3 || die "compilation error" - if use wxwindows || use kde; then + if use kde || use wxwidgets; then emake 7zG || die "error building GUI" fi } src_test() { emake test_7z test_7zr || die "test failed" - if use wxwindows || use kde; then + if use kde || use wxwidgets; then emake test_7zG || die "GUI test failed" fi } @@ -82,7 +81,7 @@ src_install() { make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za" make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z" - if use wxwindows || use kde; then + if use kde || use wxwidgets; then make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG" dobin GUI/p7zipForFilemanager |