From 1a54f2dbbc40bf4aba9417b1d1f5944cb21a577d Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Wed, 21 Mar 2007 23:15:23 +0000 Subject: [PATCH] sync with dosbox ebuild Package-Manager: portage-2.1.2.2 --- games-emulation/dosbox-cvs/ChangeLog | 6 ++- games-emulation/dosbox-cvs/Manifest | 26 +++------ .../dosbox-cvs/dosbox-cvs-20030809.ebuild | 53 ++++++++++++------- 3 files changed, 46 insertions(+), 39 deletions(-) diff --git a/games-emulation/dosbox-cvs/ChangeLog b/games-emulation/dosbox-cvs/ChangeLog index bcb89a752ec4..1389d26cc512 100644 --- a/games-emulation/dosbox-cvs/ChangeLog +++ b/games-emulation/dosbox-cvs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-emulation/dosbox-cvs # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox-cvs/ChangeLog,v 1.14 2007/03/12 13:56:49 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox-cvs/ChangeLog,v 1.15 2007/03/21 23:15:23 mr_bones_ Exp $ + + 21 Mar 2007; Michael Sterrett + dosbox-cvs-20030809.ebuild: + sync with dosbox ebuild 12 Mar 2007; Marius Mauch dosbox-cvs-20030809.ebuild: Replacing einfo with elog diff --git a/games-emulation/dosbox-cvs/Manifest b/games-emulation/dosbox-cvs/Manifest index 0559660b6f27..edeff62f9050 100644 --- a/games-emulation/dosbox-cvs/Manifest +++ b/games-emulation/dosbox-cvs/Manifest @@ -1,14 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -EBUILD dosbox-cvs-20030809.ebuild 1230 RMD160 ed1bf117b275ecaba54469c165a5b80d85635de3 SHA1 868d14fcd5a1b8ed30424b2ee29e2b15daea2e03 SHA256 a3ef5131bf402bb93bfe81b1b095e27d8fd96c7e8a778e6f84a252e9a4e501e5 -MD5 5433c92f2d84c7dbc6480581c4c922cc dosbox-cvs-20030809.ebuild 1230 -RMD160 ed1bf117b275ecaba54469c165a5b80d85635de3 dosbox-cvs-20030809.ebuild 1230 -SHA256 a3ef5131bf402bb93bfe81b1b095e27d8fd96c7e8a778e6f84a252e9a4e501e5 dosbox-cvs-20030809.ebuild 1230 -MISC ChangeLog 1781 RMD160 e62e4439e6a3d799e410f1a71aa3247e6cb1ea00 SHA1 f59f655fd7204ae0457d33007cb20f20b261fabb SHA256 0fb95c0fd5ec6ac685d8559fc6a10fca11739bb94bb0d4389aba82a0af9cb357 -MD5 94f32e4a4f03bff361410d1073b904b8 ChangeLog 1781 -RMD160 e62e4439e6a3d799e410f1a71aa3247e6cb1ea00 ChangeLog 1781 -SHA256 0fb95c0fd5ec6ac685d8559fc6a10fca11739bb94bb0d4389aba82a0af9cb357 ChangeLog 1781 +EBUILD dosbox-cvs-20030809.ebuild 1660 RMD160 0dc858b1d78d416bbac7c3b40a4389b0912d7fa8 SHA1 48619159f625c16232f0fa7ca44df25075a546da SHA256 68ae5702f77bc894da2c4780f6c41220e0d7b44ee95346a3d3027e5c385fbf47 +MD5 053fe12bb2b03e05fcd0122c75359bb3 dosbox-cvs-20030809.ebuild 1660 +RMD160 0dc858b1d78d416bbac7c3b40a4389b0912d7fa8 dosbox-cvs-20030809.ebuild 1660 +SHA256 68ae5702f77bc894da2c4780f6c41220e0d7b44ee95346a3d3027e5c385fbf47 dosbox-cvs-20030809.ebuild 1660 +MISC ChangeLog 1896 RMD160 efee496884fc6046791f913363fa9158aff3559f SHA1 d2fde5fb279f9c24062d031a106732ca22e95a84 SHA256 38c754a7b896502287aaa5e952c9a6f022ba053854d293b754fd60cce7bb2f84 +MD5 46e728d78b02af829614704d8408912d ChangeLog 1896 +RMD160 efee496884fc6046791f913363fa9158aff3559f ChangeLog 1896 +SHA256 38c754a7b896502287aaa5e952c9a6f022ba053854d293b754fd60cce7bb2f84 ChangeLog 1896 MISC metadata.xml 221 RMD160 617e2d275f39c937dfdc8ae1ebc0b4fac331d0a9 SHA1 e947c4afb6291420a09d464cb18472cfcf1cb498 SHA256 80c34a967b80bba5f0f27215677fdad5b1ed739678287b62db1f6c345cf69811 MD5 95e2b5bfd7767aeae061c77f7e1a055e metadata.xml 221 RMD160 617e2d275f39c937dfdc8ae1ebc0b4fac331d0a9 metadata.xml 221 @@ -16,10 +13,3 @@ SHA256 80c34a967b80bba5f0f27215677fdad5b1ed739678287b62db1f6c345cf69811 metadata MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-dosbox-cvs-20030809 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-dosbox-cvs-20030809 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-dosbox-cvs-20030809 0 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFF9V0j6J2i8a8J4okRAmWZAKCzOof4GeZU8HkzPI3zLh1l8DcIbACg35sr -L56VkV6uXwFoOPf/iwwDLJc= -=EQIj ------END PGP SIGNATURE----- diff --git a/games-emulation/dosbox-cvs/dosbox-cvs-20030809.ebuild b/games-emulation/dosbox-cvs/dosbox-cvs-20030809.ebuild index 200beaa38ac8..f1a6284c62ca 100644 --- a/games-emulation/dosbox-cvs/dosbox-cvs-20030809.ebuild +++ b/games-emulation/dosbox-cvs/dosbox-cvs-20030809.ebuild @@ -1,24 +1,24 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox-cvs/dosbox-cvs-20030809.ebuild,v 1.16 2007/03/12 13:56:49 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox-cvs/dosbox-cvs-20030809.ebuild,v 1.17 2007/03/21 23:15:23 mr_bones_ Exp $ -inherit games cvs +inherit eutils games cvs -DESCRIPTION="DOS Emulator" +DESCRIPTION="DOS emulator" HOMEPAGE="http://dosbox.sourceforge.net/" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ppc x86" -IUSE="opengl debug" +IUSE="alsa debug hardened opengl sdl png" -DEPEND="media-libs/alsa-lib +DEPEND="alsa? ( media-libs/alsa-lib ) opengl? ( virtual/opengl ) - >=media-libs/libsdl-1.2.0 - sys-libs/zlib - media-libs/libpng - media-libs/sdl-net - debug? ( sys-libs/ncurses )" + png? ( media-libs/libpng ) + debug? ( sys-libs/ncurses ) + media-libs/libsdl + sdl? ( media-libs/sdl-net + media-libs/sdl-sound )" ECVS_SERVER="dosbox.cvs.sourceforge.net:/cvsroot/dosbox" ECVS_MODULE="dosbox" @@ -26,26 +26,39 @@ ECVS_TOP_DIR=${DISTDIR}/cvs-src/${PN} S=${WORKDIR}/${ECVS_MODULE} +pkg_setup() { + if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then + eerror "To be able to build dosbox with ALSA support you need" + eerror "to have built media-libs/alsa-lib with midi USE flag." + die "Missing midi USE flag on media-libs/alsa-lib" + fi + games_pkg_setup +} + src_compile() { + local myconf= + + if ! use alsa ; then + myconf="--without-alsa-prefix --without-alsa-inc-prefix --disable-alsatest" + fi + # bug #66038 + if use hardened ; then + myconf="${myconf} --disable-dynamic-x86" + fi + if use debug ; then + myconf="${myconf} --enable-debug" + fi ./autogen.sh || die "autogen.sh failed" egamesconf \ --disable-dependency-tracking \ - $(use_enable debug debug heavy) \ + ${myconf} \ $(use_enable opengl) \ || die emake || die "emake failed" } src_install() { - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "emake install failed" dodoc AUTHORS ChangeLog NEWS README THANKS prepgamesdirs } - -pkg_postinst() { - games_pkg_postinst - echo - elog "If you're using ati-drivers, you may need to use output=overlay" - elog "in the dosbox config file (see bug #57188)." - echo -} -- 2.26.2