| 1 |
dirtyepic 09/05/03 07:12:52 |
| 2 |
|
| 3 |
Modified: ChangeLog p7zip-4.65.ebuild |
| 4 |
Log: |
| 5 |
Fix build error when wxGTK built with odbc support (bug #267698) and |
| 6 |
checking wxGTK USE flags even when USE="-wxwidgets" (bug #267803). |
| 7 |
Also, depend on the correct SLOT. |
| 8 |
(Portage version: 2.2_rc32/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.109 app-arch/p7zip/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/p7zip/ChangeLog?rev=1.109&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/p7zip/ChangeLog?rev=1.109&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/p7zip/ChangeLog?r1=1.108&r2=1.109 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v |
| 20 |
retrieving revision 1.108 |
| 21 |
retrieving revision 1.109 |
| 22 |
diff -u -r1.108 -r1.109 |
| 23 |
--- ChangeLog 1 May 2009 20:52:19 -0000 1.108 |
| 24 |
+++ ChangeLog 3 May 2009 07:12:52 -0000 1.109 |
| 25 |
@@ -1,6 +1,11 @@ |
| 26 |
# ChangeLog for app-arch/p7zip |
| 27 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.108 2009/05/01 20:52:19 arfrever Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.109 2009/05/03 07:12:52 dirtyepic Exp $ |
| 30 |
+ |
| 31 |
+ 03 May 2009; Ryan Hill <dirtyepic@g.o> p7zip-4.65.ebuild: |
| 32 |
+ Fix build error when wxGTK built with odbc support (bug #267698) and |
| 33 |
+ checking wxGTK USE flags even when USE="-wxwidgets" (bug #267803). |
| 34 |
+ Also, depend on the correct SLOT. |
| 35 |
|
| 36 |
01 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
| 37 |
p7zip-4.65.ebuild: |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.6 app-arch/p7zip/p7zip-4.65.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild?rev=1.6&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild?rev=1.6&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild?r1=1.5&r2=1.6 |
| 46 |
|
| 47 |
Index: p7zip-4.65.ebuild |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild,v |
| 50 |
retrieving revision 1.5 |
| 51 |
retrieving revision 1.6 |
| 52 |
diff -u -r1.5 -r1.6 |
| 53 |
--- p7zip-4.65.ebuild 1 May 2009 20:52:19 -0000 1.5 |
| 54 |
+++ p7zip-4.65.ebuild 3 May 2009 07:12:52 -0000 1.6 |
| 55 |
@@ -1,6 +1,6 @@ |
| 56 |
# Copyright 1999-2009 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild,v 1.5 2009/05/01 20:52:19 arfrever Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild,v 1.6 2009/05/03 07:12:52 dirtyepic Exp $ |
| 60 |
|
| 61 |
EAPI="2" |
| 62 |
WX_GTK_VER="2.8" |
| 63 |
@@ -16,12 +16,16 @@ |
| 64 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 65 |
IUSE="doc kde rar static wxwidgets" |
| 66 |
|
| 67 |
-RDEPEND="kde? ( x11-libs/wxGTK[X] || ( kde-base/konqueror kde-base/kdebase-meta kde-base/kdebase ) ) |
| 68 |
- wxwidgets? ( x11-libs/wxGTK[X] )" |
| 69 |
+RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] || ( kde-base/konqueror kde-base/kdebase-meta kde-base/kdebase ) ) |
| 70 |
+ wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )" |
| 71 |
DEPEND="${RDEPEND}" |
| 72 |
|
| 73 |
S=${WORKDIR}/${PN}_${PV} |
| 74 |
|
| 75 |
+pkg_setup() { |
| 76 |
+ use wxwidgets && wxwidgets_pkg_setup |
| 77 |
+} |
| 78 |
+ |
| 79 |
src_prepare() { |
| 80 |
if use kde && ! use wxwidgets ; then |
| 81 |
einfo "USE-flag kde needs wxwidgets flag" |
Archives