Remove old.

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

5 files changed, 13 insertions, 152 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/Manifest b/games-emulation/vbam/Manifest
index 5785a80d4246..652e2c4f4ac3 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX vbam-1.8.0.1009-zlib-1.2.6.patch 1253 SHA256 08ba1b0b123b30e31e1f336ca118972679481ba5a9e54db706c90fae60905548 SHA512 4e7f1470ac88dfc6b2bc03213eb2236f688ce9d4caa7a195c0ac41e5f636982074033816a55e56ac6da1b766e1285e3cbbde97a4960be6a56c8c20bd5904165f WHIRLPOOL 8131cc267f3987b2a348a04e4d48b8a498ec3e3e99de7b80e9063165663c205cb4763c1b69d204de5ac26345b576d4fb4548775e765432d43ae3aa96b3b7bfa5
-AUX vbam-1.8.0.1090-ffmpeg.patch 311 SHA256 cd215c049289a394203af417205a9535768c6875f6e151142ce101e0f79964db SHA512 3c56b3a7db579b535afe965399ece427de2ba5e62863e3c9a3392e39ce30cc3fdf80508040cc6194f42a406a641836a838af263d750678604788a4a6c7b2ca95 WHIRLPOOL be3995b509b7eae3cba6bc006c81c3ecc4816eb69b2bbfa694941eb64046e1b3b4da91b868037ac8b5442f1fe60fb048cb4cd0f079bd86d8eb02fa3516ee05ee
 AUX vbam-1.8.0.1149-desktop.patch 1400 SHA256 97643063490c76bc796a02c3062a0ba3aa5f1a1a7f6023b12d0cf0558c5a0947 SHA512 dc493ced382090b6b98487229e7d13332c626c2787afeeb4c4849773e87851778b6d1724610b3b345ee8e5fce9550cff3242851a35e3f98e2b76d7f4b8f3d2be WHIRLPOOL 9e4607e22145c7de0e9bd9b16d8210ba4cdb1d1ba972851a48e25de3a494f02d7a92a7cff0900b9f4f7328f2f073ab9f04a99f7b7f9b25cf871cab07a1604610
-DIST vbam-1.8.0.1090.tar.xz 823216 SHA256 998df784fb80188c0cd02502856881fcbfb81e40799504fcef2022f22a1af5c4 SHA512 2ea033161621d8f9e21c369f9b27ab164bd87a331f28293c8bb2fec440766aaaffc2c17ac18009b8a004eec19057dbd786073733d85a728cf1624ad3e9a44ff2 WHIRLPOOL abe1d73005d338e7057d160974b8e42a43a13253d5866a80820f9248c68778765568e12afbbd996a4ce440cdbb3ddb79d88d4a045ae2753b1994c674a7b56a82
 DIST vbam-1.8.0.1149.tar.xz 824980 SHA256 7eb2c29a416faca9c7ab28cb953c276e76c51b6b45bd5ae83f7f9a32b8c6d252 SHA512 aaf2262780ee723077002c43ca317c81a85bf2350067aa504ad578d1280765f65baac9a8428e595b0c746db1bd37ce29f9bb1758aaef300e7d52b4da45652e46 WHIRLPOOL bc230cb7a485f198a8b3ca050b85b1e167a3b313edf36753c016c8e44a2a10a99a3163c649eb48ffbdb5747fbff35909e30aebd537bcb38c1a72ad0d783e969b
-EBUILD vbam-1.8.0.1090.ebuild 1966 SHA256 c635dc0e3855768a161aea82bfc6709f543b9cdcd2590d962bead4d9e7c3de22 SHA512 d81b01892c6deb556df00716f3493ad0a2fff9733a651b1aec8115409f519bbca057462ba90dfcaca7ef5bd3cefa5840c21c70720baf768a26f14f205c572740 WHIRLPOOL 843f2f7c9a48165b9720e197de68b214f4ba834b9558a8205c37891c67ed8de21b824e767bf4e411182cd3d99e7c477da389e6efa3fe75703728a3370e849c4a
 EBUILD vbam-1.8.0.1149.ebuild 2756 SHA256 3c4e9856caa5aeb1eb9d9becf3ea0a82f0b1c83218e4194ca25a9b5312aa1df8 SHA512 5450530befe22e28f05cde5cd222cc5b5ed04db11fba99eb114559ad1105342fd0cde06574f0bfc351b84ce9a50d107d6f96344c0720e8cef8fd803f6b2e9072 WHIRLPOOL f6d4b84b1224f579496048af23f4ab6d6fb4feecda2a062eb025904a7d3dd865c52d0bf48a89391bdad3241f807d9230ce208b751a166012362f5adc3c561c5e
 EBUILD vbam-9999.ebuild 2617 SHA256 232a8b7af8ec35036df00b7f1a24cf6cd1b2f132a3386f658757a992cd1cbaf3 SHA512 91bec6ad299a706f283907b4c6700094047dbf55d36c390bf4226c09823f0ec2acb892202e14de3e17021ee633f38743d4345d0506365374121317de761e7c20 WHIRLPOOL 49e1125fa9d74d758206e020913c2808b31a0365aa711c5fbb91b863328986d450830d92327da08913b79c2379a2f8b598f1a65f5c3a89d93120db201b3edac2
