drop to maintainer-needed

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

8 files changed, 95 insertions, 909 deletions

diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index b924cac97012..155ce441720b 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.143 2015/02/28 14:06:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.144 2015/03/15 08:59:55 yngwin Exp $
+
+  15 Mar 2015; Ben de Groot <yngwin@gentoo.org> -mplayer2-2.0_p20130126.ebuild,
+  -mplayer2-2.0_p20130428-r1.ebuild, metadata.xml:
+  drop to maintainer-needed
 
   28 Feb 2015; Agostino Sarubbo <ago@gentoo.org> mplayer2-2.0_p20131009.ebuild:
   Stable for ia64, wrt bug #531798
diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest
index ebcfbf4c84a5..82d27a5a1982 100644
--- a/media-video/mplayer2/Manifest
+++ b/media-video/mplayer2/Manifest
@@ -5,30 +5,28 @@ AUX generate-tarball.sh 964 SHA256 49ca2e1174e26f73f2dfadb42426f304e30fc2d7f049e
 AUX mplayer2-2.0_p20120828-ffmpeg.patch 765 SHA256 2387daac56d711d4a7d32fc15f1b20d787342e4eb21b7cdab44aa04f2b01bc43 SHA512 e5ffa7ba9cba0c381ae37903659aaa050ecde489d7fc011e9375c41800afda08ee6073126a1e1099c4a83deb890b4ebb7ca0af43c3a9664aad8f7546757be140 WHIRLPOOL 1eb7aea177a423dd999e6c4797405bbb61c6f474ec086e9a7b91310fdc51292177fecfbb9191ba6af8326f49791607eb2d09b4201c900d3df3cbeee30a9f29d8
 AUX mplayer2-2.0_p20131009_support_libav10.patch 5172 SHA256 285d5ea88763b2c41e252327b205b268696f807cf8592507648d5b4c3301a398 SHA512 d7efeac8a4db5feee4300707de80d498381f81b96eeb0a61431e7d005d3102b6083d5faaa795c741a8281baf9ee1660da1c0c07463f9525bba09cb7e85c6d6d3 WHIRLPOOL 3a39264ecc09151e412d9f436813f95ecaa8cb42e683274204737c6ebbc860df08cab1828bf3ad0810c0e7cf009a3101c5e2c2d769ee0c8716c37a53a93705ed
 AUX mplayer2-py2compat.patch 2179 SHA256 36e26a89ec03de0e349443ca3ce07c58e408e032200f49c3ce849691589a1cc7 SHA512 a90417c923c36c78d4c8053de89b26f69cd29a01ee37028360c8c564b903ee00ac0d7e98bcaf25220998951f25987cd89ede47b54518736c14abd1e7153e6568 WHIRLPOOL 987c63235be05fd3dbe89e4e291649c6f2176771e07c8515c08725a4e3d54118136b968531565a65c1e83bd754cc51e9bef5493ec2e653dfa4b3278c8bed6cce
-DIST mplayer2-2.0_p20130126.tar.xz 1914780 SHA256 ed68090e1ed2698132065ab4567e2920a6fb9f2f0868efc172f612d6848919f5 SHA512 b54780a0a45619ababf874fe40797a6c73c4adea26469178bbd5bf3396cd1977631622a8e150c02b650cf4a415d1e5d80943fda1e50935d921328022187b65dc WHIRLPOOL b1876eece2223d1b1281aeb1043c1f436c518363a2e720a2eb6be92853cac3ed0dce16b3c4300acffe4746925831ccfddcc24553d5fdcac4cce385701d5625bf
-DIST mplayer2-2.0_p20130428.tar.xz 1911464 SHA256 41e54e6c86761196e111250fd6db79161bfd08f2cccf7d624e9b25b038fdf6c0 SHA512 da0101736b76535d38b1063c3ec7054003c8013f24df949bac26d51deebb41fcb6116af35d3b49bd6d9c1cc76842ab58c8e049a42e70dc5694058e3e6ed44bd8 WHIRLPOOL f97620ec26483e498d21b75fb533d09e41542ca18bb6a5a535c40c33fad34f745966f10a001026766610b6e40754dcecab3dc6292c00532437d2a92cb8d21079
 DIST mplayer2-2.0_p20131009.tar.xz 1907780 SHA256 c105b3804d4d66af29015d4ecd46abbdff75c39d78d5457c535519ecc4d3855a SHA512 8c072bf8fa6a908d3c587e5f26daa6a07098abc8dabd20f77b172e8de5537125873ac1cfc8f07e5616eb0b35aaa73fbab2b30e94a057d220c481dae7740cb3e6 WHIRLPOOL f595c4032371239f1f31f6356d5c7d07534fc8227ba3f1e1452b507ac64baec0747c80b067eaed5fbdc58ee957875a39d9d782eed45b6d797d9a283a34496b78
-EBUILD mplayer2-2.0_p20130126.ebuild 11842 SHA256 a0b0e2be323f3f8ffee7c01063d50a80d989f26b169d8807886d0137a7243d4f SHA512 372ecf65066e3c235c29680503e611510205ece3d6ecac94f6767121631c3676d102669854d1a87dc093d500ff70afeaa3b3a15ab814072a0eb9e4c4658b88e0 WHIRLPOOL 05ca9a84f311d14edb60deb4028aa540966006059f153e08adfc41beb6f3534a5925bc6c06ffe24776ed4c106dc2f27b72624e4474bfd77b23ec4d29ba368e63
-EBUILD mplayer2-2.0_p20130428-r1.ebuild 10517 SHA256 218c1b481bd74be4a9b2095e3b2336636d3df4a0414f5a5a5274a41086e28fd0 SHA512 1bf194ce10eba257b712e53db37710c4f654edf4045597c82e5b2522a8c03e883c95b429b95220b134471b79441396b9e49fa920e4a82f47672316d884d9f6ca WHIRLPOOL 7c2e1e37ea0e3a53dfdd499c6220f9a60a1626a6732a0b827fb52d3e7b7fa0bf9f4438bc16fbc523ee7ba845231ee82d9262bac8f984344149924c65b8a38233
 EBUILD mplayer2-2.0_p20131009-r1.ebuild 10681 SHA256 998da2bf3a07a090f5b93ac6f15a3355dee0b3b21ca5ae7b512dd5fb88d0d9d5 SHA512 dc92332ac882da14404afe23bbaf85e7407fc01e1a54b5e3ddcb28de1cde0747088a996323e43a11bd3e5ca1d84e5df7b82dcdede15d0b7c98b06eb113b52616 WHIRLPOOL 79d52c9c636fa0d1bdabce0b2616ec2e83208702c926f2662e763b4d5a325ea54ece87dd284ebd344877f0479d052a527584be9a75ac5a4e66905c7c16b0ccd0
 EBUILD mplayer2-2.0_p20131009.ebuild 10623 SHA256 55897f2cc3d1495de957fb9fbd94af7f8fcddfabe6a338d2fd1a06f7ad52ea6c SHA512 333858258d3ad7d0d650cf6d015e94b32a489c1b27815dfed7ffc535dee189988e4e78fbbd820a9d9bfc501a1a55268c241920f5a315e9d0669695d05c0021e8 WHIRLPOOL 6574590f4ad775cd7d564ea9be3d7db413630d3f54b3f322e61ab8838a7163c3a0a44616c0f72d36736adca816d83f641b3d5321472589af966350b654536ea3
 EBUILD mplayer2-9999.ebuild 10621 SHA256 af9d8c12e14677da368e34e338329cce8df04a5bc1f02c85a75f1a9cf8143c3c SHA512 40e2d2353964bc71c82b1551763c9fc8562cfad8cc53b0f358f10a902db9b0ce6f561403055faa909007b81bfef682425e170ef7eb5a217783524cdde85eb8d2 WHIRLPOOL 689e814275201639e7af4c226c0f3d12912d59a089aab51a13882d485ca27f5f3587badcbaaf900bf60b69b28c0a8faa3b2d6a46aeb77b2da9a01350b8449e1f
