bump to 0.8.6d, applying some security patches

Package-Manager: portage-2.1.4_rc14

4 files changed, 331 insertions, 8 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index b389723e8598..8f5ffe94661b 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.275 2008/01/10 22:21:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.276 2008/01/10 23:26:37 aballier Exp $
+
+*vlc-0.8.6d (10 Jan 2008)
+
+  10 Jan 2008; Alexis Ballier <aballier@gentoo.org> +vlc-0.8.6d.ebuild:
+  bump to 0.8.6d, applying some security patches
 
 *vlc-0.9.0_alpha20080110 (10 Jan 2008)
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 98e9b48be701..45814658ebfb 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -2,16 +2,22 @@
 Hash: SHA1
 
 DIST vlc-0.8.6c.tar.bz2 11147601 RMD160 6245419e39401b1ee138a5be3ea0375cdedcb17e SHA1 aefaf7a039874930b3e7caf139d2ed5b5bbd0a56 SHA256 5fc24d7bbd2c1f715af1860e39207b857662fea5d0f6f212df4794688c7db6ae
+DIST vlc-0.8.6d.tar.bz2 11170003 RMD160 16c1998dbc30ad96bebdd8792d135b5f7899166e SHA1 63afd15cc782795c8d8f3de5edc614389465c577 SHA256 c608ea08d8c6125897164b752f55cba0f35ed57d72f345eb8275b97359e23205
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
 DIST vlc-patches-43.tar.bz2 4183 RMD160 1feaa6f0c8a7fb744d9ba84094ba368df70a2c2b SHA1 d964a7a310ca2f75e40e79c7ce3bc663cc985f44 SHA256 466df1a4832cc38e4680857838412b0ba05b3c3c546a060bf400347cdf46e193
 DIST vlc-patches-44.tar.bz2 9091 RMD160 00aa48418061fc37c20bf8400c4dd60b1bfb4479 SHA1 e3d15e19ec70784bd87c104c032d47c06fee0ddc SHA256 c34b5f161e6447bb91c69407778d71e28a023d4be91de0f9f9eec0d40027d3b4
 DIST vlc-patches-45.tar.bz2 5825 RMD160 5aee3bb6679e8e20b685bfef0d4c86b94f7bee15 SHA1 be5c81838f3d8f71cba9768bbfae46507c02dd0f SHA256 2dccd7baec3f977cc8576610c333b1f5b655cd0f50391c3efc2f9069be70ca39
+DIST vlc-patches-46.tar.bz2 10127 RMD160 954918c1819fda22191432baf5ffd8b6f10dc091 SHA1 4013e8bbd963675427880e8df83b26c57c41cf1a SHA256 ec91abf2354f301029f9f7ac730b760de0c46e4ba5240ac5fc7471c1dcd19030
 DIST vlc-snapshot-20071022.tar.bz2 12796717 RMD160 be8d7301806d4d503a1390ea740e01062612370f SHA1 285f61abc4c6337b7733793b8728234150934b5d SHA256 f54fa54c95f6ee8fde4af075e7bd7111d8e46ad18d9700ba7b8bfdc0d33222ca
 DIST vlc-snapshot-20080110.tar.bz2 13168158 RMD160 d02a5be78953315d2a12236ff50c16d0de557cd0 SHA1 aaff5c58dd20c139eb461c1667518f53669d1c80 SHA256 735180bc21adf1696039c3b8b67d63f14496bd299ab966374eb5e72dc09c193a
 EBUILD vlc-0.8.6c.ebuild 8849 RMD160 42c591e399cdcacfdd3fe0f08b5f1a622515446a SHA1 483c095afd0a03f546fd22a349580c4e774516eb SHA256 ffc03883b2fcd65b149264ae43134d3983919ffa33875853d5b6c2fa5ea5f077
 MD5 e7b7596e161534d833fca1a9d79512ce vlc-0.8.6c.ebuild 8849
 RMD160 42c591e399cdcacfdd3fe0f08b5f1a622515446a vlc-0.8.6c.ebuild 8849
 SHA256 ffc03883b2fcd65b149264ae43134d3983919ffa33875853d5b6c2fa5ea5f077 vlc-0.8.6c.ebuild 8849
