gentoo resync : 22.05.2018

9 files changed, 31 insertions, 730 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 5600dc787089..2b7639dfac13 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 0452101ab8c3..e35d8471c1c7 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,7 +1,7 @@
 AUX mjpegtools-2.1.0-no_format.patch 2800 BLAKE2B fd608ca5b9700fc0ab216f99be79fe438b68eb3c62804c24285862af7a2ab93a06d4f8029da9a1a2dc7817fb55eeddeded100968066b6e6d152856c14e9034cb SHA512 234c02625898f67994261e00ca940bbd597c60d2060507ee1e7391ea61353e00906325aec608d2ba545a7b4725d1ad645bd9d2cd33d23669490de3646998005b
-AUX mjpegtools-2.1.0-pic.patch 2282 BLAKE2B 9b35e26e4ef300747b6426cab8800c2bf92daddd43649dd673cb175bf7121b9d5b81097e296c7e111652b1bba4e77939db30cea2a317b26ab893a7e7444f0709 SHA512 3ad9d0b488a4fcc29fab8c0cc8322d99e63c755234c02a7fe7ad7efa974f67871460f43db05ca8097c358fdf7aafcc852967959a2abc83460c258aa38a448e28
+AUX mjpegtools-2.1.0-pic.patch 2298 BLAKE2B 9babd547b6c631845964e7ab6cb929d0b704700782ff3118c44e6434585b66a21ae713b544e57d33beae6193b7ff499fc6be1ddb9147cf93cc3c00ccec676f76 SHA512 d90c30e097f3f2694f611b3e52d76834f9f6e1c9020680e87cc353b28492d36dfb49a7a1167792450cb6f7ed88c20ed891b9282693be9d8583e4948fd998802c
 AUX mjpegtools-2.1.0-sdl-cflags.patch 387 BLAKE2B ad8065afdf164335e77adf972b21c6fd7108dba3f21a56006eede02a650f7f0728950c36f9e73dbedd9713eb69f8dab010c547c472c02abd8642dc518cc43621 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602
 DIST mjpegtools-2.1.0.tar.gz 1844336 BLAKE2B 90ae51c81e18708132f26c1fb002128193168366542cadc15060ad52f664a5f90770b3039ada2a1777eab5fec9743fb24c65083de913ebd72b23dd55f6b25741 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5
-EBUILD mjpegtools-2.1.0-r2.ebuild 2855 BLAKE2B 81909edf169cd3d15493e25e8863e5971f449f6dfb0d2767ddc0f46f010842133de46122a5181b2f584b3731d6f722953b9ef4b8c9bede6a227b8172c824e622 SHA512 84e5827b985eee8ab7fbf9c9999e98a11075552e1b60e4e558344e0c98a77b0ba719b2e2e1187cffee5f98e7afc45fed16bc917aaaa407ceda83ab57a736eef7
-EBUILD mjpegtools-2.1.0-r3.ebuild 2893 BLAKE2B 5df89a94b2ca7231cfbcfc576b12579cd6a6439268b59e7eb3b63e5edaedcd4bd53e890abec452beae10581bb95774d887678b161d3e29811e3420fc2274742e SHA512 d85bb1730190bfd0ed4d62c6949b89034d8a68de39c5285941975fcf805116540af9eac4a0cca61fe82a58f255f99689f5c8b3cb80f9a463da9fd4c5b1745a55
+EBUILD mjpegtools-2.1.0-r2.ebuild 2856 BLAKE2B 69ecbbd0dd2a8b6176d9fa5a93e1b5321331e1f701168a809f8d1660d05855bd1cf8187073895442443bd0cdf212494985b56500bebdc531c6b092a47675eae7 SHA512 741507bd082bfdd7a46f1fa5a73cca2c7c903b922268afacc8edaf0ad43392743b79dae798abe9eab7f12f9866199d6f868c386fff930e060eb4f7543e655642
+EBUILD mjpegtools-2.1.0-r3.ebuild 2879 BLAKE2B 35b2a6360c3ac4403429aa78d3d7c35c882c5ae52ace9c03bdbc5132160ecdfe1f70e2264c99c22bdbb31cce3e4ab31c7589a221edc323226b052f00556487f6 SHA512 995c3aa3d071617b767bde3936d9773e8a575542eb8895adf21a680f5e9c1354340598b42eb97afa6c79fe3c4ad4d4181f4c92286ea61d2b143ebab6ff43cb06
 MISC metadata.xml 537 BLAKE2B 9a038894ff7da6df6f8746be16e0a0f9e0586321eba052a95afd038d2625110d7dbcd2961ac8de8c14ab2fd74ccb2eb3881d64c8b96c97936e92173e2b62a67b SHA512 f3360892e77c064d2062bb963b91f031587ebed6a31b8ba2c698d969cf88998daec9ef910689f477e36921df60d2aa8bdfbe569dda701b0e375d75acfd31d79d
