bump snapshot, blocking older versions cause of bug #157746, closing bug #195019 and bug #183584

Package-Manager: portage-2.1.3.12

4 files changed, 372 insertions, 5 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 06041103b2c4..97807886a7a7 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.257 2007/09/14 11:56:56 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.258 2007/10/09 22:23:53 aballier Exp $
+
+*vlc-0.9.0_alpha20071009 (09 Oct 2007)
+
+  09 Oct 2007; Alexis Ballier <aballier@gentoo.org>
+  +vlc-0.9.0_alpha20071009.ebuild:
+  bump snapshot, blocking older versions cause of bug #157746, closing bug
+  #195019 and bug #183584
 
   14 Sep 2007; Roy Marples <uberlord@gentoo.org> vlc-0.8.6c.ebuild:
   elibtoolize now patches install-sh for us.
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index f01761d1d8a8..4098a2f29418 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,13 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST vlc-0.8.6c.tar.bz2 11147601 RMD160 6245419e39401b1ee138a5be3ea0375cdedcb17e SHA1 aefaf7a039874930b3e7caf139d2ed5b5bbd0a56 SHA256 5fc24d7bbd2c1f715af1860e39207b857662fea5d0f6f212df4794688c7db6ae
 DIST vlc-patches-41.tar.bz2 11926 RMD160 c395422359abf9b99f7da80d8b47c8e269d80a10 SHA1 87b2ebc0d564480b3a9878a10b575405bbdce2aa SHA256 df162c2965844e0f3bacad4952ff41377566ae543a3f31b2fe1cdd33fc3e8a9c
+DIST vlc-patches-42.tar.bz2 4185 RMD160 705fd59e011a74f44f4b87823e862dd228d2bac4 SHA1 49df479feb4182b0ea55b07bc239518bc519d588 SHA256 7b54cb6cb84fe5ca1c5330ddaeea02d5df74aed601f3c61a4e4f73fc71749c98
+DIST vlc-snapshot-20071009.tar.bz2 12653194 RMD160 49a1ecea3b76b0624e9febf435043f85d29fe1d8 SHA1 6327139dd79b07af83521641d727c187ed8b9df2 SHA256 08897b167a91640782eee07b186a41067266f818df17bfaedb10937d8a67e30d
 EBUILD vlc-0.8.6c.ebuild 9158 RMD160 5b2dbe7788f2c6db1bd23426b07ce99bd3253fe6 SHA1 eaabf2d1a971b0a3ce47e544b289f5a02dec5421 SHA256 b474483168ebefbcd319e63c623ec46b08928bdf54c48a1ba2ac146fd66fab5e
 MD5 49eabe7047cd8bfeb4e9f21013f1dcbb vlc-0.8.6c.ebuild 9158
 RMD160 5b2dbe7788f2c6db1bd23426b07ce99bd3253fe6 vlc-0.8.6c.ebuild 9158
 SHA256 b474483168ebefbcd319e63c623ec46b08928bdf54c48a1ba2ac146fd66fab5e vlc-0.8.6c.ebuild 9158
