Bump to final 0.9.0, adding dirac support (via dirac and/or schroedinger) and libass support for subtitles.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.3 x86_64

4 files changed, 384 insertions, 3 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index e6b6cb345b79..ee79b4148f1a 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.375 2008/08/24 19:33:11 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.376 2008/08/24 22:31:31 aballier Exp $
+
+*vlc-0.9.0 (24 Aug 2008)
+
+  24 Aug 2008; Alexis Ballier <aballier@gentoo.org> metadata.xml,
+  +vlc-0.9.0.ebuild:
+  Bump to final 0.9.0, adding dirac support (via dirac and/or schroedinger)
+  and libass support for subtitles.
 
   24 Aug 2008; Tobias Klausmann <klausman@gentoo.org> vlc-0.8.6i-r2.ebuild:
   Stable on alpha, bug #235589
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index e0ee327e59da..b0c8468cf3f8 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST vlc-0.8.6i.tar.bz2 11786172 RMD160 a5da4e1e0980594c678c04016491c8a373df4017 SHA1 4c6f45dffe3a8309ce201897040dc1f82b9cde99 SHA256 a866768f7dd8254c62e059327094073800ed968214b5b35e2682eb81f448214f
 DIST vlc-0.9.0-test3.tar.bz2 15400271 RMD160 edc5fd17611da7e27f83cfadf4f27d8e4e1ad6c8 SHA1 a41d11aaa35fd18e27167f750d841dd7d9ef83a2 SHA256 25afd66a2dd3e573258f455a514eec2eafa80582861e0b0aa8f2818b11c55bb8
+DIST vlc-0.9.0.tar.bz2 16159217 RMD160 79e3b0df32d970a84eca74478d043ea54acead3c SHA1 24ef6b6abcc7da5a57b20b9fe04715949b4321ee SHA256 063b35d1654fccf9f54b8f15613c857a8f132d54834b6856ddde006ce041bb63
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
 DIST vlc-patches-57.tar.bz2 7243 RMD160 6138ef3140077a9ad50b7f2d772e6898fc6af3be SHA1 e35cefabb1deed98491a1814131154f3012918b9 SHA256 ddfc2e892e5718b50501de5f05aa366d2983b5b6fa6d50f16f2308b9501ab3f4
 DIST vlc-patches-59.tar.bz2 4685 RMD160 a01cba6d4af12ebd26faed4a7f8894529dc42e57 SHA1 387934801502ff82045ab446fb1421b14233cf03 SHA256 cf38f9398e62fad8c51dc1b0c8467236cbffb1d465ddbf5ab62d2bf4bbd1ec35
@@ -8,6 +12,14 @@ DIST vlc-patches-61.tar.bz2 11855 RMD160 8f79c5594eca44c0f5bb4ed19e48ae39a8b1701
 EBUILD vlc-0.8.6i-r1.ebuild 9072 RMD160 8eef80964f9e931bd04274895bbb8c3655ce675e SHA1 d93f7570ae077efc0f3fd82498219393b8fa3985 SHA256 d10e69488dd50f1ead3970bb541e9146498320d0fff6e1ebdca6d05a8e188439
 EBUILD vlc-0.8.6i-r2.ebuild 9075 RMD160 fd15c044ffb993e04638a1945eadc4fae2090847 SHA1 a1c9892c7c37c80773d2578bf81751e2a40dbc0c SHA256 795e320c0f2581bb31fa4070b8dd8d331a8c61a2276d1ecbe85e0363ab705d0e
 EBUILD vlc-0.8.6i.ebuild 9064 RMD160 42b09347845235ffcf30863f95ed8d2df45de5a9 SHA1 212cc91ef69366c56a678a26fb77c417e3d28b76 SHA256 dbd19b1047c4a7b1341135c56fac62e9ec11392cac5872b46c486674f7f15534