-MISC ChangeLog 25738 SHA256 5aae4d36a76346c37574a3e91507efcac2facf65db505e7800193cf03754f31b SHA512 721392822e891f1d237fdada8cebed6da6075234861e4135f7f344a4d89b7e0d010574041b4565119255f16f6d181c220f54dfbdeb70895345c271b6e0667cb6 WHIRLPOOL d95398948ab0167dd903dcb3d7e5339e3a6b519e3b589a6e14c90049432688e0c0b8ff8cf2017b6b246ff047d05852f79b1ba8a4f041f7ba0e05896c3bdf102d
-MISC metadata.xml 2918 SHA256 91d275b5fe3b0b0c69b914e0fbd9c7ee208ff6d2842124ca5ceada265ce00d11 SHA512 97912c3e93c8d2ecd1641b524770bf4993cf941256a69b67d026e57890f2b845680fc7326639030545888572c2e6bb44c4e9ed0b81de63d4b8e163b2c4c2b90e WHIRLPOOL 29845d959727366ab640f20fbb7ea961237f3516bf2c2001f076dca7324b6f8d8b5be20ddf6653cad60f14d43018a6c022ae2911e3f7439a1bb4582eac500d1e
+MISC ChangeLog 25901 SHA256 340f9db56fef839fb99359d4c7326148a28da4bb027d4dfada8740e37dddb2f8 SHA512 49a9fbf878bc36838af5060909b8824baf827063b6812fdaa8554aff28b3a478e4bf563257c4922e16db3699d573365e9fbd8dcadccb50b0b070af99b31e99b2 WHIRLPOOL c1fbd00869b10abb8a2a9fdb59dd85e989a2dd2480e6806c3af346d5033adca65f65f824182c1c7a88e90cc2e559a26cd81357e04c5be99468a8244cfc59ed3d
+MISC metadata.xml 2246 SHA256 067f0e70357bf0b1e5600eacd6d873c0a1e4408abc07370407ba27269f15a290 SHA512 5ba94e5a04091b20f71df97ac7ad4e5110a57009835bad9c841584ccab27c9f48d0cc2478b5267bbba19887bbfcf6be25279a0f2c8d4b7b3c8fa2f23619d8f87 WHIRLPOOL 4885e59cce4656daec7bcb892ef751ebbff3c7a28c2a26e21c81891ab220a8265d3b5bbed9030132c8a7d7f0ebff586e113642164b6f38c9bcbc8a9f83be0b4e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU8ctJAAoJELp701BxlEWfLTMQAIzDWtU1bvITU0USADf43tMW
-DWjJ8IjyAnaCOQXduHvEyfr7ZyJhb+9LnF8x+BQr1D9W3KzjxCc/vRiEQvfXo1uX
-Mw9QhSQdnqwTGWfsSbjb87aWIMwVKmKJJIyHEeYufkad57eVZ13+kEHoQRznJf39
-w2IFxWAZsD1/haJN9OI3Ic+kbugA4gXIrzQnEUj2SfV7T6yNUzjES1y/h7UG4O71
-XytI7Z1Ud0gzj01jSpv8tNj7mLIqJ31E7uXbUw8VwZY2lFSJ9obzcaHd8WXic4jw
-tyt+skRpif1siZWzkIA3QfxmqwX+LbfhKdYzb7apEOZ5c+RSVUI6+fkJ+3CgykqP
-J61teP2r5wcwnf3eZaRAwAV2li5ZvePsuuM0zy+GCtR7gUvBeBS3tR8CHqauOmqA
-JowT1yQZ6MnH+s+YVvUxGabf1oEQRTSR9rnHgBbKoIRROOpPWHoNhR0+LKyuarPf
-286cwCSb4oOwWSL3SBSp9yGCSzo1juj+fcNeJrbz+JbY66Ti8QMT0+ZuZX3kROkL
-btbPTDRWbwbwO9C/J7Wc2hTvgt4IoydAhgbZxfaMjuiX0vrZpvi8gwkvymjemyvQ
-hvl+7Pjg8tHC5fyQttzIDl3EFRiY2jVh3I2tf8cCvTl43ZVAvhnlG6kHbW77YUdY
-zcAXBkGgE2Vjqaw7ZgGj
-=IgXA
+iQJ8BAEBCABmBQJVBUoRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOebcP/j0gJHTmx1UHqIlwUZ8qKTQW
+BYOiCcqV1rBGCWk8NKXtKNHYlvuxDdP0YGlAFUNaumAgNLmvrCM+cEJxX9Nafi5N
+Ho8me0VZLGwLKwFuy+NH4BPM45+mpnA86h/YaGnp8RM+A13Vbirs2IANbg70qIkq
+N183BmZ0CK5fjOhz1q9dB+AM76z5jJmQ8Dj5Gfg7MQwVtp9MuppSCGOJW5P12vyq
+3UD+DBow4pjnLsx7dLlPHP6aEnGiAQk0ob8bW6O7jlu4qw/CcMk1rjr0h2Tdxuhb
+9S51ib6GLHRan9KTo1bCCdoItUzU5ap+lLlKYAQt3GVHzzmXjo7jyra94YnW2q+R
+xUpWpn4IckKFq9ghQGCHZqiMFGm3XNL6kJakOYnSjNAVp1BMnCx3vIcVqfmADY79
+O8/NTYWCXFRRLF0p5QdpNkeu2gBajA58W9+xiQgdM7CFX5Faz1M8hNo1/TnCGq8E
+g6Z7jqPrPIoFe+kvcttZPhXDzufsB/KKV2r8H9EUQs6D2e5DO7GhQkUQTNyNGKfW
+RAV2Hw/h6qI/C4wr3OK8pNr4mdeJ+3RpARfehLZ1woFKCnbJ+8ToNs3z0qMPG2yK
+76qbPraZCCFTWDsUYMTdh8hunneolJczDdcORqI/l5RoSnI995pTV16PhJ+WoxDF
+bsBTs1ODe1MzzkEf1yAn
+=YLQb
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer2/metadata.xml b/media-video/mplayer2/metadata.xml
index fa7fa3405e9a..7a25af5f0bb8 100644
--- a/media-video/mplayer2/metadata.xml
+++ b/media-video/mplayer2/metadata.xml
@@ -1,50 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
-<herd>proxy-maintainers</herd>
-<maintainer>
-	<email>nikoli@gmx.us</email>
-	<description>Maintainer. Assign bugs to him</description>
-</maintainer>
-<longdescription lang="en">
-	This fork has several usefull features:
-	1) Uses multithreading out of box.
-	2) Ability to change many settings staying paused.
-	3) Matroska external chapters support.
-	4) Ability to cleanly build with shared libav libraries.
-</longdescription>
-<longdescription lang="ru">
-	Этот форк обладает рядом полезных возможностей:
-	1) Многопоточный ffmpeg.
-	2) Возможность изменить настройки без продолжения воспроизведения.
-	3) Поддержка внешних глав матрёшки.
-	4) Возможность сборки с разделяемыми библиотеками ffmpeg.
-</longdescription>
-<use>
-	<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
-	<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
-	<flag name="cdio">Use libcdio for CD support (instead of cdparanoia)</flag>
-	<flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
-	<flag name="dvdnav">Use forked libdvdnav, navigate menus in GUIs</flag>
-	<flag name="enca">Enables support for charset discovery and conversion</flag>
-	<flag name="faad">Use external faad library for AAC decoding</flag>
-	<flag name="md5sum">Enables md5sum video output</flag>
-	<flag name="mng">MNG input support</flag>
-	<flag name="mp3">Enable support for mp3 decoding over <pkg>media-sound/mpg123</pkg> instead of relying on ffmpeg support.</flag>
-	<flag name="network">Enables network streaming support</flag>
-	<flag name="nut">Enables support for the NUT container format</flag>
-	<flag name="pnm">Add PNM video output option, to create PPM/PGM/PGMYUV images</flag>
-	<flag name="postproc">Enable image post-processing via libpostproc</flag>
-	<flag name="pvr">Enable Video4Linux2 MPEG PVR</flag>
-	<flag name="quvi">Enable support for streaming sites using <pkg>media-libs/libquvi</pkg></flag>
-	<flag name="radio">Enable V4L2 radio interface and support</flag>
-	<flag name="rar">Enable Unique RAR File Library</flag>
-	<flag name="rtc">Enables usage of the linux real time clock. The alternative is software emulation of rtc</flag>
-	<flag name="shm">Enable support for shm</flag>
-	<flag name="symlink">Copy all binaries and configuration into locations occupied by <pkg>media-video/mplayer</pkg> and thus act like drop-in replacement.</flag>
-	<flag name="tga">Enables Targa video output</flag>
-	<flag name="xanim">Enables support for xanim based codecs</flag>
-	<flag name="yuv4mpeg">Enables yuv4mpeg video output</flag>
-</use>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
+    <flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
+    <flag name="cdio">Use libcdio for CD support (instead of cdparanoia)</flag>
+    <flag name="cpudetection">Enables runtime CPU detection (useful for
+      bindist, compatibility on other CPUs)
+    </flag>
+    <flag name="dvdnav">Use forked libdvdnav, navigate menus in GUIs</flag>
+    <flag name="enca">Enables support for charset discovery and conversion</flag>
+    <flag name="faad">Use external faad library for AAC decoding</flag>
+    <flag name="md5sum">Enables md5sum video output</flag>
+    <flag name="mng">MNG input support</flag>
+    <flag name="mp3">
+      Enable support for mp3 decoding over <pkg>media-sound/mpg123</pkg>
+      instead of relying on ffmpeg support.
+    </flag>
+    <flag name="network">Enables network streaming support</flag>
+    <flag name="nut">Enables support for the NUT container format</flag>
+    <flag name="pnm">Add PNM video output option, to create PPM/PGM/PGMYUV
+      images
+    </flag>
+    <flag name="postproc">Enable image post-processing via libpostproc</flag>
+    <flag name="pvr">Enable Video4Linux2 MPEG PVR</flag>
+    <flag name="quvi">
+      Enable support for streaming sites using <pkg>media-libs/libquvi</pkg>
+    </flag>
+    <flag name="radio">Enable V4L2 radio interface and support</flag>
+    <flag name="rar">Enable Unique RAR File Library</flag>
+    <flag name="rtc">Enables usage of the linux real time clock. The
+      alternative is software emulation of rtc
+    </flag>
+    <flag name="shm">Enable support for shm</flag>
+    <flag name="symlink">Copy all binaries and configuration into locations
+      occupied by <pkg>media-video/mplayer</pkg> and thus act like drop-in
+      replacement.
+    </flag>
+    <flag name="tga">Enables Targa video output</flag>
+    <flag name="xanim">Enables support for xanim based codecs</flag>
+    <flag name="yuv4mpeg">Enables yuv4mpeg video output</flag>
+  </use>
 </pkgmetadata>