-MISC ChangeLog 3657 SHA256 cf7754261d3b783b8a0e078cec45a3cbda3870c65413c7250329463ae41e49b7 SHA512 a036b67423b821e15d28d358c34bfabe202f0959c6e3fed5e712b3594b69c4865aa232859b344ad40685f3d8833a655a258b4b84a61ff7aa87b6b4306ef96292 WHIRLPOOL 7fab380ebf6f0d86fc32bba3e0df6640cba0e485402610a88a1b8eacfd22e999f4d1681510d044f2cc79e60a35b831df4637fefc9fb18123ff19c41011d5f52f
+MISC ChangeLog 3826 SHA256 4e607ae43b3c40aea952ee604897568a3b141e906a73cae408777517b3ddbbe3 SHA512 824da3bb31dbbb35d38f4c6d625c133466f332c131c0974f87b1fa60154576757546ff42c009fd03c23e26b1e30064bb24cf84b0c9ff6a73041d2cbe1de33153 WHIRLPOOL 2b583dbbffc32bd9a28b94cdadeede629c50b34e5fb7aae1a8ce95f8a6dcb5f429e237f1cff3cdb8d15373028ffd243d39ac207af452293161c4adad3b91971f
 MISC metadata.xml 331 SHA256 d6054d5a8bdfb747166a4b83c1f7db04be3898899323aa316cbef1ab7a6b7daa SHA512 6fad448db04e5a8cf3880de3a34638a7a5791ac3d847318def2163e2cf91637d99eb4adfc2acc8351c62965b8ea95f4f86b1b5d372691565ffbc553250ee1cbd WHIRLPOOL 603a7f5c7378302173ba3758eb57b67489cca71a71af4d15319bfb145b2b332508e7759f44fe6382dccb850a60d1f9e21d43ebf1507e47d61b33c5a21dd809da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRvDMtAAoJEEqz6FtPBkyjL4YIAKApBRrnur8Oo7EmAiPlI6YF
-3RkIPNtDDI975qVN4s5Yx2RSnNchd2eUcI5THbEyJEhID/paJw2rsd4TgGm5CU8O
-HVtSJvyspJ34QMlco2xlGc7Nfit089rPOCZamHp2ZeCjVXbfhohnjkEXnBAOJtHO
-XMj6yULjvA4NhFmvZTLpzLDJ5T1Bq+CaIIBhoavjlrve7m4azp7q/rzndInybUZI
-Oh6lb22HsIPKRLyTWZCXB7MWnb+zO6UuEurytCnjzpdLduz3Wh6yKZnmJp89MVwL
-heFhCxI4CMRRtD447iBUZcBfK+PnC+FEJckC44wFjuG7e4gRLUi+oUzySMCMWr0=
-=Viom
+iQEcBAEBCAAGBQJRvDNoAAoJEEqz6FtPBkyjppMIAJZSXtB4/UL4GTyUn8OHJ/MV
+VQu85QUFs5rU7Kf+vlwg+Brj2YDByDsRpqmx90HOtBrftKDcoG9jRWilhOsk6Pzm
+r5Tis7VZCIMTyw9bTXbOW/pD1gn+jwS6vXvxy79f7wHUsMP2KxZecLzimZdSXxv3
+7RtO5Ow387YUUAMJ+keIEqaJYL+UuBMXzL8Hgq00BoCUpoDSPGvOEkaq1A27rBTV
+NjJd11jipLxcZpuTEy861lcHw4FsxSPd06Ri+bwidivvatCXtvzoEWfdf+bH4uGO
+tJHjH0Fmyr94GwKqE5bKBsrEaV7UqI16Iidp/ojB+64UFWc8xeRnWC+vfwzi6iA=
+=qT8z
 -----END PGP SIGNATURE-----
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
-}