bump to test2

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.7 x86_64

3 files changed, 378 insertions, 2 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 361fde029b24..4b8f8a193cca 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.356 2008/07/14 10:49:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.357 2008/07/14 12:51:09 aballier Exp $
+
+*vlc-0.9.0_beta2 (14 Jul 2008)
+
+  14 Jul 2008; Alexis Ballier <aballier@gentoo.org> +vlc-0.9.0_beta2.ebuild:
+  bump to test2
 
   14 Jul 2008; Raúl Porcel <armin76@gentoo.org> vlc-0.8.6i.ebuild:
   sparc/x86 stable wrt #230692
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 9a38012b9aa2..d232cc5e8565 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,15 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST vlc-0.8.6g.tar.bz2 11680440 RMD160 f4a7e7650a1d1d7be7c581a54a5771dece0bcb6b SHA1 6dab0e1593607d3a1ee585ba009b99627477f467 SHA256 3054e7278ac2dcb061f2268fcff8c2bc37b22be537cc01c19882e9a96eaeb18e
 DIST vlc-0.8.6h.tar.bz2 11762435 RMD160 943c1b2d02de3515d287eeb10f2ac755dbe2d762 SHA1 142ff3362e46681ee2ace6276c4add5905d210ca SHA256 50ed87c869228274043b7fa468f908fe6ee571196510177593c701d99b357221
 DIST vlc-0.8.6i.tar.bz2 11786172 RMD160 a5da4e1e0980594c678c04016491c8a373df4017 SHA1 4c6f45dffe3a8309ce201897040dc1f82b9cde99 SHA256 a866768f7dd8254c62e059327094073800ed968214b5b35e2682eb81f448214f
 DIST vlc-0.9.0-test1.tar.bz2 15521807 RMD160 161e6218705721a54f1caf25ac3829cb51afac55 SHA1 4be6df3d881d8bf8ef65aac80ea6e83233f48fea SHA256 0c59e92d03f9126b059238ac965dd5f011c01a26b64b0f99babee630738f346a
+DIST vlc-0.9.0-test2.tar.bz2 15543183 RMD160 8d400f6837ee1eadd110b98521ece118d5fd375c SHA1 40c1e2741342dc4816c1abb0b1102cc786cb1226 SHA256 6e7881b9c2ddd366b0da24b70a7462421f1d8b53822de792ad1daaeb1da27caa
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
 DIST vlc-patches-53.tar.bz2 9737 RMD160 dfbc11984c21c2bfe31bd77c813415fa04b10204 SHA1 1726c2bd17539c076fc4baa2d9611a4b39abab39 SHA256 dd2558049044701a60bdf2c30a6a716e009a6c4c180a54ea848a1de105e00ca5
 DIST vlc-patches-55.tar.bz2 8111 RMD160 66eb8d34bc39f6b5c408e7f66b2868ad848031ef SHA1 723c02a0113e836d9b604d7a9380a0125f64e1d5 SHA256 11626cce5d2c15780a812f067ec45d582b06cc1dc205f5b897c666f711b583db
 DIST vlc-patches-56.tar.bz2 5736 RMD160 fbda37e0662e89c0452c28ea6a369e27f7b2f04f SHA1 06cc90f7ca5cf8754623ce0608d3c721f04c7b8c SHA256 6b968adf43c66f472013c7fb141595ba414291aa45c0800c8afdf4a260a11296
 DIST vlc-patches-57.tar.bz2 7243 RMD160 6138ef3140077a9ad50b7f2d772e6898fc6af3be SHA1 e35cefabb1deed98491a1814131154f3012918b9 SHA256 ddfc2e892e5718b50501de5f05aa366d2983b5b6fa6d50f16f2308b9501ab3f4
