Fix (hopefully) the nsplugin location, thanks to Alex, Caster and Sascha Geschwandtner in bug #139317.

(Portage version: 2.1.1_pre2-r6)
 (Signed Manifest commit)

3 files changed, 14 insertions, 270 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 5b06e04ac10f..425e89717850 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -14,14 +14,14 @@ EBUILD vlc-0.8.5-r3.ebuild 6941 RMD160 4b53dfe1c5ffc17c45e1637bc0ff34909b7430d5
 MD5 cbed4949fda5f337811513927772bf3f vlc-0.8.5-r3.ebuild 6941
 RMD160 4b53dfe1c5ffc17c45e1637bc0ff34909b7430d5 vlc-0.8.5-r3.ebuild 6941
 SHA256 aa769efbd7d5c136ba31cf3e61009bd5404f794e29a4019d1a8d1ba26a7d48a0 vlc-0.8.5-r3.ebuild 6941
-EBUILD vlc-0.8.5-r4.ebuild 7240 RMD160 ad3817b7e86820d82fc2958de61ee13f824591e1 SHA1 7fd80c041203c7f2ac3d93779a29834bfdabdf78 SHA256 8f7157b1d9cf079f22099c1aee071bd7b91d642394c1809137498b4e0f9fd68f
-MD5 c84b4a2c1565739939b909e25f89d8f3 vlc-0.8.5-r4.ebuild 7240
-RMD160 ad3817b7e86820d82fc2958de61ee13f824591e1 vlc-0.8.5-r4.ebuild 7240
-SHA256 8f7157b1d9cf079f22099c1aee071bd7b91d642394c1809137498b4e0f9fd68f vlc-0.8.5-r4.ebuild 7240
-MISC ChangeLog 33883 RMD160 a48a3f8a9ff69bd78c767ec0752df7b2d79845fb SHA1 2222af7cadd883df8eb18b6e6056adb6cbcf76a1 SHA256 bbf415bc1333056fc790f28cccf106cb777c27d50770ae853e3a35edf797361b
-MD5 b091d9530a9c821cdb70a37ca7c309a1 ChangeLog 33883
-RMD160 a48a3f8a9ff69bd78c767ec0752df7b2d79845fb ChangeLog 33883
-SHA256 bbf415bc1333056fc790f28cccf106cb777c27d50770ae853e3a35edf797361b ChangeLog 33883
+EBUILD vlc-0.8.5-r5.ebuild 7386 RMD160 0cd644c4656b13ad74f3e3b409d5e57902623aca SHA1 182342d1b8eaf3b82bd52f76ee30d06e229dc1cc SHA256 c08c7b3743f4fadc81b8caa9546e47c23fc8c9e873931ccf89a04524d627a5e3
+MD5 3c9644d0355c4a26cce2988539916dca vlc-0.8.5-r5.ebuild 7386
+RMD160 0cd644c4656b13ad74f3e3b409d5e57902623aca vlc-0.8.5-r5.ebuild 7386
+SHA256 c08c7b3743f4fadc81b8caa9546e47c23fc8c9e873931ccf89a04524d627a5e3 vlc-0.8.5-r5.ebuild 7386
+MISC ChangeLog 34119 RMD160 b85be2b01e253e6ac31ce0b1b2b1299bdd6c19eb SHA1 db40b9a5adf4a25999ab6b478fe7e803d3cdfb7b SHA256 5b8a12d391f4769ab29afcb1145e6df58879acc73cb06226fb7b6821f7267414
+MD5 b3e716145d6ec46c5f2c2ea78dccabc0 ChangeLog 34119
+RMD160 b85be2b01e253e6ac31ce0b1b2b1299bdd6c19eb ChangeLog 34119
+SHA256 5b8a12d391f4769ab29afcb1145e6df58879acc73cb06226fb7b6821f7267414 ChangeLog 34119
 MISC metadata.xml 249 RMD160 bccf7e953ea1336e9ec1e722af1592e5f7cbd732 SHA1 fc3811086b04b8f498738e2461158e2f17da5fb4 SHA256 c88de03d7b2aa4afd88762ce6d56e5bb25db4699fad09c6e3e3323fb42a150c0
 MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249
 RMD160 bccf7e953ea1336e9ec1e722af1592e5f7cbd732 metadata.xml 249