+EBUILD vlc-0.8.6d.ebuild 8857 RMD160 9ff88a0ef8bd1b73e082a48451da3153819cfee1 SHA1 01430702d4b3fbc0448b578659dca824ae243392 SHA256 75a904a3a1857ee6f1725ed36f1523a07c30fb2684eceac5365a741302e41636
+MD5 561fa7a647c847a279e9071dcf64ba2d vlc-0.8.6d.ebuild 8857
+RMD160 9ff88a0ef8bd1b73e082a48451da3153819cfee1 vlc-0.8.6d.ebuild 8857
+SHA256 75a904a3a1857ee6f1725ed36f1523a07c30fb2684eceac5365a741302e41636 vlc-0.8.6d.ebuild 8857
 EBUILD vlc-0.9.0_alpha20071022.ebuild 10184 RMD160 ca8f89fc11a3038e7457e641cfd01222d8850484 SHA1 cb207a515f6b550eccc9c71077b770de1b51c4c2 SHA256 07a1e504e44c4d0bd2d6e0c53ad3c467615a3128da4f83919295b670c49776f1
 MD5 88f9c07bb41846264f6fa8086aa6ee3c vlc-0.9.0_alpha20071022.ebuild 10184
 RMD160 ca8f89fc11a3038e7457e641cfd01222d8850484 vlc-0.9.0_alpha20071022.ebuild 10184
@@ -20,10 +26,10 @@ EBUILD vlc-0.9.0_alpha20080110.ebuild 10160 RMD160 7bf7b7d0b5adb3755bd714e164850
 MD5 629a0556506274092387f2aa617fc060 vlc-0.9.0_alpha20080110.ebuild 10160
 RMD160 7bf7b7d0b5adb3755bd714e164850e145712575b vlc-0.9.0_alpha20080110.ebuild 10160
 SHA256 10bacf4180b414d189589977a21eddd3830a547d01443b5ae16300c9a7530692 vlc-0.9.0_alpha20080110.ebuild 10160
-MISC ChangeLog 48267 RMD160 18effd32d0a4c51e48ae798b60b78730ffae6a2d SHA1 33af7faead9149ffee8c3197f819cfa3b60030cc SHA256 f583f4a7745f9535b132719627c6c3dd9384d0c37c379ad600216b9089d30f15
-MD5 bd650dddf1c70dc6f994860ecc97eb9f ChangeLog 48267
-RMD160 18effd32d0a4c51e48ae798b60b78730ffae6a2d ChangeLog 48267
-SHA256 f583f4a7745f9535b132719627c6c3dd9384d0c37c379ad600216b9089d30f15 ChangeLog 48267
+MISC ChangeLog 48416 RMD160 0387bcebad0d038e1c812b22d04b2c83f1405345 SHA1 4481cdc23bd6d4b6647a1a75aac93a218f7d1e50 SHA256 9c97166a6423df4df69447e37764ea44eb27d5ecdd399ff14d372812f081f5cb
+MD5 5b118b023876bffc7db38bf7c5e9a3e8 ChangeLog 48416
+RMD160 0387bcebad0d038e1c812b22d04b2c83f1405345 ChangeLog 48416
+SHA256 9c97166a6423df4df69447e37764ea44eb27d5ecdd399ff14d372812f081f5cb ChangeLog 48416
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -31,6 +37,9 @@ SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 metadata
 MD5 2497ac547591db5cec364bf025715234 files/digest-vlc-0.8.6c 482
 RMD160 f4ad30c9646891c7d6412ce02b0970b1284ce77a files/digest-vlc-0.8.6c 482
 SHA256 c7c3d04432a54fba82cd15ba0801e4c60b250cb599f9d0b5fd46b230eae2f65e files/digest-vlc-0.8.6c 482
+MD5 ce5c49344d894b75857eeccc778b2605 files/digest-vlc-0.8.6d 485
+RMD160 6aafcd8a243585c0f85d47a628e2cf416325a388 files/digest-vlc-0.8.6d 485
+SHA256 8b245936c8e34f554c5512c5235400e60170befa591d53d5fd24cf3b8ad9bf80 files/digest-vlc-0.8.6d 485
 MD5 a226fe989a1acdfb52645eddade06b0c files/digest-vlc-0.9.0_alpha20071022 515
 RMD160 c8103362e52b3db447537eee10ba70be5387af4d files/digest-vlc-0.9.0_alpha20071022 515
 SHA256 0122640d03d1f6c2784a6768b2b461263463f81e81a7b1a55d8d037aa80ebbb8 files/digest-vlc-0.9.0_alpha20071022 515
