From 3ec46ca00cdb40fb64a5698aa90645838c65ae84 Mon Sep 17 00:00:00 2001 From: Daniel Goller Date: Tue, 8 Nov 2005 01:33:05 +0000 Subject: remove avifile dep wrt bug #111337 Package-Manager: portage-2.0.52-r1 --- games-emulation/mupen64/ChangeLog | 7 +++++- games-emulation/mupen64/Manifest | 27 ++++++++++++++-------- .../mupen64/files/mupen64-gentoo-avi.patch | 11 --------- games-emulation/mupen64/mupen64-0.4-r2.ebuild | 10 +++----- 4 files changed, 27 insertions(+), 28 deletions(-) delete mode 100644 games-emulation/mupen64/files/mupen64-gentoo-avi.patch (limited to 'games-emulation/mupen64') diff --git a/games-emulation/mupen64/ChangeLog b/games-emulation/mupen64/ChangeLog index fd39865e57d2..160d2fa4e92a 100644 --- a/games-emulation/mupen64/ChangeLog +++ b/games-emulation/mupen64/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-emulation/mupen64 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.17 2005/09/20 15:29:04 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.18 2005/11/08 01:33:05 morfic Exp $ + + 08 Nov 2005; Daniel Goller + -files/mupen64-gentoo-avi.patch, mupen64-0.4-r2.ebuild: + remove avifile dep and avi support wrt bug #111337, -amd64 since it doesn't + work 20 Sep 2005; Michael Sterrett mupen64-0.4-r2.ebuild: diff --git a/games-emulation/mupen64/Manifest b/games-emulation/mupen64/Manifest index e6aa4958d9ad..9176f4bbd152 100644 --- a/games-emulation/mupen64/Manifest +++ b/games-emulation/mupen64/Manifest @@ -1,15 +1,24 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 bc84826291bd32f93d21767d8101d457 ChangeLog 3338 MD5 a3e62bf537d9a02609601aa9ba76da7e metadata.xml 247 -MD5 32ad799fcf944bd2c2889cc96fa28f01 ChangeLog 3148 -MD5 7707985771663481aa96e7567ea2cb83 mupen64-0.4-r2.ebuild 2515 -MD5 8a58a3ce196f2d69b21339244722e957 files/mupen64-makefiles.patch 2052 +MD5 49a7654deda668a03424e9b35090ba40 mupen64-0.4-r2.ebuild 2410 MD5 e2b006764c1bac03ac2667ad60a66101 files/0.3-gcc3.patch 3662 -MD5 72f9db08fce1cb715c16d28c11f1cf9a files/mupen64-confdir.patch 171 -MD5 a7ebb16b1b250e889d5acd49537a9ece files/mupen64 751 -MD5 87053b50f759d8d4b65a2369fe42338a files/mupen64-rice-confdir.patch 1208 MD5 b21462ab51b383d28ca9d83f6531c664 files/digest-mupen64-0.4-r2 265 +MD5 a7ebb16b1b250e889d5acd49537a9ece files/mupen64 751 +MD5 f63e1260b9d35674f21fdcfff3be5c16 files/mupen64-SDL_ttf.patch 353 +MD5 72f9db08fce1cb715c16d28c11f1cf9a files/mupen64-confdir.patch 171 +MD5 e2b006764c1bac03ac2667ad60a66101 files/mupen64-gcc3.patch 3662 MD5 623f09fd7f622d43901a028d7069ac04 files/mupen64-gentoo-sdl.patch 1558 MD5 c9949136ca13fb53bdbe8cdcf0374ead files/mupen64-gtk2-makefile.patch 4845 -MD5 f63e1260b9d35674f21fdcfff3be5c16 files/mupen64-SDL_ttf.patch 353 -MD5 04a919e368e803ceda85d809cc767b0a files/mupen64-gentoo-avi.patch 255 +MD5 8a58a3ce196f2d69b21339244722e957 files/mupen64-makefiles.patch 2052 MD5 638046a5841774d744611e9f38751bcc files/mupen64-noasm.patch 229 -MD5 e2b006764c1bac03ac2667ad60a66101 files/mupen64-gcc3.patch 3662 +MD5 87053b50f759d8d4b65a2369fe42338a files/mupen64-rice-confdir.patch 1208 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDcABK/aM9DdBw91cRApbTAJ9TZeXzSalBKJLbXk76ig4jGfWh0wCeOyS3 +awRl6gBOlwl2vVs+GP3solw= +=2V7I +-----END PGP SIGNATURE----- diff --git a/games-emulation/mupen64/files/mupen64-gentoo-avi.patch b/games-emulation/mupen64/files/mupen64-gentoo-avi.patch deleted file mode 100644 index bda3d7f2e4e3..000000000000 --- a/games-emulation/mupen64/files/mupen64-gentoo-avi.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- emu64/config.h.orig 2004-07-15 23:09:00.000000000 +0000 -+++ emu64/config.h 2004-07-15 23:05:24.000000000 +0000 -@@ -1,7 +1,7 @@ - #ifndef CONFIG_H - #define CONFIG_H - - #undef WITH_HOME --#undef VCR_SUPPORT -+#define VCR_SUPPORT 1 - - #endif /* CONFIG_H */ diff --git a/games-emulation/mupen64/mupen64-0.4-r2.ebuild b/games-emulation/mupen64/mupen64-0.4-r2.ebuild index 2310929eee00..06ea34e2ee94 100644 --- a/games-emulation/mupen64/mupen64-0.4-r2.ebuild +++ b/games-emulation/mupen64/mupen64-0.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.4-r2.ebuild,v 1.6 2005/09/20 15:29:04 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.4-r2.ebuild,v 1.7 2005/11/08 01:33:05 morfic Exp $ inherit eutils games @@ -13,14 +13,13 @@ SRC_URI="http://mupen64.emulation64.com/files/${PV}/mupen64_src-${PV}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="asm avi" +KEYWORDS="-amd64 x86" +IUSE="asm" RDEPEND="sys-libs/zlib media-libs/libsdl virtual/glu virtual/opengl - avi? ( media-video/avifile ) =x11-libs/gtk+-2*" DEPEND="${RDEPEND} dev-util/pkgconfig" @@ -36,9 +35,6 @@ src_unpack() { epatch "${FILESDIR}/${PN}-makefiles.patch" \ "${FILESDIR}/${PN}-confdir.patch" \ "${FILESDIR}/${PN}-gtk2-makefile.patch" - if use avi; then - epatch "${FILESDIR}/${PN}-gentoo-avi.patch" - fi if ! use asm ; then epatch "${FILESDIR}/${PN}-noasm.patch" -- cgit v1.2.3-65-gdbad