+DIST vlc-patches-58.tar.bz2 5095 RMD160 e7705d3d67e18500208ea5fd3933788c1eb81391 SHA1 302d35e02eafb12c1166f80db4c8a8409eef5307 SHA256 a202df6a526c59ed0105ce4909b65f17d187948290a99b9586e319ec0324bca0
 EBUILD vlc-0.8.6g.ebuild 9086 RMD160 97f2951ccb49c282d68f6bbad2b1b9c43bf475cf SHA1 d3528f8373cea598576af21661969319d7a4690c SHA256 6d9338668490b13da61365e8856f4b749419dd90d135ca22970b3c4b4c93cb47
 EBUILD vlc-0.8.6h.ebuild 8989 RMD160 3f08b80bdc96d6ab57f5d5869949bf18f3a4c915 SHA1 2b9b6a353c7b467bb5468ec6770dfdb62638269b SHA256 eabf234909dfb3f9bbc36993839c00039282847cfdc580bd88ac4f6ae31cfce8
 EBUILD vlc-0.8.6i.ebuild 8986 RMD160 a773b90f7dee807318a47a2a0c61341a4e97e69d SHA1 7ee5a1e0038948809592d743479d3f21eed47b7c SHA256 849485f83a6769c6c806a720e496ed1e6059ffeec6e74db771b5ff1abc094027
 EBUILD vlc-0.9.0_beta1.ebuild 10917 RMD160 a81a9eb7e02544a0ffabf7a7aed640e6f016e3d1 SHA1 ee8573f50be8298a02dcb35b0f8a9a45b3eb7f43 SHA256 e6cbb0413881348c58e758e9f22f1b4c178098204831ecec5bb3cb5c9d55c342
-MISC ChangeLog 59299 RMD160 302327d7871c12b1a00795470d3c8b66b68c1be6 SHA1 b346099e6f207a95ba01fec8d07b94a3517e1b14 SHA256 5bca2242248449b49d28efede197186c8c70060866c727a0f65913d921054d64
+EBUILD vlc-0.9.0_beta2.ebuild 10833 RMD160 104585795b41ebfc57980da387af228f9aa326cf SHA1 e5e18efe9fcf4957faec9082a838aff60705f208 SHA256 6d90d3f86e125bb6e1dd340a7ea78fc789dfd90f744a6dd5bc9b662b955ccddf
+MISC ChangeLog 59426 RMD160 a67be9fabece80f9a75af1094b55850361550f24 SHA1 4e8a752c9f4f8fcf37b552a0a254da553d50bc27 SHA256 2043f06c388d69b4a8ec854b6800577dfd55489ab53dec3a558388dfc5f883ba
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkh7S8oACgkQvFcC4BYPU0peuACdEjBIFFfIJaaGD7mpyacjl3KV
+NGAAn0RgQymFQRKZvTPayaxGu9aDB57U
+=nR+g
+-----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-0.9.0_beta2.ebuild b/media-video/vlc/vlc-0.9.0_beta2.ebuild
new file mode 100644
index 000000000000..495398b0cfd0
--- /dev/null
+++ b/media-video/vlc/vlc-0.9.0_beta2.ebuild
@@ -0,0 +1,358 @@
+# 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_beta2.ebuild,v 1.1 2008/07/14 12:51:09 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="58"
+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="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="a52 aac aalib alsa altivec arts atmo avahi bidi cdda cddb cdio dbus dc1394
+	debug directfb dts dvb dvd esd fbcon fluidsynth +ffmpeg flac ggi gnome gnutls hal httpd
+	id3tag jack 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 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 )
+		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 )
+		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 )
+		libcaca? ( media-libs/libcaca )
+		libgcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
+		libnotify? ( x11-libs/libnotify )
+		lirc? ( app-misc/lirc )
+		live? ( >=media-plugins/live-2007.02.20 )
+		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.2.0:4 ) )
+		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
+		samba? ( net-fs/samba )
+		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.2.0: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
+# dirac? ( >=media-video/dirac-0.10.0 )
+#	Needs testing but can be ok
+# 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-r1" ; 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) \
+		--disable-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) \
+		--disable-galaktos \
+		$(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 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 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) \
+		--disable-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
+}