Bump to latest test version from upstream.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 293 insertions, 2 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index e3f85095ecc4..5f2af2bd74f1 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.152 2006/04/15 16:36:41 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.153 2006/04/20 03:03:04 flameeyes Exp $
+
+*vlc-0.8.5_beta3 (20 Apr 2006)
+
+  20 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +vlc-0.8.5_beta3.ebuild:
+  Bump to latest test version from upstream.
 
   15 Apr 2006; Thomas Cort <tcort@gentoo.org> vlc-0.8.5_beta2.ebuild:
   Added ~alpha keyword.
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 859aa8484df3..9e78c260e0e7 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,14 +1,58 @@
-MD5 0f8cbe405f459b8be58daf3a5a5eaeec ChangeLog 29809
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0bd6180e06ba2e87d1354d3e7df649cd ChangeLog 29971
+RMD160 3e602c43f3eca97d81c88d1c7ab2567b2b2d1c12 ChangeLog 29971
+SHA256 9180e39f5bb9c8bf8327de201f0c77a15599f5802a97169f3f0fceeef283a730 ChangeLog 29971
 MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r1 127
+RMD160 5f9576b5ac77c3eb86228d9246b7d1e45db20e25 files/digest-vlc-0.8.1-r1 127
+SHA256 62acf5be95fea3c68450279d0a4fb55461d7841e9b4f28ed4c28f9e6cba23250 files/digest-vlc-0.8.1-r1 127
 MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r2 127
+RMD160 273421b7a5b3bdf2d8fff28862cc042e0dbb567b files/digest-vlc-0.8.2-r2 127
+SHA256 039fa9f4902d3a8f558cdaf143671e1d251d1d41b12d9a50dbd6560bb0d8bf1e files/digest-vlc-0.8.2-r2 127
 MD5 d84791584b167d4cf96f365498050a62 files/digest-vlc-0.8.4 127
+RMD160 9ab36af70e59ff3053861c5329b76fd065703341 files/digest-vlc-0.8.4 127
+SHA256 6761f2ddb180cff04248c38dd2ceb9a6d5de595e561b78755c1374f080e67d17 files/digest-vlc-0.8.4 127
 MD5 846990f93776c355395f44ca186ecfef files/digest-vlc-0.8.4a 129
+RMD160 6bc25a516e65913a266391eb4fade564f0445ccc files/digest-vlc-0.8.4a 129
+SHA256 ab2229dc184b78578ec7eb733023f5bef05b0cfe859da5ed004c62d2f110848d files/digest-vlc-0.8.4a 129
 MD5 f34d6c5a25230e1ebb6761514287f838 files/digest-vlc-0.8.4a-r1 482
+RMD160 f5981b387f59cd065dd5e8a2d305ff966c4a59de files/digest-vlc-0.8.4a-r1 482
+SHA256 ecfd8c4a8edf5a58d299acaff67a316567d2e802bd676a356fbb113ce28779a8 files/digest-vlc-0.8.4a-r1 482
 MD5 e2a8abbea3b2029b00b9b1bf0f9877c0 files/digest-vlc-0.8.5_beta2 494
+RMD160 e35c21c49c6a9c2be6eb4dd7989e578fbb99d713 files/digest-vlc-0.8.5_beta2 494
+SHA256 6e0bd5420943d18d28014ace4827c1f94e884b6eb26649e557f246ab946e54b0 files/digest-vlc-0.8.5_beta2 494
+MD5 a88d3a2792f6593ca49ecd7898f54f0f files/digest-vlc-0.8.5_beta3 494
+RMD160 c25a858157a5a77d9488eb6778f56d12b2082b13 files/digest-vlc-0.8.5_beta3 494
+SHA256 f97d59dc270444b4e8148224128a7e4192af7228d974f6ca23ec0861f203bc54 files/digest-vlc-0.8.5_beta3 494
 MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249
+RMD160 bccf7e953ea1336e9ec1e722af1592e5f7cbd732 metadata.xml 249
+SHA256 c88de03d7b2aa4afd88762ce6d56e5bb25db4699fad09c6e3e3323fb42a150c0 metadata.xml 249
 MD5 160a009b44c4d5931803a92669c32960 vlc-0.8.1-r1.ebuild 6040
+RMD160 1378b1d36f6b69b17201d9604cd365d0590da496 vlc-0.8.1-r1.ebuild 6040
+SHA256 b56acb63f7ee2f918c9f128abc5fb40938ac8f0aa20dcf14c23cf960ffa5a977 vlc-0.8.1-r1.ebuild 6040
 MD5 2a4d85def1d0fd31aa4dd3917c4050e9 vlc-0.8.2-r2.ebuild 7470
+RMD160 2594dc083ddbdfdf8435bb037ad8ad6d1c7eabd2 vlc-0.8.2-r2.ebuild 7470
+SHA256 49c81ceaebc04a409f3d1a90ef223aa82581ee6fde348d9aba3c336edc0c118d vlc-0.8.2-r2.ebuild 7470
 MD5 abdad82efe9b21f65e728a3ba20d48c7 vlc-0.8.4.ebuild 6923
