bump to 1.0.3 rc

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

3 files changed, 404 insertions, 5 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 33ce6ef6188f..2c09f3b9c217 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.525 2009/10/18 21:28:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.526 2009/10/22 13:12:39 aballier Exp $
+
+*vlc-1.0.3_rc (22 Oct 2009)
+
+  22 Oct 2009; Alexis Ballier <aballier@gentoo.org> +vlc-1.0.3_rc.ebuild:
+  bump to 1.0.3 rc
 
   18 Oct 2009; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild:
   we dont need an m4 tarball anymore for master
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index e8cc94f3f0a4..1330200fe96f 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 DIST vlc-0.9.10.tar.bz2 17526464 RMD160 25a96098e3507d48f7d62d1b2f3a1138c2004832 SHA1 8b562a5327c358a332f97d9012702ca2b445c0ed SHA256 54f6ef6e592e0c0315da82ccbe76304210073d0b778e65e3c47e1e950c12b726
 DIST vlc-1.0.2.tar.bz2 20958212 RMD160 36f93339d1947483bb5ef4877cbb4b3ab200b3cd SHA1 5207d227f09d16a44823ae4a8b2144b3ce18eefb SHA256 38b176fd495f3254db74e03977235a0a2212fc6533d7cd1a4c3dddc495b074f0
+DIST vlc-1.0.3-rc.tar.bz2 21131864 RMD160 1a54c584a117b741aa2a13f39b9ffbee37264eee SHA1 42e02dd7bd53285e24f73b5c6c88b2e7d6760f81 SHA256 2a7a035938a7103d960a680027755535064e609ab68ef6ad89b5c04df9b3965e
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
 DIST vlc-patches-69.tar.bz2 5312 RMD160 627261e8f4764e2f4e93e4c64cf33561a742cbeb SHA1 efc45ed9e91ed9b8702a499d9b456e16957013fc SHA256 f18461b7f8fb78e9faa9200563304dda511a974ba656273a56ac232d94dbb0ab
 DIST vlc-patches-72.tar.bz2 4940 RMD160 7c5afdd17d64171d832e52ad21379252c76f5f2a SHA1 3f21780d14283bebd1dc3db28d42e588e8dccf12 SHA256 6ae99340dd836803e69f395e6307c17ed8d0dfd1602ae400e25e0b484b616ea8
@@ -10,14 +11,15 @@ DIST vlc-patches-77.tar.bz2 8054 RMD160 fbab51b6f9867880b272d27803112dff46d1bbdd
 DIST vlc-patches-79.tar.bz2 6483 RMD160 f4bb903049b35c411ead3d812c865ac97d42c905 SHA1 b650ae71e4a59397be5a74cb7de5101d030ee04a SHA256 c2956b049de208408d64175792c936f8fcd325bd51c21d76158ba38107dda800
 EBUILD vlc-0.9.10.ebuild 11162 RMD160 415a2e8b487cc81c4ddfd64a352c7a677e0d0a1d SHA1 8fd2bb8c150dd9ad42ad535c1c67ba5870a0df3d SHA256 ee052678ca5279912308983ae44564a3aa7e5f1d2bb91216948ed28f64d7d4c5
 EBUILD vlc-1.0.2.ebuild 11979 RMD160 463930faeb9de330a10b56c895b9ddf9a7999337 SHA1 e6a5704ad2363b162b5d89abb23afd2d1f09e0bf SHA256 b20f54e72b36a2656538832f73c2f009529e3c6f74181fdb7e9afc27b349d0fb
+EBUILD vlc-1.0.3_rc.ebuild 12044 RMD160 172b6e73119574f30227784ab9912acb6b172f6e SHA1 183f13f2c3880e6fc5aa9e024850261c155f6dbc SHA256 eb9dae71db5f9a891f47be1b5b9c8cfac846418f3c0eb48584079aff8f2ab8a7
 EBUILD vlc-1.0.9999.ebuild 11993 RMD160 b49cae4fa43cc169c72dcad5ee0266fdf000070b SHA1 dfe1154bd3950735383545b3d0bf5a924b171d20 SHA256 e1ffbab4357b0ef070063b4f3f6d13a484dfd6be77b22bb8b0fdc362928ea1c2
 EBUILD vlc-9999.ebuild 11764 RMD160 9654a0c4093e61429173bbbc77dba7f2e9df9a72 SHA1 1df796ba60ec7fb2f7c590d18976f3652af52ae0 SHA256 971efa510be5dc7dd834e5fe3336fd5000ca4b819bc43b65810bb055cfd055a2