diff --git a/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch b/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch
index 7d0d1b60c017..0fda6c73c26f 100644
--- a/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch
+++ b/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch
@@ -4,8 +4,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/y4mdenoise/Makefile.am,v
 retrieving revision 1.12
 retrieving revision 1.13
 diff -u -r1.12 -r1.13
---- y4mdenoise/Makefile.am	1 Apr 2012 08:44:49 -0000	1.12
-+++ y4mdenoise/Makefile.am	28 Nov 2013 22:39:41 -0000	1.13
+--- a/y4mdenoise/Makefile.am	1 Apr 2012 08:44:49 -0000	1.12
++++ b/y4mdenoise/Makefile.am	28 Nov 2013 22:39:41 -0000	1.13
 @@ -4,8 +4,8 @@
  
  EXTRA_DIST = implementation.html
@@ -23,8 +23,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/y4munsharp/Makefile.am,v
 retrieving revision 1.2
 retrieving revision 1.3
 diff -u -r1.2 -r1.3
---- y4munsharp/Makefile.am	16 Jun 2005 17:09:38 -0000	1.2
-+++ y4munsharp/Makefile.am	28 Nov 2013 22:39:41 -0000	1.3
+--- a/y4munsharp/Makefile.am	16 Jun 2005 17:09:38 -0000	1.2
++++ b/y4munsharp/Makefile.am	28 Nov 2013 22:39:41 -0000	1.3
 @@ -4,7 +4,7 @@
  
  INCLUDES = -I $(top_srcdir)/utils -I $(top_srcdir)
@@ -40,8 +40,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/y4mutils/Makefile.am,v
 retrieving revision 1.7
 retrieving revision 1.8
 diff -u -r1.7 -r1.8
---- y4mutils/Makefile.am	1 Apr 2012 08:44:49 -0000	1.7
-+++ y4mutils/Makefile.am	28 Nov 2013 22:39:41 -0000	1.8
+--- a/y4mutils/Makefile.am	1 Apr 2012 08:44:49 -0000	1.7
++++ b/y4mutils/Makefile.am	28 Nov 2013 22:39:41 -0000	1.8
 @@ -2,7 +2,7 @@
  
  MAINTAINERCLEANFILES = Makefile.in
@@ -57,8 +57,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/yuvscaler/Makefile.am,v
 retrieving revision 1.5
 retrieving revision 1.6
 diff -u -r1.5 -r1.6
---- yuvscaler/Makefile.am	1 Apr 2012 08:44:49 -0000	1.5
-+++ yuvscaler/Makefile.am	28 Nov 2013 22:39:41 -0000	1.6
+--- a/yuvscaler/Makefile.am	1 Apr 2012 08:44:49 -0000	1.5
++++ b/yuvscaler/Makefile.am	28 Nov 2013 22:39:41 -0000	1.6
 @@ -18,6 +18,6 @@
  
  EXTRA_DIST = yuvscaler_implementation.txt
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
index 99e778a7bbac..09216f8d0c94 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="dv gtk cpu_flags_x86_mmx png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
index 7d41dcbe2185..a12c9c11b243 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils flag-o-matic multilib-minimal toolchain-funcs
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="Tools for MJPEG video"
 HOMEPAGE="http://mjpeg.sourceforge.net/"
@@ -11,31 +11,35 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE="dv gtk cpu_flags_x86_mmx png quicktime sdl sdlgfx static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd"
+IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 
-RDEPEND="virtual/jpeg:0=[${MULTILIB_USEDEP}]
-	quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] )
+RDEPEND="
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
 	dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0= )
 	gtk? ( x11-libs/gtk+:2 )
+	png? ( media-libs/libpng:0= )
+	quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] )
 	sdl? ( >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		sdlgfx? ( media-libs/sdl-gfx )
 	)"
