| 1 |
dirtyepic 10/02/10 03:52:04 |
| 2 |
|
| 3 |
Modified: bochs-2.3.6.ebuild ChangeLog bochs-2.3.ebuild |
| 4 |
bochs-2.3.7.ebuild bochs-2.4.1.ebuild |
| 5 |
Log: |
| 6 |
Clean up wxGTK handling/old 2.4 workarounds. wxwindows->wxwidgets. |
| 7 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 app-emulation/bochs/bochs-2.3.6.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/bochs-2.3.6.ebuild?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/bochs-2.3.6.ebuild?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/bochs-2.3.6.ebuild?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: bochs-2.3.6.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.6.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- bochs-2.3.6.ebuild 23 Sep 2009 15:32:34 -0000 1.4 |
| 23 |
+++ bochs-2.3.6.ebuild 10 Feb 2010 03:52:03 -0000 1.5 |
| 24 |
@@ -1,8 +1,10 @@ |
| 25 |
-# Copyright 1999-2009 Gentoo Foundation |
| 26 |
+# Copyright 1999-2010 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.6.ebuild,v 1.4 2009/09/23 15:32:34 patrick Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.6.ebuild,v 1.5 2010/02/10 03:52:03 dirtyepic Exp $ |
| 30 |
|
| 31 |
-inherit eutils wxwidgets autotools |
| 32 |
+WX_GTK_VER=2.6 |
| 33 |
+ |
| 34 |
+inherit eutils wxwidgets |
| 35 |
|
| 36 |
DESCRIPTION="a LGPL-ed pc emulator" |
| 37 |
HOMEPAGE="http://bochs.sourceforge.net/" |
| 38 |
@@ -12,7 +14,7 @@ |
| 39 |
LICENSE="LGPL-2.1" |
| 40 |
SLOT="0" |
| 41 |
KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" |
| 42 |
-IUSE="X debugger readline usb wxwindows svga sdl ncurses vnc acpi" |
| 43 |
+IUSE="X debugger readline usb wxwidgets svga sdl ncurses vnc acpi" |
| 44 |
|
| 45 |
RDEPEND="X? ( x11-libs/libICE |
| 46 |
x11-libs/libSM |
| 47 |
@@ -20,7 +22,7 @@ |
| 48 |
x11-libs/libXpm ) |
| 49 |
sdl? ( media-libs/libsdl ) |
| 50 |
svga? ( media-libs/svgalib ) |
| 51 |
- wxwindows? ( =x11-libs/wxGTK-2.6* ) |
| 52 |
+ wxwidgets? ( =x11-libs/wxGTK-2.6* ) |
| 53 |
readline? ( sys-libs/readline ) |
| 54 |
ncurses? ( sys-libs/ncurses )" |
| 55 |
|
| 56 |
@@ -39,27 +41,18 @@ |
| 57 |
-e "s:\$(WGET) \$(DLXLINUX_TAR_URL):cp ${DISTDIR}/dlxlinux4.tar.gz .:" \ |
| 58 |
Makefile.in || \ |
| 59 |
die "sed Makefile.in failed" |
| 60 |
- |
| 61 |
- # Make sure wxwindows 2.6 is used in case both 2.6 and 2.4 are installed |
| 62 |
- sed -i -e "s:wx-config:wx-config-2.6:" configure.in |
| 63 |
- eautoconf |
| 64 |
} |
| 65 |
|
| 66 |
src_compile() { |
| 67 |
- export WX_GTK_VER=2.6 |
| 68 |
- |
| 69 |
- use wxwindows && \ |
| 70 |
- need-wxwidgets gtk2 |
| 71 |
- |
| 72 |
use x86 && \ |
| 73 |
myconf="--enable-idle-hack --enable-fast-function-calls" |
| 74 |
|
| 75 |
use amd64 && \ |
| 76 |
myconf="--enable-x86-64" |
| 77 |
|
| 78 |
- use wxwindows && \ |
| 79 |
+ use wxwidgets && \ |
| 80 |
myconf="${myconf} --with-wx" |
| 81 |
- use wxwindows || \ |
| 82 |
+ use wxwidgets || \ |
| 83 |
myconf="${myconf} --without-wx" |
| 84 |
|
| 85 |
use vnc && \ |
| 86 |
@@ -120,7 +113,7 @@ |
| 87 |
dodoc README.rfb || die "dodoc failed" |
| 88 |
fi |
| 89 |
|
| 90 |
- if [ use wxwindows ] |
| 91 |
+ if [ use wxwidgets ] |
| 92 |
then |
| 93 |
dodoc README-wxWindows || die "dodoc failed" |
| 94 |
fi |
| 95 |
|
| 96 |
|
| 97 |
|
| 98 |
1.86 app-emulation/bochs/ChangeLog |
| 99 |
|
| 100 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/ChangeLog?rev=1.86&view=markup |
| 101 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/ChangeLog?rev=1.86&content-type=text/plain |
| 102 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/ChangeLog?r1=1.85&r2=1.86 |
| 103 |
|
| 104 |
Index: ChangeLog |
| 105 |
=================================================================== |
| 106 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v |
| 107 |
retrieving revision 1.85 |
| 108 |
retrieving revision 1.86 |
| 109 |
diff -u -r1.85 -r1.86 |
| 110 |
--- ChangeLog 23 Sep 2009 15:32:34 -0000 1.85 |
| 111 |
+++ ChangeLog 10 Feb 2010 03:52:03 -0000 1.86 |
| 112 |
@@ -1,6 +1,10 @@ |
| 113 |
# ChangeLog for app-emulation/bochs |
| 114 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 115 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.85 2009/09/23 15:32:34 patrick Exp $ |
| 116 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 117 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.86 2010/02/10 03:52:03 dirtyepic Exp $ |
| 118 |
+ |
| 119 |
+ 10 Feb 2010; Ryan Hill <dirtyepic@g.o> bochs-2.3.ebuild, |
| 120 |
+ bochs-2.3.6.ebuild, bochs-2.3.7.ebuild, bochs-2.4.1.ebuild: |
| 121 |
+ Clean up wxGTK handling/old 2.4 workarounds. wxwindows->wxwidgets. |
| 122 |
|
| 123 |
23 Sep 2009; Patrick Lauer <patrick@g.o> bochs-2.3.ebuild, |
| 124 |
bochs-2.3.6.ebuild, bochs-2.3.7.ebuild, bochs-2.4.1.ebuild: |
| 125 |
|
| 126 |
|
| 127 |
|
| 128 |
1.9 app-emulation/bochs/bochs-2.3.ebuild |
| 129 |
|
| 130 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/bochs-2.3.ebuild?rev=1.9&view=markup |
| 131 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/bochs-2.3.ebuild?rev=1.9&content-type=text/plain |
| 132 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/bochs-2.3.ebuild?r1=1.8&r2=1.9 |
| 133 |
|
| 134 |
Index: bochs-2.3.ebuild |
| 135 |
=================================================================== |
| 136 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.ebuild,v |
| 137 |
retrieving revision 1.8 |
| 138 |
retrieving revision 1.9 |
| 139 |
diff -u -r1.8 -r1.9 |
| 140 |
--- bochs-2.3.ebuild 23 Sep 2009 15:32:34 -0000 1.8 |
| 141 |
+++ bochs-2.3.ebuild 10 Feb 2010 03:52:03 -0000 1.9 |
| 142 |
@@ -1,6 +1,8 @@ |
| 143 |
-# Copyright 1999-2009 Gentoo Foundation |
| 144 |
+# Copyright 1999-2010 Gentoo Foundation |
| 145 |
# Distributed under the terms of the GNU General Public License v2 |
| 146 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.ebuild,v 1.8 2009/09/23 15:32:34 patrick Exp $ |
| 147 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.ebuild,v 1.9 2010/02/10 03:52:03 dirtyepic Exp $ |
| 148 |
+ |
| 149 |
+WX_GTK_VER=2.6 |
| 150 |
|
| 151 |
inherit eutils wxwidgets autotools |
| 152 |
|
| 153 |
@@ -12,14 +14,14 @@ |
| 154 |
LICENSE="LGPL-2.1" |
| 155 |
SLOT="0" |
| 156 |
KEYWORDS="alpha amd64 ppc ~sparc x86" |
| 157 |
-IUSE="debugger readline sdl wxwindows X ncurses vnc" |
| 158 |
+IUSE="debugger readline sdl wxwidgets X ncurses vnc" |
| 159 |
|
| 160 |
RDEPEND="X? ( x11-libs/libICE |
| 161 |
x11-libs/libSM |
| 162 |
x11-libs/libX11 |
| 163 |
x11-libs/libXpm ) |
| 164 |
sdl? ( media-libs/libsdl ) |
| 165 |
- wxwindows? ( =x11-libs/wxGTK-2.6* ) |
| 166 |
+ wxwidgets? ( =x11-libs/wxGTK-2.6* ) |
| 167 |
readline? ( sys-libs/readline ) |
| 168 |
ncurses? ( sys-libs/ncurses )" |
| 169 |
|
| 170 |
@@ -41,8 +43,6 @@ |
| 171 |
sed -i -e "s:/opt/gnome:/usr:" configure |
| 172 |
# Fix some bad coding for gcc-4.1 compliance |
| 173 |
sed -i -e "s:\#ifndef PARANOID:\#if 0:" iodev/hdimage.h |
| 174 |
-# Make sure wxwindows 2.6 is used in case both 2.6 and 2.4 are installed |
| 175 |
- sed -i -e "s:wx-config:wx-config-2.6:" configure |
| 176 |
# wx unicode patches from fedora and bits the fedora missed |
| 177 |
# epatch ${DISTDIR}/${P}-unicode.patch.gz |
| 178 |
epatch ${FILESDIR}/${P}-redog.patch |
| 179 |
@@ -52,18 +52,13 @@ |
| 180 |
} |
| 181 |
|
| 182 |
src_compile() { |
| 183 |
- export WX_GTK_VER=2.6 |
| 184 |
- |
| 185 |
- use wxwindows && \ |
| 186 |
- need-wxwidgets gtk2 |
| 187 |
- |
| 188 |
[[ "$ARCH" == "x86" ]] \ |
| 189 |
&& myconf="--enable-idle-hack --enable-fast-function-calls" |
| 190 |
myconf="${myconf} `use_with sdl`" |
| 191 |
myconf="${myconf} `use_enable readline`" |
| 192 |
- use wxwindows && \ |
| 193 |
+ use wxwidgets && \ |
| 194 |
myconf="${myconf} --with-wx" |
| 195 |
- use wxwindows || \ |
| 196 |
+ use wxwidgets || \ |
| 197 |
myconf="${myconf} --without-wx" |
| 198 |
use debugger && \ |
| 199 |
myconf="$myconf --enable-debugger --enable-disasm \ |
| 200 |
|
| 201 |
|
| 202 |
|
| 203 |
1.7 app-emulation/bochs/bochs-2.3.7.ebuild |
| 204 |
|
| 205 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/bochs-2.3.7.ebuild?rev=1.7&view=markup |
| 206 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/bochs-2.3.7.ebuild?rev=1.7&content-type=text/plain |
| 207 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/bochs-2.3.7.ebuild?r1=1.6&r2=1.7 |
| 208 |
|
| 209 |
Index: bochs-2.3.7.ebuild |
| 210 |
=================================================================== |
| 211 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.7.ebuild,v |
| 212 |
retrieving revision 1.6 |
| 213 |
retrieving revision 1.7 |
| 214 |
diff -u -r1.6 -r1.7 |
| 215 |
--- bochs-2.3.7.ebuild 23 Sep 2009 15:32:34 -0000 1.6 |
| 216 |
+++ bochs-2.3.7.ebuild 10 Feb 2010 03:52:03 -0000 1.7 |
| 217 |
@@ -1,8 +1,10 @@ |
| 218 |
-# Copyright 1999-2009 Gentoo Foundation |
| 219 |
+# Copyright 1999-2010 Gentoo Foundation |
| 220 |
# Distributed under the terms of the GNU General Public License v2 |
| 221 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.7.ebuild,v 1.6 2009/09/23 15:32:34 patrick Exp $ |
| 222 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.7.ebuild,v 1.7 2010/02/10 03:52:03 dirtyepic Exp $ |
| 223 |
|
| 224 |
-inherit eutils wxwidgets autotools |
| 225 |
+WX_GTK_VER=2.6 |
| 226 |
+ |
| 227 |
+inherit eutils wxwidgets |
| 228 |
|
| 229 |
DESCRIPTION="a LGPL-ed pc emulator" |
| 230 |
HOMEPAGE="http://bochs.sourceforge.net/" |
| 231 |
@@ -12,7 +14,7 @@ |
| 232 |
LICENSE="LGPL-2.1" |
| 233 |
SLOT="0" |
| 234 |
KEYWORDS="alpha amd64 ppc ~sparc x86" |
| 235 |
-IUSE="X debugger readline usb wxwindows svga sdl ncurses vnc acpi" |
| 236 |
+IUSE="X debugger readline usb wxwidgets svga sdl ncurses vnc acpi" |
| 237 |
|
| 238 |
RDEPEND="X? ( x11-libs/libICE |
| 239 |
x11-libs/libSM |
| 240 |
@@ -20,7 +22,7 @@ |
| 241 |
x11-libs/libXpm ) |
| 242 |
sdl? ( media-libs/libsdl ) |
| 243 |
svga? ( media-libs/svgalib ) |
| 244 |
- wxwindows? ( =x11-libs/wxGTK-2.6* ) |
| 245 |
+ wxwidgets? ( =x11-libs/wxGTK-2.6* ) |
| 246 |
readline? ( sys-libs/readline ) |
| 247 |
ncurses? ( sys-libs/ncurses )" |
| 248 |
|
| 249 |
@@ -42,27 +44,18 @@ |
| 250 |
-e "s:\$(WGET) \$(DLXLINUX_TAR_URL):cp ${DISTDIR}/dlxlinux4.tar.gz .:" \ |
| 251 |
Makefile.in || \ |
| 252 |
die "sed Makefile.in failed" |
| 253 |
- |
| 254 |
- # Make sure wxwindows 2.6 is used in case both 2.6 and 2.4 are installed |
| 255 |
- sed -i -e "s:wx-config:wx-config-2.6:" configure.in |
| 256 |
- eautoconf |
| 257 |
} |
| 258 |
|
| 259 |
src_compile() { |
| 260 |
- export WX_GTK_VER=2.6 |
| 261 |
- |
| 262 |
- use wxwindows && \ |
| 263 |
- need-wxwidgets gtk2 |
| 264 |
- |
| 265 |
use x86 && \ |
| 266 |
myconf="--enable-idle-hack --enable-fast-function-calls" |
| 267 |
|
| 268 |
use amd64 && \ |
| 269 |
myconf="--enable-x86-64" |
| 270 |
|
| 271 |
- use wxwindows && \ |
| 272 |
+ use wxwidgets && \ |
| 273 |
myconf="${myconf} --with-wx" |
| 274 |
- use wxwindows || \ |
| 275 |
+ use wxwidgets || \ |
| 276 |
myconf="${myconf} --without-wx" |
| 277 |
|
| 278 |
use vnc && \ |
| 279 |
@@ -152,7 +145,7 @@ |
| 280 |
dodoc README.rfb || die "dodoc failed" |
| 281 |
fi |
| 282 |
|
| 283 |
- if [ use wxwindows ] |
| 284 |
+ if [ use wxwidgets ] |
| 285 |
then |
| 286 |
dodoc README-wxWindows || die "dodoc failed" |
| 287 |
fi |
| 288 |
|
| 289 |
|
| 290 |
|
| 291 |
1.3 app-emulation/bochs/bochs-2.4.1.ebuild |
| 292 |
|
| 293 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/bochs-2.4.1.ebuild?rev=1.3&view=markup |
| 294 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/bochs-2.4.1.ebuild?rev=1.3&content-type=text/plain |
| 295 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/bochs-2.4.1.ebuild?r1=1.2&r2=1.3 |
| 296 |
|
| 297 |
Index: bochs-2.4.1.ebuild |
| 298 |
=================================================================== |
| 299 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.4.1.ebuild,v |
| 300 |
retrieving revision 1.2 |
| 301 |
retrieving revision 1.3 |
| 302 |
diff -u -r1.2 -r1.3 |
| 303 |
--- bochs-2.4.1.ebuild 23 Sep 2009 15:32:34 -0000 1.2 |
| 304 |
+++ bochs-2.4.1.ebuild 10 Feb 2010 03:52:03 -0000 1.3 |
| 305 |
@@ -1,8 +1,10 @@ |
| 306 |
-# Copyright 1999-2009 Gentoo Foundation |
| 307 |
+# Copyright 1999-2010 Gentoo Foundation |
| 308 |
# Distributed under the terms of the GNU General Public License v2 |
| 309 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.4.1.ebuild,v 1.2 2009/09/23 15:32:34 patrick Exp $ |
| 310 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.4.1.ebuild,v 1.3 2010/02/10 03:52:03 dirtyepic Exp $ |
| 311 |
|
| 312 |
-inherit eutils wxwidgets autotools |
| 313 |
+WX_GTK_VER=2.6 |
| 314 |
+ |
| 315 |
+inherit eutils wxwidgets |
| 316 |
|
| 317 |
DESCRIPTION="a LGPL-ed pc emulator" |
| 318 |
HOMEPAGE="http://bochs.sourceforge.net/" |
| 319 |
@@ -12,7 +14,7 @@ |
| 320 |
LICENSE="LGPL-2.1" |
| 321 |
SLOT="0" |
| 322 |
KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" |
| 323 |
-IUSE="X debugger readline usb wxwindows svga sdl ncurses vnc acpi" |
| 324 |
+IUSE="X debugger readline usb wxwidgets svga sdl ncurses vnc acpi" |
| 325 |
|
| 326 |
RDEPEND="X? ( x11-libs/libICE |
| 327 |
x11-libs/libSM |
| 328 |
@@ -20,7 +22,7 @@ |
| 329 |
x11-libs/libXpm ) |
| 330 |
sdl? ( media-libs/libsdl ) |
| 331 |
svga? ( media-libs/svgalib ) |
| 332 |
- wxwindows? ( =x11-libs/wxGTK-2.6* ) |
| 333 |
+ wxwidgets? ( =x11-libs/wxGTK-2.6* ) |
| 334 |
readline? ( sys-libs/readline ) |
| 335 |
ncurses? ( sys-libs/ncurses )" |
| 336 |
|
| 337 |
@@ -39,27 +41,18 @@ |
| 338 |
-e "s:\$(WGET) \$(DLXLINUX_TAR_URL):cp ${DISTDIR}/dlxlinux4.tar.gz .:" \ |
| 339 |
Makefile.in || \ |
| 340 |
die "sed Makefile.in failed" |
| 341 |
- |
| 342 |
- # Make sure wxwindows 2.6 is used in case both 2.6 and 2.4 are installed |
| 343 |
- sed -i -e "s:wx-config:wx-config-2.6:" configure.in |
| 344 |
- eautoconf |
| 345 |
} |
| 346 |
|
| 347 |
src_compile() { |
| 348 |
- export WX_GTK_VER=2.6 |
| 349 |
- |
| 350 |
- use wxwindows && \ |
| 351 |
- need-wxwidgets gtk2 |
| 352 |
- |
| 353 |
use x86 && \ |
| 354 |
myconf="--enable-idle-hack --enable-fast-function-calls" |
| 355 |
|
| 356 |
use amd64 && \ |
| 357 |
myconf="--enable-x86-64" |
| 358 |
|
| 359 |
- use wxwindows && \ |
| 360 |
+ use wxwidgets && \ |
| 361 |
myconf="${myconf} --with-wx" |
| 362 |
- use wxwindows || \ |
| 363 |
+ use wxwidgets || \ |
| 364 |
myconf="${myconf} --without-wx" |
| 365 |
|
| 366 |
use vnc && \ |
| 367 |
@@ -146,7 +139,7 @@ |
| 368 |
dodoc README.rfb || die "dodoc failed" |
| 369 |
fi |
| 370 |
|
| 371 |
- if [ use wxwindows ] |
| 372 |
+ if [ use wxwidgets ] |
| 373 |
then |
| 374 |
dodoc README-wxWindows || die "dodoc failed" |
| 375 |
fi |
Archives