Update to latest test version before final release.

Package-Manager: portage-2.0.53_rc7

7 files changed, 16 insertions, 267 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index bfb33c1959b4..7bbb972f3981 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.114 2005/11/22 10:07:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.115 2005/11/23 11:20:11 flameeyes Exp $
+
+*vlc-0.8.4_beta3 (23 Nov 2005)
+
+  23 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -vlc-0.8.4_beta1.ebuild, -vlc-0.8.4_beta2.ebuild, +vlc-0.8.4_beta3.ebuild:
+  Update to latest test version before final release.
 
   22 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r1.ebuild,
   vlc-0.8.2-r1.ebuild, vlc-0.8.2-r2.ebuild, vlc-0.8.4_beta1.ebuild,
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index eec99135d21e..69d087143d7f 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,22 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b3ca3bfcf0f1abcacbcff4cd816c678f ChangeLog 22719
+MD5 3b8580ad655baff37f469ce34ecb6fe3 ChangeLog 22936
 MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r1 127
 MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r1 127
 MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r2 127
-MD5 b0d542494faed30ebb0281e6dc7fcfe2 files/digest-vlc-0.8.4_beta1 133
-MD5 f7f70c38d36f117d8859250d3100cd63 files/digest-vlc-0.8.4_beta2 133
+MD5 2faf48fde07bcbec2998cac8acc93613 files/digest-vlc-0.8.4_beta3 133
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 cee16e82ad42e4a17e53b01a02650598 vlc-0.8.1-r1.ebuild 6872
 MD5 72190efa9733237fac984453f33e1449 vlc-0.8.2-r1.ebuild 7907
 MD5 21ac8e678dfae64c69ef3644ad7f0818 vlc-0.8.2-r2.ebuild 7789
