Remove win32codecs USE flag, bug 468406.

Package-Manager: portage-2.1.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

9 files changed, 56 insertions, 44 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index f96176e6ef06..b8a938cd666a 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.842 2013/05/06 14:22:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.843 2013/05/16 19:21:23 ulm Exp $
+
+  16 May 2013; Ulrich Müller <ulm@gentoo.org> vlc-2.0.5.ebuild,
+  vlc-2.0.6.ebuild, vlc-2.0.9999.ebuild, vlc-9999.ebuild:
+  Remove win32codecs USE flag, bug 468406.
 
   06 May 2013; Samuli Suominen <ssuominen@gentoo.org> vlc-2.0.5.ebuild,
   vlc-2.0.6.ebuild, vlc-2.0.9999.ebuild, vlc-9999.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index e568751d9916..ae221a6b3eb3 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -4,21 +4,24 @@ Hash: SHA256
 DIST vlc-2.0.5.tar.xz 18369292 SHA256 dff9eb00861bcd9f8446ff5cedbd3c5fd2bed460e6bfa84bd9e01f750ed96b6e SHA512 eff8146e99f819f49bf9875e4ce0bb562fca46bbf68cd7d2e2121e86d12c8b4ce02bf8fb024910f7d5742abec90583bba45eb2301156ed0418ef76952345d49e WHIRLPOOL bfef0e9adaeb520e709ce34d9a2057a26f302c657b1f89a2e655b2f6b9ad77a4ffcd0ee673549d617ff724f098116f128e13f36228a306670c85375ed9d01038
 DIST vlc-2.0.6.tar.xz 18619836 SHA256 31cc98035e2ce36c71a8f105aa5a87e3d8b5e206a0b3f7208c5ced407cbe1963 SHA512 80793305f7e0e48c99be99adfd85d699deaff53184f740b7624cdc9cad106b7c70f1d221e26c1362a1d1e5b02b861a1289e21a3af8a4c5ae3dfc316c67f15e74 WHIRLPOOL 04d2ff943d59979e25707aeab8a4157a3417b604ddf4d7116a6affe235afcd24fede3c49fea15b2b54784f9716b6376aae753b8b5b89f65e471d1fe11bfa728d
 DIST vlc-patches-101.tar.bz2 3011 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae SHA512 f059f3c47b571dd5a28d979abdcb3a8c2ebef13845cd4102d877b1786ef4b3ba15cc22873de0fd84fcc7a4413f582064f12edf40627e9f030fd8e6fa03d67c66 WHIRLPOOL eb2f184c99db6d174d22e4231003d93171f5081f917f10ecf6bc927ff96983aa21756d15063909cb6f8ad77f0db0b978fdf2eb2fba3320f19c6bc26e17b04ba7
