Remove old.

(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

4 files changed, 5 insertions, 140 deletions

diff --git a/games-emulation/vbam/ChangeLog b/games-emulation/vbam/ChangeLog
index eaa8fd9520a3..6f09cf128892 100644
--- a/games-emulation/vbam/ChangeLog
+++ b/games-emulation/vbam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/vbam
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/ChangeLog,v 1.19 2013/06/15 09:26:01 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/ChangeLog,v 1.20 2013/06/15 09:27:03 radhermit Exp $
+
+  15 Jun 2013; Tim Harder <radhermit@gentoo.org> -vbam-1.8.0.1090.ebuild,
+  -files/vbam-1.8.0.1009-zlib-1.2.6.patch, -files/vbam-1.8.0.1090-ffmpeg.patch:
+  Remove old.
 
   15 Jun 2013; Tim Harder <radhermit@gentoo.org> vbam-1.8.0.1149.ebuild,
   vbam-9999.ebuild:
diff --git a/games-emulation/vbam/files/vbam-1.8.0.1009-zlib-1.2.6.patch b/games-emulation/vbam/files/vbam-1.8.0.1009-zlib-1.2.6.patch
deleted file mode 100644
index 2be7c50b2963..000000000000
--- a/games-emulation/vbam/files/vbam-1.8.0.1009-zlib-1.2.6.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- vbam-1.8.0.1009.orig/fex/fex/Data_Reader.cpp
-+++ vbam-1.8.0.1009/fex/fex/Data_Reader.cpp
-@@ -732,11 +732,11 @@
- 
- blargg_err_t Gzip_File_Reader::read_v( void* p, int s )
- {
--	int result = gzread( file_, p, s );
-+	int result = gzread( (gzFile)file_, p, s );
- 	if ( result != s )
- 	{
- 		if ( result < 0 )
--			return convert_gz_error( file_ );
-+			return convert_gz_error( (gzFile)file_ );
- 		
- 		return blargg_err_file_corrupt;
- 	}
-@@ -746,8 +746,8 @@
- 
- blargg_err_t Gzip_File_Reader::seek_v( int n )
- {
--	if ( gzseek( file_, n, SEEK_SET ) < 0 )
--		return convert_gz_error( file_ );
-+	if ( gzseek( (gzFile)file_, n, SEEK_SET ) < 0 )
-+		return convert_gz_error( (gzFile)file_ );
- 
- 	return blargg_ok;
- }
-@@ -756,7 +756,7 @@
- {
- 	if ( file_ )
- 	{
--		if ( gzclose( file_ ) )
-+		if ( gzclose( (gzFile)file_ ) )
- 			check( false );
- 		file_ = NULL;
- 	}
---- vbam-1.8.0.1009.orig/src/Util.cpp
-+++ vbam-1.8.0.1009/src/Util.cpp
-@@ -544,7 +544,7 @@
- 
- gzFile utilGzOpen(const char *file, const char *mode)
- {
--  utilGzWriteFunc = (int (ZEXPORT *)(void *,void * const, unsigned int))gzwrite;
-+  utilGzWriteFunc = (int (ZEXPORT *)(gzFile, void * const, unsigned int))gzwrite;
-   utilGzReadFunc = gzread;
-   utilGzCloseFunc = gzclose;
-   utilGzSeekFunc = gzseek;
diff --git a/games-emulation/vbam/files/vbam-1.8.0.1090-ffmpeg.patch b/games-emulation/vbam/files/vbam-1.8.0.1090-ffmpeg.patch
deleted file mode 100644
index deb212e97113..000000000000
--- a/games-emulation/vbam/files/vbam-1.8.0.1090-ffmpeg.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- vbam-1.8.0.1090.orig/src/common/ffmpeg.cpp
-+++ vbam-1.8.0.1090/src/common/ffmpeg.cpp
-@@ -12,6 +12,7 @@
- #include <libavformat/avformat.h>
- #include <libswscale/swscale.h>
- #include <libavcodec/opt.h>
-+#include <libavutil/mathematics.h>
- #ifndef AV_PKT_FLAG_KEY
- #define AV_PKT_FLAG_KEY PKT_FLAG_KEY
- #endif
diff --git a/games-emulation/vbam/vbam-1.8.0.1090.ebuild b/games-emulation/vbam/vbam-1.8.0.1090.ebuild
deleted file mode 100644
index 354109919a6e..000000000000
--- a/games-emulation/vbam/vbam-1.8.0.1090.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/vbam-1.8.0.1090.ebuild,v 1.4 2012/09/09 22:10:18 radhermit Exp $
-
-EAPI=3
-
-inherit confutils cmake-utils games eutils
-
-DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
-HOMEPAGE="http://vba-m.ngemu.com"
-SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg gtk link lirc nls +sdl"
-
-RDEPEND=">=media-libs/libpng-1.4
-	media-libs/libsdl[joystick]
-	link? ( media-libs/libsfml )
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl
-	ffmpeg? ( virtual/ffmpeg )
-	gtk? ( >=dev-cpp/glibmm-2.4.0:2
-		>=dev-cpp/gtkmm-2.4.0:2.4
-		>=dev-cpp/gtkglextmm-1.2.0 )
-	lirc? ( app-misc/lirc )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
-	nls? ( sys-devel/gettext )
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-pkg_setup() {
-	confutils_require_any sdl gtk
-	games_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.8.0.1009-zlib-1.2.6.patch
-	epatch "${FILESDIR}"/${P}-ffmpeg.patch
-
-	# Fix issue with zlib-1.2.5.1 macros (bug #383179)
-	sed -i '1i#define OF(x) x' src/common/memgzio.c || die
-
-	sed -i -e "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" CMakeLists.txt || die
-}
-
-src_configure() {
-	local myconf
-	use x86 && myconf="-DENABLE_ASM_SCALERS=ON -DENABLE_ASM_CORE=ON"
-
-	mycmakeargs=(
-		$(cmake-utils_use_enable ffmpeg FFMPEG)
-		$(cmake-utils_use_enable gtk GTK)
-		$(cmake-utils_use_enable link LINK)
-		$(cmake-utils_use_enable lirc LIRC)
-		$(cmake-utils_use_enable nls NLS)
-		$(cmake-utils_use_enable sdl SDL)
-		${myconf}
-		"-DDATA_INSTALL_DIR=share/games/${PN}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use sdl ; then
-		dodoc doc/ReadMe.SDL.txt || die
-		doman debian/vbam.1 || die
-	fi
-
-	prepgamesdirs
-}