fbosd and xosd plugins are gone

Package-Manager: portage-2.2.0_alpha105/cvs/Linux x86_64

3 files changed, 12 insertions, 14 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 9bd668ee2a66..674bd0673072 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.795 2012/05/15 13:36:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.796 2012/05/15 13:40:37 aballier Exp $
+
+  15 May 2012; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild:
+  fbosd and xosd plugins are gone
 
   15 May 2012; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild:
   dv has been renamed to dv1394
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 035a9b9160a1..aa56420819dc 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -9,14 +9,14 @@ DIST vlc-patches-107.tar.bz2 4694 RMD160 341138714b59572bb4aaa7af96cfbebcfdd76d2
 EBUILD vlc-1.1.13.ebuild 12191 RMD160 7b43ec8e6f9a15feca5539302bba2b03c759ea92 SHA1 f7783f88a746d7ab87c83345598259c3edf5116e SHA256 5bace9c8b7fbfc18f9668ccafa85aa5282cedbf7fb284571e0182fd6fe7ed80b
 EBUILD vlc-2.0.1.ebuild 11033 RMD160 fe619d5edc0c98c1c7cbf8a1ac19c097891d5c5e SHA1 a40d529f50ba4a15d32c49329ed977d31abf4b22 SHA256 414990865230ca0eefbf7592c4ef4bca3497056a1284897fa73695c766b32af0
 EBUILD vlc-2.0.9999.ebuild 11020 RMD160 9362e97bf1d4e40a2a56a3596e603008b0d73611 SHA1 69fbf3a9c4a4fc8d19bd0dc9b7c884bfc5d57be6 SHA256 809fff2f26f702d5195d28eeb2fe0ff32f3dae47241e5a652aa5322e8c1500fc
-EBUILD vlc-9999.ebuild 10945 RMD160 22172f7e3848c1aaa988bc77b3c3732bc79feea6 SHA1 7c9b580d568ec99b85d5aa2697a934f9976ce13a SHA256 5085267fe4247bb573c87501e1b67bb44fd404966afde1e58747a3c0648bc797
-MISC ChangeLog 4084 RMD160 4f094622a6cc0e905e5c7fb75e300f82c5378acb SHA1 536f34c00f879497b3fa9292e267f134a9b6fb39 SHA256 bf13158b8c38c32327387e83f7839c36998f72a35d36cdbaab71dba64fbf3aa2
+EBUILD vlc-9999.ebuild 10811 RMD160 5bd62e2ac64417ee716f0bb4a6a6d06d808b06a7 SHA1 4b737cf70fe57ffeb54d73e35a0e75b82fc923cb SHA256 c606a961b65bacaa2f3526adbc8f63aa1594d5d49156fa2b434053ff37fb64b4
+MISC ChangeLog 4188 RMD160 4ec0df70ad691172bfb371e2c1907af59ab722bf SHA1 63f7ec72fe7371e22fd0c1a1a486240e43c33335 SHA256 a5c1a2233daa5e67647c862eb949f2bd944e545fe080549312faf37f8a17cdf0
 MISC ChangeLog-2011 113818 RMD160 fbb86916aed66ae0a18a2b1f13d3c1dc9fdcaf7a SHA1 5e3dab004808f103ffae80563d33568e98f0d119 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2
 MISC metadata.xml 6552 RMD160 488f3c652c7618d7b380e00e4653f7dbb8a9889f SHA1 e4b180f82122f69d3e975b0f2957c4c414d9cc6d SHA256 fa3578af6d2d660fe8ffecf5fbc1601379d10f78ee3a2c0dc0632f4d424b9d3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+yW/IACgkQvFcC4BYPU0rbuwCgngvfiyQ0V5wjx/XHgUc0t3+u
-ycsAniyZTeKyua7FPfb14PWwvMSx0HUH
-=PzjU
+iEYEARECAAYFAk+yXNsACgkQvFcC4BYPU0o8rwCfQKlndtB1W3vYsuaYY/GNrVK8
+KeMAoKwr4h7/YQgafrvAyknbmgO8ZkFx
+=MWbm
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 2425e7f50250..bb4b5fece321 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.168 2012/05/15 13:36:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.169 2012/05/15 13:40:37 aballier Exp $
 
 EAPI="4"
 
@@ -46,7 +46,7 @@ fi
 IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
 	+avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d
 	directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode
-	fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
+	fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
 	growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
 	libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx
 	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
@@ -55,7 +55,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"
+	win32codecs wingdi wma-fixed +X x264 +xcb xml xv zvbi"
 
 RDEPEND="
 		>=sys-libs/zlib-1.2.5.1-r2[minizip]
@@ -142,13 +142,11 @@ RDEPEND="
 		x264? ( >=media-libs/x264-0.0.20090923 )
 		xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 )
 		xml? ( dev-libs/libxml2 )
-		xosd? ( x11-libs/xosd )
 		zvbi? ( >=media-libs/zvbi-0.2.25 )
 		"
 
 DEPEND="${RDEPEND}
 	alsa? ( >=media-sound/alsa-headers-1.0.23 )
-	fbosd? ( sys-kernel/linux-headers )
 	kde? ( >=kde-base/kdelibs-4 )
 	xcb? ( x11-proto/xproto )
 	app-arch/xz-utils
@@ -176,7 +174,6 @@ REQUIRED_USE="
 	switcher? ( avcodec )
 	vaapi? ( avcodec X )
 	vlm? ( encode )
-	xosd? ( X )
 	xv? ( xcb )
 "
 
@@ -232,7 +229,6 @@ src_configure() {
 		$(use_enable dxva2) \
 		$(use_enable egl) \
 		$(use_enable encode sout) \
-		$(use_enable fbosd) \
 		$(use_enable flac) \
 		$(use_enable fluidsynth) \
 		$(use_enable fontconfig) \
@@ -320,7 +316,6 @@ src_configure() {
 		$(use_enable x264) \
 		$(use_enable xcb) \
 		$(use_enable xml libxml2) \
-		$(use_enable xosd) \
 		$(use_enable xv xvideo) \
 		$(use_enable zvbi) $(use_enable !zvbi telx) \
 		--disable-optimizations \