-EBUILD vlc-2.0.5.ebuild 11031 SHA256 0e00a93d8ef3828aff467ee21bfcbac99a94c998d3cc0cd3f46331b29e57201a SHA512 ab6a59fc9cedea2d9f4431106b706f8cfcdfdf5cd74ebff0b0cfe2c079999899fe83765b6a7bfecb05ceb6a3f7d2bf4012c0f74fa7ac3dec88df176df520e18b WHIRLPOOL 1cca72e9e4911d069d695e7ab6df49332c8759d07de583af8e096ea132f15fce331211a8dbeba6188d2e6f4976cf8173d37a25c62ca439b97148fbc3ae510d7e
-EBUILD vlc-2.0.6.ebuild 11094 SHA256 a8f9c9924e5fb768c22ad11a7c1601954eca6003ac26430d75739a5ee30d1032 SHA512 7f7dbddc687011012d227c6297f47eadb709b5ffcc6dc52ede5e3bee98996d8d7979419d161296c6af0807ea07d2dc9148e0f1ec498e7a2d199497ab1af58afa WHIRLPOOL e7575cd1781acbb916b7cbebb6cd17cd7bc67c597b36df20f2ffdddd514e8e256181a9c001fd6d406f0bd9d25cfae05e1136ded3b2f6113b5ac4c348539746ba
-EBUILD vlc-2.0.9999.ebuild 10868 SHA256 2cee42777dafab3e3cfabfe9dd8e841bfd6c81fb78c044252bb5a25f9e72c2e0 SHA512 28e3c4f25cd4c0d9a38e57d6bba0d29a55a99cec22db304efb82ff2d8e489aa39729d6c454874a70aa73a8a52d162d6816fe920e292c28898d4c812160451917 WHIRLPOOL 099a441c73a0c06389100eb79b449ade948cf55e51c1a66ccef8b17ef2ab3dd6d1169d3840d612ec5c5fddbc6252dc23093904819055eeee3a77e7111da2c0f3
-EBUILD vlc-9999.ebuild 10679 SHA256 2d92ee5f1d5102cc4ae92cdb9fe32119cabf059550c4f8fb434d8b0d06d004cd SHA512 951fdcd79977d75498cf5cc916f6979aeaa1d5801df668899ccea300f2bcd0ef6194fd91806f0f06a2c9e1e715840b7d34c27a92e8156af832631e5409d2f0d9 WHIRLPOOL 633ee34ed0839eef2cc1cf019b4a3045455ed115598729f70e5af80c20e15bcd77e3c262d5a8fd306f84c0a9e2d9fe32541478121de49185ab0b1fbdcd74a194
-MISC ChangeLog 10585 SHA256 5eb8e9253da70994f745772fe22437366ec8e3b6cf60412dda822f696aed1794 SHA512 599d16c3eb4e9baaca713b99103f5efdf15931950a57d357d939be4a302fadebc05d3899c2f6b77ccb1fbb1666cf6625a4b7ec114aa4e97a9ba6c75a68504f65 WHIRLPOOL e6f5ff93ef45a631768072799eb20f07afa7a8e111f679fb80f8400bbeddd619bdc0232881fe734535e5825b4ee934937a981d071ed78c39219e91a41596be5e
+EBUILD vlc-2.0.5.ebuild 10955 SHA256 4ac92021fa3cb5b73706081f9f22926bc2ac836f789898d30414e0cd258b631b SHA512 97e02300fa42af8557fd17051af175c58fbbdf540c8a1c12c9704b3418bd6a943d809220ea13c17b431215ce3430ebc7d85f3e3845d9ef606ca9cef44af3c3ee WHIRLPOOL a370db8e922b3b45a695a9285aac245f57db2c47e61e6b9aa74aa99323797e1849c51173ad30d014ea6f6cae6cdc9b1b66f77cc7de573658ababf72e47fe40e0
+EBUILD vlc-2.0.6.ebuild 11018 SHA256 4fe4112c9f2ec6a916725b5781fce1741b12774260d1f64176361a0fd063d4be SHA512 7f7ff3ee6ced52389857f437f2ad85cf74ac446f357adeff318eb6475f40b68e51b292bd4abc74f868323fe911901d0bfd068c257ee45a91e20119a15f48126d WHIRLPOOL d2ebe57a0a6d4ed8c3d2ee4132b9811531046b503c5e26b0c83d1885a319a90a92b16ed41cd5ce8a48c8ec0f42179b1541c5583faa37af13d270afecf451e48f
+EBUILD vlc-2.0.9999.ebuild 10792 SHA256 c2e7721b371b3cad1172a8b5cf55635172914c023b3998c6cd39e29ffe51966d SHA512 e78ccffe717238fb3d9865d4881f0acc4db0f3a6b486da6bc59a384946cce536d869f24d87b9e5952c0e2c6a9ad26bcf76b8df533828c4876cb959149193dcce WHIRLPOOL 5972102e0e071813de50cc5809fb9a445debcdb82bde89e5e68f01b58af191069ecc66c14ab7599d3761ac681aa2e11265288453e752171b33e2a66f2019e9bd
+EBUILD vlc-9999.ebuild 10613 SHA256 e64c8723cb03ce35840a41675f11372aefbbfa72b4b5ac30f15612c53136413d SHA512 5e167624a7a84bec18f088a5c22fe11d3a87fa78f7ef943bbf044fd62f7c0cad04a4c395313cefdae28e7446ac4a8e3bed7daee7631d48776c6f7cd186066aeb WHIRLPOOL 2c91d8704f190402ee128ea9ddc690fb727a8c6e7af2c9490db85be732f8eae425bc67b2f68cfd71dc1da65c460b3d4675dd5519907507e9c91216a2955d0da4
+MISC ChangeLog 10746 SHA256 68061c2d9ce95858e7ffc55e6c78c8b8409165e3ce9cac82219e0b337c9d5394 SHA512 ba606c182ac42c5752c5ba1df8e8083f87f7248ee6790f132ac78822f5bb24fa8a9d16cc88e672f00474f374cf29136f20b5ce7420bdf75195333b3e93106a46 WHIRLPOOL 0d28f7f059a0ab1f81da4c539a2a065b1f215d291039c26a8566995a4550e05ada1a28bdd4ed6028ddc3f4221b6bedd4c242110466cd2e9b611cab9c63d8b639
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 5930 SHA256 fc2605f67272f81ed582248b34df595c22536e446075b94131302b5b6c7c0b1c SHA512 59ff8f40ff0af5efef463fd1875939ba85ed55af1a394923a3ba48d005e9d45519be7ee0aabd0f0a05b7aafa77637473c826cde8bda512b041e02b3d2bcecc44 WHIRLPOOL 56bf2213b9e6fa5e562791689fec6cce4ad6e881ee4e9c813defab5b54dca2f912d271d14664028940e13da7e1d11c5331fb6b21b55977d8f4cfc60fa4fd95b2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRh7yOAAoJEEdUh39IaPFNPWIIAIhBx+WlHvPq57I6Edg04zbG
-YVXLcHiXLjN61vujMpiEcBth3R+FlZYOY7UVjMv3W2J97LblL09zzK21H7u+bgRI
-hTeO1gSsCC9SLC39IWdhnAwtDDbLYolQXYupCNCnbeNudF9k0AVxNDSTiknn0r3C
-2UksqCEjRjuQByyajOpsCaGAQE/Fbddf9732i8iA0ZXsRbwTBJPQtrvxxuUSSE/6
-run1ojeuKudq4GA4aN7NmYJLkbhGSR4AQO2p6y8DPlj0q+U6tf0fJI7bEvOmco8B
-fQQ8VNT4hYBOO5ipaIJ+CGTlgqdN4cJQ+pjF3K3P+ASVX1NEJdKgxckozngUJ10=
-=Y9st
+iQGcBAEBCAAGBQJRlTN3AAoJEJQzkH1pP7W4BjIL/Arw9noyOSfq+5ZvMtFRa9tN
+9vnd+RtDtjzopJFqTgqcpTlF+1MT4O+7h0kx6Xh4fsAxPpe47uGnTgfftwtKSccT
+KL2SV3XlVzb2JENw2pAFq4wZuCF/2rvxMYmEhDgcE4GGCCdaNHqGeelysUNHCE18
+rHieTp4yW/Y8kvdySpdBxHpMgT9MlF+ZlMh7S/tcRYJ4JuyXpC7SheFjhmzvBjpB
+tFyqZAzQimvgU697nBYDbcJLP0Sz82hBken5jeTRk3jYjn0e1HDBQYjUTcc97avj
+q/KzWwt2/HRFms6dOuloLZ6ZdpFCwv9r47nSUO6DxbqCb9Z2nux6V0c+qqU8O3UY
+cFrFc1YCKVJIAiyUWrXGGL4wkMS2CZGK0d6enCx+pvUGhT3rykyYCCu4TDMAQKpc
+5HrBGxLPxMQb4IDlrSVzY5fEmKk8Uxt3rCtEzdwbgA22768t/P0JMU9yMQwXKm6N
+EwK5QmeUXQuSprwO8euKS4Dus21UZ9J9Wgdc/J7E6Q==
+=iuAQ
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-2.0.5.ebuild b/media-video/vlc/vlc-2.0.5.ebuild
index 12eb9dced9eb..8625ad21068c 100644
--- a/media-video/vlc/vlc-2.0.5.ebuild
+++ b/media-video/vlc/vlc-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.5.ebuild,v 1.6 2013/05/06 14:22:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.5.ebuild,v 1.7 2013/05/16 19:21:23 ulm Exp $
 
 EAPI="5"
 