-MISC ChangeLog 45225 RMD160 ad8e6a08a46566f2547de0ccdd91c4b5ee701296 SHA1 404329c16915ba2da4c4df4237f4ab8443e2356a SHA256 695d89d0cdc6bad1a9f4a335f841cfee2a488df8b2c6b52751dc5f895d805ff8
-MD5 e713bbdfbdce50ae932980e1856db38a ChangeLog 45225
-RMD160 ad8e6a08a46566f2547de0ccdd91c4b5ee701296 ChangeLog 45225
-SHA256 695d89d0cdc6bad1a9f4a335f841cfee2a488df8b2c6b52751dc5f895d805ff8 ChangeLog 45225
+EBUILD vlc-0.9.0_alpha20071009.ebuild 9892 RMD160 14ea87685791ca69200e228587137c2785330fb2 SHA1 b9fd81a4f59c835b25db5d51d8d5af87cc510d20 SHA256 1ef15bbf8e5c036a25ad70e62d03c9717ea4bc5ab527f504068624390fd7a1e5
+MD5 c957dae4bae6c9bc8c17deac0c6fef30 vlc-0.9.0_alpha20071009.ebuild 9892
+RMD160 14ea87685791ca69200e228587137c2785330fb2 vlc-0.9.0_alpha20071009.ebuild 9892
+SHA256 1ef15bbf8e5c036a25ad70e62d03c9717ea4bc5ab527f504068624390fd7a1e5 vlc-0.9.0_alpha20071009.ebuild 9892
+MISC ChangeLog 45454 RMD160 83e7c9282b52c7e17b4a349b2babdb2adfa9a006 SHA1 af3ce03399499dc6af65df6ba939fbe27ff6bc0d SHA256 7945897da64ec29a20aaa415872d45b7d85bf2acd7bb67681d06857600b8c2a5
+MD5 bd9a60ec2c4c3914126273f08d9968b4 ChangeLog 45454
+RMD160 83e7c9282b52c7e17b4a349b2babdb2adfa9a006 ChangeLog 45454
+SHA256 7945897da64ec29a20aaa415872d45b7d85bf2acd7bb67681d06857600b8c2a5 ChangeLog 45454
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -15,3 +24,13 @@ SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 metadata
 MD5 c9c3fbb41f5a3a690ecdbc689cad6409 files/digest-vlc-0.8.6c 485
 RMD160 b73875346a97349dbdf69cfebe61a3711705dc48 files/digest-vlc-0.8.6c 485
 SHA256 53b046074eba615a0fea6e70c52b158bf6c332ce12b0e2b7ed287413344faa5b files/digest-vlc-0.8.6c 485