-
 DEPEND="${RDEPEND}
-	cpu_flags_x86_mmx? ( dev-lang/nasm )
 	>=sys-apps/sed-4
 	virtual/awk
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	cpu_flags_x86_mmx? ( dev-lang/nasm )
+"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-pic.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-pic.patch
 	# https://sourceforge.net/p/mjpeg/bugs/139/
-	epatch "${FILESDIR}"/${P}-sdl-cflags.patch
-	epatch "${FILESDIR}"/mjpegtools-2.1.0-no_format.patch
+	"${FILESDIR}"/${P}-sdl-cflags.patch
+	"${FILESDIR}"/mjpegtools-2.1.0-no_format.patch
+)
+
+src_prepare() {
 	default
 
 	eautoreconf
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index ffe4ea263b3c..7faa780127e5 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -8,7 +8,6 @@ DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a3
 DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
-EBUILD mplayer-1.3.0-r3.ebuild 17273 BLAKE2B 760bc09441661e7fcc1a2d0243c60ea084b7d7a7e378fe65c1b7475b46a04b087281f4d8075271bd5e79980bb0416291c5c2a03592d3f3c1dca6b07f111401e7 SHA512 48ebca46b6d865cdc075d5f68f775ed86366b24d8e848962cc8cdb165d5c8d243e6f7dd215c5b570705879b3d2287731d15d129f5f131560a25f5f26a47c9f9c
 EBUILD mplayer-1.3.0-r5.ebuild 17297 BLAKE2B 5cf6ff6c9d48f91e837c4fd3e2d6bda6486e85ef01427943bd2c12fd7a68264ca5c0ad52c48624b72e0b73721c649a95804e2569ddb98555d8dfe5cdf74597ea SHA512 42b9866eecfb3eb44fecdb08dfdeac0a8ae878cb3c4757f5fe7b2f97bc7e60fbf8451ccef81bac7ec49c24072260dfd43d8a661e52a5c9edc15f5e75ef37ea3f
 EBUILD mplayer-9999.ebuild 16983 BLAKE2B 22736905b595451ca6ecbb09ca28a32e59655de960850764e22a228caceb515a05b4dca2af04af1d63c1a1b3e78709c69c69b35f28e79c15aa9149e1344b3e36 SHA512 a8625386b91ee53d09dc50ae5a34938f9e981e174748399d580329308fbca99afdf71340214f4a7d577f5c4c61dd7ba1a6edef11d62f40bf3430eb3d365889a5
 MISC metadata.xml 2530 BLAKE2B 83baf1357e9b0d31244b7c04ceab7eec0bc7db7eb9a2de4ffc1a85cc49af40f1094d9bdbac22c9abff43c215c19e5b8c745afbd397ae7221921c24b422590e3a SHA512 b650af6aa25ee064d81d3db5cc066d634eaf8c8ccdf8e1352d449f0579b0a310026be2ff873999767c5b82c25a76c138af722220892794b9c615ce477335a93b
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
deleted file mode 100644
index c48e3a8e79db..000000000000
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ /dev/null
@@ -1,626 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
-
-inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
-
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
-bs2b cddb +cdio cdparanoia cpudetection debug dga
-directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
-
-VIDEO_CARDS="mga tdfx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-FONT_URI="
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
-if [[ ${PV} == *9999* ]]; then
-	RELEASE_URI=""
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
-	MY_P="MPlayer-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
-else
-	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
-fi
-SRC_URI="${RELEASE_URI}
-	!truetype? ( ${FONT_URI} )"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-FONT_RDEPS="
-	virtual/ttf-fonts
-	media-libs/fontconfig
-	>=media-libs/freetype-2.2.1:2
-"
-X_RDEPS="
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-"
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-#	nemesi? ( net-libs/libnemesi )
-RDEPEND+="
-	sys-libs/ncurses:0=
-	app-arch/bzip2
-	sys-libs/zlib
-	>=media-video/ffmpeg-3.0:0=[vdpau?]
-	a52? ( media-libs/a52dec )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bidi? ( dev-libs/fribidi )
-	bluray? ( >=media-libs/libbluray-0.2.1:= )
-	bs2b? ( media-libs/libbs2b )
-	cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
-	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
-	dga? ( x11-libs/libXxf86dga )
-	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 )
-	encode? (
-		!twolame? ( toolame? ( media-sound/toolame ) )
-		twolame? ( media-sound/twolame )
-		faac? ( media-libs/faac )
-		mp3? ( media-sound/lame )
-		x264? ( >=media-libs/x264-0.0.20100423:= )
-		xvid? ( media-libs/xvid )
-	)
-	enca? ( app-i18n/enca )
-	faad? ( media-libs/faad2 )
-	ggi? ( media-libs/libggi media-libs/libggiwmh )
-	gif? ( media-libs/giflib:0= )
-	gsm? ( media-sound/gsm )
-	iconv? ( virtual/libiconv )
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? ( >=media-libs/libass-0.9.10:= )
-	libcaca? ( media-libs/libcaca )
-	libmpeg2? ( media-libs/libmpeg2 )
-	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live )
-	lzo? ( >=dev-libs/lzo-2 )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng:= )
-	mp3? ( media-sound/mpg123 )
-	nas? ( media-libs/nas )
-	nut? ( >=media-libs/libnut-661 )
-	openal? ( media-libs/openal )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	pnm? ( media-libs/netpbm )
-	pulseaudio? ( media-sound/pulseaudio )
-	rar? (
-		|| (
-			app-arch/unrar
-			app-arch/rar
-		)
-	)
-	rtmp? ( media-video/rtmpdump )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora[encode?] )
-	tremor? ( media-libs/tremor )
-	truetype? ( ${FONT_RDEPS} )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( !tremor? ( media-libs/libvorbis ) )
-	X? ( ${X_RDEPS}	)
-	xinerama? ( x11-libs/libXinerama )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-"
-
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dga? ( x11-base/xorg-proto )
-	X? ( x11-base/xorg-proto )
-	xinerama? ( x11-base/xorg-proto )
-	xscreensaver? ( x11-base/xorg-proto )
-	amd64? ( ${ASM_DEP} )
-	doc? (
-		dev-libs/libxslt app-text/docbook-xml-dtd
-		app-text/docbook-xsl-stylesheets
-	)
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-RDEPEND+="
-	selinux? ( sec-policy/selinux-mplayer )
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86"
-fi
-
-# faac codecs are nonfree
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
-# dvd navigation requires dvd read support
-# ass and freetype font require iconv and ass requires freetype fonts
-# unicode transformations are usefull only with iconv
-# radio requires oss or alsa backend
-# xvmc requires xvideo support
-REQUIRED_USE="
-	dga? ( X )
-	dvdnav? ( dvd )
-	enca? ( iconv )
-	ggi? ( X )
-	libass? ( truetype )
-	opengl? ( X )
-	osdmenu? ( X )
-	truetype? ( iconv )
-	vdpau? ( X )
-	vidix? ( X )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-	xvmc? ( xv )"
-RESTRICT="faac? ( bindist )"
-
-PATCHES=( "${FILESDIR}/${PN}-1.3-vdpau-x11.patch" )
-
-pkg_setup() {
-	if [[ ${PV} == *9999* ]]; then
-		elog
-		elog "This is a live ebuild which installs the latest from upstream's"
-		elog "subversion 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 has_version 'media-video/libav' ; then
-		ewarn "Please note that upstream uses media-video/ffmpeg."
-		ewarn "media-video/libav should be fine in theory but if you"
-		ewarn "experience any problem, try to move to media-video/ffmpeg."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_src_unpack
-		cd "${WORKDIR}"
-		rm -rf "${WORKDIR}/${P}/ffmpeg/"
-		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
-	else
-		unpack ${A}
-	fi
-
-	if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
-		cd "${S}"
-		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
-		chmod +x dump_ffmpeg.sh
-		./dump_ffmpeg.sh || die
-	fi
-
-	if ! use truetype; then
-		unpack font-arial-iso-8859-1.tar.bz2 \
-			font-arial-iso-8859-2.tar.bz2 \
-			font-arial-cp1250.tar.bz2
-	fi
-}
-
-src_prepare() {
-	local svf=snapshot_version
-	if [[ ${PV} = *9999* ]]; then
-		# Set SVN version manually
-		subversion_wc_info
-		printf "${ESVN_WC_REVISION}" > $svf
-	else
-		epatch "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240
-		epatch "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
-	fi
-	if [ ! -f VERSION ] ; then
-		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
-		local sv=$(<$svf)
-		printf "SVN-r${sv} (Gentoo)" > VERSION
-	fi
-
-	# fix path to bash executable in configure scripts
-	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
-
-	base_src_prepare
-
-	# Use sane default for >=virtual/udev-197
-	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
-}
-
-src_configure() {
-	local myconf=""
-	local uses i
-
-	# set LINGUAS
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
-
-	# 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 svga since we don't want it
-	# disable arts since we don't have kde3
-	# always disable internal ass
-	# disable opus and ilbc since it only controls support in internal
-	#         ffmpeg which we do not use
-	myconf+="
-		--disable-svga --disable-svgalib_helper
-		--disable-ass-internal
-		--disable-arts
-		--disable-kai
-		--disable-libopus
-		--disable-libilbc
-		$(use_enable network networking)
-		$(use_enable joystick)
-	"
-	uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
-	myconf+=" --disable-nemesi" # nemesi automagic disable
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use bidi  || myconf+=" --disable-fribidi"
-	use ipv6  || myconf+=" --disable-inet6"
-	use libass || myconf+=" --disable-ass"
-	use nut   || myconf+=" --disable-libnut"
-	use rar   || myconf+=" --disable-unrarexec"
-	use samba || myconf+=" --disable-smb"
-	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
-
-	# libcdio support: prefer libcdio over cdparanoia
-	# don't check for cddb w/cdio
-	if use cdio; then
-		myconf+=" --disable-cdparanoia"
-	else
-		myconf+=" --disable-libcdio"
-		use cdparanoia || myconf+=" --disable-cdparanoia"
-		use cddb || myconf+=" --disable-cddb"
-	fi
-
-	################################
-	# DVD read, navigation support #
-	################################
-	#
-	# dvdread - accessing a DVD
-	# dvdnav - navigation of menus
-	use dvd || myconf+=" --disable-dvdread"
-	use dvdnav || myconf+=" --disable-dvdnav"
-
-	#############
-	# Subtitles #
-	#############
-	#
-	# SRT/ASS/SSA (subtitles) requires freetype support
-	# freetype support requires iconv
-	# iconv optionally can use unicode
-	use truetype || myconf+=" --disable-freetype"
-	use iconv || myconf+=" --disable-iconv --charset=noconv"
-	use iconv && use unicode && myconf+=" --charset=UTF-8"
-
-	#####################################
-	# DVB / Video4Linux / Radio support #
-	#####################################
-	myconf+=" --disable-tv-bsdbt848"
-	# broken upstream, won't work with recent kernels
-	myconf+=" --disable-ivtv"
-	# gone since linux-headers-2.6.38
-	myconf+=" --disable-tv-v4l1"
-	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
-				$(use_enable encode 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" # Use internal musepack codecs for SV7 and SV8 support
-	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
-	use dts || myconf+=" --disable-libdca"
-	if ! use mp3; then
-		myconf+="
-			--disable-mp3lame
-			--disable-mpg123
-		"
-	fi
-	uses="a52 bs2b dv gsm lzo rtmp vorbis"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-lib${i}"
-	done
-
-	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	# Pulls an outdated libopenjpeg, ffmpeg provides better support for it
-	myconf+=" --disable-libopenjpeg"
-
-	# Encoding
-	uses="faac x264 xvid toolame twolame"
-	if use encode; then
-		for i in ${uses}; do
-			use ${i} || myconf+=" --disable-${i}"
-		done
-	else
-		myconf+=" --disable-mencoder"
-		for i in ${uses}; do
-			myconf+=" --disable-${i}"
-			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
-		done
-	fi
-
-	#################
-	# 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 aalib || myconf+=" --disable-aa"
-	use fbcon || myconf+=" --disable-fbdev"
-	use libcaca || myconf+=" --disable-caca"
-	use zoran || myconf+=" --disable-zr"
-
-	if ! use kernel_linux || ! use video_cards_mga; then
-		 myconf+=" --disable-mga --disable-xmga"
-	fi
-
-	if use video_cards_tdfx; then
-		myconf+="
-			$(use_enable video_cards_tdfx tdfxvid)
-			$(use_enable fbcon tdfxfb)
-		"
-	else
-		myconf+="
-			--disable-3dfx
-			--disable-tdfxvid
-			--disable-tdfxfb
-		"
-	fi
-
-	# sun card, disable by default, see bug #258729
-	myconf+=" --disable-xvr100"
-
-	################
-	# Audio Output #
-	################
-	myconf+=" --disable-esd"
-	uses="alsa jack ladspa nas openal"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	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"
-
-	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
-	for i in ${uses}; do
-		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
-	done
-
-	uses="altivec shm"
-	for i in ${uses}; do
-		myconf+=" $(use_enable ${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 #
-	###########################
-	myconf+=" --disable-gui"
-	myconf+=" --disable-vesa"
-	uses="ggi vdpau xinerama xv"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use dga          || myconf+=" --disable-dga1 --disable-dga2"
-	use opengl       || myconf+=" --disable-gl"
-	use osdmenu      && myconf+=" --enable-menu"
-	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
-	use xscreensaver || myconf+=" --disable-xss"
-	use X            || myconf+=" --disable-x11"
-	if use xvmc; then
-		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
-	else
-		myconf+=" --disable-xvmc"
-	fi
-
-	############################
-	# OSX (aqua) configuration #
-	############################
-	if use aqua; then
-		myconf+="
-			--enable-macosx-finder
-			--enable-macosx-bundle
-		"
-	fi
-
-	./configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		--prefix="${EPREFIX}/usr" \
-		--bindir="${EPREFIX}/usr/bin" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--confdir="${EPREFIX}/etc/mplayer" \
-		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--disable-ffmpeg_a \
-		${myconf} || die
-}
-
-src_compile() {
-	base_src_compile
-	# Build only user-requested docs if they're available.
-	if use doc ; then
-		# select available languages from $LINGUAS
-		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
-		local BUILT_DOCS=""
-		for i in ${LINGUAS} ; do
-			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
-		done
-		if [[ -z $BUILT_DOCS ]]; then
-			emake -j1 html-chunked
-		else
-			for i in ${BUILT_DOCS}; do
-				emake -j1 html-chunked-${i}
-			done
-		fi
-	fi
-}
-
-src_install() {
-	local i
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALLSTRIP="" \
-		install
-
-	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
-
-	docinto tech/
-	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
-	docinto TOOLS/
-	dodoc -r TOOLS
-	docinto tech/mirrors/
-	dodoc DOCS/tech/mirrors/*
-
-	if use doc; then
-		docinto html/
-		dohtml -r "${S}"/DOCS/HTML/*
-	fi
-
-	if ! use truetype; then
-		dodir /usr/share/mplayer/fonts
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
-			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
-		done
-		# Fix the font symlink ...
-		rm -rf "${ED}/usr/share/mplayer/font"
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	fi
-
-	insinto /etc/mplayer
-	newins "${S}/etc/example.conf" mplayer.conf
-	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
-	doins "${S}/etc/input.conf"
-	if use osdmenu; then
-		doins "${S}/etc/menu.conf"
-	fi
-
-	if use truetype; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-_EOF_
-	fi
-
-	# bug 256203
-	if use rar; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
-	fi
-
-	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
-	newbin "${S}/TOOLS/midentify.sh" midentify
-}
-
-pkg_preinst() {
-	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
-		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
-}
-
-pkg_postrm() {
-	# Cleanup stale symlinks
-	[ -L "${EROOT}/usr/share/mplayer/font" -a \
-			! -e "${EROOT}/usr/share/mplayer/font" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/font"
-
-	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
-			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
-}
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 1b73400bdf15..43dac5fb29ad 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,7 +1,5 @@
 AUX gpac.patch 507 BLAKE2B 7872c56ed87e96a247b63b92c6a23c094346fea9ee5127a6086a45efd064b4c00ddf2cd2191772bcbd54365c56ef550f3f5e0ecf2c2ab35a2e0c9dc3197ec9b9 SHA512 9da7a1ffe637e39863e5828547923424b9c072d194d3ddadcc9a6c31f7803f5456b3ba88d470458a84d37b0c07374983adc124f3710ae7122a81a13ea9b4ae0e
-DIST x264-snapshot-20160712-2245.tar.bz2 730644 BLAKE2B 3d80d831c5a13ab95f9a4ba269f959e36aa35f4f2914d435b9e9817fcbe40105f44881b0dbb92cad4b9c41e25536194ff2b7c35925bff9016ebca5e38b16c54e SHA512 ac97730611e6194701a891a7e73c739696664de2411a7937ab0c36a3ce843f22bf2bd2defe053c2506d95652842b99a905b6f16a2f016a9d73059c2c75b71963
 DIST x264-snapshot-20170701-2245.tar.bz2 750527 BLAKE2B ccf276da31383ab4b4a1ac48866bc49b4b2bc5913361c933fa2359de4d6e90cca091dd4aba781f3735a5b28d6ce006aa9d4e149ba48745b80cb971c2952ca867 SHA512 28fc9850c36ac385fced6dec9a0f68a5605a68805e1ef7b8cedcd78917eaa1ad6e47e57fe5a74fee0a6e482f3a33de6011f675e6c77b5db94c8fe01d5c5f3e9f
-EBUILD x264-encoder-0.0.20160712.ebuild 2172 BLAKE2B 296b52516b478729d9f87f0a1c50393d74e1b11f38fa445838a219940388a63de4d2ef63cb91f34bf1e422afb67d02de1864bf4ef3534cea4dc15a1f07c368a6 SHA512 94d003d2096750d5b333315a805858b403c09c0bb20f271cfcdeb1bd3d035b7353611c76c9c475ee3675762cc178c2e4db8eaa2ca92ca10477a36c5446582a33
 EBUILD x264-encoder-0.0.20170701.ebuild 2153 BLAKE2B f02d87b81eed8ff4778bc31e36b7309aeb0bc82819c77dfcb4a02268fd3758cdb18eddd4338099074c9eccd11bf6cf925fc6e524202bf8977677f6eb8b5cb958 SHA512 214e20a611544cebf87b7a4b5d01688f4926d6d9d2685b37e6a0ddea9d419e2a0ed5cec51c0e3c3b9cfbab39e8ec5252b451f9bb3d26facc19c7f03cdf7c144c
 EBUILD x264-encoder-9999.ebuild 2155 BLAKE2B 4a1ac4e8a49544996c39952a84f91cafa363d1dccc4b500af3b6419a5e9dc9fe27dfd29f259337949bd2a6eb16d723eff3f8a70ca07b95ca90cabf07c4e81026 SHA512 684327257e53797928802134cb1bac95266667a7999b3ad1b9edd1a0dab525d69ecec743924625522c91202c89c6b386d53375af55999a817090e8ef46d803c2
 MISC metadata.xml 587 BLAKE2B c768f1adecd9c56480a7ae1c3c4907230d5e1ffd7884abdf569de00f64bc34faf6314e473928540d6c9fa747bfaf2573717b2fdca0996a80f69ea7330c3c6226 SHA512 383e8540e2bde9190f48030956ff00eebb86f02781dfeffee9507198e00ee9d7f6cba6e05e5b9c7e8c692b0d5935531c162d7b5efe61a7f1ce2a88458ae2ec04
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild
deleted file mode 100644
index 0f3b0b91384d..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs eutils
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://git.videolan.org/x264.git"
-	SRC_URI=""
-else
-	inherit versionator
-	MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="ffmpeg? ( virtual/ffmpeg )
-	~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
-	ffmpegsource? ( media-libs/ffmpegsource )
-	mp4? ( >=media-video/gpac-0.5.2 )"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="${RDEPEND}
-	amd64? ( ${ASM_DEP} )
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/gpac.patch"
-}
-
-src_configure() {
-	tc-export CC
-
-	# let upstream pick the optimization level by default
-	use custom-cflags || filter-flags -O?
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--system-libx264 \
-		--host="${CHOST}" \
-		--disable-lsmash \
-		$(usex 10bit "--bit-depth=10" "") \
-		$(usex avs "" "--disable-avs") \
-		$(usex ffmpeg "" "--disable-lavf --disable-swscale") \
-		$(usex ffmpegsource "" "--disable-ffms") \
-		$(usex interlaced "" "--disable-interlaced") \
-		$(usex mp4 "" "--disable-gpac") \
-		$(usex threads "" "--disable-thread") || die
-
-	# this is a nasty workaround for bug #376925 for x264 that also applies
-	# here, needed because as upstream doesn't like us fiddling with their CFLAGS
-	if use custom-cflags; then
-		local cflags
-		cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
-		cflags="${cflags//$(get-flag O)/}"
-		cflags="${cflags//-O? /$(get-flag O) }"
-		cflags="${cflags//-g /}"
-		sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
-	fi
-}