+EBUILD vlc-0.9.0.ebuild 10949 RMD160 3e08b006c7f6a42687327af8c99d1ca99bebb20f SHA1 d9598b2d68a698570cfc6b612d1cd96ba03eb093 SHA256 e521d1b084e5e63ab92c522c98c4745378855853d48c337bab1f61c19c241a2f
 EBUILD vlc-0.9.0_beta3.ebuild 10840 RMD160 cc6b3317023175bbe0a04ed3c631d758c2cf5df5 SHA1 b8af07c935f38ac457f067a45264632c680dc43a SHA256 dd0b00a8641d324077fb5ebf4b31cc4d8e5a830630c516bc4987c3b7a75f7660
-MISC ChangeLog 61816 RMD160 1d59ac2e528acd59ceb3fd24fee00c5a311054fc SHA1 565683d5f39e3b6951acbeb3efdae198403940c7 SHA256 20416d6049a588d5df0e00837979c267a0abc779ea323193622a8c2d126bda5a
-MISC metadata.xml 2060 RMD160 921ed9ad6183e326c58650570bfc1bd98cb0ed4a SHA1 fbd9db8afb1eaec0534de6664af8ecf2b8c39737 SHA256 4226f6b9ea96c77e20232a05a99b0824020672abc729e7c057c83ea5302f23a2
+MISC ChangeLog 62042 RMD160 9aec05c2d3190728613cf9dc76fc3b00e037a224 SHA1 c5b9ca7ed929e8100c548055d48f12657cf359c8 SHA256 d852f37f8fa98a3df18a22b6f849dc9669cbf8a6f8dd8d5436408dfbef6d30fa
+MISC metadata.xml 2457 RMD160 598d58744603c6649e85bda64a46eeed38113cbc SHA1 26cd8866b12e65efbc879d56178e9d450a49c6df SHA256 ed07753c4e5e5d53007a30af2e0ec22c59c09f30a5444e3444c69d23419a231c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkix4UoACgkQvFcC4BYPU0pZXwCeJOH2oD/hVk8ck9QdMt48wM52
+QewAoKBjoNs52tFwahfMR8rg9E1Ixh3E
+=uWdk
+-----END PGP SIGNATURE-----
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index a38b536d61d1..e65e8a181433 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -12,15 +12,18 @@
     <flag name="corba">Enables corba interface support.</flag>
     <flag name="daap">Enables DAAP shares services discovery support.</flag>
     <flag name="dc1394">Enables IIDC cameras support.</flag>
+	<flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag>
     <flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis (with external sound fonts).</flag>
     <flag name="httpd">Enables a web based interface for vlc.</flag>
     <flag name="id3tag">Enables id3tag metadata reader plugin.</flag>
+	<flag name="libass">Enables subtitles support using libass.</flag>
     <flag name="libgcrypt">Enables cryptography support via libgcrypt.</flag>
     <flag name="live">Enables LIVE.com support.</flag>
     <flag name="optimisememory">Enable optimisation for memory rather than performance.</flag>
     <flag name="pvr">Enables PVR cards access module.</flag>
     <flag name="remoteosd">Enables RemoteOSD plugin (VNC client as video filter).</flag>
     <flag name="rtsp">Enables real audio and RTSP modules.</flag>
+    <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
     <flag name="sdl-image">Enables sdl image video decoder (depends on sdl)</flag>
     <flag name="shout">Enables libshout output.</flag>
     <flag name="skins">Enables support for the skins2 interface.</flag>