+MD5 dd986e559d91193f811c7dfac331bce6 files/digest-vlc-0.9.0_alpha20071009 515
+RMD160 1585670c540aab83926c0ec261e021db5e51dc58 files/digest-vlc-0.9.0_alpha20071009 515
+SHA256 2b05cba79b1af61169f0a696109070cc3e0a7cbd18f1010ddf78fae313cce3b6 files/digest-vlc-0.9.0_alpha20071009 515
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHC/+XvFcC4BYPU0oRAtd2AJwMRnAhuD5LFCV1Xzu13za86DnRPgCfaAyh
+w1XbAptDh0jDRlsMqraAszI=
+=V7hd
+-----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/digest-vlc-0.9.0_alpha20071009 b/media-video/vlc/files/digest-vlc-0.9.0_alpha20071009
new file mode 100644
index 000000000000..b811c79afe80
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.9.0_alpha20071009
@@ -0,0 +1,6 @@
+MD5 e81e85aa4856806ed2b2e58df22e11a2 vlc-patches-42.tar.bz2 4185
+RMD160 705fd59e011a74f44f4b87823e862dd228d2bac4 vlc-patches-42.tar.bz2 4185
+SHA256 7b54cb6cb84fe5ca1c5330ddaeea02d5df74aed601f3c61a4e4f73fc71749c98 vlc-patches-42.tar.bz2 4185
+MD5 2c9c675f14b3caa6760697859b9ab187 vlc-snapshot-20071009.tar.bz2 12653194
+RMD160 49a1ecea3b76b0624e9febf435043f85d29fe1d8 vlc-snapshot-20071009.tar.bz2 12653194
+SHA256 08897b167a91640782eee07b186a41067266f818df17bfaedb10937d8a67e30d vlc-snapshot-20071009.tar.bz2 12653194
diff --git a/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild b/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild
new file mode 100644
index 000000000000..e5b6b9fb8da5
--- /dev/null
+++ b/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2007 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_alpha20071009.ebuild,v 1.1 2007/10/09 22:23:53 aballier Exp $
+
+WANT_AUTOMAKE=latest
+WANT_AUTOCONF=latest
+
+inherit eutils wxwidgets multilib autotools toolchain-funcs gnome2 nsplugins
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+VLC_SNAPSHOT_TIME="0016"
+
+# Used for live ebuilds
+# ESVN_REPO_URI="svn://svn.videolan.org/vlc/trunk"
+# ESVN_PROJECT="${PN}-trunk"
+# ESVN_BOOTSTRAP="bootstrap"
+# ESVN_PATCHES="${WORKDIR}/patches/*.patch"
+
+PATCHLEVEL="42"
+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*/}-svn"
+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"
+
+LICENSE="GPL-2"
+SLOT="1"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="a52 3dfx debug altivec httpd vlm gnutls live v4l v4l2 cdda ogg matroska
+dvb dvd vcd vcdx 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 sdl-image png xml samba daap mod speex shout rtsp
+win32codecs skins hal avahi xinerama cddb directfb upnp nsplugin seamonkey
+optimisememory libnotify jack musepack x264 dc1394 lua gnome pvr taglib
+musicbrainz dbus libgcrypt id3tag cdio ffmpeg twolame"
+
+RDEPEND="
+		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r1 )
+		cdda? ( >=dev-libs/libcdio-0.72
+			cddb? ( >=media-libs/libcddb-1.2.0 ) )
+		live? ( >=media-plugins/live-2007.02.20 )
+		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.8.0 )
+		mp3? ( media-libs/libmad )
+		a52? ( >=media-libs/a52dec-0.7.4-r3 )
+		dts? ( media-libs/libdca )
+		flac? ( media-libs/libogg
+			>=media-libs/flac-1.1.2 )
+		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.3.3 )
+		sys-libs/zlib
+		png? ( media-libs/libpng )
+		media-libs/libdvbpsi
+		sdl? ( >=media-libs/libsdl-1.2.8
+			sdl-image? ( media-libs/sdl-image ) )
+		xml? ( dev-libs/libxml2 )
+		samba? ( net-fs/samba )
+		cdio? ( >=dev-libs/libcdio-0.78.2
+			>=media-video/vcdimager-0.7.22 )
+		daap? ( >=media-libs/libopendaap-0.3.0 )
+		v4l? ( sys-kernel/linux-headers )
+		v4l2? ( sys-kernel/linux-headers )
+		dvb? ( sys-kernel/linux-headers )
+		mod? ( media-libs/libmodplug )
+		speex? ( media-libs/speex )
+		svg? ( >=gnome-base/librsvg-2.9.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 )
+			opengl? ( virtual/opengl )
+		)
+		directfb? ( dev-libs/DirectFB )
+		upnp? ( net-libs/libupnp )
+		nsplugin? (
+			!seamonkey? ( www-client/mozilla-firefox )
+			seamonkey? ( www-client/seamonkey )
+		)
+		libnotify? ( x11-libs/libnotify )
+		musepack? ( media-libs/libmpcdec )
+		x264? ( >=media-libs/x264-svn-20061014 )
+		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
+		lua? ( >=dev-lang/lua-5.1 )
+		gnome? ( gnome-base/gnome-vfs )
+		taglib? ( media-libs/taglib )
+		musicbrainz? ( media-libs/musicbrainz )
+		dc1394? ( sys-libs/libraw1394
+			<media-libs/libdc1394-1.9.99 )
+		dbus? ( >=sys-apps/dbus-1.0.2 )
+		libgcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
+		id3tag? ( media-libs/libid3tag
+			sys-libs/zlib )
+		twolame? ( media-sound/twolame )"
+
+# Disabled features and reasons : 
+# xvmc? ( x11-libs/libXvMC )
+#	Will probably compile only on x86
+# dirac? ( media-video/dirac )
+#	Needs testing but can be ok
+# qt4? ( $(qt4_min_version 4.2.0 ) )
+#	Main addition of 0.9.0, will enable it when it'll be released
+# zvbi? ( >=media-libs/zvbi-0.2.25 )
+#	Dep not up to date enough
+
+
+DEPEND="${RDEPEND}
+	X? ( xinerama? ( x11-proto/xineramaproto ) )
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+# Block older versions, we can't upgrade cleanly until bug #157746 gets
+# resolved...
+RDEPEND="${RDEPEND}
+	!<media-video/vlc-0.8.8"
+DEPEND="${DEPEND}
+	!<media-video/vlc-0.8.8"
+
+
+
+# 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."
+}
+
+pkg_setup() {
+	if use wxwindows || use skins; then
+		WX_GTK_VER="2.6"
+		need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
+	fi
+	vlc_use_needs skins truetype
+	vlc_use_needs skins wxwindows
+	vlc_use_needs cdda cdio
+	vlc_use_needs vcdx cdio
+	vlc_use_needs libgcrypt gnutls
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile () {
+	local XPIDL=""
+	local MOZILLA_CONFIG=""
+
+	use vlm && \
+		myconf="${myconf} --enable-vlm --enable-sout" || \
+		myconf="${myconf} --disable-vlm"
+
+	if use nsplugin; then
+		if use seamonkey; then
+			XPIDL=/usr/lib/seamonkey
+			MOZILLA_CONFIG=/usr/lib/seamonkey/seamonkey-config
+		else
+			XPIDL=/usr/lib/mozilla-firefox
+			MOZILLA_CONFIG=/usr/lib/mozilla-firefox/firefox-config
+		fi
+	fi
+
+	econf \
+		$(use_enable altivec) \
+		$(use_enable stream sout) \
+		$(use_enable httpd) \
+		$(use_enable gnutls) \
+		$(use_enable v4l) \
+		$(use_enable v4l2) \
+		$(use_enable cdda) $(use_enable cdda cddax)\
+		$(use_enable cddb libcddb) \
+		$(use_enable vcd) \
+		$(use_enable vcdx vcdx) \
+		$(use_enable dvb) \
+		$(use_enable pvr) \
+		$(use_enable ogg) \
+		$(use_enable matroska mkv) \
+		$(use_enable flac) \
+		$(use_enable vorbis) \
+		$(use_enable theora) \
+		$(use_enable X x11) \
+		$(use_enable X screen) \
+		$(use_enable xv xvideo) \
+		$(use_enable directfb) \
+		--disable-xvmc \
+		$(use_enable xinerama) \
+		$(use_enable opengl glx) $(use_enable opengl) $(use_enable opengl galaktos) \
+		$(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 ncurses) \
+		$(use_enable xosd) \
+		$(use_enable lirc) \
+		$(use_enable mp3 mad) \
+		$(use_enable a52) \
+		$(use_enable dts dca) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable ggi) \
+		$(use_enable 3dfx glide) \
+		$(use_enable sdl) \
+		$(use_enable sdl-image) \
+		$(use_enable png) \
+		$(use_enable xml libxml2) \
+		$(use_enable samba smb) \
+		$(use_enable daap) \
+		$(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 upnp) \
+		$(use_enable optimisememory optimize-memory) \
+		$(use_enable libnotify notify) \
+		$(use_enable jack) \
+		$(use_enable musepack mpc) \
+		$(use_enable x264) \
+		$(use_enable dc1394) \
+		--disable-qt4 \
+		$(use_enable lua) \
+		$(use_enable gnome gnomevfs) \
+		$(use_enable taglib) \
+		$(use_enable musicbrainz) \
+		--disable-dirac \
+		$(use_enable dbus) $(use_enable dbus dbus-control) \
+		$(use_enable libgcrypt) \
+		--disable-zvbi \
+		$(use_enable id3tag) \
+		$(use_enable live live555) \
+		$(use_enable cdio libcdio) \
+		$(use_enable truetype freetype) \
+		$(use_enable wxwindows wxwidgets) \
+		$(use_enable ffmpeg) \
+		$(use_enable twolame) \
+		--disable-faad \
+		--disable-dv \
+		--disable-libvc1 \
+		--disable-snapshot \
+		--disable-growl \
+		--disable-pth \
+		--disable-portaudio \
+		--disable-libtar \
+		--disable-optimizations \
+		--enable-utf8 \
+		--enable-libtool \
+		--enable-fast-install \
+		$(use_enable nsplugin mozilla) \
+		XPIDL="${XPIDL}" MOZILLA_CONFIG="${MOZILLA_CONFIG}" \
+		WX_CONFIG="${WX_CONFIG}" \
+		${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 "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
+
+	use wxwindows || rm "${D}/usr/share/applications/vlc.desktop"
+}