-MD5 78381f10eafd7f4341ff9d115c1c97db vlc-0.8.4_beta1.ebuild 8157
-MD5 6870c46d2f23577be48c77fda11abb0f vlc-0.8.4_beta2.ebuild 8188
+MD5 7177e5a4b217b7d5e910b7c5c2e34018 vlc-0.8.4_beta3.ebuild 8188
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDgu4HAiZjviIA2XgRAvT4AJ90BhLCclA4Kq+6HyYRKED94jHIPgCeMHIX
-0awYly486BXaUyZ0RX9WSGY=
-=PYNn
+iD8DBQFDhFCsAiZjviIA2XgRAh/+AJ9hUiQQSfLQcLEn7bhmlzXt1d2FZACfRZVY
+RD0a1MvoJbXpJvlf/lLG6/c=
+=7YkJ
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/digest-vlc-0.8.4_beta1 b/media-video/vlc/files/digest-vlc-0.8.4_beta1
deleted file mode 100644
index 3aea340f5eb8..000000000000
--- a/media-video/vlc/files/digest-vlc-0.8.4_beta1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f231125351a469b49228c583547cf4a7 vlc-0.8.4-test1.tar.bz2 6948542
-MD5 46cf14ce7547add1f85634831b32e8b5 vlc-patches-7.tar.bz2 4696
diff --git a/media-video/vlc/files/digest-vlc-0.8.4_beta2 b/media-video/vlc/files/digest-vlc-0.8.4_beta2
deleted file mode 100644
index 7d307a780a3b..000000000000
--- a/media-video/vlc/files/digest-vlc-0.8.4_beta2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 734f3082484a664bd06cf83f18f83659 vlc-0.8.4-test2.tar.bz2 6554273
-MD5 46cf14ce7547add1f85634831b32e8b5 vlc-patches-7.tar.bz2 4696
diff --git a/media-video/vlc/files/digest-vlc-0.8.4_beta3 b/media-video/vlc/files/digest-vlc-0.8.4_beta3
new file mode 100644
index 000000000000..e6ec1c7ad725
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.8.4_beta3
@@ -0,0 +1,2 @@
+MD5 74e1b3323e79f74185557daec0ad02e4 vlc-0.8.4-test3.tar.bz2 6757625
+MD5 46cf14ce7547add1f85634831b32e8b5 vlc-patches-7.tar.bz2 4696
diff --git a/media-video/vlc/vlc-0.8.4_beta1.ebuild b/media-video/vlc/vlc-0.8.4_beta1.ebuild
deleted file mode 100644
index 100806076e0a..000000000000
--- a/media-video/vlc/vlc-0.8.4_beta1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4_beta1.ebuild,v 1.5 2005/11/22 10:07:20 flameeyes Exp $
-
-# Missing USE-flags due to missing deps:
-# media-vidoe/vlc:tremor - Enables Tremor decoder support
-# media-video/vlc:tarkin - Enables experimental tarkin codec
-# media-video/vlc:cyberlink - Enable CyberLink UPnP stack
-
-# Missing USE-flags due to needed testing
-# media-video/vlc:dirac - Enables experimental dirac codec
-# media-video/vlc:avahi - Enables Bonjour service discovery via Avahi
-# media-video/vlc:h264 - Enables H264 encoding support with libx264
-
-inherit libtool eutils wxwidgets flag-o-matic nsplugins multilib autotools toolchain-funcs
-
-MY_P="${P/_beta/-test}"
-
-PATCHLEVEL="7"
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdda ogg matroska
-dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga
-oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick stream
-mp3 xv bidi sdl png xml2 samba daap corba screen mod speex nsplugin shout real
-win32codecs"
-
-RDEPEND="cdda? ( >=dev-libs/libcdio-0.71
-			>=media-libs/libcddb-0.9.5 )
-		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? ( >=media-libs/libmatroska-0.7.5 )
-		mp3? ( media-libs/libmad )
-		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r1 )
-		a52? ( media-libs/a52dec )
-		dts? ( media-libs/libdts )
-		flac? ( media-libs/flac )
-		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
-		vorbis? ( media-libs/libvorbis )
-		theora? ( media-libs/libtheora )
-		X? ( virtual/x11 )
-		xv? ( virtual/x11 )
-		freetype? ( 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? ( virtual/alsa )
-		wxwindows? ( =x11-libs/wxGTK-2.6* )
-		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 )
-		opengl? ( virtual/opengl )
-		sys-libs/zlib
-		png? ( media-libs/libpng )
-		media-libs/libdvbpsi
-		aac? ( >=media-libs/faad2-2.0-r2 )
-		sdl? ( >=media-libs/libsdl-1.2.8 )
-		xml2? ( 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 )
-		joystick? ( sys-kernel/linux-headers )
-		mod? ( media-libs/libmodplug )
-		speex? ( media-libs/speex )
-		svg? ( >=gnome-base/librsvg-2.5.0 )
-		nsplugin? ( >=net-libs/gecko-sdk-1.7.8 )
-		shout? ( media-libs/libshout )
-		win32codecs? ( media-libs/win32codecs )"
-
-DEPEND="${RDEPEND}
-	=sys-devel/automake-1.6*
-	sys-devel/autoconf
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use wxwindows; then
-		WX_GTK_VER="2.6"
-		if use unicode; then
-			need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
-		else
-			need-wxwidgets gtk2 || die "You need to install wxGTK with gtk2 support."
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# We only have glide v3 in portage
-	cd ${S}
-
-	EPATCH_EXCLUDE="050_all_nomozconfig.patch 030_all_amd64-cpudetect.patch
-		090_all_samba-3.0.20.patch 040_all_cast.patch 070_all_debug.patch"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	AT_M4DIR="m4" eautoreconf
-
-	sed -i -e \
-		"s:/usr/include/glide:/usr/include/glide3:;s:glide2x:glide3:" \
-		configure || die "sed glide failed."
-
-	# Fix the default font
-	sed -i -e "s:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/ttf-bitstream-vera/VeraBd.ttf:" modules/misc/freetype.c
-}
-
-src_compile () {
-	# reason why:
-	# skins2 interface is horribly broken for some reason.
-	# Therefore it's being disabled for the standard wxwindows
-	# interface which isn't
-	myconf="${myconf} --disable-skins2"
-
-	use nsplugin && myconf="${myconf} --with-mozilla-sdk-path=/usr/$(get_libdir)/gecko-sdk"
-
-	use wxwindows && \
-		myconf="${myconf} --with-wx-config=$(basename ${WX_CONFIG}) --with-wx-config-path=$(dirname ${WX_CONFIG})"
-
-	if use ffmpeg; then
-		myconf="${myconf} --enable-ffmpeg"
-
-		built_with_use media-video/ffmpeg aac \
-			&& myconf="${myconf} --with-ffmpeg-aac"
-
-		built_with_use media-video/ffmpeg dts \
-			&& myconf="${myconf} --with-ffmpeg-dts"
-
-		built_with_use media-video/ffmpeg zlib \
-			&& myconf="${myconf} --with-ffmpeg-zlib"
-
-		built_with_use media-video/ffmpeg encode \
-			&& myconf="${myconf} --with-ffmpeg-mp3lame"
-
-	else
-		myconf="${myconf} --disable-ffmpeg"
-	fi
-
-	# Portaudio support needs at least v19
-	# pth (threads) support is quite unstable with latest ffmpeg/libmatroska.
-	econf \
-		$(use_enable altivec) \
-		$(use_enable unicode utf8) \
-		$(use_enable stream sout) \
-		$(use_enable httpd) \
-		$(use_enable vlm) \
-		$(use_enable gnutls) \
-		$(use_enable v4l) \
-		$(use_enable cdda) $(use_enable cdda cddax)\
-		$(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 opengl glx) $(use_enable opengl) \
-		$(use_enable 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 joystick) \
-		$(use_enable live livedotcom) $(use_with live livedotcom-tree /usr/lib/live) \
-		$(use_enable mp3 mad) \
-		$(use_enable aac faad) \
-		$(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 xml2 libxml2) \
-		$(use_enable samba smb) \
-		$(use_enable daap) \
-		$(use_enable corba) \
-		$(use_enable mod) \
-		$(use_enable speex) \
-		$(use_enable nsplugin mozilla) \
-		$(use_enable shout) \
-		$(use_enable real) $(use_enable real realrtsp) \
-		$(use_enable win32codecs loader) \
-		--disable-pth \
-		--disable-portaudio \
-		--disable-slp \
-		--disable-hal \
-		--disable-x264 \
-		${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 -j1 || die "make of VLC failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" plugindir="/usr/$(get_libdir)/${PLUGINS_DIR}" install || die "Installation failed!"
-
-	dodoc AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \
-		doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
-
-	rm -r ${D}/usr/share/vlc/vlc*.png ${D}/usr/share/vlc/vlc*.xpm ${D}/usr/share/vlc/vlc*.ico \
-		${D}/usr/share/vlc/kvlc*.png ${D}/usr/share/vlc/kvlc*.xpm ${D}/usr/share/vlc/qvlc*.png \
-		${D}/usr/share/vlc/qvlc*.xpm ${D}/usr/share/vlc/gvlc*.png ${D}/usr/share/vlc/gvlc*.xpm \
-		${D}/usr/share/vlc/gvlc*.ico ${D}/usr/share/vlc/gnome-vlc*.png \
-		${D}/usr/share/vlc/gnome-vlc*.xpm ${D}/usr/share/vlc/skins2 \
-		${D}/usr/share/doc/vlc
-
-	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
-
-	make_desktop_entry vlc "VLC Media Player" vlc "AudioVideo;Player"
-}
diff --git a/media-video/vlc/vlc-0.8.4_beta2.ebuild b/media-video/vlc/vlc-0.8.4_beta3.ebuild
index 3192e6a7f8e2..05567a0e720f 100644
--- a/media-video/vlc/vlc-0.8.4_beta2.ebuild
+++ b/media-video/vlc/vlc-0.8.4_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4_beta2.ebuild,v 1.3 2005/11/22 10:07:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4_beta3.ebuild,v 1.1 2005/11/23 11:20:11 flameeyes Exp $
 
 # Missing USE-flags due to missing deps:
 # media-vidoe/vlc:tremor - Enables Tremor decoder support