@@ -56,7 +56,7 @@ IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
 	portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba
 	schroedinger sdl sdl-image shine shout sid skins speex sqlite sse svg
 	+swscale switcher taglib theora truetype twolame udev upnp vaapi v4l
-	vcdx vlm vorbis waveout win32codecs wingdi wma-fixed +X x264 +xcb xml
+	vcdx vlm vorbis waveout wingdi wma-fixed +X x264 +xcb xml
 	xosd xv zvbi"
 
 RDEPEND="
@@ -141,7 +141,6 @@ RDEPEND="
 		vaapi? ( x11-libs/libva )
 		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
 		vorbis? ( media-libs/libvorbis )
-		win32codecs? ( media-libs/win32codecs )
 		X? ( x11-libs/libX11 )
 		x264? ( >=media-libs/x264-0.0.20090923 )
 		xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 )
@@ -316,7 +315,6 @@ src_configure() {
 		$(use_enable vlm) \
 		$(use_enable vorbis) \
 		$(use_enable waveout) \
-		$(use_enable win32codecs loader) \
 		$(use_enable wingdi) \
 		$(use_enable wma-fixed) \
 		$(use_with X x) \
@@ -326,6 +324,7 @@ src_configure() {
 		$(use_enable xosd) \
 		$(use_enable xv xvideo) \
 		$(use_enable zvbi) $(use_enable !zvbi telx) \
+		--disable-loader \
 		--disable-optimizations \
 		--without-tuning \
 		--enable-fast-install
diff --git a/media-video/vlc/vlc-2.0.6.ebuild b/media-video/vlc/vlc-2.0.6.ebuild
index 3b1ab624fce6..22a85384cde2 100644
--- a/media-video/vlc/vlc-2.0.6.ebuild
+++ b/media-video/vlc/vlc-2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.6.ebuild,v 1.4 2013/05/06 14:22:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.6.ebuild,v 1.5 2013/05/16 19:21:23 ulm Exp $
 
 EAPI="5"
 
@@ -56,7 +56,7 @@ IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
 	portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba
 	schroedinger sdl sdl-image shine shout sid skins speex sqlite sse svg
 	+swscale switcher taglib theora truetype twolame udev upnp vaapi v4l
-	vcdx vlm vorbis waveout win32codecs wingdi wma-fixed +X x264 +xcb xml
+	vcdx vlm vorbis waveout wingdi wma-fixed +X x264 +xcb xml
 	xosd xv zvbi"
 
 RDEPEND="
@@ -141,7 +141,6 @@ RDEPEND="
 		vaapi? ( x11-libs/libva )
 		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
 		vorbis? ( media-libs/libvorbis )
-		win32codecs? ( media-libs/win32codecs )
 		X? ( x11-libs/libX11 )
 		x264? ( >=media-libs/x264-0.0.20090923 )
 		xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 )
@@ -318,7 +317,6 @@ src_configure() {
 		$(use_enable vlm) \
 		$(use_enable vorbis) \
 		$(use_enable waveout) \
-		$(use_enable win32codecs loader) \
 		$(use_enable wingdi) \
 		$(use_enable wma-fixed) \
 		$(use_with X x) \
@@ -328,6 +326,7 @@ src_configure() {
 		$(use_enable xosd) \
 		$(use_enable xv xvideo) \
 		$(use_enable zvbi) $(use_enable !zvbi telx) \
+		--disable-loader \
 		--disable-optimizations \
 		--without-tuning \
 		--enable-fast-install
diff --git a/media-video/vlc/vlc-2.0.9999.ebuild b/media-video/vlc/vlc-2.0.9999.ebuild
index 4a73c0d1eaff..10ad63576c37 100644
--- a/media-video/vlc/vlc-2.0.9999.ebuild
+++ b/media-video/vlc/vlc-2.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.22 2013/05/06 14:22:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.23 2013/05/16 19:21:23 ulm Exp $
 
 EAPI="5"
 
@@ -51,7 +51,7 @@ IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
 	+postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger
 	sdl sdl-image shine shout sid skins speex sqlite sse svg +swscale switcher
 	taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout
-	win32codecs wingdi wma-fixed +X x264 +xcb xml xosd xv zvbi"
+	wingdi wma-fixed +X x264 +xcb xml xosd xv zvbi"
 
 RDEPEND="
 		>=sys-libs/zlib-1.2.5.1-r2[minizip]
@@ -134,7 +134,6 @@ RDEPEND="
 		vaapi? ( x11-libs/libva )
 		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
 		vorbis? ( media-libs/libvorbis )
-		win32codecs? ( media-libs/win32codecs )
 		X? ( x11-libs/libX11 )
 		x264? ( >=media-libs/x264-0.0.20090923 )
 		xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 )
@@ -307,7 +306,6 @@ src_configure() {
 		$(use_enable vlm) \
 		$(use_enable vorbis) \
 		$(use_enable waveout) \
-		$(use_enable win32codecs loader) \
 		$(use_enable wingdi) \
 		$(use_enable wma-fixed) \
 		$(use_with X x) \
@@ -317,6 +315,7 @@ src_configure() {
 		$(use_enable xosd) \
 		$(use_enable xv xvideo) \
 		$(use_enable zvbi) $(use_enable !zvbi telx) \
+		--disable-loader \
 		--disable-optimizations \
 		--without-tuning \
 		--enable-fast-install
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index b0af99c707b8..0da43d45b227 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.187 2013/05/06 14:22:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.188 2013/05/16 19:21:23 ulm Exp $
 
 EAPI="5"
 
@@ -55,7 +55,7 @@ IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
 	+postproc projectm pulseaudio +qt4 rtsp run-as-root samba schroedinger
 	sdl sdl-image shine shout sid skins speex sse svg +swscale
 	taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout
-	win32codecs wma-fixed +X x264 +xcb xml xv zvbi"
+	wma-fixed +X x264 +xcb xml xv zvbi"
 
 RDEPEND="
 		>=sys-libs/zlib-1.2.5.1-r2[minizip]
@@ -135,7 +135,6 @@ RDEPEND="
 		vaapi? ( x11-libs/libva )
 		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
 		vorbis? ( media-libs/libvorbis )
-		win32codecs? ( media-libs/win32codecs )
 		X? ( x11-libs/libX11 )
 		x264? ( >=media-libs/x264-0.0.20090923 )
 		xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 )
@@ -195,8 +194,8 @@ src_configure() {
 	if use truetype || use projectm; then
 		local dejavu="/usr/share/fonts/dejavu/"
 		myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
-			    --with-default-font-family=Sans \
-			    --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+				--with-default-font-family=Sans \
+				--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
 				--with-default-monospace-font-family=Monospace"
 	fi
 
diff --git a/media-video/vmaid/ChangeLog b/media-video/vmaid/ChangeLog
index 2ee0d8575376..b091a7b96f8c 100644
--- a/media-video/vmaid/ChangeLog
+++ b/media-video/vmaid/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/vmaid
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vmaid/ChangeLog,v 1.11 2013/02/03 12:28:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vmaid/ChangeLog,v 1.12 2013/05/16 19:24:51 ulm Exp $
+
+  16 May 2013; Ulrich Müller <ulm@gentoo.org> vmaid-2.2.0.ebuild:
+  Remove win32codecs USE flag, bug 468406.
 
   03 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due #22900
diff --git a/media-video/vmaid/Manifest b/media-video/vmaid/Manifest
index 4bad5360ced7..8610e5e1d525 100644
--- a/media-video/vmaid/Manifest
+++ b/media-video/vmaid/Manifest
@@ -2,13 +2,20 @@
 Hash: SHA256
 
 DIST vmaid-2.2.0.tar.gz 1267631 SHA256 433e9aefe7b9b45308e76ce0f0cb7b63ab35f4c290f38ecdec5ce5889238ec2a
-EBUILD vmaid-2.2.0.ebuild 1095 SHA256 ef9992c46c385ea2feadc6370d71c391f5426d2584c9ea21c5ee4032918d6997 SHA512 0b5b8c43f55603ea3f9038a439f85a3e254fe041bce3892ecc48b66e6ec02eb28ada39477b3b0b41fee823daf19f8be4bc3495c445ee066679e1238e64438c2c WHIRLPOOL 384d256234c8fe2c7ffc2fbcb0f9a4aae25e85a7f80365c033fde287e2d2416048d38048e46162983b562a9db74227a4fe210cad65e024586d6ed1547bd4816e
-MISC ChangeLog 1544 SHA256 19b6477cf2bdaf2189d171ee17a5f0e64b89480a1be515cb10cb2d6a2dd7c13c SHA512 776a2ea34695405a6f77dd9b0f940e3f5cf70173cb026d19799bda30c427236f6df51020a42086e4b303be779fb1182e04102cea33e95cbf080fe84716dca340 WHIRLPOOL ae2dd5789beff0b1b2d873009d9cf67d59bf66089233438d4b7f34ada0e34a7a284f2521e4149b750b189e26a4dfbd6eb16d0b688b973ab226748ba45c34b1f3
+EBUILD vmaid-2.2.0.ebuild 1025 SHA256 5d1b333cc17a3d5d50e9d49d310881330b613e7ed458ae588019517bb82e0865 SHA512 ba7d40c0501fb44bb14333696e99f58bc0dade5406cd7659fe8e47d2ec003bb293452343a658563857768a3ac7fe410c79612a84608781e922861a8b29a2448a WHIRLPOOL 183645b9d6a00efc21bc5794292e3bf23da63d76d10e3a363368e9f6f5ebd165af1d4705e3c8981b959178a3c6832cc8ae198921168d846f7bc4666d3cb1f7f9
+MISC ChangeLog 1653 SHA256 3c8a6a9f5a19f8355a1ddf8e798329d99f70dd1a3a292ffa35130a91d718ed14 SHA512 2de48fb15afc868615d793ce30c6b0f536a6f9db01cb91013634e4c7f727e234ffb0b48fde5b0de97742563c5f6fcb2d8c78b56f4e1b0739ef96eefa70753d0f WHIRLPOOL 2525ecb8220ad2316b5087ec827eeec1843ac161871ba50c29c84a2a66454bde807b5a4ac6654ecbd4575d3fa27c9e79e0852705dc0bcd2935c59e6d8bfdc718
 MISC metadata.xml 513 SHA256 331323dbd2ae448b5b149d4a995859c654b86a58268031e1ae26965c6ef37b9c SHA512 e21654062f148037fb12741640c2162af1a83672caacd6fdfc0ac4df44a1f045b0ab67efdc7fda1bbd6494120c336deac178878b81549dcfe1db773f2ff6a01f WHIRLPOOL db7ef056e185a6382911d10b347054bb17bde9a11398f6eb00ed026aebae2bb57107e6e9f0e454db43dd638d5bc0763b64b4b4da37d3e64fa616f2f8ab4ebf24
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlEOV9QACgkQCaWpQKGI+9TYkACfeadcJ35nbYCve/zHk71+AD7j
-jnwAn1LGyu2o6jfHc/O1zG2QNVPHvBM/
-=FtnR
+iQGcBAEBCAAGBQJRlTRHAAoJEJQzkH1pP7W4ry8L/3cUSITtlqiWue0tArTGAe3V
+r89BE3am1YAyb1IDSZjdwV66uRQA/gVsgFu9kfPBAMR1PP7FteOnl/QuLK/rPRjA
+f4jAswphUHrJXXgq59NI7FNM37n4MWKgZtHV+ZlfXyg162PpLAAuLOb9c5N31ook
+oMc4E1zu+1+6Bs9hzhn/bhH11WBp1hGIQdD6/cPx/Q2qNCqxnMEzm/yN7l633USW
+QU07932bp5EO8/+ekEcR9LlDTsbySx6vRav6JwuWq+VT0j5O5Vw7iEo+rofciNaV
+HQLs16DtnTkGCHk4O+KVChzGtjW/q2AjB4kVrK6eZb8yR8mtVzl1k0Diqvv2I0oM
+ohB9/WXUxVsI9uKpHnbe6M6h14lmI0DR3fvGe4azSUqMnR+47ve8DpDIiVXQmFr9
+QvDNWQ0XM0hADa8MiIbSECzaUdqAFs3VhhQYYufvo+p9Izzs2l2X133HGHyktgP+
+OGUjbMEWVJvEdgZEs3GBBZl7MkwkGsJASsHhoWWN5Q==
+=4eWC
 -----END PGP SIGNATURE-----
diff --git a/media-video/vmaid/vmaid-2.2.0.ebuild b/media-video/vmaid/vmaid-2.2.0.ebuild
index 4d82aa74d93e..162153e88f9a 100644
--- a/media-video/vmaid/vmaid-2.2.0.ebuild
+++ b/media-video/vmaid/vmaid-2.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vmaid/vmaid-2.2.0.ebuild,v 1.3 2012/05/05 08:58:59 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vmaid/vmaid-2.2.0.ebuild,v 1.4 2013/05/16 19:24:51 ulm Exp $
 
 EAPI=1
 
@@ -11,13 +11,12 @@ SRC_URI="mirror://sourceforge.jp/vmaid/33098/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa ao mime win32codecs"
+IUSE="alsa ao mime"
 
 RDEPEND="x11-libs/gtk+:2
 	ao? ( media-libs/libao )
 	!ao? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
-	mime? ( x11-misc/shared-mime-info )
-	win32codecs? ( media-libs/win32codecs )"
+	mime? ( x11-misc/shared-mime-info )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -34,7 +33,7 @@ src_compile() {
 
 	econf \
 		$(use_enable mime) \
-		$(use_with win32codecs w32) \
+		--without-w32 \
 		${myconf} || die
 	emake || die
 }