From 5e852c70c6abd01abe88f7557f24857d56533477 Mon Sep 17 00:00:00 2001 From: Tristan Heaven Date: Thu, 26 Apr 2007 18:06:14 +0000 Subject: [PATCH] Version bump Package-Manager: portage-2.1.2.4 --- app-emulation/vice/ChangeLog | 8 +- app-emulation/vice/Manifest | 56 ++++------- app-emulation/vice/files/digest-vice-1.17 | 3 - app-emulation/vice/files/digest-vice-1.19 | 3 - app-emulation/vice/files/digest-vice-1.20 | 3 - app-emulation/vice/files/digest-vice-1.21 | 3 + .../vice/files/vice-1.19-64bitfix.patch | 39 -------- .../vice/files/vice-1.21-uicolor.patch | 22 +++++ app-emulation/vice/vice-1.17.ebuild | 87 ----------------- app-emulation/vice/vice-1.19.ebuild | 95 ------------------- .../{vice-1.20.ebuild => vice-1.21.ebuild} | 25 +++-- 11 files changed, 67 insertions(+), 277 deletions(-) delete mode 100644 app-emulation/vice/files/digest-vice-1.17 delete mode 100644 app-emulation/vice/files/digest-vice-1.19 delete mode 100644 app-emulation/vice/files/digest-vice-1.20 create mode 100644 app-emulation/vice/files/digest-vice-1.21 delete mode 100644 app-emulation/vice/files/vice-1.19-64bitfix.patch create mode 100644 app-emulation/vice/files/vice-1.21-uicolor.patch delete mode 100644 app-emulation/vice/vice-1.17.ebuild delete mode 100644 app-emulation/vice/vice-1.19.ebuild rename app-emulation/vice/{vice-1.20.ebuild => vice-1.21.ebuild} (78%) diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog index 1ead72e07200..bfd78e1776c3 100644 --- a/app-emulation/vice/ChangeLog +++ b/app-emulation/vice/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/vice # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.45 2007/04/24 13:14:19 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.46 2007/04/26 18:06:14 nyhm Exp $ + +*vice-1.21 (26 Apr 2007) + + 26 Apr 2007; Tristan Heaven + +files/vice-1.21-uicolor.patch, +vice-1.21.ebuild: + Version bump 24 Apr 2007; Gustavo Zacarias vice-1.20.ebuild: Stable on sparc diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest index 49b382d52db4..ca4b1de51946 100644 --- a/app-emulation/vice/Manifest +++ b/app-emulation/vice/Manifest @@ -1,46 +1,30 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX vice-1.19-64bitfix.patch 1019 RMD160 95fd93ae3fda668a660e510c444a9681967a2e39 SHA1 8b53885dec90072455c85c986ee0439f4609ea58 SHA256 1d5ed8ae642d201110446b64fbcca58f288e55f7e1d3bc9800dd2d7417aa096e -MD5 deacb0b29944f25716bf051f45b8f174 files/vice-1.19-64bitfix.patch 1019 -RMD160 95fd93ae3fda668a660e510c444a9681967a2e39 files/vice-1.19-64bitfix.patch 1019 -SHA256 1d5ed8ae642d201110446b64fbcca58f288e55f7e1d3bc9800dd2d7417aa096e files/vice-1.19-64bitfix.patch 1019 -DIST vice-1.17.tar.gz 4412711 RMD160 ec73b69ee9bad49d10f7b6047082d24cc4f37009 SHA1 d943defd2dec6f4d3bb17f809a2d3ffbed8ce92c SHA256 cb7bed2e200ea53d207a627f7d758c6daffe0461edf7ceb9654d1f3363c53a1d -DIST vice-1.19.tar.gz 4796181 RMD160 d0a62750c30e3cf8645117a8e8536a8061c260ea SHA1 8620d891fa9de29eb21e334f3c7c8254e89e80a9 SHA256 faf354cfef53f5b31c459692fac73dd45b72d9b05d6920348bd881856d75cd7e -DIST vice-1.20.tar.gz 5183757 RMD160 b4f7a50257cbdd6338d4e685760e99c07ad14adb SHA1 ab24d4cda34e93eb8663337af127402cc6ccaa6a SHA256 be32aabeb9073c25532e6df796e782a2949c464dcccb1648ad0db27fef6fd177 -EBUILD vice-1.17.ebuild 1858 RMD160 ac37ee11eb04d9f583eeda079f6e8aaa9a970747 SHA1 4d0ab1f2f5449ed68f5eca59f090bb62e7bdf1f5 SHA256 a032689e21ab79423d62a86a9af90a92600dc062801f8d042262141821ff24fa -MD5 740f09bc129d6b1f320bf8df0565b0df vice-1.17.ebuild 1858 -RMD160 ac37ee11eb04d9f583eeda079f6e8aaa9a970747 vice-1.17.ebuild 1858 -SHA256 a032689e21ab79423d62a86a9af90a92600dc062801f8d042262141821ff24fa vice-1.17.ebuild 1858 -EBUILD vice-1.19.ebuild 1993 RMD160 374c6a5982c80a811c1dd4b70627045d22567530 SHA1 3557b6f2fce5eb9be8f7bb3811ab56bc896d911b SHA256 3c6ed17695162e17b881583530591cc7ce1660c253cb93d977e308666b35be65 -MD5 110b942714e4c79935abf063b15a89f7 vice-1.19.ebuild 1993 -RMD160 374c6a5982c80a811c1dd4b70627045d22567530 vice-1.19.ebuild 1993 -SHA256 3c6ed17695162e17b881583530591cc7ce1660c253cb93d977e308666b35be65 vice-1.19.ebuild 1993 -EBUILD vice-1.20.ebuild 2008 RMD160 131ac12fd6f182ba662597c575e65952e59b98dd SHA1 424dece45af1c8c86fbc2ed833b7d96f879fbd4d SHA256 b6ba85eb6c10efb229b36870911046e29882ac52dd455084f3e82b5682bf297d -MD5 a9fc3961578833236334f5f37d16d0f3 vice-1.20.ebuild 2008 -RMD160 131ac12fd6f182ba662597c575e65952e59b98dd vice-1.20.ebuild 2008 -SHA256 b6ba85eb6c10efb229b36870911046e29882ac52dd455084f3e82b5682bf297d vice-1.20.ebuild 2008 -MISC ChangeLog 5580 RMD160 c771285c05072749d405164e91089971289036e4 SHA1 aa7de235a07038834beea32ea81730a11a8778e7 SHA256 aaa58efecf2eeed32c47cdcc7f171d42a0052df489cbbb7da521079db3b90aa7 -MD5 c0299d4b8ba2c65a660ff4e16b23b407 ChangeLog 5580 -RMD160 c771285c05072749d405164e91089971289036e4 ChangeLog 5580 -SHA256 aaa58efecf2eeed32c47cdcc7f171d42a0052df489cbbb7da521079db3b90aa7 ChangeLog 5580 +AUX vice-1.21-uicolor.patch 948 RMD160 5bc77d9541dc2b5a018581d97403ed24fffa8e22 SHA1 eba3a77c12b2071ca78e9c87e069758f7d8d4bcc SHA256 501d7bd542703b553c12313350c89cced8c1169d3dd7501434e96bf4eb18dad9 +MD5 e861107465c1b15024e8016e22519a82 files/vice-1.21-uicolor.patch 948 +RMD160 5bc77d9541dc2b5a018581d97403ed24fffa8e22 files/vice-1.21-uicolor.patch 948 +SHA256 501d7bd542703b553c12313350c89cced8c1169d3dd7501434e96bf4eb18dad9 files/vice-1.21-uicolor.patch 948 +DIST vice-1.21.tar.gz 5725833 RMD160 1384cb4d80be6801de603c0424b3a5e5dd18de15 SHA1 a4915ae85dc562208bed5766d2c17481244b157d SHA256 511ed35e6692f68e8b58ea3d040af6428239859e31eef9d99b6187a166373389 +EBUILD vice-1.21.ebuild 2095 RMD160 768baa90528739238503c0c458cf19d7a316b95d SHA1 7b9bc8dcf9f8bbe5a663c8242a7ef31cfef050e8 SHA256 0b233447409624bd2523448bbb551339bbb4659b7b885117bee6aac04863236e +MD5 e537b81ebc0e2c3b5c5c506767b7608d vice-1.21.ebuild 2095 +RMD160 768baa90528739238503c0c458cf19d7a316b95d vice-1.21.ebuild 2095 +SHA256 0b233447409624bd2523448bbb551339bbb4659b7b885117bee6aac04863236e vice-1.21.ebuild 2095 +MISC ChangeLog 5719 RMD160 35773f49040259e7550ad3ab0f378fb2fa07f0ff SHA1 db15dbf5209650563b68ab97a4e0e3f64e95df08 SHA256 10c5532abd765d1f1460e25f11636d32d14707c9a9497e791571e011621cf781 +MD5 aa963a048632adbf351f283fa1d82733 ChangeLog 5719 +RMD160 35773f49040259e7550ad3ab0f378fb2fa07f0ff ChangeLog 5719 +SHA256 10c5532abd765d1f1460e25f11636d32d14707c9a9497e791571e011621cf781 ChangeLog 5719 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 -MD5 b297ea8c7eb157d7ab230e85c0a0815c files/digest-vice-1.17 232 -RMD160 b845eb64d0635e97fe876073b3d04dac85314eb2 files/digest-vice-1.17 232 -SHA256 28866706951de814358e6e8c7ed984080fbb1d4772149e909a2c38e703a08330 files/digest-vice-1.17 232 -MD5 99fd8c681eb2ed93e3e4513bf66b8d4a files/digest-vice-1.19 232 -RMD160 736cb2993393b6add14f15fc56af0148df11c3ef files/digest-vice-1.19 232 -SHA256 12704a4dc33f2e5e71b6f3d73df08d3fffb614b12e79546306473b255ff4661c files/digest-vice-1.19 232 -MD5 0418d56da4a468b00d48b7d34117895b files/digest-vice-1.20 232 -RMD160 392a8cf04c78ea491e8f9504a6678bf5f105ed54 files/digest-vice-1.20 232 -SHA256 67cf47ac1b25161272a347365dab7edb10105b44991d17778b396a9376011e42 files/digest-vice-1.20 232 +MD5 a680f9f188ab74cf61f3ade2d586b223 files/digest-vice-1.21 232 +RMD160 f4bc76b22eb62e175e84fc811b58c0fde457deac files/digest-vice-1.21 232 +SHA256 5f3f3b4ee9bb6d41f43c38c593646d01e41ee4cc055aca9cb1dd822b3bba78dc files/digest-vice-1.21 232 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGLgKxKRy60XGEcJIRAlY7AKCkYkoXhrChNpNnr2onNOkAo5XXgwCfbP0r -Byun1TsntFuluVfMfyGJZBk= -=AHsu +iD8DBQFGMOoedz7hIScOURERAvH6AKDBAVehQf0cHbLnf436+zDG6uIdPACgtJHn +icRse9o6RgW+8GQykyI+jRk= +=w3yi -----END PGP SIGNATURE----- diff --git a/app-emulation/vice/files/digest-vice-1.17 b/app-emulation/vice/files/digest-vice-1.17 deleted file mode 100644 index b9a25cfd21cc..000000000000 --- a/app-emulation/vice/files/digest-vice-1.17 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 a3b70d5fcef0b345599b6d452401e18e vice-1.17.tar.gz 4412711 -RMD160 ec73b69ee9bad49d10f7b6047082d24cc4f37009 vice-1.17.tar.gz 4412711 -SHA256 cb7bed2e200ea53d207a627f7d758c6daffe0461edf7ceb9654d1f3363c53a1d vice-1.17.tar.gz 4412711 diff --git a/app-emulation/vice/files/digest-vice-1.19 b/app-emulation/vice/files/digest-vice-1.19 deleted file mode 100644 index 013680847651..000000000000 --- a/app-emulation/vice/files/digest-vice-1.19 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 92f828f29e05f57d7a498a861d3dab6a vice-1.19.tar.gz 4796181 -RMD160 d0a62750c30e3cf8645117a8e8536a8061c260ea vice-1.19.tar.gz 4796181 -SHA256 faf354cfef53f5b31c459692fac73dd45b72d9b05d6920348bd881856d75cd7e vice-1.19.tar.gz 4796181 diff --git a/app-emulation/vice/files/digest-vice-1.20 b/app-emulation/vice/files/digest-vice-1.20 deleted file mode 100644 index 469a839e49f9..000000000000 --- a/app-emulation/vice/files/digest-vice-1.20 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d02fe05f0f9e839820105cdf51da6b4e vice-1.20.tar.gz 5183757 -RMD160 b4f7a50257cbdd6338d4e685760e99c07ad14adb vice-1.20.tar.gz 5183757 -SHA256 be32aabeb9073c25532e6df796e782a2949c464dcccb1648ad0db27fef6fd177 vice-1.20.tar.gz 5183757 diff --git a/app-emulation/vice/files/digest-vice-1.21 b/app-emulation/vice/files/digest-vice-1.21 new file mode 100644 index 000000000000..0c87a06f1327 --- /dev/null +++ b/app-emulation/vice/files/digest-vice-1.21 @@ -0,0 +1,3 @@ +MD5 913bdee9d59d154ed33ef4e037d8a12c vice-1.21.tar.gz 5725833 +RMD160 1384cb4d80be6801de603c0424b3a5e5dd18de15 vice-1.21.tar.gz 5725833 +SHA256 511ed35e6692f68e8b58ea3d040af6428239859e31eef9d99b6187a166373389 vice-1.21.tar.gz 5725833 diff --git a/app-emulation/vice/files/vice-1.19-64bitfix.patch b/app-emulation/vice/files/vice-1.19-64bitfix.patch deleted file mode 100644 index 5961b8eea2ae..000000000000 --- a/app-emulation/vice/files/vice-1.19-64bitfix.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- vice-1.18/src/gfxoutputdrv/ffmpeg/common.h.unpatched 2005-12-25 11:57:38.000000000 +0100 -+++ vice-1.18/src/gfxoutputdrv/ffmpeg/common.h 2005-12-25 12:01:47.000000000 +0100 -@@ -18,6 +18,10 @@ - //#define A32_BITSTREAM_READER - #define LIBMPEG2_BITSTREAM_READER_HACK //add BERO - -+#if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(EMULATE_INTTYPES) -+# define EMULATE_INTTYPES -+#endif -+ - #ifndef M_PI - #define M_PI 3.14159265358979323846 - #endif -@@ -93,7 +97,6 @@ - #endif - #endif - --#define EMULATE_INTTYPES - #ifndef EMULATE_INTTYPES - # include - #else -@@ -255,7 +258,7 @@ - - extern const uint32_t inverse[256]; - --#ifdef ARCH_X86 -+#if defined(ARCH_X86) || defined(ARCH_X86_64) - # define FASTDIV(a,b) \ - ({\ - int ret,dmy;\ -@@ -1219,7 +1222,7 @@ - #define MKBETAG(a,b,c,d) (d | (c << 8) | (b << 16) | (a << 24)) - - --#ifdef ARCH_X86 -+#if defined(ARCH_X86) || defined(ARCH_X86_64) - #define MASK_ABS(mask, level)\ - asm volatile(\ - "cdq \n\t"\ diff --git a/app-emulation/vice/files/vice-1.21-uicolor.patch b/app-emulation/vice/files/vice-1.21-uicolor.patch new file mode 100644 index 000000000000..7eebf08d185a --- /dev/null +++ b/app-emulation/vice/files/vice-1.21-uicolor.patch @@ -0,0 +1,22 @@ +--- src/arch/unix/x11/gnome/uicolor.c ++++ src/arch/unix/x11/gnome/uicolor.c +@@ -166,7 +166,7 @@ + way to do this? //tvr */ + im = XCreateImage(display, GDK_VISUAL_XVISUAL(visual), + x11ui_get_display_depth(), +- ZPixmap, 0, (char *)data, 1, 1, 8, 1); ++ ZPixmap, 0, (char *)data, 1, 1, 8, 0); + if (!im) { + log_error(LOG_DEFAULT, _("XCreateImage failed.")); + free(data); +--- src/arch/unix/x11/xaw/uicolor.c ++++ src/arch/unix/x11/xaw/uicolor.c +@@ -121,7 +121,7 @@ + /* This is a kludge to map pixels to zimage values. Is there a better + way to do this? //tvr */ + im = XCreateImage(display, visual, x11ui_get_display_depth(), +- ZPixmap, 0, (char *)data, 1, 1, 8, 1); ++ ZPixmap, 0, (char *)data, 1, 1, 8, 0); + if (!im) { + log_error(LOG_DEFAULT, _("XCreateImage failed.")); + free(data); diff --git a/app-emulation/vice/vice-1.17.ebuild b/app-emulation/vice/vice-1.17.ebuild deleted file mode 100644 index 782ce3aed293..000000000000 --- a/app-emulation/vice/vice-1.17.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-1.17.ebuild,v 1.8 2006/11/17 23:06:10 compnerd Exp $ - -inherit eutils games - -DESCRIPTION="The Versatile Commodore 8-bit Emulator" -HOMEPAGE="http://www.viceteam.org/" -SRC_URI="ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ppc x86" -IUSE="X Xaw3d arts esd ffmpeg nls readline sdl" - -XDEPEND="|| ( - ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXxf86vm - x11-libs/libICE - x11-libs/libSM - x11-libs/libXv - x11-libs/libXxf86dga ) - virtual/x11 )" -RDEPEND="esd? ( media-sound/esound ) - media-libs/libpng - sys-libs/zlib - arts? ( kde-base/arts ) - readline? ( sys-libs/readline ) - sdl? ( - ${XDPENED} - || ( - ( - x11-libs/libXt - x11-libs/libXmu ) - virtual/x11 ) - media-libs/libsdl ) - X? ( - ${XDEPEND} - || ( - ( - x11-libs/libXt - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXaw ) - virtual/x11 ) ) - Xaw3d? ( - ${XDEPEND} - x11-libs/Xaw3d ) - ffmpeg? ( media-video/ffmpeg )" -DEPEND="${RDEPEND} - || ( - ( - x11-proto/xproto - x11-proto/xf86vidmodeproto - x11-proto/xextproto - x11-proto/xf86dgaproto - x11-proto/videoproto ) - virtual/x11 )" - -src_compile() { - egamesconf \ - --disable-dependency-tracking \ - --enable-fullscreen \ - --enable-textfield \ - --enable-ethernet \ - --enable-realdevice \ - --with-resid \ - --without-midas \ - $(use_enable ffmpeg) \ - $(use_enable nls) \ - $(use_with X x) \ - $(use_with Xaw3d xaw3d) \ - $(use_with arts) \ - $(use_with esd) \ - $(use_with readline) \ - $(use_with sdl) \ - || die - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog FEEDBACK README - prepgamesdirs -} diff --git a/app-emulation/vice/vice-1.19.ebuild b/app-emulation/vice/vice-1.19.ebuild deleted file mode 100644 index 8b41ac69b5c3..000000000000 --- a/app-emulation/vice/vice-1.19.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-1.19.ebuild,v 1.11 2006/11/17 23:06:10 compnerd Exp $ - -inherit eutils games - -DESCRIPTION="The Versatile Commodore 8-bit Emulator" -HOMEPAGE="http://www.viceteam.org/" -SRC_URI="ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ppc sparc ~x86" -IUSE="X Xaw3d arts esd ffmpeg nls readline sdl" - -XDEPEND="|| ( - ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXxf86vm - x11-libs/libICE - x11-libs/libSM - x11-libs/libXv - x11-libs/libXxf86dga ) - virtual/x11 )" -RDEPEND="esd? ( media-sound/esound ) - media-libs/libpng - sys-libs/zlib - arts? ( kde-base/arts ) - readline? ( sys-libs/readline ) - sdl? ( - ${XDEPEND} - || ( - ( - x11-libs/libXt - x11-libs/libXmu ) - virtual/x11 ) - media-libs/libsdl ) - X? ( - ${XDEPEND} - || ( - ( - x11-libs/libXt - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXaw ) - virtual/x11 ) ) - Xaw3d? ( - ${XDEPEND} - x11-libs/Xaw3d ) - ffmpeg? ( media-video/ffmpeg )" -DEPEND="${RDEPEND} - || ( - ( - x11-apps/bdftopcf - x11-apps/mkfontdir - x11-proto/xproto - x11-proto/xf86vidmodeproto - x11-proto/xextproto - x11-proto/xf86dgaproto - x11-proto/videoproto ) - virtual/x11 )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}"-64bitfix.patch -} - -src_compile() { - egamesconf \ - --disable-dependency-tracking \ - --enable-fullscreen \ - --enable-textfield \ - --enable-ethernet \ - --enable-realdevice \ - --with-resid \ - --without-midas \ - $(use_enable ffmpeg) \ - $(use_enable nls) \ - $(use_with X x) \ - $(use_with Xaw3d xaw3d) \ - $(use_with arts) \ - $(use_with esd) \ - $(use_with readline) \ - $(use_with sdl) \ - || die - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog FEEDBACK README - prepgamesdirs -} diff --git a/app-emulation/vice/vice-1.20.ebuild b/app-emulation/vice/vice-1.21.ebuild similarity index 78% rename from app-emulation/vice/vice-1.20.ebuild rename to app-emulation/vice/vice-1.21.ebuild index d5e7d9984720..4c69ee2cc2c3 100644 --- a/app-emulation/vice/vice-1.20.ebuild +++ b/app-emulation/vice/vice-1.21.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-1.20.ebuild,v 1.6 2007/04/24 13:14:19 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-1.21.ebuild,v 1.1 2007/04/26 18:06:14 nyhm Exp $ -inherit games +inherit eutils games DESCRIPTION="The Versatile Commodore 8-bit Emulator" HOMEPAGE="http://www.viceteam.org/" @@ -10,8 +10,8 @@ SRC_URI="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/${P LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc sparc x86" -IUSE="Xaw3d alsa arts esd gnome nls png readline sdl" +KEYWORDS="~amd64 ppc sparc x86" +IUSE="Xaw3d alsa arts esd ffmpeg gnome nls png readline sdl" RDEPEND="media-libs/giflib media-libs/jpeg @@ -29,6 +29,10 @@ RDEPEND="media-libs/giflib alsa? ( media-libs/alsa-lib ) arts? ( kde-base/arts ) esd? ( media-sound/esound ) + ffmpeg? ( + media-video/ffmpeg + media-sound/lame + ) gnome? ( gnome-base/libgnomeui ) nls? ( virtual/libintl ) png? ( media-libs/libpng ) @@ -51,19 +55,20 @@ src_unpack() { -e '/^gnulocaledir/s:$(prefix):/usr:' \ po/Makefile.in.in \ || die "sed failed" + sed -i \ + -e 's/getline/intlpo_getline/' \ + po/intl2po.c \ + || die "sed failed" + epatch "${FILESDIR}"/${P}-uicolor.patch #174056 } src_compile() { - # --enable-ffmpeg broken with 0.4.9_p20060530 egamesconf \ --disable-dependency-tracking \ - --disable-ffmpeg \ - --enable-ethernet \ --enable-fullscreen \ - --enable-textfield \ - --enable-realdevice \ - --with-resid \ --without-midas \ + --without-resid \ + $(use_enable ffmpeg) \ $(use_enable gnome gnomeui) \ $(use_enable nls) \ $(use_with Xaw3d xaw3d) \ -- 2.26.2