| 1 |
dirtyepic 07/12/22 13:49:09 |
| 2 |
|
| 3 |
Modified: wxpython-2.6.4.0-r1.ebuild ChangeLog |
| 4 |
wxpython-2.6.4.0.ebuild wxpython-2.6.3.3.ebuild |
| 5 |
Log: |
| 6 |
Lock DEPEND to wxGTK-2.6 for bug #202998. |
| 7 |
(Portage version: 2.1.4_rc10) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 dev-python/wxpython/wxpython-2.6.4.0-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-r1.ebuild?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-r1.ebuild?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-r1.ebuild?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: wxpython-2.6.4.0-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-r1.ebuild,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- wxpython-2.6.4.0-r1.ebuild 13 Dec 2007 04:09:12 -0000 1.3 |
| 23 |
+++ wxpython-2.6.4.0-r1.ebuild 22 Dec 2007 13:49:08 -0000 1.4 |
| 24 |
@@ -1,8 +1,8 @@ |
| 25 |
# Copyright 1999-2007 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-r1.ebuild,v 1.3 2007/12/13 04:09:12 dirtyepic Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-r1.ebuild,v 1.4 2007/12/22 13:49:08 dirtyepic Exp $ |
| 29 |
|
| 30 |
-WX_GTK_VER="2.6" |
| 31 |
+EAPI=1 |
| 32 |
|
| 33 |
inherit alternatives eutils multilib python wxwidgets |
| 34 |
|
| 35 |
@@ -17,7 +17,7 @@ |
| 36 |
IUSE="opengl unicode" |
| 37 |
|
| 38 |
RDEPEND=">=dev-lang/python-2.1 |
| 39 |
- >=x11-libs/wxGTK-${PV} |
| 40 |
+ >=x11-libs/wxGTK-${PV}:2.6 |
| 41 |
>=x11-libs/gtk+-2.0 |
| 42 |
>=x11-libs/pango-1.2 |
| 43 |
>=dev-libs/glib-2.0 |
| 44 |
@@ -25,8 +25,7 @@ |
| 45 |
media-libs/jpeg |
| 46 |
media-libs/tiff |
| 47 |
>=sys-libs/zlib-1.1.4 |
| 48 |
- opengl? ( >=dev-python/pyopengl-2.0.0.44 ) |
| 49 |
- !<dev-python/wxpython-2.4.2.4-r1" |
| 50 |
+ opengl? ( >=dev-python/pyopengl-2.0.0.44 )" |
| 51 |
|
| 52 |
DEPEND="${RDEPEND} |
| 53 |
dev-util/pkgconfig" |
| 54 |
@@ -42,6 +41,7 @@ |
| 55 |
|
| 56 |
src_compile() { |
| 57 |
local mypyconf |
| 58 |
+ WX_GTK_VER="2.6" |
| 59 |
|
| 60 |
if use unicode; then |
| 61 |
need-wxwidgets unicode |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.72 dev-python/wxpython/ChangeLog |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/ChangeLog?rev=1.72&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/ChangeLog?rev=1.72&content-type=text/plain |
| 69 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/ChangeLog?r1=1.71&r2=1.72 |
| 70 |
|
| 71 |
Index: ChangeLog |
| 72 |
=================================================================== |
| 73 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v |
| 74 |
retrieving revision 1.71 |
| 75 |
retrieving revision 1.72 |
| 76 |
diff -u -r1.71 -r1.72 |
| 77 |
--- ChangeLog 13 Dec 2007 04:09:12 -0000 1.71 |
| 78 |
+++ ChangeLog 22 Dec 2007 13:49:08 -0000 1.72 |
| 79 |
@@ -1,6 +1,10 @@ |
| 80 |
# ChangeLog for dev-python/wxpython |
| 81 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 82 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.71 2007/12/13 04:09:12 dirtyepic Exp $ |
| 83 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.72 2007/12/22 13:49:08 dirtyepic Exp $ |
| 84 |
+ |
| 85 |
+ 22 Dec 2007; Ryan Hill <dirtyepic@g.o> wxpython-2.6.3.3.ebuild, |
| 86 |
+ wxpython-2.6.4.0.ebuild, wxpython-2.6.4.0-r1.ebuild: |
| 87 |
+ Lock DEPEND to wxGTK-2.6 for bug #202998. |
| 88 |
|
| 89 |
13 Dec 2007; Ryan Hill <dirtyepic@g.o> wxpython-2.6.4.0-r1.ebuild: |
| 90 |
Drop arm, ppc, sh, and x86-fbsd keywords for bug #199594. |
| 91 |
|
| 92 |
|
| 93 |
|
| 94 |
1.11 dev-python/wxpython/wxpython-2.6.4.0.ebuild |
| 95 |
|
| 96 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0.ebuild?rev=1.11&view=markup |
| 97 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0.ebuild?rev=1.11&content-type=text/plain |
| 98 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0.ebuild?r1=1.10&r2=1.11 |
| 99 |
|
| 100 |
Index: wxpython-2.6.4.0.ebuild |
| 101 |
=================================================================== |
| 102 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0.ebuild,v |
| 103 |
retrieving revision 1.10 |
| 104 |
retrieving revision 1.11 |
| 105 |
diff -u -r1.10 -r1.11 |
| 106 |
--- wxpython-2.6.4.0.ebuild 4 Nov 2007 14:34:10 -0000 1.10 |
| 107 |
+++ wxpython-2.6.4.0.ebuild 22 Dec 2007 13:49:08 -0000 1.11 |
| 108 |
@@ -1,6 +1,6 @@ |
| 109 |
# Copyright 1999-2007 Gentoo Foundation |
| 110 |
# Distributed under the terms of the GNU General Public License v2 |
| 111 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0.ebuild,v 1.10 2007/11/04 14:34:10 angelos Exp $ |
| 112 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0.ebuild,v 1.11 2007/12/22 13:49:08 dirtyepic Exp $ |
| 113 |
|
| 114 |
inherit python wxwidgets eutils multilib |
| 115 |
|
| 116 |
@@ -15,7 +15,7 @@ |
| 117 |
IUSE="unicode opengl" |
| 118 |
|
| 119 |
RDEPEND=">=dev-lang/python-2.1 |
| 120 |
- >=x11-libs/wxGTK-${PV} |
| 121 |
+ ~x11-libs/wxGTK-${PV} |
| 122 |
>=x11-libs/gtk+-2.0 |
| 123 |
>=x11-libs/pango-1.2 |
| 124 |
>=dev-libs/glib-2.0 |
| 125 |
@@ -31,8 +31,6 @@ |
| 126 |
|
| 127 |
S="${WORKDIR}/${MY_P}/wxPython/" |
| 128 |
|
| 129 |
-WX_GTK_VER="2.6" |
| 130 |
- |
| 131 |
pkg_setup() { |
| 132 |
echo |
| 133 |
use opengl && check_wxuse opengl |
| 134 |
@@ -49,6 +47,8 @@ |
| 135 |
|
| 136 |
src_compile() { |
| 137 |
local mypyconf |
| 138 |
+ WX_GTK_VER="2.6" |
| 139 |
+ |
| 140 |
if use unicode; then |
| 141 |
need-wxwidgets unicode |
| 142 |
else |
| 143 |
|
| 144 |
|
| 145 |
|
| 146 |
1.17 dev-python/wxpython/wxpython-2.6.3.3.ebuild |
| 147 |
|
| 148 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/wxpython-2.6.3.3.ebuild?rev=1.17&view=markup |
| 149 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/wxpython-2.6.3.3.ebuild?rev=1.17&content-type=text/plain |
| 150 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpython/wxpython-2.6.3.3.ebuild?r1=1.16&r2=1.17 |
| 151 |
|
| 152 |
Index: wxpython-2.6.3.3.ebuild |
| 153 |
=================================================================== |
| 154 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.3.3.ebuild,v |
| 155 |
retrieving revision 1.16 |
| 156 |
retrieving revision 1.17 |
| 157 |
diff -u -r1.16 -r1.17 |
| 158 |
--- wxpython-2.6.3.3.ebuild 22 Sep 2007 00:58:13 -0000 1.16 |
| 159 |
+++ wxpython-2.6.3.3.ebuild 22 Dec 2007 13:49:08 -0000 1.17 |
| 160 |
@@ -1,6 +1,6 @@ |
| 161 |
# Copyright 1999-2007 Gentoo Foundation |
| 162 |
# Distributed under the terms of the GNU General Public License v2 |
| 163 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.3.3.ebuild,v 1.16 2007/09/22 00:58:13 dirtyepic Exp $ |
| 164 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.3.3.ebuild,v 1.17 2007/12/22 13:49:08 dirtyepic Exp $ |
| 165 |
|
| 166 |
inherit python wxwidgets eutils multilib |
| 167 |
|
| 168 |
@@ -15,7 +15,7 @@ |
| 169 |
IUSE="unicode opengl" |
| 170 |
|
| 171 |
RDEPEND=">=dev-lang/python-2.1 |
| 172 |
- >=x11-libs/wxGTK-${PV} |
| 173 |
+ =x11-libs/wxGTK-2.6* |
| 174 |
>=x11-libs/gtk+-2.0 |
| 175 |
>=x11-libs/pango-1.2 |
| 176 |
>=dev-libs/glib-2.0 |
| 177 |
|
| 178 |
|
| 179 |
|
| 180 |
-- |
| 181 |
gentoo-commits@g.o mailing list |
Archives