Gentoo Archives: gentoo-commits

From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" <arfrever@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-arch/p7zip: ChangeLog p7zip-4.65.ebuild
Date: Fri, 01 May 2009 20:52:22
Message-Id: E1LzziV-0007JB-TC@stork.gentoo.org
1 arfrever 09/05/01 20:52:19
2
3 Modified: ChangeLog p7zip-4.65.ebuild
4 Log:
5 Rename "wxwindows" USE flag to "wxwidgets".
6 (Portage version: 13577-svn/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.108 app-arch/p7zip/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/p7zip/ChangeLog?rev=1.108&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/p7zip/ChangeLog?rev=1.108&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/p7zip/ChangeLog?r1=1.107&r2=1.108
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v
18 retrieving revision 1.107
19 retrieving revision 1.108
20 diff -u -r1.107 -r1.108
21 --- ChangeLog 1 May 2009 13:05:58 -0000 1.107
22 +++ ChangeLog 1 May 2009 20:52:19 -0000 1.108
23 @@ -1,6 +1,10 @@
24 # ChangeLog for app-arch/p7zip
25 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.107 2009/05/01 13:05:58 jer Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.108 2009/05/01 20:52:19 arfrever Exp $
28 +
29 + 01 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
30 + p7zip-4.65.ebuild:
31 + Rename "wxwindows" USE flag to "wxwidgets".
32
33 01 May 2009; Jeroen Roovers <jer@g.o> p7zip-4.65.ebuild:
34 Restore dropped keywords.
35
36
37
38 1.5 app-arch/p7zip/p7zip-4.65.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild?rev=1.5&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild?rev=1.5&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild?r1=1.4&r2=1.5
43
44 Index: p7zip-4.65.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild,v
47 retrieving revision 1.4
48 retrieving revision 1.5
49 diff -u -r1.4 -r1.5
50 --- p7zip-4.65.ebuild 1 May 2009 13:05:58 -0000 1.4
51 +++ p7zip-4.65.ebuild 1 May 2009 20:52:19 -0000 1.5
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2009 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild,v 1.4 2009/05/01 13:05:58 jer Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild,v 1.5 2009/05/01 20:52:19 arfrever Exp $
57
58 EAPI="2"
59 WX_GTK_VER="2.8"
60 @@ -14,19 +14,18 @@
61 LICENSE="LGPL-2.1 rar? ( unRAR )"
62 SLOT="0"
63 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
64 -IUSE="wxwindows doc kde rar static"
65 +IUSE="doc kde rar static wxwidgets"
66
67 -RDEPEND="wxwindows? ( x11-libs/wxGTK[X] )
68 - kde? ( || ( kde-base/konqueror kde-base/kdebase-meta kde-base/kdebase ) )
69 - kde? ( !wxwindows? ( x11-libs/wxGTK[X] ) )"
70 +RDEPEND="kde? ( x11-libs/wxGTK[X] || ( kde-base/konqueror kde-base/kdebase-meta kde-base/kdebase ) )
71 + wxwidgets? ( x11-libs/wxGTK[X] )"
72 DEPEND="${RDEPEND}"
73
74 S=${WORKDIR}/${PN}_${PV}
75
76 src_prepare() {
77 - if use kde && ! use wxwindows ; then
78 - einfo "USE-flag kde needs wxwindows flag"
79 - einfo "silently enabling wxwindows flag"
80 + if use kde && ! use wxwidgets ; then
81 + einfo "USE-flag kde needs wxwidgets flag"
82 + einfo "silently enabling wxwidgets flag"
83 fi
84
85 # remove non-free RAR codec
86 @@ -64,14 +63,14 @@
87
88 src_compile() {
89 emake all3 || die "compilation error"
90 - if use wxwindows || use kde; then
91 + if use kde || use wxwidgets; then
92 emake 7zG || die "error building GUI"
93 fi
94 }
95
96 src_test() {
97 emake test_7z test_7zr || die "test failed"
98 - if use wxwindows || use kde; then
99 + if use kde || use wxwidgets; then
100 emake test_7zG || die "GUI test failed"
101 fi
102 }
103 @@ -82,7 +81,7 @@
104 make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
105 make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
106
107 - if use wxwindows || use kde; then
108 + if use kde || use wxwidgets; then
109 make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
110
111 dobin GUI/p7zipForFilemanager