-MISC ChangeLog 82715 RMD160 cac593c7b44fde9d5f8610bf8493bf221c4c1375 SHA1 a400d254cd81208cb9f8bc592167c6ba11f0206c SHA256 dbc145e959164ce28368d09699cd198e4d3ab2a416aa126cb8f6d7535789033c
+MISC ChangeLog 82838 RMD160 53d38681092fdae3415064bd107fdb7a5c9b4940 SHA1 f4d4b5f39959007ae239aa0db0328c4d75ba23ce SHA256 6ba3fe97303d776ddca4968bab9e70aff2e75465df28cd8bd90ebb8024eed981
 MISC metadata.xml 4085 RMD160 8f33e09ab79ae2dff3d4785038b45e18401f8dc4 SHA1 12b619fa51ec43cbf0245c2982ffa92b85e2e2e0 SHA256 aaaa04aa8d6759b7c090249086b597ef8a95a033d97998ede837d7aef0cc0c14
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkrbiG8ACgkQvFcC4BYPU0p0tgCfcW7gVDXKWStqIYkBrfN4oCdL
-EL4AoJH/dcK9JBLpI4kPvu0BoBKp2lnW
-=sM3u
+iEYEARECAAYFAkrgWk0ACgkQvFcC4BYPU0rXGQCeOpMyBhPoMYk4Yh+9bBeFsxvJ
+W3YAnimpufNeGUNSRUefbX8YB7lxTrRa
+=ygND
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.0.3_rc.ebuild b/media-video/vlc/vlc-1.0.3_rc.ebuild
new file mode 100644
index 000000000000..1a88a1fa5e19
--- /dev/null
+++ b/media-video/vlc/vlc-1.0.3_rc.ebuild
@@ -0,0 +1,392 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.3_rc.ebuild,v 1.1 2009/10/22 13:12:39 aballier Exp $
+
+EAPI="2"
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then
+	SCM=git
+	EGIT_REPO_URI="git://git.videolan.org/vlc.git"
+	EGIT_BOOTSTRAP="bootstrap"
+	if [ "${PV%.9999}" != "${PV}" ] ; then
+		EGIT_BRANCH=${PV%.9999}-bugfix
+	else
+		EGIT_BRANCH=master
+	fi
+fi
+
+inherit eutils multilib autotools toolchain-funcs gnome2 nsplugins qt4 flag-o-matic ${SCM}
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+VLC_SNAPSHOT_TIME="0013"
+
+PATCHLEVEL="79"
+M4_TARBALL_VERSION="1"
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+elif [[ "${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 [[ "${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="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddax cddb cdio dbus dc1394
+	debug dirac directfb dts dvb dvd elibc_glibc fbcon fluidsynth +ffmpeg flac fontconfig
+	+gcrypt ggi gnome gnutls hal httpd id3tag ieee1394 jack kate libass libcaca
+	libnotify libproxy libsysfs libtiger libv4l2 lirc live lua matroska mmx
+	modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
+	pda png pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba schroedinger
+	sdl sdl-image seamonkey shine shout skins speex sse stream svg svga taglib
+	theora truetype twolame udev upnp v4l v4l2 vcdinfo vcdx vlm vorbis win32codecs
+	wma-fixed X x264 xcb xinerama xml xosd xv zvbi"
+
+RDEPEND="
+		!!<=media-video/vlc-0.9.99999
+		sys-libs/zlib
+		>=media-libs/libdvbpsi-0.1.6
+		a52? ( >=media-libs/a52dec-0.7.4-r3 )
+		aalib? ( media-libs/aalib )
+		aac? ( >=media-libs/faad2-2.6.1 )
+		alsa? ( media-libs/alsa-lib )
+		avahi? ( >=net-dns/avahi-0.6 )
+		bidi? ( >=dev-libs/fribidi-0.10.4 )
+		cdda? (	cddb? ( >=media-libs/libcddb-1.2.0 ) )
+		cddax? ( cddb? ( >=media-libs/libcddb-1.2.0 ) )
+		cdio? ( >=dev-libs/libcdio-0.78.2 )
+		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/libdvdnav-0.1.9
+				media-libs/libdvdplay )
+		elibc_glibc? ( >=sys-libs/glibc-2.8 )
+		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20090201 )
+		flac? ( media-libs/libogg
+			>=media-libs/flac-1.1.2 )
+		fluidsynth? ( media-sound/fluidsynth )
+		fontconfig? ( media-libs/fontconfig )
+		gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
+		ggi? ( media-libs/libggi )
+		gnome? ( gnome-base/gnome-vfs )
+		gnutls? ( >=net-libs/gnutls-1.7.4 )
+		hal? ( sys-apps/hal )
+		id3tag? ( media-libs/libid3tag
+			sys-libs/zlib )
+		ieee1394? ( sys-libs/libraw1394 sys-libs/libavc1394 )
+		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
+		kate? ( >=media-libs/libkate-0.1.1 )
+		libass? ( >=media-libs/libass-0.9.5 media-libs/fontconfig )
+		libcaca? ( media-libs/libcaca )
+		libnotify? ( x11-libs/libnotify )
+		libproxy? ( net-libs/libproxy )
+		libsysfs? ( sys-fs/sysfsutils )
+		libtiger? ( media-libs/libtiger )
+		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 )
+		mtp? ( >=media-libs/libmtp-0.3.0 )
+		musepack? ( >=media-sound/musepack-tools-444 )
+		ncurses? ( sys-libs/ncurses )
+		nsplugin? (
+			seamonkey?  ( =www-client/seamonkey-1* )
+			!seamonkey? ( >=net-libs/xulrunner-1.8 )
+		)
+		ogg? ( media-libs/libogg )
+		pda? ( x11-libs/gtk+:2 )
+		png? ( media-libs/libpng )
+		pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
+		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
+		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
+		samba? ( || ( >=net-fs/samba-libs-3.4[smbclient]
+			 <net-fs/samba-3.4 ) )
+		schroedinger? ( >=media-libs/schroedinger-1.0.6 )
+		sdl? ( >=media-libs/libsdl-1.2.8
+			sdl-image? ( media-libs/sdl-image ) )
+		shout? ( media-libs/libshout )
+		skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 )
+		speex? ( media-libs/speex )
+		svg? ( >=gnome-base/librsvg-2.9.0 )
+		svga? ( media-libs/svgalib )
+		taglib? ( >=media-libs/taglib-1.5 )
+		theora? ( >=media-libs/libtheora-1.0_beta3 )
+		truetype? ( media-libs/freetype
+			media-fonts/dejavu )
+		twolame? ( media-sound/twolame )
+		udev? ( >=sys-fs/udev-142 )
+		upnp? ( net-libs/libupnp )
+		v4l2? ( libv4l2? ( media-libs/libv4l ) )
+		vcdinfo? ( >=media-video/vcdimager-0.7.22 )
+		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 )
+		xcb? ( x11-libs/libxcb x11-libs/xcb-util )
+		xml? ( dev-libs/libxml2 )
+		xosd? ( x11-libs/xosd )
+		zvbi? ( >=media-libs/zvbi-0.2.25 )
+		"
+
+# Disabled features and reasons:
+# xvmc? ( x11-libs/libXvMC )
+#	Will probably compile only on x86
+
+DEPEND="${RDEPEND}
+	dvb? ( sys-kernel/linux-headers )
+	v4l? ( sys-kernel/linux-headers )
+	v4l2? ( >=sys-kernel/linux-headers-2.6.25 )
+	X? ( xinerama? ( x11-proto/xineramaproto ) )
+	xcb? ( x11-proto/xproto )
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+# Displays a warning if the first use flag is set but the second is not
+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
+}
+
+pkg_setup() {
+	if has_version '<=media-video/vlc-0.9.9999'; then
+		eerror "Please unmerge vlc-0.9.x first before installing ${P}"
+		eerror "If you don't do that, some plugins will get linked against"
+		eerror "the old ${PN} version and will not work."
+		die "Unmerge vlc 0.9.x first"
+	fi
+	vlc_use_needs skins truetype
+	vlc_use_force skins qt4
+	vlc_use_needs cddax cdio
+	vlc_use_needs vcdx cdio
+	vlc_use_needs vcdx vcdinfo
+	vlc_use_needs vcdinfo cdio
+	vlc_use_needs bidi truetype
+	vlc_use_force remoteosd gcrypt
+	vlc_use_needs fontconfig truetype
+	vlc_use_needs libv4l2 v4l2
+	vlc_use_needs libtiger kate
+	use cddb && use !cdda && use !cddax && ewarn "USE=cddb requires either cdda or cddax, cddb will be disabled."
+	if use qt4 || use skins ; then
+		qt4_pkg_setup
+	else
+		ewarn "You have disabled the qt4 useflag, ${PN} will not have any"
+		ewarn "graphical interface. Maybe that is not what you want..."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	if [ "${PV%9999}" != "${PV}" ] ; then
+		git_src_unpack
+	fi
+}
+
+src_prepare() {
+	if [ "${PV%9999}" != "${PV}" ] ; then
+		git_src_prepare
+	fi
+	# Make it build with libtool 1.5
+	rm -f m4/lt* m4/libtool.m4
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf
+}
+
+src_configure() {
+
+	# It would fail if -fforce-addr is used due to too few registers...
+	use x86 && filter-flags -fforce-addr
+
+	local MOZILLA_PC
+
+	if use nsplugin; then
+		if use seamonkey; then
+			MOZILLA_PC=seamonkey-plugin
+		else
+			if has_version 'net-libs/xulrunner:1.9' ; then
+				MOZILLA_PC=libxul
+			else
+				MOZILLA_PC=xulrunner-plugin
+			fi
+		fi
+	fi
+
+	econf \
+		$(use_enable a52) \
+		$(use_enable aalib aa) \
+		$(use_enable aac faad) \
+		$(use_enable alsa) \
+		$(use_enable altivec) \
+		--disable-asademux \
+		$(use_enable atmo) \
+		$(use_enable avahi bonjour) \
+		$(use_enable bidi fribidi) \
+		$(use_enable cdda vcd) \
+		$(use_enable 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) \
+		$(use_enable dvb) \
+		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
+		$(use_enable fbcon fb) \
+		$(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(use_enable ffmpeg swscale) $(use_enable ffmpeg postproc) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth) \
+		$(use_enable fontconfig) \
+		$(use_enable ggi) \
+		$(use_enable gnome gnomevfs) \
+		$(use_enable gnutls) \
+		$(use_enable hal) \
+		$(use_enable httpd) \
+		$(use_enable id3tag) \
+		$(use_enable ieee1394 dv) \
+		$(use_enable jack) \
+		$(use_enable kate) \
+		$(use_enable libass) \
+		$(use_enable libcaca caca) \
+		$(use_enable gcrypt libgcrypt) \
+		$(use_enable libnotify notify) \
+		$(use_enable libproxy) \
+		--disable-libtar \
+		$(use_enable libtiger tiger) \
+		$(use_enable libsysfs) \
+		$(use_enable libv4l2) \
+		$(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 mtp) \
+		$(use_enable musepack mpc) \
+		$(use_enable ncurses) \
+		$(use_enable nsplugin mozilla) --with-mozilla-pkg="${MOZILLA_PC}" \
+		$(use_enable ogg) \
+		$(use_enable opengl glx) $(use_enable opengl) $(use_enable opengl galaktos) \
+		$(use_enable optimisememory optimize-memory) \
+		$(use_enable oss) \
+		$(use_enable pda) \
+		$(use_enable png) \
+		--disable-portaudio \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable pvr) \
+		$(use_enable qt4) \
+		$(use_enable rtsp realrtsp) \
+		$(use_enable run-as-root) \
+		$(use_enable samba smb) \
+		$(use_enable schroedinger) \
+		$(use_enable sdl) \
+		$(use_enable sdl-image) \
+		$(use_enable shine) \
+		$(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 udev) \
+		$(use_enable upnp) \
+		$(use_enable v4l) \
+		$(use_enable v4l2) \
+		$(use_enable vcdinfo) \
+		$(use_enable vcdx) \
+		$(use_enable vorbis) \
+		$(use_enable win32codecs loader) \
+		$(use_enable wma-fixed) \
+		$(use_enable X x11) $(use_enable X screen) \
+		$(use_enable x264) \
+		$(use_enable xcb) \
+		$(use_enable xinerama) \
+		$(use_enable xml libxml2) \
+		$(use_enable xosd) \
+		$(use_enable xv xvideo) \
+		--disable-xvmc \
+		$(use_enable zvbi) $(use_enable !zvbi telx) \
+		--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)
+}
+
+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
+}