@@ -32,13 +32,13 @@ SHA256 ecfd8c4a8edf5a58d299acaff67a316567d2e802bd676a356fbb113ce28779a8 files/di
 MD5 4c14e8547996eab7e66c2f8f860b3146 files/digest-vlc-0.8.5-r3 479
 RMD160 cf8e559e060d85895fa7c23b39e9b380e35df841 files/digest-vlc-0.8.5-r3 479
 SHA256 bfd1f44477c295414873d4caa10fe213eed6a193d129c1b0f2a619fa8b3db1f8 files/digest-vlc-0.8.5-r3 479
-MD5 283fc5b9097a2e16bdfaa9ad3cf014cf files/digest-vlc-0.8.5-r4 479
-RMD160 4ef36982eec5eac0b1f3c13452c851c928b65dc8 files/digest-vlc-0.8.5-r4 479
-SHA256 d680affc51d1c435bd459ad745f44eea3a256ad4a411ce2ab21e464e0f116c79 files/digest-vlc-0.8.5-r4 479
+MD5 283fc5b9097a2e16bdfaa9ad3cf014cf files/digest-vlc-0.8.5-r5 479
+RMD160 4ef36982eec5eac0b1f3c13452c851c928b65dc8 files/digest-vlc-0.8.5-r5 479
+SHA256 d680affc51d1c435bd459ad745f44eea3a256ad4a411ce2ab21e464e0f116c79 files/digest-vlc-0.8.5-r5 479
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEqvMRAiZjviIA2XgRAqdfAJ91eVA6QibQ2lXhEVsinKe1RL7YnACfclto
-8SFFslfBnNKDFUTWU4guUhk=
-=tpnP
+iD8DBQFEr7gaAiZjviIA2XgRAjPNAKCS4jP9yIf3Lg+z8Jppn95kBZcJqwCggxh0
+EqEgEwJ+US8kNl//eMfjWsA=
+=0TZg
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/digest-vlc-0.8.5-r4 b/media-video/vlc/files/digest-vlc-0.8.5-r4
deleted file mode 100644
index f2363dfc5b13..000000000000
--- a/media-video/vlc/files/digest-vlc-0.8.5-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 16bb5bf87ed94879a8eb7b0ff9b4f16f vlc-0.8.5.tar.bz2 8562996
-RMD160 d24140a5b4bf771754028090e103bb5c171e4fd8 vlc-0.8.5.tar.bz2 8562996
-SHA256 48bc557bec16b48a304e5e760aef10e1c3cca2d74a011bc900bd1768d9ee79fa vlc-0.8.5.tar.bz2 8562996
-MD5 3bb5c88f50c5375dba2fdb00343bc445 vlc-patches-26.tar.bz2 11815
-RMD160 1db7b615899535dbd03f99028e053a5503901781 vlc-patches-26.tar.bz2 11815
-SHA256 b21b2f81840dc0270214de08fb7bf5185b9d8b8366e9628b1b97f74c89b571a9 vlc-patches-26.tar.bz2 11815
diff --git a/media-video/vlc/vlc-0.8.5-r4.ebuild b/media-video/vlc/vlc-0.8.5-r4.ebuild
deleted file mode 100644
index 3b8e22c08727..000000000000
--- a/media-video/vlc/vlc-0.8.5-r4.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.5-r4.ebuild,v 1.1 2006/07/04 23:00:25 flameeyes Exp $
-
-inherit eutils wxwidgets multilib autotools toolchain-funcs gnome2
-
-RESTRICT="confcache"
-
-MY_P="${P/_beta/-test}"
-
-PATCHLEVEL="26"
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-
-[[ ${MY_P} != "${P}" ]] && \
-	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2" \
-	|| SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="a52 3dfx nls debug altivec httpd vlm gnutls live v4l cdda ogg matroska
-dvb dvd vcd ffmpeg 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 png xml samba daap corba screen mod speex shout rtsp
-win32codecs skins hal avahi xinerama cddb directfb upnp nsplugin seamonkey
-optimisememory"
-
-RDEPEND="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 )
-		ogg? ( media-libs/libogg )
-		matroska? (
-			>=dev-libs/libebml-0.7.6
-			>=media-libs/libmatroska-0.7.5 )
-		mp3? ( media-libs/libmad )
-		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r1 )
-		a52? ( >=media-libs/a52dec-0.7.4-r3 )
-		dts? ( >=media-libs/libdts-0.0.2-r3 )
-		flac? ( media-libs/flac )
-		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.2-r1 )
-		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.0.17 )
-		sys-libs/zlib
-		png? ( media-libs/libpng )
-		media-libs/libdvbpsi
-		sdl? ( >=media-libs/libsdl-1.2.8 )
-		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 )
-		v4l? ( sys-kernel/linux-headers )
-		dvb? ( sys-kernel/linux-headers )
-		mod? ( 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 )
-			) virtual/x11 )
-			opengl? ( virtual/opengl )
-		)
-		directfb? ( dev-libs/DirectFB )
-		upnp? ( >=net-misc/upnp-1.2 )
-		nsplugin? (
-			!seamonkey? ( www-client/mozilla-firefox )
-			seamonkey? ( www-client/seamonkey )
-		)"
-
-DEPEND="${RDEPEND}
-	X? ( || ( (
-			x11-proto/xproto
-			x11-proto/xextproto
-			xinerama? ( x11-proto/xineramaproto )
-		) virtual/x11 )
-	)
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use wxwindows; 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
-		eerror "Trying to build with skins support but without truetype."
-		die "You have to use 'truetype' to use 'skins'"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile () {
-	use wxwindows && \
-		myconf="${myconf} --with-wx-config=$(basename ${WX_CONFIG}) --with-wx-config-path=$(dirname ${WX_CONFIG})"
-
-	use vlm && \
-		myconf="${myconf} --enable-vlm --enable-sout" || \
-		myconf="${myconf} --disable-vlm"
-
-	if use directfb; then
-		myconf="${myconf} --enable-directfb --with-directfb=/usr"
-		append-flags "-I /usr/include/directfb"
-	else
-		myconf="${myconf} --disable-directfb"
-	fi
-
-	if use nsplugin; then
-		use seamonkey && \
-			myconf="${myconf} --enable-mozilla=seamonkey" || \
-			myconf="${myconf} --enable-mozilla=firefox"
-	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 truetype freetype) \
-		$(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 wxwindows wxwidgets) \
-		$(use_enable ncurses) \
-		$(use_enable xosd) \
-		$(use_enable lirc) \
-		$(use_enable live livedotcom) $(use_with live livedotcom-tree /usr/lib/live) \
-		$(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 png) \
-		$(use_enable xml libxml2) \
-		$(use_enable samba smb) \
-		$(use_enable daap) \
-		$(use_enable corba) \
-		$(use_enable 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 ffmpeg) \
-		$(use_enable upnp) \
-		$(use_enable optimisememory optimize-memory) \
-		--disable-faad \
-		--disable-jack \
-		--disable-dv \
-		--disable-libvc1 \
-		--disable-snapshot \
-		--disable-growl \
-		--disable-pth \
-		--disable-portaudio \
-		--disable-x264 \
-		--enable-utf8 \
-		${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() {
-	emake DESTDIR="${D}" install || die "Installation failed!"
-
-	dodoc AUTHORS MAINTAINERS HACKING THANKS TODO 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}
-
-	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 && domenu "${S}/debian/vlc.desktop"
-}