+RMD160 e782d3d0b643ae918642e4ab7b598345de378a2d vlc-0.8.4.ebuild 6923
+SHA256 05d8cc7e92535576ac552751c84d32fd461ef7b86d06b890155cc94c1868820b vlc-0.8.4.ebuild 6923
 MD5 1070e4986007224939cd981051edd322 vlc-0.8.4a-r1.ebuild 7313
+RMD160 90e725c59dbfe2f08c573e1f5131b06708758e6f vlc-0.8.4a-r1.ebuild 7313
+SHA256 22cd228ae61f31784795be23b28261684ab2597d2b96e01f8fc7b638babec373 vlc-0.8.4a-r1.ebuild 7313
 MD5 2908bdb33796f25e21e2d4ee6dbdba2c vlc-0.8.4a.ebuild 7481
+RMD160 e4e353bbbc2e4b79e715fffad61efcb8e3b25814 vlc-0.8.4a.ebuild 7481
+SHA256 3ec83bb2d6d256ddeb663f762bdd42ef29b54cf3e8872acae631e9c35826e063 vlc-0.8.4a.ebuild 7481
 MD5 6fc75ee19e7e0ff5fcb7d12ed3a531c5 vlc-0.8.5_beta2.ebuild 7008
+RMD160 ecf89514646b1bbe9d9a09d1931fbd0a712bd42e vlc-0.8.5_beta2.ebuild 7008
+SHA256 8b57df3a8a670c5a4eb2efb9dd569540bc97081240204071bdc1cb423e3df553 vlc-0.8.5_beta2.ebuild 7008
+MD5 38ca79af2c5bb2671cfb919bc2c7a1ea vlc-0.8.5_beta3.ebuild 7012
+RMD160 e5a5279fc1e559d48ae8f20e70d46523a6201074 vlc-0.8.5_beta3.ebuild 7012
+SHA256 be3accd5bb43642c89e98fc8dd9ff00c3902230d3426d44f17e6a89334714542 vlc-0.8.5_beta3.ebuild 7012
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFERvk6AiZjviIA2XgRAp2TAJ4mL5reGq++imhZeFk2p8zIwy4yGQCfXerI
+NCX/Tfs7dYmqN3+5yQWlDHg=
+=J7Fb
+-----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/digest-vlc-0.8.5_beta3 b/media-video/vlc/files/digest-vlc-0.8.5_beta3
new file mode 100644
index 000000000000..21ffa28b5f72
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.8.5_beta3
@@ -0,0 +1,6 @@
+MD5 549366839dc456510636b387d5aec926 vlc-0.8.5-test3.tar.bz2 8519721
+RMD160 309a1b035b2fc53996f050d2507a7951d5cbb02a vlc-0.8.5-test3.tar.bz2 8519721
+SHA256 0344dc9f5a2f14b896e5f9c67b68568fc824b12d1ee41d23ac77a673c7925b55 vlc-0.8.5-test3.tar.bz2 8519721
+MD5 cd7a8c873e80acd2619e4c1911ae5de2 vlc-patches-17.tar.bz2 6243
+RMD160 05a5722e38ff2f40df44d11672455fd2ec0a779a vlc-patches-17.tar.bz2 6243
+SHA256 9d177a688661416ae3761500a5fb22e20f87a843ebee06e7092799a13da23750 vlc-patches-17.tar.bz2 6243
diff --git a/media-video/vlc/vlc-0.8.5_beta3.ebuild b/media-video/vlc/vlc-0.8.5_beta3.ebuild
new file mode 100644
index 000000000000..d22f7abbe2c9
--- /dev/null
+++ b/media-video/vlc/vlc-0.8.5_beta3.ebuild
@@ -0,0 +1,235 @@
+# 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_beta3.ebuild,v 1.1 2006/04/20 03:03:04 flameeyes Exp $
+
+inherit eutils wxwidgets nsplugins multilib autotools toolchain-funcs
+
+MY_P="${P/_beta/-test}"
+
+PATCHLEVEL="17"
+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="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="a52 3dfx nls debug altivec httpd vlm gnutls live v4l cdda ogg matroska
+dvb dvd vcd ffmpeg aac 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 nsplugin shout rtsp
+win32codecs skins hal avahi xinerama cddb directfb upnp"
+
+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
+		aac? ( >=media-libs/faad2-2.0-r2 )
+		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 )
+		nsplugin? ( >=net-libs/gecko-sdk-1.7.8 )
+		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 )"
+
+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 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})"
+
+	use vlm && \
+		myconf="${myconf} --enable-vlm --enable-sout" || \
+		myconf="${myconf} --disable-vlm"
+
+	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 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 xml 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 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 directfb) \
+		$(use_enable upnp) \
+		--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() {
+	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 -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"
+}