diff --git a/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild b/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild
deleted file mode 100644
index 6200eef8f8f8..000000000000
--- a/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild
+++ /dev/null
@@ -1,442 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild,v 1.19 2015/01/30 17:27:26 mgorny Exp $
-
-EAPI=4
-
-[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS=""
-
-inherit python toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS}
-
-NAMESUF="${PN/mplayer/}"
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayer2.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
-else
-	SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.xz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-if [[ ${PV} == *9999* ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux"
-fi
-IUSE="+a52 +alsa aqua bluray bs2b cddb +cdio cpudetection debug
-directfb doc +dts +dv dvb +dvd +dvdnav +enca +faad fbcon ftp gif +iconv
-ipv6 jack joystick jpeg kernel_linux ladspa lcms +libass libcaca lirc mad
-md5sum mng +mp3 +network nut +opengl oss png pnm portaudio +postproc
-pulseaudio pvr quvi radio +rar +rtc samba sdl selinux +speex tga
-+theora +unicode v4l vcd vdpau +vorbis +X xanim xinerama
-+xscreensaver +xv xvid yuv4mpeg
-"
-IUSE+=" symlink"
-
-CPU_FEATURES="cpu_flags_x86_3dnow:3dnow cpu_flags_x86_3dnowext:3dnowext altivec +cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmxext +shm cpu_flags_x86_sse:sse cpu_flags_x86_sse2:sse2 cpu_flags_x86_ssse3:ssse3"
-for x in ${CPU_FEATURES}; do
-	IUSE+=" ${x%:*}"
-done
-
-REQUIRED_USE="
-	cddb? ( cdio network )
-	dvdnav? ( dvd )
-	lcms? ( opengl )
-	libass? ( iconv )
-	opengl? ( || ( aqua X ) )
-	radio? ( || ( dvb v4l ) )
-	vdpau? ( X )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-"
-
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-RDEPEND+="
-	sys-libs/ncurses
-	sys-libs/zlib
-	X? (
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		opengl? ( virtual/opengl )
-		lcms? ( media-libs/lcms:2 )
-		vdpau? ( x11-libs/libvdpau )
-		xinerama? ( x11-libs/libXinerama )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		xv? (
-			x11-libs/libXv
-		)
-	)
-	a52? ( media-libs/a52dec )
-	alsa? ( media-libs/alsa-lib )
-	bluray? ( media-libs/libbluray )
-	bs2b? ( media-libs/libbs2b )
-	cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdca )
-	dv? ( media-libs/libdv )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? (
-		>=media-libs/libdvdread-4.1.3
-		dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
-	)
-	enca? ( app-i18n/enca )
-	faad? ( media-libs/faad2 )
-	gif? ( media-libs/giflib )
-	iconv? ( virtual/libiconv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] virtual/ttf-fonts )
-	libcaca? ( media-libs/libcaca )
-	lirc? ( app-misc/lirc )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng )
-	mp3? ( media-sound/mpg123 )
-	nut? ( >=media-libs/libnut-661 )
-	png? ( media-libs/libpng )
-	pnm? ( media-libs/netpbm )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
-	postproc? ( || ( media-libs/libpostproc <media-video/libav-0.8.2-r1	media-video/ffmpeg:0 ) )
-	pulseaudio? ( media-sound/pulseaudio )
-	quvi? ( >=media-libs/libquvi-0.4.1 <media-libs/libquvi-0.9 )
-	rar? (
-		|| (
-			app-arch/unrar
-			app-arch/rar
-		)
-	)
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	selinux? ( sec-policy/selinux-mplayer )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora )
-	vorbis? ( media-libs/libvorbis )
-	xanim? ( media-video/xanim )
-	xvid? ( media-libs/xvid )
-	>=virtual/ffmpeg-0.10.2
-	symlink? ( !media-video/mplayer )
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-lang/python-2.7
-	dev-python/docutils
-	sys-devel/gettext
-	X? (
-		x11-proto/videoproto
-		x11-proto/xf86vidmodeproto
-		xinerama? ( x11-proto/xineramaproto )
-		xscreensaver? ( x11-proto/scrnsaverproto )
-	)
-	amd64? ( ${ASM_DEP} )
-	doc? (
-		dev-libs/libxslt app-text/docbook-xml-dtd
-		app-text/docbook-xsl-stylesheets
-	)
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-py2compat.patch"
-)
-
-pkg_setup() {
-	if [[ ${PV} == *9999* ]]; then
-		elog
-		elog "This is a live ebuild which installs the latest from upstream's"
-		elog "${VCS_ECLASS} repository, and is unsupported by Gentoo."
-		elog "Everything but bugs in the ebuild itself will be ignored."
-		elog
-	fi
-
-	if use cpudetection; then
-		ewarn
-		ewarn "You've enabled the cpudetection flag. This feature is"
-		ewarn "included mainly for people who want to use the same"
-		ewarn "binary on another system with a different CPU architecture."
-		ewarn "MPlayer will already detect your CPU settings by default at"
-		ewarn "buildtime; this flag is used for runtime detection."
-		ewarn "You won't need this turned on if you are only building"
-		ewarn "mplayer for this system. Also, if your compile fails, try"
-		ewarn "disabling this use flag."
-	fi
-
-	if use !libass; then
-		ewarn
-		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
-	fi
-
-	einfo "For various format support you need to enable the support on your ffmpeg package:"
-	einfo "    media-video/libav or media-video/ffmpeg"
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=434356#c4
-	python_pkg_setup
-	major=$(python_get_version --major)
-	minor=$(python_get_version --minor)
-	[[ ( ${major} -eq 2 && ${minor} -ge 7 ) || ${major} -ge 3 ]] \
-			|| die "Please eselect Python 2.7 or later"
-}
-
-src_prepare() {
-	# fix path to bash executable in configure scripts
-	local bash_scripts="configure version.sh"
-	sed -i -e "1c\#!${EPREFIX}/bin/bash" \
-		${bash_scripts} || die
-
-	if [[ -n ${NAMESUF} ]]; then
-		sed -e "/^EXESUF/s,= \$_exesuf$,= ${NAMESUF}\$_exesuf," \
-			-i configure || die
-		sed -e "s/mplayer/${PN}/" \
-			-i TOOLS/midentify.sh || die
-	fi
-
-	base_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	local uses i
-
-	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
-	# compilation in almost every situation. The reason for this is
-	# because if --enable is used, it will force the build of that option,
-	# regardless of whether the dependency is available or not.
-
-	###################
-	#Optional features#
-	###################
-	# disable tremor, it needs libvorbisidec and is for FPU-less systems only
-	myconf+="
-		--disable-tremor
-		$(use_enable network networking)
-		$(use_enable joystick)
-	"
-	uses="bluray enca ftp libass rtc vcd"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use ipv6 || myconf+=" --disable-inet6"
-	use nut || myconf+=" --disable-libnut"
-	use quvi || myconf+=" --disable-libquvi"
-	use rar || myconf+=" --disable-unrarexec"
-	use samba || myconf+=" --disable-smb"
-	if ! use lirc; then
-		myconf+="
-			--disable-lirc
-			--disable-lircc
-			--disable-apple-ir
-		"
-	fi
-
-	########
-	# CDDA #
-	########
-	use cddb || myconf+=" --disable-cddb"
-	use cdio || myconf+=" --disable-libcdio"
-
-	################################
-	# DVD read, navigation support #
-	################################
-	#
-	# dvdread - accessing a DVD
-	# dvdnav - navigation of menus
-	#
-	# use external libdvdcss, dvdread and dvdnav
-	myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal"
-	use dvd || myconf+=" --disable-dvdread"
-	use dvdnav || myconf+=" --disable-dvdnav"
-
-	#############
-	# Subtitles #
-	#############
-	#
-	# iconv optionally can use unicode
-	use iconv || myconf+=" --disable-iconv --charset=noconv"
-	use iconv && use unicode && myconf+=" --charset=UTF-8"
-
-	#####################################
-	# DVB / Video4Linux / Radio support #
-	#####################################
-	myconf+=" --disable-tv-bsdbt848"
-	if { use dvb || use v4l || use pvr || use radio; }; then
-		use dvb || myconf+=" --disable-dvb"
-		use pvr || myconf+=" --disable-pvr"
-		use v4l || myconf+=" --disable-tv-v4l2"
-		if use radio && { use dvb || use v4l; }; then
-			myconf+="
-				--enable-radio
-				--disable-radio-capture
-			"
-		else
-			myconf+="
-				--disable-radio-v4l2
-				--disable-radio-bsdbt848
-			"
-		fi
-	else
-		myconf+="
-			--disable-tv
-			--disable-tv-v4l2
-			--disable-radio
-			--disable-radio-v4l2
-			--disable-radio-bsdbt848
-			--disable-dvb
-			--disable-v4l2
-			--disable-pvr"
-	fi
-
-	##########
-	# Codecs #
-	##########
-	myconf+=" --disable-musepack" # deprecated, libavcodec Musepack decoder is preferred
-	use dts || myconf+=" --disable-libdca"
-	use mp3 || myconf+=" --disable-mpg123"
-	uses="a52 bs2b dv vorbis"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-lib${i}"
-	done
-	uses="faad gif jpeg mad mng png pnm speex tga theora xanim xvid"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-
-	#################
-	# Binary codecs #
-	#################
-	myconf+=" --disable-qtx --disable-real --disable-win32dll"
-
-	################
-	# Video Output #
-	################
-	uses="directfb md5sum sdl yuv4mpeg"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use libcaca || myconf+=" --disable-caca"
-	use postproc || myconf+=" --disable-libpostproc"
-
-	################
-	# Audio Output #
-	################
-	myconf+=" --disable-rsound" # media-sound/rsound is in pro-audio overlay only
-	uses="alsa jack ladspa portaudio"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	#use openal && myconf+=" --enable-openal" # build fails
-	use pulseaudio || myconf+=" --disable-pulse"
-	if ! use radio; then
-		use oss || myconf+=" --disable-ossaudio"
-	fi
-
-	####################
-	# Advanced Options #
-	####################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	use cpudetection && myconf+=" --enable-runtime-cpudetection"
-
-	for i in ${CPU_FEATURES//+/}; do
-		myconf+=" $(use_enable ${i%:*} ${i#*:})"
-	done
-
-	use debug && myconf+=" --enable-debug=3"
-
-	if use x86 && gcc-specs-pie; then
-		filter-flags -fPIC -fPIE
-		append-ldflags -nopie
-	fi
-
-	###########################
-	# X enabled configuration #
-	###########################
-	use X || myconf+=" --disable-x11"
-	uses="vdpau xinerama xv"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use opengl || myconf+=" --disable-gl"
-	use lcms || myconf+=" --disable-lcms2"
-	use xscreensaver || myconf+=" --disable-xss"
-
-	############################
-	# OSX (aqua) configuration #
-	############################
-	if use aqua; then
-		myconf+="
-			--enable-macosx-finder
-			--enable-macosx-bundle
-		"
-	fi
-
-	./configure \
-		--cc="$(tc-getCC)" \
-		--pkg-config="$(tc-getPKG_CONFIG)" \
-		--prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--confdir="${EPREFIX}"/etc/${PN} \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--localedir="${EPREFIX}"/usr/share/locale \
-		--enable-translation \
-		${myconf} || die
-
-	MAKEOPTS+=" V=1"
-}
-
-src_compile() {
-	base_src_compile
-	use doc && emake -C DOCS/xml html-chunked
-}
-
-src_install() {
-	local i
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALLSTRIP="" \
-		install
-
-	dodoc AUTHORS Copyright README etc/codecs.conf
-
-	docinto tech/
-	dodoc DOCS/tech/{*.txt,mpsub.sub,playtree}
-	docinto TOOLS/
-	dodoc -r TOOLS
-
-	if use doc; then
-		docinto html/
-		dohtml -r "${S}"/DOCS/HTML/*
-	fi
-
-	insinto /etc/${PN}
-	newins "${S}/etc/example.conf" mplayer.conf
-	cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
-	doins "${S}/etc/input.conf"
-
-	# set unrar path when required
-	if use rar; then
-		cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
-	fi
-	dosym ../../../etc/${PN}/mplayer.conf /usr/share/${PN}/mplayer.conf
-
-	newbin "${S}/TOOLS/midentify.sh" midentify${NAMESUF}
-
-	if [[ -n ${NAMESUF} ]]; then
-		mv "${ED}/usr/share/man/man1/mplayer.1" "${ED}/usr/share/man/man1/mplayer${NAMESUF}.1" || die
-
-		if use symlink; then
-			dosym "${PN}" /usr/bin/mplayer
-			dosym "midentify${NAMESUF}" /usr/bin/midentify
-		fi
-	fi
-}
diff --git a/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild b/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild
deleted file mode 100644
index d5f7f74d070a..000000000000
--- a/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild
+++ /dev/null
@@ -1,376 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild,v 1.18 2015/01/30 17:27:26 mgorny Exp $
-
-EAPI=5
-
-# https://bugs.gentoo.org/show_bug.cgi?id=434356#c4
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-
-EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
-
-inherit toolchain-funcs flag-o-matic multilib eutils python-any-r1
-[[ ${PV} == *9999* ]] && inherit git-2
-
-NAMESUF="${PN/mplayer/}"
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayer2.org/"
-[[ ${PV} == *9999* ]] || \
-SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux"
-IUSE="+alsa aqua bluray bs2b cddb +cdio cpudetection debug directfb doc dvb +dvd
-+dvdnav +enca ftp gif +iconv ipv6 jack joystick jpeg ladspa lcms +libass libcaca
-lirc md5sum mng +mp3 +network +opengl oss png pnm portaudio +postproc pulseaudio
-pvr +quvi radio samba selinux +shm tga +threads +unicode v4l vcd vdpau +X xinerama
-+xscreensaver +xv yuv4mpeg"
-IUSE+=" symlink"
-
-CPU_FEATURES="cpu_flags_x86_3dnow:3dnow cpu_flags_x86_3dnowext:3dnowext altivec +cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmxext cpu_flags_x86_sse:sse cpu_flags_x86_sse2:sse2 cpu_flags_x86_ssse3:ssse3"
-for x in ${CPU_FEATURES}; do
-	IUSE+=" ${x%:*}"
-done
-
-REQUIRED_USE="
-	cddb? ( cdio network )
-	dvdnav? ( dvd )
-	enca? ( iconv )
-	lcms? ( opengl )
-	libass? ( iconv )
-	opengl? ( || ( aqua X ) )
-	portaudio? ( threads )
-	pvr? ( v4l )
-	radio? ( v4l || ( alsa oss ) )
-	v4l? ( threads )
-	vdpau? ( X )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-"
-
-RDEPEND+="
-	sys-libs/ncurses
-	sys-libs/zlib
-	X? (
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		opengl? ( virtual/opengl )
-		lcms? ( media-libs/lcms:2 )
-		vdpau? ( x11-libs/libvdpau )
-		xinerama? ( x11-libs/libXinerama )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		xv? ( x11-libs/libXv )
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluray? ( media-libs/libbluray )
-	bs2b? ( media-libs/libbs2b )
-	cdio? (
-		|| (
-			dev-libs/libcdio-paranoia
-			<dev-libs/libcdio-0.90[-minimal]
-		)
-	)
-	directfb? ( dev-libs/DirectFB )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? (
-		>=media-libs/libdvdread-4.1.3
-		dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
-	)
-	enca? ( app-i18n/enca )
-	gif? ( media-libs/giflib )
-	iconv? ( virtual/libiconv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? (
-		>=media-libs/libass-0.9.10[enca?,fontconfig]
-		virtual/ttf-fonts
-	)
-	libcaca? ( media-libs/libcaca )
-	lirc? ( app-misc/lirc )
-	mng? ( media-libs/libmng )
-	mp3? ( media-sound/mpg123 )
-	png? ( media-libs/libpng )
-	pnm? ( media-libs/netpbm )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
-	postproc? (
-		|| (
-			media-libs/libpostproc
-			media-video/ffmpeg:0
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	quvi? ( >=media-libs/libquvi-0.4.1 <media-libs/libquvi-0.9 )
-	samba? ( net-fs/samba )
-	>=virtual/ffmpeg-9[threads?,vdpau?]
-	symlink? ( !media-video/mplayer )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	dev-python/docutils
-	X? (
-		x11-proto/videoproto
-		x11-proto/xf86vidmodeproto
-		xinerama? ( x11-proto/xineramaproto )
-		xscreensaver? ( x11-proto/scrnsaverproto )
-	)
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xml-dtd
-		app-text/docbook-xsl-stylesheets
-	)
-"
-RDEPEND+="
-	selinux? ( sec-policy/selinux-mplayer )
-"
-DOCS=( AUTHORS Copyright README etc/example.conf etc/input.conf etc/codecs.conf )
-
-pkg_setup() {
-	if [[ ${PV} == *9999* ]]; then
-		elog
-		elog "This is a live ebuild which installs the latest from upstream's"
-		elog "git repository, and is unsupported by Gentoo."
-		elog "Everything but bugs in the ebuild itself will be ignored."
-		elog
-	fi
-
-	if use !libass; then
-		ewarn
-		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
-	fi
-
-	if use cpudetection; then
-		ewarn
-		ewarn "You've enabled the cpudetection flag. This feature is"
-		ewarn "included mainly for people who want to use the same"
-		ewarn "binary on another system with a different CPU architecture."
-		ewarn "MPlayer will already detect your CPU settings by default at"
-		ewarn "buildtime; this flag is used for runtime detection."
-		ewarn "You won't need this turned on if you are only building"
-		ewarn "mplayer for this system. Also, if your compile fails, try"
-		ewarn "disabling this use flag."
-	fi
-
-	einfo "For various format support you need to enable the support on your ffmpeg package:"
-	einfo "    media-video/libav or media-video/ffmpeg"
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-py2compat.patch"
-	epatch_user
-
-	# fix path to bash executable in configure scripts
-	sed -i -e "1c\#!${EPREFIX}/bin/bash" \
-		configure version.sh || die
-
-	sed -e 's/ $(INSTALLSTRIP)//' \
-		-e '/$(INSTALL) -d $(LIBDIR)/d' \
-		-i Makefile || die
-
-	if [[ -n ${NAMESUF} ]]; then
-		sed -e "/^EXESUF/s,= \$_exesuf$,= ${NAMESUF}\$_exesuf," \
-			-i configure || die
-		sed -e "s/mplayer/${PN}/" \
-			-i TOOLS/midentify.sh || die
-	fi
-}
-
-src_configure() {
-	local myconf=""
-	local uses i
-
-	# ebuild uses "use foo || --disable-foo" to forcibly disable
-	# compilation in almost every situation. The reason for this is
-	# because if --enable is used, it will force the build of that option,
-	# regardless of whether the dependency is available or not.
-
-	#####################
-	# Optional features #
-	#####################
-	# rtc is useless and /dev/rtc0 is only readable for root
-	myconf+=" --disable-rtc"
-	# SDL output is fallback for platforms where nothing better is available
-	myconf+=" --disable-sdl"
-	myconf+="
-		$(use_enable network networking)
-		$(use_enable joystick)
-	"
-	uses="bluray ftp vcd"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use ipv6 || myconf+=" --disable-inet6"
-	use quvi || myconf+=" --disable-libquvi"
-	use samba || myconf+=" --disable-smb"
-	use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
-
-	########
-	# CDDA #
-	########
-	use cddb || myconf+=" --disable-cddb"
-	use cdio || myconf+=" --disable-libcdio"
-
-	################################
-	# DVD read, navigation support #
-	################################
-	#
-	# dvdread - accessing a DVD
-	# dvdnav - navigation of menus
-	#
-	# use external libdvdcss, dvdread and dvdnav
-	myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal"
-	use dvd || myconf+=" --disable-dvdread"
-	use dvdnav || myconf+=" --disable-dvdnav"
-
-	#############
-	# Subtitles #
-	#############
-	uses="enca libass"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	# iconv optionally can use unicode
-	use iconv || myconf+=" --disable-iconv --charset=noconv"
-	use iconv && use unicode && myconf+=" --charset=UTF-8"
-	# obscure and not maintained feature
-	myconf+=" --disable-unrarexec"
-
-	#####################################
-	# DVB / Video4Linux / Radio support #
-	#####################################
-	# BSD legacy TV/radio support, FreeBSD actually supports V4L2, and V4L2 supports this chip.
-	myconf+=" --disable-tv-bsdbt848 --disable-radio-bsdbt848"
-	use dvb || myconf+=" --disable-dvb"
-	use pvr || myconf+=" --disable-pvr"
-	use v4l || myconf+=" --disable-tv --disable-tv-v4l2 --disable-v4l2"
-	if use radio; then
-		myconf+=" --enable-radio --enable-radio-capture"
-	else
-		myconf+=" --disable-radio-v4l2"
-	fi
-
-	##########
-	# Codecs #
-	##########
-	# better demuxers and decoders are provided by libav and ffmpeg
-	uses="faad liba52 libdca libdv libnut libvorbis mad musepack speex theora tremor xanim xvid"
-	for i in ${uses}; do
-		myconf+=" --disable-${i}"
-	done
-	use mp3 || myconf+=" --disable-mpg123"
-	uses="gif jpeg mng png pnm tga"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-
-	#################
-	# Binary codecs #
-	#################
-	myconf+=" --disable-qtx --disable-real --disable-win32dll"
-
-	################
-	# Video Output #
-	################
-	uses="directfb md5sum yuv4mpeg"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use libcaca || myconf+=" --disable-caca"
-	use postproc || myconf+=" --disable-libpostproc"
-
-	################
-	# Audio Output #
-	################
-	myconf+=" --disable-rsound" # media-sound/rsound is in pro-audio overlay only
-	uses="alsa jack ladspa portaudio"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use bs2b || myconf+=" --disable-libbs2b"
-	#use openal && myconf+=" --enable-openal" # build fails
-	use oss || myconf+=" --disable-ossaudio"
-	use pulseaudio || myconf+=" --disable-pulse"
-
-	####################
-	# Advanced Options #
-	####################
-	use threads || myconf+=" --disable-pthreads"
-
-	# Platform specific flags, hardcoded on amd64 (see below)
-	use cpudetection && myconf+=" --enable-runtime-cpudetection"
-	use shm || myconf+=" --disable-shm"
-
-	for i in ${CPU_FEATURES//+/}; do
-		myconf+=" $(use_enable ${i%:*} ${i#*:})"
-	done
-
-	use debug && myconf+=" --enable-debug=3"
-
-	if use x86 && gcc-specs-pie; then
-		filter-flags -fPIC -fPIE
-		append-ldflags -nopie
-	fi
-
-	###########################
-	# X enabled configuration #
-	###########################
-	use X || myconf+=" --disable-x11"
-	uses="vdpau xinerama xv"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use opengl || myconf+=" --disable-gl"
-	use lcms || myconf+=" --disable-lcms2"
-	use xscreensaver || myconf+=" --disable-xss"
-
-	############################
-	# OSX (aqua) configuration #
-	############################
-	use aqua && myconf+=" --enable-macosx-bundle --enable-macosx-finder"
-
-	CFLAGS= LDFLAGS= ./configure \
-		--cc="$(tc-getCC)" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		--pkg-config="$(tc-getPKG_CONFIG)" \
-		--prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--confdir="${EPREFIX}"/etc/${PN} \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--localedir="${EPREFIX}"/usr/share/locale \
-		${myconf} || die
-
-	MAKEOPTS+=" V=1"
-}
-
-src_compile() {
-	default
-	use doc && emake -C DOCS/xml html-chunked
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		rm -r TOOLS/osxbundle* DOCS/tech/{Doxyfile,realcodecs} || die
-		dodoc -r TOOLS DOCS/tech
-		dohtml -r DOCS/HTML/*
-	fi
-
-	newbin TOOLS/midentify.sh midentify${NAMESUF}
-
-	if [[ -n ${NAMESUF} ]]; then
-		mv "${ED}/usr/share/man/man1/mplayer.1" "${ED}/usr/share/man/man1/mplayer${NAMESUF}.1" || die
-
-		if use symlink; then
-			dosym ${PN} /usr/bin/mplayer
-			dosym midentify${NAMESUF} /usr/bin/midentify
-		fi
-	fi
-}
diff --git a/media-video/smplayer2/ChangeLog b/media-video/smplayer2/ChangeLog
index 3a6fe279f567..d1fd821cdc8e 100644
--- a/media-video/smplayer2/ChangeLog
+++ b/media-video/smplayer2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/smplayer2
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer2/ChangeLog,v 1.17 2014/04/26 17:36:59 maksbotan Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer2/ChangeLog,v 1.18 2015/03/15 09:01:04 yngwin Exp $
+
+  15 Mar 2015; Ben de Groot <yngwin@gentoo.org> metadata.xml:
+  drop to maintainer-needed
 
   26 Apr 2014; Maxim Koltsov <maksbotan@gentoo.org>
   -smplayer2-0.7.0_pre20111120.ebuild, -smplayer2-0.7.1_p20120301.ebuild,
diff --git a/media-video/smplayer2/Manifest b/media-video/smplayer2/Manifest
index e72c593ef65e..7411116045fb 100644
--- a/media-video/smplayer2/Manifest
+++ b/media-video/smplayer2/Manifest
@@ -4,16 +4,24 @@ Hash: SHA256
 DIST smplayer2-0.8.0_p20130111.tar.xz 989320 SHA256 2b97826d99804bf1c86bf4e438763394be776e423fd96e196cfc1273e3a62b92 SHA512 3e0aa77588a9b3c829fbfa350dea14b55aa88560ae796a6b2897cb3cadb6b6d71b2a5b2ab2eccc2021b201cfeeebea24d781939ad30633737dd523789ff10788 WHIRLPOOL c4fac2391b14ebe3ee34f0b535512c9e0f0ccdd2f87298c3b0ed841ed3075b4b397e83de0d1a01ca5a58194df916f4da150cddae7ef726ffefb96f4bb3607a09
 EBUILD smplayer2-0.8.0_p20130111.ebuild 1603 SHA256 759ab5fc8bd5669ed37cf5d29a1262a9a334722468aa730a6d94230bcf3e0c02 SHA512 07cb0d46fadd0e9fbd16a1283e0ff2618a6063782e0953138dd11e1ba158b4172b3abe790029411b2b2401ec60e1e71420d338d24af403cb14297bbb53c21230 WHIRLPOOL 4e73b185768a6cda3773062c724cbb7bc02dacf8eba47e4c10a5a71925672410a6eb6cebc905220557eb830d0e28369f41211a362a49d131a163f7d628b2cbfc
 EBUILD smplayer2-9999.ebuild 1314 SHA256 72304b06ac18a2feff1b281407798938cea36c735966b22ea61c6871bc19682d SHA512 70a80d821f58a30ad57995265621b15224c7552611587a201ec49a6fb70f36b821d2c8a6d6bf934e07555916ec4f03a0392f8c09862f632a16f298f5564cae08 WHIRLPOOL 4d624c58aaeac4b83c56790a8a238d8576e5c41f6bce8153f0391b3795f558d5a4096238d8b69960a1abb67c7b41d8b662b8a781fbab0fb6529a9067bf11d186
-MISC ChangeLog 3534 SHA256 3ee72731be1f5eeb3edbe47c2232e088a76e222afd2f9e039076f3176ae71e45 SHA512 b609b5327a7a05b7d91f2d53a2fb07b9f04b9a81b8bef1c80c4756b74bfc09114e77cb78603e8a20d731f08627475fae409630f0de4b53d43f7a49e38b43ce4d WHIRLPOOL e5de67c997555b8c7c3abae223d7fc23cd63287ab0c885b1ded6e4b0177eb5e30ab5b66fb4a9619348a66d19f43cec14084be30276160c091e7bba01e318ee04
-MISC metadata.xml 445 SHA256 155c8ae4467fa71fbb7ced0bb0b8f34d4a4afeecaaa1c78806046bbbb74ee61b SHA512 cc67633af59ffc4a118adb63c85be9cc01af3db6aba43bbbeb556b613384e2427f8e40e9227f548b1314ee62078b9a6b8026a3d698dbe848dcfdc298f0e98d45 WHIRLPOOL b000cc845fdb0499cc1cdd69d43b648e3f39a6360a7130205884a7b107d185f70c3cd2f12b868e7e0922e43f872cf6dd3bb2cc4be52c0d67857f9c6b2d238fdb
+MISC ChangeLog 3622 SHA256 e946b3433f7b632caf31a0c4e545af33f7893fad3291a85163f507d71763b4c4 SHA512 400c8becc6469ba5f6a6a766d3406bf1513979af6684fd979e0c751fdce6b61a3dcd1e1c62e7a1240ca7b7f0411c48d7f08abd93585cdf614f3255636898fc29 WHIRLPOOL d9239c158ca2fa10132002ab9ae313a716a88b62b6a921e377ade6751c2bfdfdad1d7ca7a85e52434abf850e5513c973aa842b3a34cb4aef67864d687d4252ab
+MISC metadata.xml 318 SHA256 547fb7464bfc8e09dd019ee705fd46f1aff730c6911dcc75e4826191624af10e SHA512 bbe10ddae1f4e337b4fe212a21f6432e79db0b982122c6d39a0025346ba539c9e3dd03deba78f2222a26c7c424dbb8fddee663fc25bd4a3683d300a94d714911 WHIRLPOOL 0c294b62bb595e846fed70bec2a9f7859e9108c235262b0584476a05b2fcb8aa1bf38f19d89ebe7f4572a0636079553d4425574812e55c8d4d1aa39607e41982
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTW+67AAoJEAmJmMX429reprgH/0CcWqj+5lLZ52la7/+2uwtQ
-VgeDAkbE7EjHxl1EmiEUJ27YYEJaAULjCylfT/ykEomxOiuWgvxRFuJucd0n+kc9
-aIwT9JyUI7YMY57KBK4pE/681EV9B0FTMrQapA005ZTS+KjtCB9yenXS6aKQhtAJ
-E7umXNdJ/qKl0BjA+BOkdcFuSp09nkuMoiiUkWb+1iRoryylEQNAbnByNiEKOT4g
-n+1Ql+/v9KQqLYqakWtFm8KY2Z0JA4ZId8eFYJLa+ap3H1ym6Cxk7i21j1L4nXfS
-eZ+LLZUg3Fl6m4hllAiJMNGlcWuCk+M8Mc8aK4sODLCF5EIcmEal5wbgvjNnnQE=
-=Qfjz
+iQJ8BAEBCABmBQJVBUpRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOl3QQAJi9Aylx6gRr70pZTdYKmjDz
+7314cUIZg/EL2lYa/SUcI4JEFA/yCUJqVWr4apZbrQDlvhnDBW5MJBxN6rw3CTCC
+NB/TGZcZcNdybITYsH3YMxP6fsY7k3prQIQyQnN+/l4JYKZkj+HoLkPfwTXuVVO6
+Bv0lRXJOdisLnBdYwFHD3o4dkH4DnV/NGMjcI32ICaSa9xXTIDaJxcM21pyMIMQR
+DZUPKcJZOAamf47nnAhWsLJ3wpoXYL7/53oaZ5sHuWefJoq8RtFzd/A+Q8RwsEQw
+TiqI+fgdBx2At8hfpOGzSa+Bo2ZNpk/WBgSMv9gABqANgtwA+cSUr97acYGhdDYb
+oDwVK7nJ1+G2fSnasdRluoCJAcCH/bSt5yu3LlFgbav6rldPTx3MB8A3x5EWN9GS
+QCkqagjEcuFcCYkn0D+dOYj78cv5mFLTZcgzmR0QyiUWjMmt7C3h1ajwkgn8By8g
+SBJrXfo0e09lEJ/5OOp34kKPzlVjdFM7Qmyh3TjZo18AwUrN+eHcIQx7R7Lrrjja
+onn2epkUwsvzbmIeGYMcOY+OShNVhukJMhDopwjNOhZs8HwYgbTFCLg2MyJb3s5o
+0R28fSou+Z+JLBEo9EANqZtZS+MKBAL0dPSNgQKLMHuT+E55sU2ZmDUlP4EDPLC+
+cxnGc0Yl0TSLoe/Uk0fj
+=TdE0
 -----END PGP SIGNATURE-----
diff --git a/media-video/smplayer2/metadata.xml b/media-video/smplayer2/metadata.xml
index 5e778eafba51..6de73f2f5936 100644
--- a/media-video/smplayer2/metadata.xml
+++ b/media-video/smplayer2/metadata.xml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
-		<email>nikoli@gmx.us</email>
-		<name>Nikoli</name>
-	</maintainer>
-	<maintainer>
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
-	<use>
-		<flag name="download-subs">Enable subtitle downloader (requires QuaZip)</flag>
-	</use>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="download-subs">Enable subtitle downloader (requires QuaZip)</flag>
+  </use>
 </pkgmetadata>