@@ -40,7 +49,7 @@ SHA256 676de7f65272e63f7ca3a12bee063f1ca713a639abf0f4ab891c70ec83415294 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkeGmqgACgkQvFcC4BYPU0oaowCfbL12VKM/8OQ/OeDRCW1TwEIF
-sW4AoKGL1+BW5FypL8Wd+qw0Ez/0+c79
-=qg0n
+iEYEARECAAYFAkeGqe4ACgkQvFcC4BYPU0oilQCgupeklHmQzTKEf1ltdnAnxO3k
+FUcAn0npXALxjRMZPGJt+Mm6s/9oR/8w
+=ruuw
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/digest-vlc-0.8.6d b/media-video/vlc/files/digest-vlc-0.8.6d
new file mode 100644
index 000000000000..30c5d49ff2ed
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.8.6d
@@ -0,0 +1,6 @@
+MD5 c11e4c38c3347e74ad9004e41208782e vlc-0.8.6d.tar.bz2 11170003
+RMD160 16c1998dbc30ad96bebdd8792d135b5f7899166e vlc-0.8.6d.tar.bz2 11170003
+SHA256 c608ea08d8c6125897164b752f55cba0f35ed57d72f345eb8275b97359e23205 vlc-0.8.6d.tar.bz2 11170003
+MD5 f259309ac7cc87b2cfff89a395256c77 vlc-patches-46.tar.bz2 10127
+RMD160 954918c1819fda22191432baf5ffd8b6f10dc091 vlc-patches-46.tar.bz2 10127
+SHA256 ec91abf2354f301029f9f7ac730b760de0c46e4ba5240ac5fc7471c1dcd19030 vlc-patches-46.tar.bz2 10127
diff --git a/media-video/vlc/vlc-0.8.6d.ebuild b/media-video/vlc/vlc-0.8.6d.ebuild
new file mode 100644
index 000000000000..a73512fe4ac9
--- /dev/null
+++ b/media-video/vlc/vlc-0.8.6d.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6d.ebuild,v 1.1 2008/01/10 23:26:37 aballier Exp $
+
+WANT_AUTOMAKE=latest
+WANT_AUTOCONF=latest
+
+inherit eutils wxwidgets multilib autotools toolchain-funcs gnome2 nsplugins
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+
+PATCHLEVEL="46"
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
+
+if [[ "${P}" == *_p* ]]; then # Snapshots
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	MY_P="${P}"
+elif [[ "${MY_P}" == "${P}" ]]; then
+	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
+else
+	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2"
+fi
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="a52 3dfx debug altivec httpd vlm gnutls live v4l cdda ogg matroska
+dvb dvd vcd dts flac mpeg vorbis theora X opengl truetype svg fbcon svga
+oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc stream
+mp3 xv bidi sdl sdl-image png xml samba daap corba modplug speex shout rtsp
+win32codecs skins hal avahi xinerama cddb directfb upnp nsplugin seamonkey
+optimisememory libnotify jack musepack x264 dc1394 gnome"
+
+RDEPEND="
+		>=media-video/ffmpeg-0.4.9_p20050226-r1
+		cdda? ( >=dev-libs/libcdio-0.71
+			cddb? ( >=media-libs/libcddb-1.2.0 ) )
+		live? ( >=media-plugins/live-2005.01.29 )
+		dvd? (	media-libs/libdvdread
+				media-libs/libdvdcss
+				>=media-libs/libdvdnav-0.1.9
+				media-libs/libdvdplay )
+		esd? ( media-sound/esound )
+		gnome? ( gnome-base/gnome-vfs )
+		ogg? ( media-libs/libogg )
+		matroska? (
+			>=dev-libs/libebml-0.7.6
+			>=media-libs/libmatroska-0.8.0 )
+		mp3? ( media-libs/libmad )
+		a52? ( >=media-libs/a52dec-0.7.4-r3 )
+		dts? ( || ( media-libs/libdca >=media-libs/libdts-0.0.2-r3 ) )
+		flac? ( media-libs/libogg
+			>=media-libs/flac-1.1.2 )
+		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
+		vorbis? ( media-libs/libvorbis )
+		theora? ( media-libs/libtheora )
+		truetype? ( media-libs/freetype
+			media-fonts/ttf-bitstream-vera )
+		svga? ( media-libs/svgalib )
+		ggi? ( media-libs/libggi )
+		aalib? ( media-libs/aalib )
+		libcaca? ( media-libs/libcaca )
+		arts? ( kde-base/arts )
+		alsa? ( media-libs/alsa-lib )
+		wxwindows? ( =x11-libs/wxGTK-2.6* )
+		skins? ( =x11-libs/wxGTK-2.6*
+			media-libs/freetype
+			media-fonts/ttf-bitstream-vera )
+		ncurses? ( sys-libs/ncurses )
+		xosd? ( x11-libs/xosd )
+		lirc? ( app-misc/lirc )
+		3dfx? ( media-libs/glide-v3 )
+		bidi? ( >=dev-libs/fribidi-0.10.4 )
+		gnutls? ( >=net-libs/gnutls-1.2.9 )
+		sys-libs/zlib
+		png? ( media-libs/libpng )
+		media-libs/libdvbpsi
+		sdl? ( >=media-libs/libsdl-1.2.8
+			sdl-image? ( media-libs/sdl-image ) )
+		xml? ( dev-libs/libxml2 )
+		samba? ( net-fs/samba )
+		vcd? ( >=dev-libs/libcdio-0.72
+			>=media-video/vcdimager-0.7.21 )
+		daap? ( >=media-libs/libopendaap-0.3.0 )
+		corba? ( >=gnome-base/orbit-2.8.0
+			>=dev-libs/glib-2.3.2 )
+		modplug? ( media-libs/libmodplug )
+		speex? ( media-libs/speex )
+		svg? ( >=gnome-base/librsvg-2.5.0 )
+		shout? ( media-libs/libshout )
+		win32codecs? ( media-libs/win32codecs )
+		hal? ( sys-apps/hal )
+		avahi? ( >=net-dns/avahi-0.6 )
+		X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			xv? ( x11-libs/libXv )
+			xinerama? ( x11-libs/libXinerama )
+			opengl? ( virtual/opengl )
+		)
+		directfb? ( dev-libs/DirectFB )
+		upnp? ( net-libs/libupnp )
+		nsplugin? (
+			!seamonkey? ( www-client/mozilla-firefox )
+			seamonkey? ( www-client/seamonkey )
+		)
+		libnotify? ( x11-libs/libnotify )
+		musepack? ( media-libs/libmpcdec )
+		x264? ( >=media-libs/x264-svn-20061014 )
+		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
+		dc1394? ( sys-libs/libraw1394
+			<media-libs/libdc1394-1.9.99 )"
+
+DEPEND="${RDEPEND}
+	v4l? ( sys-kernel/linux-headers )
+	dvb? ( sys-kernel/linux-headers )
+	X? ( xinerama? ( x11-proto/xineramaproto ) )
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use wxwindows || use skins; then
+		WX_GTK_VER="2.6"
+		need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
+	fi
+
+	if use skins && ! use truetype; then
+		ewarn "Trying to build with skins support but without truetype."
+		ewarn "Enabling truetype."
+	fi
+	if use skins && ! use wxwindows; then
+		ewarn "Trying to build with skins support but without wxwindows."
+		ewarn "Enabling wxwindows."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	has_version '>=dev-libs/libcdio-0.78' || \
+		export EPATCH_EXCLUDE="230_all_libcdio-0.78.2.patch"
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile () {
+	local XPIDL=""
+	local MOZILLA_CONFIG=""
+
+	use vlm && \
+		myconf="${myconf} --enable-vlm --enable-sout" || \
+		myconf="${myconf} --disable-vlm"
+
+	if use nsplugin; then
+		if use seamonkey; then
+			XPIDL=/usr/lib/seamonkey
+			MOZILLA_CONFIG=/usr/lib/seamonkey/seamonkey-config
+		else
+			XPIDL=/usr/lib/mozilla-firefox
+			MOZILLA_CONFIG=/usr/lib/mozilla-firefox/firefox-config
+		fi
+	fi
+
+	if use live && ! has_version '>=media-plugins/live-2006.12.08'; then
+		myconf="${myconf} --enable-live555 --with-live555-tree=/usr/$(get_libdir)/live"
+	else
+		myconf="${myconf} $(use_enable live live555)"
+	fi
+
+	if use truetype || use skins; then
+		myconf="${myconf} --enable-freetype"
+	else
+		myconf="${myconf} --disable-freetype"
+	fi
+
+	if use wxwindows || use skins; then
+		myconf="${myconf} --enable-wxwidgets"
+	else
+		myconf="${myconf} --disable-wxwidgets"
+	fi
+
+	econf \
+		$(use_enable altivec) \
+		$(use_enable stream sout) \
+		$(use_enable httpd) \
+		$(use_enable gnutls) \
+		$(use_enable v4l) \
+		$(use_enable cdda) $(use_enable cdda cddax)\
+		$(use_enable cddb libcddb) \
+		$(use_enable vcd) $(use_enable vcd vcdx) \
+		$(use_enable dvb) $(use_enable dvb pvr) \
+		$(use_enable ogg) \
+		$(use_enable matroska mkv) \
+		$(use_enable flac) \
+		$(use_enable vorbis) \
+		$(use_enable theora) \
+		$(use_enable X x11) \
+		$(use_enable xv xvideo) \
+		$(use_enable xinerama) \
+		$(use_enable opengl glx) $(use_enable opengl) \
+		$(use_enable bidi fribidi) \
+		$(use_enable dvd dvdread) $(use_enable dvd dvdplay) $(use_enable dvd dvdnav) \
+		$(use_enable fbcon fb) \
+		$(use_enable svga svgalib) \
+		$(use_enable 3dfx glide) \
+		$(use_enable aalib aa) \
+		$(use_enable libcaca caca) \
+		$(use_enable oss) \
+		$(use_enable esd) \
+		$(use_enable arts) \
+		$(use_enable alsa) \
+		$(use_enable ncurses) \
+		$(use_enable gnome gnomevfs) \
+		$(use_enable xosd) \
+		$(use_enable lirc) \
+		$(use_enable mp3 mad) \
+		$(use_enable a52) \
+		$(use_enable dts) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable ggi) \
+		$(use_enable 3dfx glide) \
+		$(use_enable sdl) \
+		$(use_enable sdl-image) \
+		$(use_enable png) \
+		$(use_enable xml libxml2) \
+		$(use_enable samba smb) \
+		$(use_enable daap) \
+		$(use_enable corba) \
+		$(use_enable modplug mod) \
+		$(use_enable speex) \
+		$(use_enable shout) \
+		$(use_enable rtsp) $(use_enable rtsp realrtsp) \
+		$(use_enable win32codecs loader) \
+		$(use_enable skins skins2) \
+		$(use_enable hal) \
+		$(use_enable avahi bonjour) \
+		$(use_enable upnp) \
+		$(use_enable optimisememory optimize-memory) \
+		$(use_enable libnotify notify) \
+		$(use_enable jack) \
+		$(use_enable musepack mpc) \
+		$(use_enable x264) \
+		$(use_enable dc1394) \
+		$(use_enable directfb) \
+		--enable-ffmpeg \
+		--disable-faad \
+		--disable-dv \
+		--disable-libvc1 \
+		--disable-snapshot \
+		--disable-growl \
+		--disable-pth \
+		--disable-portaudio \
+		--disable-libtar \
+		--disable-optimizations \
+		--enable-utf8 \
+		--enable-libtool \
+		$(use_enable nsplugin mozilla) \
+		XPIDL="${XPIDL}" MOZILLA_CONFIG="${MOZILLA_CONFIG}" \
+		WX_CONFIG="${WX_CONFIG}" \
+		${myconf} || die "configuration failed"
+
+	if [[ $(gcc-major-version) == 2 ]]; then
+		sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
+	fi
+
+	emake || die "make of VLC failed"
+}
+
+src_install() {
+	# First install the library, to avoid screwups during relinking.select
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS MAINTAINERS HACKING THANKS NEWS README \
+		doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
+
+	if use nsplugin; then
+		dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
+		mv "${D}"/usr/$(get_libdir)/mozilla/{components,plugins}/* \
+			"${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
+	fi
+
+	rm -rf "${D}/usr/share/doc/vlc" \
+		"${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
+
+	use skins || rm -rf "${D}/usr/share/vlc/skins2"
+
+	for res in 16 32 48; do
+		insinto /usr/share/icons/hicolor/${res}x${res}/apps/
+		newins "${S}"/share/vlc${res}x${res}.png vlc.png
+	done
+
+	use wxwindows || use skins || rm "${D}/usr/share/applications/vlc.desktop"
+}