media-sound/xmms2: add 0.9.6, drop 0.9.5-r1

These are identical save for ffmpeg8.patch being upstreamed,
so may as well git mv straight-to-stable to save work.

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>

media-sound/xmms2/Manifest

@@ -1 +1 @@
-DIST xmms2-0.9.5.tar.xz 1741972 BLAKE2B f9737b8f98e34145cfff8f06eb4d3b0cb080b5bbb5e807a544516e8827f83f5e15447aa0d2aba4aeaf79af3483703309570d7358543f3607099985bdc0b34df2 SHA512 284c3c29e8231a540ccfaf608e147b058c1dc683bec86a96c8383508cc8f49f76b734fd4da69f25ecf628f91c39157801b37db342b1bc5644ed2f7175841a882
+DIST xmms2-0.9.6.tar.xz 1742224 BLAKE2B 9d91436fb21473147622bd1c2026a8c9e0b620149d0c4467ead4eb6f5fcd44e71c46c76602098eb83a83a14cd975932c1afbb0e41eb16788ea553f538225c488 SHA512 faaf0e9112b4a0aef91e002d78b9a3c90917f46aadade0bcbd96d6f0e161438a7c1055e6d47fc6a02a1ae73254cdbb4e32db0197764e331e029fbc7c11f7d2ab

media-sound/xmms2/files/xmms2-0.9.5-ffmpeg8.patch

@@ -1,30 +0,0 @@
-https://github.com/xmms2/xmms2-devel/pull/63
---- a/src/plugins/avcodec/avcodec.c
-+++ b/src/plugins/avcodec/avcodec.c
-@@ -131,6 +131,5 @@
- 	g_return_if_fail (data);
- 
--	avcodec_close (data->codecctx);
--	av_free (data->codecctx);
-+	avcodec_free_context (&(data->codecctx));
- 	av_frame_free (&data->read_out_frame);
- 
-@@ -252,5 +251,4 @@
- 		} else {
- 			XMMS_DBG ("First read failed, codec is not working...");
--			avcodec_close (data->codecctx);
- 			goto err;
- 		}
-@@ -261,5 +259,4 @@
- 	data->sampleformat = xmms_avcodec_translate_sample_format (data->codecctx->sample_fmt);
- 	if (data->sampleformat == XMMS_SAMPLE_FORMAT_UNKNOWN) {
--		avcodec_close (data->codecctx);
- 		goto err;
- 	}
-@@ -285,5 +282,5 @@
- err:
- 	if (data->codecctx) {
--		av_free (data->codecctx);
-+		avcodec_free_context (&(data->codecctx));
- 	}
- 	if (data->read_out_frame) {

media-sound/xmms2/xmms2-0.9.6.ebuild

@@ -133,7 +133,6 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.1-cpp-client.patch
 	"${FILESDIR}"/${PN}-0.9.1-faad.patch
-	"${FILESDIR}"/${P}-ffmpeg8.patch
 )
 
 src_prepare() {