diff --git a/media-video/vlc/vlc-0.9.0.ebuild b/media-video/vlc/vlc-0.9.0.ebuild
new file mode 100644
index 000000000000..cde04d66f4dd
--- /dev/null
+++ b/media-video/vlc/vlc-0.9.0.ebuild
@@ -0,0 +1,359 @@
+# 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.9.0.ebuild,v 1.1 2008/08/24 22:31:31 aballier Exp $
+
+EAPI="1"
+
+WANT_AUTOMAKE=latest
+WANT_AUTOCONF=latest
+
+inherit eutils multilib autotools toolchain-funcs gnome2 nsplugins qt4 flag-o-matic
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+VLC_SNAPSHOT_TIME="0013"
+
+PATCHLEVEL="59"
+M4_TARBALL_VERSION="1"
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
+if [[ "${P}" == *_alpha* ]]; then # Snapshots taken from nightlies.videolan.org
+	SRC_URI="http://nightlies.videolan.org/build/source/trunk-${PV/*_alpha/}-${VLC_SNAPSHOT_TIME}/${PN}-snapshot-${PV/*_alpha/}.tar.bz2"
+	MY_P="${P/_alpha*/}-git"
+elif [[ "${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
+	mirror://gentoo/${PN}-m4-${M4_TARBALL_VERSION}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="a52 aac aalib alsa altivec arts atmo avahi bidi cdda cddb cdio dbus dc1394
+	debug dirac directfb dts dvb dvd esd fbcon fluidsynth +ffmpeg flac ggi gnome gnutls hal httpd
+	id3tag jack libass libcaca +libgcrypt libnotify lirc live lua matroska mmx modplug mp3 mpeg
+	musepack musicbrainz ncurses nsplugin ogg opengl optimisememory oss png	pulseaudio pvr +qt4
+	remoteosd rtsp samba schroedinger sdl sdl-image seamonkey shout skins speex sse stream svg svga taglib
+	theora truetype twolame upnp v4l v4l2 vcd vcdx vlm vorbis win32codecs
+	X x264 xinerama xml xosd xulrunner xv"
+
+RDEPEND="
+		sys-libs/zlib
+		media-libs/libdvbpsi
+		a52? ( >=media-libs/a52dec-0.7.4-r3 )
+		aalib? ( media-libs/aalib )
+		aac? ( >=media-libs/faad2-2.6.1 )
+		alsa? ( media-libs/alsa-lib )
+		arts? ( kde-base/arts )
+		avahi? ( >=net-dns/avahi-0.6 )
+		bidi? ( >=dev-libs/fribidi-0.10.4 )
+		cdda? ( >=dev-libs/libcdio-0.72
+			cddb? ( >=media-libs/libcddb-1.2.0 ) )
+		cdio? ( >=dev-libs/libcdio-0.78.2
+			>=media-video/vcdimager-0.7.22 )
+		dbus? ( >=sys-apps/dbus-1.0.2 )
+		dc1394? ( sys-libs/libraw1394
+			<media-libs/libdc1394-1.9.99 )
+		dirac? ( >=media-video/dirac-0.10.0 )
+		directfb? ( dev-libs/DirectFB )
+		dts? ( media-libs/libdca )
+		dvd? (	media-libs/libdvdread
+				media-libs/libdvdcss
+				>=media-libs/libdvdnav-0.1.9
+				media-libs/libdvdplay )
+		esd? ( media-sound/esound )
+		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616-r3 )
+		flac? ( media-libs/libogg
+			>=media-libs/flac-1.1.2 )
+		fluidsynth? ( media-sound/fluidsynth )
+		ggi? ( media-libs/libggi )
+		gnome? ( gnome-base/gnome-vfs )
+		gnutls? ( >=net-libs/gnutls-1.3.3 )
+		hal? ( sys-apps/hal )
+		id3tag? ( media-libs/libid3tag
+			sys-libs/zlib )
+		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
+		libass? ( >=media-libs/libass-0.9.5 media-libs/fontconfig )
+		libcaca? ( media-libs/libcaca )
+		libgcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
+		libnotify? ( x11-libs/libnotify )
+		lirc? ( app-misc/lirc )
+		live? ( >=media-plugins/live-2008.07.06 )
+		lua? ( >=dev-lang/lua-5.1 )
+		matroska? (
+			>=dev-libs/libebml-0.7.6
+			>=media-libs/libmatroska-0.8.0 )
+		modplug? ( media-libs/libmodplug )
+		mp3? ( media-libs/libmad )
+		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
+		musepack? ( media-libs/libmpcdec )
+		musicbrainz? ( =media-libs/musicbrainz-2* )
+		ncurses? ( sys-libs/ncurses )
+		nsplugin? (
+			xulrunner? ( >=net-libs/xulrunner-1.8 )
+			!xulrunner? ( seamonkey? ( =www-client/seamonkey-1* ) )
+			!xulrunner? ( !seamonkey? ( =www-client/mozilla-firefox-2* ) )
+		)
+		ogg? ( media-libs/libogg )
+		png? ( media-libs/libpng )
+		pulseaudio? ( >=media-sound/pulseaudio-0.9.8 )
+		qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
+		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
+		samba? ( net-fs/samba )
+		schroedinger? ( >=media-libs/schroedinger-1.0 )
+		sdl? ( >=media-libs/libsdl-1.2.8
+			sdl-image? ( media-libs/sdl-image ) )
+		shout? ( media-libs/libshout )
+		skins? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
+		speex? ( media-libs/speex )
+		svg? ( >=gnome-base/librsvg-2.9.0 )
+		svga? ( media-libs/svgalib )
+		taglib? ( media-libs/taglib )
+		theora? ( media-libs/libtheora )
+		truetype? ( media-libs/freetype
+			media-fonts/ttf-bitstream-vera )
+		twolame? ( media-sound/twolame )
+		upnp? ( net-libs/libupnp )
+		vorbis? ( media-libs/libvorbis )
+		win32codecs? ( media-libs/win32codecs )
+		X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			xv? ( x11-libs/libXv )
+			xinerama? ( x11-libs/libXinerama )
+			opengl? ( virtual/opengl )
+		)
+		x264? ( media-libs/x264 )
+		xml? ( dev-libs/libxml2 )
+		xosd? ( x11-libs/xosd )
+		"
+
+# Disabled features and reasons:
+# xvmc? ( x11-libs/libXvMC )
+#	Will probably compile only on x86
+# zvbi? ( >=media-libs/zvbi-0.2.25 )
+#	Dep not up to date enough
+# kate? ( >=media-libs/libkate-0.1.1 )
+#   No package yet
+
+DEPEND="${RDEPEND}
+	dvb? ( sys-kernel/linux-headers )
+	v4l? ( sys-kernel/linux-headers )
+	v4l2? ( sys-kernel/linux-headers )
+	X? ( xinerama? ( x11-proto/xineramaproto ) )
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+# Dispalys a warning if the first use flag is set but not the second
+vlc_use_needs() {
+	use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled."
+}
+
+# Notify the user that some useflag have been forced on
+vlc_use_force() {
+	use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
+}
+
+# Use when $2 depends strictly on $3
+# if use $1 then enable $2 and $3, otherwise disable $2
+vlc_use_enable_force() {
+	if use $1 ; then
+		echo "--enable-$2 --enable-$3"
+	else
+		echo "--disable-$2"
+	fi
+}
+
+# Prints the configure argument for the ffmpeg scaling api to use
+vlc_ffmpeg_scaling_api() {
+	if use ffmpeg ; then
+		if has_version ">=media-video/ffmpeg-0.4.9_p20070616-r20" ; then
+			echo "--enable-swscale --disable-imgresample"
+		else
+			echo "--disable-swscale --enable-imgresample"
+		fi
+	else
+		echo "--disable-swscale --disable-imgresample"
+	fi
+}
+
+pkg_setup() {
+	vlc_use_needs skins truetype
+	vlc_use_force skins qt4
+	vlc_use_needs cdda cdio
+	vlc_use_needs vcdx cdio
+	vlc_use_needs bidi truetype
+	vlc_use_force remoteosd libgcrypt
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf
+}
+
+src_compile () {
+
+	# It would fail if -fforce-addr is used due to too few registers...
+	use x86 && filter-flags -fforce-addr
+
+	local XPIDL=""
+	local MOZILLA_CONFIG=""
+
+	if use nsplugin; then
+		if use xulrunner; then
+			XPIDL=/usr/$(get_libdir)/xulrunner
+			MOZILLA_CONFIG=/usr/bin/xulrunner-config
+		elif use seamonkey; then
+			XPIDL=/usr/$(get_libdir)/seamonkey
+			MOZILLA_CONFIG=/usr/$(get_libdir)/seamonkey/seamonkey-config
+		else
+			XPIDL=/usr/$(get_libdir)/mozilla-firefox
+			MOZILLA_CONFIG=/usr/$(get_libdir)/mozilla-firefox/firefox-config
+		fi
+	fi
+
+	econf \
+		$(use_enable a52) \
+		$(use_enable aalib aa) \
+		$(use_enable aac faad) \
+		$(use_enable alsa) \
+		$(use_enable altivec) \
+		$(use_enable arts) \
+		--disable-asademux \
+		$(use_enable atmo) \
+		$(use_enable avahi bonjour) \
+		$(use_enable bidi fribidi) \
+		$(use_enable cdda) $(use_enable cdda cddax)\
+		$(use_enable cddb libcddb) \
+		$(use_enable cdio libcdio) \
+		--disable-csri \
+		$(use_enable dbus) $(use_enable dbus dbus-control) \
+		$(use_enable dirac) \
+		$(use_enable directfb) \
+		$(use_enable dc1394) \
+		$(use_enable debug) \
+		$(use_enable dts dca) \
+		--disable-dv \
+		$(use_enable dvb) \
+		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
+		$(use_enable esd) \
+		$(use_enable fbcon fb) \
+		$(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(vlc_ffmpeg_scaling_api) $(use_enable ffmpeg postproc) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth) \
+		$(use_enable ggi) \
+		$(use_enable gnome gnomevfs) \
+		$(use_enable gnutls) \
+		$(use_enable hal) \
+		$(use_enable httpd) \
+		$(use_enable id3tag) \
+		$(use_enable jack) \
+		--disable-kate \
+		$(use_enable libass) \
+		$(use_enable libcaca caca) \
+		$(use_enable libgcrypt) \
+		$(use_enable libnotify notify) \
+		--disable-libproxy \
+		--disable-libtar \
+		$(use_enable lirc) \
+		$(use_enable live live555) \
+		$(use_enable lua) \
+		$(use_enable matroska mkv) \
+		$(use_enable mmx) \
+		$(use_enable modplug mod) \
+		$(use_enable mp3 mad) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable musepack mpc) \
+		$(use_enable musicbrainz) \
+		$(use_enable ncurses) \
+		$(use_enable nsplugin mozilla) XPIDL="${XPIDL}" MOZILLA_CONFIG="${MOZILLA_CONFIG}" \
+		$(use_enable ogg) \
+		$(use_enable opengl glx) $(use_enable opengl) $(use_enable opengl galaktos) \
+		$(use_enable optimisememory optimize-memory) \
+		$(use_enable oss) \
+		$(use_enable png) \
+		--disable-portaudio \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable pvr) \
+		$(use_enable qt4) \
+		$(use_enable rtsp realrtsp) \
+		$(use_enable samba smb) \
+		$(use_enable schroedinger) \
+		$(use_enable sdl) \
+		$(use_enable sdl-image) \
+		$(use_enable shout) \
+		$(use_enable skins skins2) \
+		$(use_enable speex) \
+		$(use_enable sse) \
+		$(use_enable stream sout) \
+		$(use_enable svg) \
+		$(use_enable svga svgalib) \
+		$(use_enable taglib) \
+		$(use_enable theora) \
+		$(use_enable truetype freetype) \
+		$(use_enable twolame) \
+		$(use_enable upnp) \
+		$(use_enable v4l) \
+		$(use_enable v4l2) \
+		$(use_enable vcd) \
+		$(use_enable vcdx) \
+		$(use_enable vorbis) \
+		$(use_enable win32codecs loader) \
+		$(use_enable X x11) $(use_enable X screen) \
+		$(use_enable x264) \
+		$(use_enable xinerama) \
+		$(use_enable xml libxml2) \
+		$(use_enable xosd) \
+		$(use_enable xv xvideo) \
+		--disable-xvmc \
+		--disable-zvbi \
+		--disable-snapshot \
+		--disable-growl \
+		--disable-optimizations \
+		--enable-fast-install \
+		$(vlc_use_enable_force vlm vlm sout) \
+		$(vlc_use_enable_force skins skins2 qt4) \
+		$(vlc_use_enable_force remoteosd remoteosd libgcrypt)
+
+	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() {
+	emake 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
+
+	rm -rf "${D}/usr/share/doc/vlc" \
+		"${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
+
+	if use nsplugin; then
+		dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
+		mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \
+			"${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
+	fi
+
+	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
+}