diff options
author | Ryan Hill <rhill@gentoo.org> | 2010-02-10 03:52:03 +0000 |
---|---|---|
committer | Ryan Hill <rhill@gentoo.org> | 2010-02-10 03:52:03 +0000 |
commit | 431a58cd67e8394335dac07fed52818a60cdbfaf (patch) | |
tree | 273e9024a5815cf6712fa9c9ec5a4684c5c18541 /app-emulation/bochs | |
parent | Marked ppc/ppc64 stable for bug #300126. (diff) | |
download | historical-431a58cd67e8394335dac07fed52818a60cdbfaf.tar.gz historical-431a58cd67e8394335dac07fed52818a60cdbfaf.tar.bz2 historical-431a58cd67e8394335dac07fed52818a60cdbfaf.zip |
Clean up wxGTK handling/old 2.4 workarounds. wxwindows->wxwidgets.
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
Diffstat (limited to 'app-emulation/bochs')
-rw-r--r-- | app-emulation/bochs/ChangeLog | 8 | ||||
-rw-r--r-- | app-emulation/bochs/Manifest | 20 | ||||
-rw-r--r-- | app-emulation/bochs/bochs-2.3.6.ebuild | 27 | ||||
-rw-r--r-- | app-emulation/bochs/bochs-2.3.7.ebuild | 27 | ||||
-rw-r--r-- | app-emulation/bochs/bochs-2.3.ebuild | 21 | ||||
-rw-r--r-- | app-emulation/bochs/bochs-2.4.1.ebuild | 27 |
6 files changed, 59 insertions, 71 deletions
diff --git a/app-emulation/bochs/ChangeLog b/app-emulation/bochs/ChangeLog index 7781e8cd9642..d4efa5fb4fdc 100644 --- a/app-emulation/bochs/ChangeLog +++ b/app-emulation/bochs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/bochs -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.85 2009/09/23 15:32:34 patrick Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.86 2010/02/10 03:52:03 dirtyepic Exp $ + + 10 Feb 2010; Ryan Hill <dirtyepic@gentoo.org> bochs-2.3.ebuild, + bochs-2.3.6.ebuild, bochs-2.3.7.ebuild, bochs-2.4.1.ebuild: + Clean up wxGTK handling/old 2.4 workarounds. wxwindows->wxwidgets. 23 Sep 2009; Patrick Lauer <patrick@gentoo.org> bochs-2.3.ebuild, bochs-2.3.6.ebuild, bochs-2.3.7.ebuild, bochs-2.4.1.ebuild: diff --git a/app-emulation/bochs/Manifest b/app-emulation/bochs/Manifest index 907229c1b38e..fb6d15e7c337 100644 --- a/app-emulation/bochs/Manifest +++ b/app-emulation/bochs/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX bochs-2.3-floppy.patch 1356 RMD160 753655013f512d8e47245913727c996a3a2314a9 SHA1 7a7d5246a179d88e096d2eda5981036a32fc26b1 SHA256 01323056edbbfa4d142d7a81ee3725404bd5464372aa4e3507af58890a22b7fe AUX bochs-2.3-ne2k.patch 557 RMD160 9094800e0d427ae9b13b69d39da5f569816c50ca SHA1 39df13629909535104a7febc52b8749d4414000a SHA256 c68d8bfc3759e031474e3f144d2780c62ada633b97721bee78f3c996255e9527 AUX bochs-2.3-redog.patch 507 RMD160 7840dee3b03a040882655ea7f5e63fb44e9cd4fe SHA1 1658fa72d8d1e8e6ea687e22ade722cba15bbfa9 SHA256 d7013f39972bc989ad3663a6849b72169b4d1d41d36a9ffc25b83c62033ba002 @@ -8,9 +11,16 @@ DIST bochs-2.3.7.tar.gz 3989982 RMD160 b4c9cb8e777c4e484f653085783bce9645804fe0 DIST bochs-2.3.tar.gz 3812273 RMD160 545e0bf3edd0fdd073a107e835f90c65451c100e SHA1 2fe0dbdebd7fe9fe07d697bcbe1736bdaeb64aaf SHA256 fd926f3915d0619ddde8dedd02dac661f3233d77f3fc2ec7f94e1e028398497a DIST bochs-2.4.1.tar.gz 4046505 RMD160 c1b71ba4f6cef8710aa66a5e6862c7ccaf13d7eb SHA1 80a85bb7b8598298615db1216c4a8c3597666309 SHA256 d4fd63e328870d8a9452d8397c83a295b093d5d158386d1ef9b98f161f520ab3 DIST dlxlinux4.tar.gz 1504868 RMD160 29fd31dd0f77edacecabd9f053206a486635e7f1 SHA1 b3f441cd71c54c71a8c21aa405e949bde02c1783 SHA256 68b35f850ce69f4050ed85064e15d756245d57e84ddc1d52678b0e2a97dbf73e -EBUILD bochs-2.3.6.ebuild 2774 RMD160 2883821e43ba10608f4adc08382b83e0b3e4b055 SHA1 bdf57fc3d794211f54b8516204d240cfdd5fceac SHA256 171c004d1f0d5954d9f193a5282720a4678e6b6f0557eaf1f82e54d9e907730d -EBUILD bochs-2.3.7.ebuild 3505 RMD160 ba0374ffa8011d7ca1da0b729a4599bab9fe4e13 SHA1 7f0e7fe0c1ee67825a5edc59eac36383896eac5a SHA256 5f14f5388157bcec396b93398fc73183f26ddce5c8cece01c96a89cf22083ee1 -EBUILD bochs-2.3.ebuild 3054 RMD160 cc0fa6f9fe72fdeb09a53604d99be1abcf12a1c0 SHA1 d3792294eef7fbf4de0559c6478179b72f97c381 SHA256 96426d6c0dafcd7b708f432b41836c27f58b478464d8507b78d1212177de7eb6 -EBUILD bochs-2.4.1.ebuild 3342 RMD160 395d6adfc5b7d4579c9694e70571ed5110a3cba1 SHA1 de1b09a692f5237539ca7fa7047af6765ab4f3cc SHA256 b78acbf2248694a9fe13cd2597b6a78a37c490b41c713ef518f32fd1e1ddcc49 -MISC ChangeLog 10805 RMD160 1ce8a5fc130cbf156d7d82cf583d2b8e260ada4f SHA1 4dc5338a215a5f21c792440c869e1d26d858c103 SHA256 d4b20711a3be7c725d48fad08a5efabc788a6a4841218f1e9b29430a87152728 +EBUILD bochs-2.3.6.ebuild 2576 RMD160 8f673c437343ce394ab3454b3a55297db9ed822d SHA1 7dd1e9c43bfec5bfdc9c68139da0278494b88771 SHA256 e7e6f404958d06b598c04cbe9858f0baf812ad581b1004b6e2d2a31dd34c333a +EBUILD bochs-2.3.7.ebuild 3307 RMD160 db014a2bc7739c30ea763546fca648608d30f2c2 SHA1 6b5b3c865bd266c9a2fd4c95bab4f465e82b4332 SHA256 ef8703d973494a95f43463bee824c6e17e82e8b7a75c44577ce20c95a87aab6f +EBUILD bochs-2.3.ebuild 2882 RMD160 063c7d14314c860b09152f74e0dbc27e3f2f666e SHA1 fde337b4cf683b96f1f30cfae7430e501b3d027f SHA256 2cef373ca255340882b81620e6cb5371c4290531ee84f72b548efc1583b936be +EBUILD bochs-2.4.1.ebuild 3144 RMD160 3d17be562eb22e7a7b994e418fdbe118b29cc50a SHA1 6343294465b3ce67bad5074fa9b580b632f4a186 SHA256 f7c7097d66fc349eaf30c8ccaedc1b077a501d626158d341088ec461527746a4 +MISC ChangeLog 11005 RMD160 43155767a4b41d7ae01ce8fa9d338d9c56fe3661 SHA1 9cf85198f6f75f93376fe74592b1c8e5cefea509 SHA256 912c4a5fff0a33c36b699f7c4d838ccaf55c52da77822fd0f7707ea3ad21cf5e MISC metadata.xml 292 RMD160 763d8dd9333f7e318c659a073bd837405d528e00 SHA1 8886f39ce9788c2d0a908106704ea9552ca3d78c SHA256 0d8960adac2ec04d372e9317aff221b788071bb3d31852560e4bebe1d2272a65 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAktyLfYACgkQiqiDRvmkBmJXigCg78HT/RSgABztDD6/idodnWgd +LX8AoLGE62Sg3Bfor1h3T8ombZ3OtRcL +=cmTq +-----END PGP SIGNATURE----- diff --git a/app-emulation/bochs/bochs-2.3.6.ebuild b/app-emulation/bochs/bochs-2.3.6.ebuild index e5f461dfe469..2947c5d59cd6 100644 --- a/app-emulation/bochs/bochs-2.3.6.ebuild +++ b/app-emulation/bochs/bochs-2.3.6.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.6.ebuild,v 1.4 2009/09/23 15:32:34 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.6.ebuild,v 1.5 2010/02/10 03:52:03 dirtyepic Exp $ -inherit eutils wxwidgets autotools +WX_GTK_VER=2.6 + +inherit eutils wxwidgets DESCRIPTION="a LGPL-ed pc emulator" HOMEPAGE="http://bochs.sourceforge.net/" @@ -12,7 +14,7 @@ SRC_URI="mirror://sourceforge/bochs/${P}.tar.gz LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" -IUSE="X debugger readline usb wxwindows svga sdl ncurses vnc acpi" +IUSE="X debugger readline usb wxwidgets svga sdl ncurses vnc acpi" RDEPEND="X? ( x11-libs/libICE x11-libs/libSM @@ -20,7 +22,7 @@ RDEPEND="X? ( x11-libs/libICE x11-libs/libXpm ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) - wxwindows? ( =x11-libs/wxGTK-2.6* ) + wxwidgets? ( =x11-libs/wxGTK-2.6* ) readline? ( sys-libs/readline ) ncurses? ( sys-libs/ncurses )" @@ -39,27 +41,18 @@ src_unpack() { -e "s:\$(WGET) \$(DLXLINUX_TAR_URL):cp ${DISTDIR}/dlxlinux4.tar.gz .:" \ Makefile.in || \ die "sed Makefile.in failed" - - # Make sure wxwindows 2.6 is used in case both 2.6 and 2.4 are installed - sed -i -e "s:wx-config:wx-config-2.6:" configure.in - eautoconf } src_compile() { - export WX_GTK_VER=2.6 - - use wxwindows && \ - need-wxwidgets gtk2 - use x86 && \ myconf="--enable-idle-hack --enable-fast-function-calls" use amd64 && \ myconf="--enable-x86-64" - use wxwindows && \ + use wxwidgets && \ myconf="${myconf} --with-wx" - use wxwindows || \ + use wxwidgets || \ myconf="${myconf} --without-wx" use vnc && \ @@ -120,7 +113,7 @@ src_install() { dodoc README.rfb || die "dodoc failed" fi - if [ use wxwindows ] + if [ use wxwidgets ] then dodoc README-wxWindows || die "dodoc failed" fi diff --git a/app-emulation/bochs/bochs-2.3.7.ebuild b/app-emulation/bochs/bochs-2.3.7.ebuild index 8aa8ae1433e3..3647951167ad 100644 --- a/app-emulation/bochs/bochs-2.3.7.ebuild +++ b/app-emulation/bochs/bochs-2.3.7.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.7.ebuild,v 1.6 2009/09/23 15:32:34 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.7.ebuild,v 1.7 2010/02/10 03:52:03 dirtyepic Exp $ -inherit eutils wxwidgets autotools +WX_GTK_VER=2.6 + +inherit eutils wxwidgets DESCRIPTION="a LGPL-ed pc emulator" HOMEPAGE="http://bochs.sourceforge.net/" @@ -12,7 +14,7 @@ SRC_URI="mirror://sourceforge/bochs/${P}.tar.gz LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="alpha amd64 ppc ~sparc x86" -IUSE="X debugger readline usb wxwindows svga sdl ncurses vnc acpi" +IUSE="X debugger readline usb wxwidgets svga sdl ncurses vnc acpi" RDEPEND="X? ( x11-libs/libICE x11-libs/libSM @@ -20,7 +22,7 @@ RDEPEND="X? ( x11-libs/libICE x11-libs/libXpm ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) - wxwindows? ( =x11-libs/wxGTK-2.6* ) + wxwidgets? ( =x11-libs/wxGTK-2.6* ) readline? ( sys-libs/readline ) ncurses? ( sys-libs/ncurses )" @@ -42,27 +44,18 @@ src_unpack() { -e "s:\$(WGET) \$(DLXLINUX_TAR_URL):cp ${DISTDIR}/dlxlinux4.tar.gz .:" \ Makefile.in || \ die "sed Makefile.in failed" - - # Make sure wxwindows 2.6 is used in case both 2.6 and 2.4 are installed - sed -i -e "s:wx-config:wx-config-2.6:" configure.in - eautoconf } src_compile() { - export WX_GTK_VER=2.6 - - use wxwindows && \ - need-wxwidgets gtk2 - use x86 && \ myconf="--enable-idle-hack --enable-fast-function-calls" use amd64 && \ myconf="--enable-x86-64" - use wxwindows && \ + use wxwidgets && \ myconf="${myconf} --with-wx" - use wxwindows || \ + use wxwidgets || \ myconf="${myconf} --without-wx" use vnc && \ @@ -152,7 +145,7 @@ src_install() { dodoc README.rfb || die "dodoc failed" fi - if [ use wxwindows ] + if [ use wxwidgets ] then dodoc README-wxWindows || die "dodoc failed" fi diff --git a/app-emulation/bochs/bochs-2.3.ebuild b/app-emulation/bochs/bochs-2.3.ebuild index 464d22d61b0f..774272eb5c0c 100644 --- a/app-emulation/bochs/bochs-2.3.ebuild +++ b/app-emulation/bochs/bochs-2.3.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.ebuild,v 1.8 2009/09/23 15:32:34 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.ebuild,v 1.9 2010/02/10 03:52:03 dirtyepic Exp $ + +WX_GTK_VER=2.6 inherit eutils wxwidgets autotools @@ -12,14 +14,14 @@ SRC_URI="mirror://sourceforge/bochs/${P}.tar.gz LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="alpha amd64 ppc ~sparc x86" -IUSE="debugger readline sdl wxwindows X ncurses vnc" +IUSE="debugger readline sdl wxwidgets X ncurses vnc" RDEPEND="X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm ) sdl? ( media-libs/libsdl ) - wxwindows? ( =x11-libs/wxGTK-2.6* ) + wxwidgets? ( =x11-libs/wxGTK-2.6* ) readline? ( sys-libs/readline ) ncurses? ( sys-libs/ncurses )" @@ -41,8 +43,6 @@ src_unpack() { sed -i -e "s:/opt/gnome:/usr:" configure # Fix some bad coding for gcc-4.1 compliance sed -i -e "s:\#ifndef PARANOID:\#if 0:" iodev/hdimage.h -# Make sure wxwindows 2.6 is used in case both 2.6 and 2.4 are installed - sed -i -e "s:wx-config:wx-config-2.6:" configure # wx unicode patches from fedora and bits the fedora missed # epatch ${DISTDIR}/${P}-unicode.patch.gz epatch ${FILESDIR}/${P}-redog.patch @@ -52,18 +52,13 @@ src_unpack() { } src_compile() { - export WX_GTK_VER=2.6 - - use wxwindows && \ - need-wxwidgets gtk2 - [[ "$ARCH" == "x86" ]] \ && myconf="--enable-idle-hack --enable-fast-function-calls" myconf="${myconf} `use_with sdl`" myconf="${myconf} `use_enable readline`" - use wxwindows && \ + use wxwidgets && \ myconf="${myconf} --with-wx" - use wxwindows || \ + use wxwidgets || \ myconf="${myconf} --without-wx" use debugger && \ myconf="$myconf --enable-debugger --enable-disasm \ diff --git a/app-emulation/bochs/bochs-2.4.1.ebuild b/app-emulation/bochs/bochs-2.4.1.ebuild index a6522b4297d1..1c902e700d02 100644 --- a/app-emulation/bochs/bochs-2.4.1.ebuild +++ b/app-emulation/bochs/bochs-2.4.1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.4.1.ebuild,v 1.2 2009/09/23 15:32:34 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.4.1.ebuild,v 1.3 2010/02/10 03:52:03 dirtyepic Exp $ -inherit eutils wxwidgets autotools +WX_GTK_VER=2.6 + +inherit eutils wxwidgets DESCRIPTION="a LGPL-ed pc emulator" HOMEPAGE="http://bochs.sourceforge.net/" @@ -12,7 +14,7 @@ SRC_URI="mirror://sourceforge/bochs/${P}.tar.gz LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" -IUSE="X debugger readline usb wxwindows svga sdl ncurses vnc acpi" +IUSE="X debugger readline usb wxwidgets svga sdl ncurses vnc acpi" RDEPEND="X? ( x11-libs/libICE x11-libs/libSM @@ -20,7 +22,7 @@ RDEPEND="X? ( x11-libs/libICE x11-libs/libXpm ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) - wxwindows? ( =x11-libs/wxGTK-2.6* ) + wxwidgets? ( =x11-libs/wxGTK-2.6* ) readline? ( sys-libs/readline ) ncurses? ( sys-libs/ncurses )" @@ -39,27 +41,18 @@ src_unpack() { -e "s:\$(WGET) \$(DLXLINUX_TAR_URL):cp ${DISTDIR}/dlxlinux4.tar.gz .:" \ Makefile.in || \ die "sed Makefile.in failed" - - # Make sure wxwindows 2.6 is used in case both 2.6 and 2.4 are installed - sed -i -e "s:wx-config:wx-config-2.6:" configure.in - eautoconf } src_compile() { - export WX_GTK_VER=2.6 - - use wxwindows && \ - need-wxwidgets gtk2 - use x86 && \ myconf="--enable-idle-hack --enable-fast-function-calls" use amd64 && \ myconf="--enable-x86-64" - use wxwindows && \ + use wxwidgets && \ myconf="${myconf} --with-wx" - use wxwindows || \ + use wxwidgets || \ myconf="${myconf} --without-wx" use vnc && \ @@ -146,7 +139,7 @@ src_install() { dodoc README.rfb || die "dodoc failed" fi - if [ use wxwindows ] + if [ use wxwidgets ] then dodoc README-wxWindows || die "dodoc failed" fi |