Version bump wrt #191094.

(Portage version: 2.1.3.7)

6 files changed, 51 insertions, 312 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 21c8cd3f3e4b..4c2ae9e8bedf 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.475 2007/07/31 14:29:54 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.476 2007/09/03 11:38:17 drac Exp $
+
+*xine-lib-1.1.8 (03 Sep 2007)
+
+  03 Sep 2007; Samuli Suominen <drac@gentoo.org> +xine-lib-1.1.8.ebuild:
+  Version bump wrt #191094.
 
   31 Jul 2007; Doug Goldstein <cardoe@gentoo.org> xine-lib-1.1.2-r3.ebuild:
   nvidia-legacy-drivers has merged with nvidia-drivers
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.2-r3 b/media-libs/xine-lib/files/digest-xine-lib-1.1.2-r3
deleted file mode 100644
index 95f803c5bafa..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.2-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c4dd262c47caae6f428eb902ac8ec0e8 xine-lib-1.1.2.tar.bz2 6457108
-RMD160 21322d6d7e085237926741495d70f5ce7764910b xine-lib-1.1.2.tar.bz2 6457108
-SHA256 871933c745f5824808a88720518c0164166906536c7f8723bd38e84f78319226 xine-lib-1.1.2.tar.bz2 6457108
-MD5 bcf6f9a132ef087c1ae35e06f797b52b xine-lib-patches-64.tar.bz2 23578
-RMD160 6a4272d82c7d8de004e71e2991e0cdf66ab833c2 xine-lib-patches-64.tar.bz2 23578
-SHA256 d5fcf477e59d6963235c6d6f682d887e21f849bc76441d915152b83f93d44884 xine-lib-patches-64.tar.bz2 23578
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.3 b/media-libs/xine-lib/files/digest-xine-lib-1.1.3
deleted file mode 100644
index 16d7e52cb158..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 161dc882a9e7352c63b3fd1b6ff2e55f xine-lib-1.1.3.tar.gz 8508884
-RMD160 8e28638385ea48e7d4d4d702573ca92c4eca77c8 xine-lib-1.1.3.tar.gz 8508884
-SHA256 96e50c6e7b2fb1209c52dcab6b38f2a99aa1c9d6e028b479a800cafef11bccb0 xine-lib-1.1.3.tar.gz 8508884
-MD5 ae3f09d77faf7e31ca78e9ebc79463ce xine-lib-patches-61.tar.bz2 9701
-RMD160 4e58b5cbbaa97a4a9ac90713ea9997a86722b1ac xine-lib-patches-61.tar.bz2 9701
-SHA256 39ad08a08cb3f9b71ec062b7fac6bf3d089f31f421d10d4e12b9f51d684030c2 xine-lib-patches-61.tar.bz2 9701
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.8 b/media-libs/xine-lib/files/digest-xine-lib-1.1.8
new file mode 100644
index 000000000000..c13df17646b1
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.8
@@ -0,0 +1,3 @@
+MD5 607386c8f5d5a5a896aa651b4f367561 xine-lib-1.1.8.tar.bz2 7284933
+RMD160 b926caa13d5b3f3c74eee681aa6c47c6083c1349 xine-lib-1.1.8.tar.bz2 7284933
+SHA256 6c9f11bdec714f8df36b5140a7c8cc6ec81dd8a7673f4756e940cee4f4833c0e xine-lib-1.1.8.tar.bz2 7284933
diff --git a/media-libs/xine-lib/xine-lib-1.1.2-r3.ebuild b/media-libs/xine-lib/xine-lib-1.1.2-r3.ebuild
deleted file mode 100644
index 7cb0041af00e..000000000000
--- a/media-libs/xine-lib/xine-lib-1.1.2-r3.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.2-r3.ebuild,v 1.13 2007/07/31 14:29:54 cardoe Exp $
-
-WANT_AUTOMAKE="1.9"
-WANT_AUTOCONF="2.5"
-
-inherit eutils flag-o-matic toolchain-funcs libtool autotools
-
-# This should normally be empty string, unless a release has a suffix.
-if [[ "${P/_pre/}" != "${P}" ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else
-	MY_PKG_SUFFIX=""
-	MY_P="${PN}-${PV/_/-}${MY_PKG_SUFFIX}"
-	S="${WORKDIR}/${MY_P}"
-
-	SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.bz2"
-fi
-
-PATCHLEVEL="64"
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_via video_cards_i810"
-
-IUSE="aalib libcaca arts esd win32codecs nls dvd X directfb vorbis alsa
-gnome sdl speex theora ipv6 altivec opengl aac fbcon xv xvmc
-dxr3 vidix mng flac oss v4l xinerama vcd a52 mp3 imagemagick dts asf
-debug modplug ${IUSE_VIDEO_CARDS}"
-
-RDEPEND="vorbis? ( media-libs/libvorbis )
-	X? (
-		x11-libs/libXext
-		x11-libs/libX11
-	)
-	xv? ( x11-libs/libXv )
-	xvmc? (
-		x11-libs/libXvMC
-		video_cards_nvidia? ( x11-drivers/nvidia-drivers )
-		video_cards_via? ( x11-drivers/xf86-video-via )
-		video_cards_i810? ( x11-drivers/xf86-video-i810 )
-	)
-	xinerama? ( x11-libs/libXinerama )
-	win32codecs? ( >=media-libs/win32codecs-0.50 )
-	esd? ( media-sound/esound )
-	dvd? ( >=media-libs/libdvdcss-1.2.7 )
-	arts? ( kde-base/arts )
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	directfb? ( >=dev-libs/DirectFB-0.9.9 )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	flac? ( ~media-libs/flac-1.1.2 )
-	sdl? ( >=media-libs/libsdl-1.1.5 )
-	dxr3? ( >=media-libs/libfame-0.9.0 )
-	theora? ( media-libs/libtheora )
-	speex? ( media-libs/speex )
-	libcaca? ( media-libs/libcaca )
-	mng? ( media-libs/libmng )
-	vcd? ( media-video/vcdimager )
-	a52? ( >=media-libs/a52dec-0.7.4-r5 )
-	mp3? ( media-libs/libmad )
-	imagemagick? ( media-gfx/imagemagick )
-	dts? ( media-libs/libdts )
-	>=media-video/ffmpeg-0.4.9_p20051120
-	modplug? ( media-libs/libmodplug )
-	nls? ( virtual/libintl )
-	virtual/libiconv
-	!=media-libs/xine-lib-0.9.13*"
-
-DEPEND="${RDEPEND}
-	X? (
-		x11-libs/libXt
-		x11-proto/xproto
-		x11-proto/videoproto
-		x11-proto/xf86vidmodeproto
-		xinerama? ( x11-proto/xineramaproto )
-	)
-	v4l? ( virtual/os-headers )
-	dev-util/pkgconfig
-	sys-devel/libtool
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-# check for the X11 path for a given library
-get_x11_dir() {
-	if [[ -f "${ROOT}/usr/$(get_libdir)/$1" ]]; then
-		echo "${ROOT}/usr/$(get_libdir)"
-	elif [[ -f "${ROOT}/usr/$(get_libdir)/xorg/$1" ]]; then
-		echo "${ROOT}/usr/$(get_libdir)/xorg"
-	elif [[ -f "${ROOT}/usr/X11R6/$(get_libdir)/$1" ]]; then
-		echo "${ROOT}/usr/X11R6/$(get_libdir)"
-	fi
-}
-
-src_compile() {
-	#prevent quicktime crashing
-	append-flags -frename-registers -ffunction-sections
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ $(tc-arch) == "x86" ]]; then
-		filter-flags -fforce-addr
-		filter-flags -momit-leaf-frame-pointer # break on gcc 3.4/4.x
-		filter-flags -fno-omit-frame-pointer #breaks per bug #149704
-		is-flag -O? || append-flags -O2
-	fi
-
-	# debug useflag used to emulate debug make targets. See bug #112980 and the
-	# xine maintainers guide.
-	use debug && append-flags -UNDEBUG -DDEBUG
-
-	local myconf
-
-	# enable/disable appropiate optimizations on sparc
-	[[ "${PROFILE_ARCH}" == "sparc64" ]] && myconf="${myconf} --enable-vis"
-	[[ "${PROFILE_ARCH}" == "sparc" ]] && myconf="${myconf} --disable-vis"
-
-	# The default CFLAGS (-O) is the only thing working on hppa.
-	use hppa && unset CFLAGS
-
-	if ! use xvmc; then
-		myconf="${myconf} --disable-xvmc"
-	else
-		count="0"
-		if use video_cards_nvidia; then
-			count="`expr ${count} + 1`"
-			xvmclib="XvMCNVIDIA"
-		fi
-
-		if use video_cards_i810; then
-			count="`expr ${count} + 1`"
-			xvmclib="I810XvMC"
-		fi
-
-		if use video_cards_via; then
-			count="`expr ${count} + 1`"
-			xvmclib="viaXvMC"
-		fi
-
-		if [[ "${count}" -gt "1" ]]; then
-			eerror "Invalid combination of USE flags"
-			eerror "When building support for xvmc, you may only include support"
-			eerror "for none or one of the following VIDEO_CARDS:"
-			eerror ""
-			eerror "nvidia i810 via"
-			eerror ""
-			eerror "XvMC support will try to link against libXvMCW."
-		elif [[ -n "${xvmclib}" ]]; then
-			xvmcconf="--with-xvmc-lib=${xvmclib} --with-xxmc-lib=${xvmclib}"
-			xvmcdir=$(get_x11_dir libXvMC.so)
-
-			[[ -z ${xvmcdir} ]] && die "Unable to find libXvMC.so."
-
-			myconf="${myconf} ${xvmcconf} --with-xvmc-path=${xvmcdir} --with-xxmc-path=${xvmcdir}"
-		fi
-	fi
-
-	if use xv; then
-		xvdir=$(get_x11_dir libXv.so)
-
-		[[ -z ${xvdir} ]] && die "Unable to find libXv.so. Did you set USE=\"xv\" when you emerged xorg-x11?"
-
-		myconf="${myconf} --with-xv-path=${xvdir}"
-	fi
-
-	econf \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
-		$(use_enable altivec) \
-		$(use_enable v4l) \
-		\
-		$(use_enable mng) \
-		$(use_enable imagemagick) \
-		\
-		$(use_enable aac faad) \
-		$(use_enable flac) \
-		$(use_with vorbis ogg) $(use_with vorbis) \
-		$(use_enable speex) \
-		$(use_enable a52) --with-external-a52dec \
-		$(use_enable mp3 mad) --with-external-libmad \
-		$(use_enable dts) --with-external-libdts \
-		\
-		$(use_with X x) \
-		$(use_enable xinerama) \
-		$(use_enable vidix) \
-		$(use_enable dxr3) \
-		$(use_enable directfb) \
-		$(use_enable fbcon fb) \
-		$(use_enable opengl) \
-		$(use_enable aalib) \
-		$(use_enable libcaca caca) \
-		$(use_enable sdl) \
-		\
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		$(use_enable arts) \
-		$(use_enable esd) \
-		$(use_enable vcd) --without-internal-vcdlibs \
-		\
-		$(use_enable asf) \
-		$(use_enable win32codecs w32dll) \
-		$(use_enable modplug) \
-		--with-external-ffmpeg \
-		--disable-polypaudio \
-		--disable-optimizations \
-		--disable-freetype \
-		--disable-samba \
-		${myconf} \
-		--with-w32-path=/usr/lib/win32 \
-		--enable-fast-install \
-		--disable-dependency-tracking || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	dodoc AUTHORS ChangeLog README TODO doc/README* doc/faq/faq.txt
-	dohtml doc/faq/faq.html doc/hackersguide/*.html doc/hackersguide/*.png
-
-	rm -rf ${D}/usr/share/doc/xine
-}
-
-pkg_postinst() {
-	if use win32codecs && ! use asf; then
-		elog "You choose to build win32codecs support but disabled ASF"
-		elog "demuxer. This way you'll have support for win32codecs in"
-		elog "formats like AVI or Matroska, but not in WMV/WMA files."
-		elog ""
-		elog "To be able to play WMV/WMA files, please add asf useflag."
-	fi
-}
diff --git a/media-libs/xine-lib/xine-lib-1.1.3.ebuild b/media-libs/xine-lib/xine-lib-1.1.8.ebuild
index a941bcf7eaba..dab0f09c5d8f 100644
--- a/media-libs/xine-lib/xine-lib-1.1.3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.8.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.3.ebuild,v 1.16 2007/07/27 04:39:28 vapier Exp $
-
-WANT_AUTOMAKE="1.9"
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.8.ebuild,v 1.1 2007/09/03 11:38:17 drac Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -14,28 +12,24 @@ else
 	MY_P="${PN}-${PV/_/-}${MY_PKG_SUFFIX}"
 	S="${WORKDIR}/${MY_P}"
 
-	SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz"
+	SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.bz2"
 fi
 
-PATCHLEVEL="61"
-
 DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+HOMEPAGE="http://xine.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="aalib libcaca arts esd win32codecs nls dvd X directfb vorbis alsa
 gnome sdl speex theora ipv6 altivec opengl aac fbcon xv xvmc
-dxr3 vidix mng flac oss v4l xinerama vcd a52 mad imagemagick dts
-debug modplug gtk pulseaudio mmap truetype"
+samba dxr3 vidix mng flac oss v4l xinerama vcd a52 mad imagemagick dts
+debug modplug gtk pulseaudio mmap truetype wavpack musepack xcb jack
+real"
 
-RDEPEND="
-	X? ( x11-libs/libXext
-		 x11-libs/libX11 )
+RDEPEND="X? ( x11-libs/libXext
+	x11-libs/libX11 )
 	xv? ( x11-libs/libXv )
 	xvmc? ( x11-libs/libXvMC )
 	xinerama? ( x11-libs/libXinerama )
@@ -47,27 +41,35 @@ RDEPEND="
 	aalib? ( media-libs/aalib )
 	directfb? ( >=dev-libs/DirectFB-0.9.9 )
 	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	flac? ( ~media-libs/flac-1.1.2 )
+	flac? ( >=media-libs/flac-1.1.2 )
 	sdl? ( >=media-libs/libsdl-1.1.5 )
 	dxr3? ( >=media-libs/libfame-0.9.0 )
 	vorbis? ( media-libs/libogg media-libs/libvorbis )
 	theora? ( media-libs/libogg media-libs/libvorbis >=media-libs/libtheora-1.0_alpha6 )
 	speex? ( media-libs/libogg media-libs/libvorbis media-libs/speex )
 	libcaca? ( >=media-libs/libcaca-0.99_beta1 )
+	samba? ( net-fs/samba )
 	mng? ( media-libs/libmng )
 	vcd? ( media-video/vcdimager )
 	a52? ( >=media-libs/a52dec-0.7.4-r5 )
 	mad? ( media-libs/libmad )
 	imagemagick? ( media-gfx/imagemagick )
-	dts? ( media-libs/libdts )
-	>=media-video/ffmpeg-0.4.9_p20060816
+	dts? ( || ( media-libs/libdca media-libs/libdts ) )
+	>=media-video/ffmpeg-0.4.9_p20070129
 	modplug? ( media-libs/libmodplug )
 	nls? ( virtual/libintl )
 	gtk? ( =x11-libs/gtk+-2* )
 	pulseaudio? ( media-sound/pulseaudio )
 	truetype? ( =media-libs/freetype-2* media-libs/fontconfig )
 	virtual/libiconv
-	!=media-libs/xine-lib-0.9.13*"
+	wavpack? ( >=media-sound/wavpack-4.31 )
+	musepack? ( media-libs/libmpcdec )
+	xcb? ( >=x11-libs/libxcb-1.0 )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+	real? (
+		x86? ( media-libs/win32codecs )
+		x86-fbsd? ( media-libs/win32codecs )
+		amd64? ( media-libs/amd64codecs ) )"
 
 DEPEND="${RDEPEND}
 	X? ( x11-libs/libXt
@@ -80,19 +82,6 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	epatch "${WORKDIR}/patches/120"*
-
-	sed -i -e '/FFMPEG_POSTPROC/s:libpostproc >= .*]:libpostproc]:' \
-		"${S}/configure.ac"
-
-	AT_M4DIR="m4" eautoreconf
-}
-
 src_compile() {
 	#prevent quicktime crashing
 	append-flags -frename-registers -ffunction-sections
@@ -105,10 +94,6 @@ src_compile() {
 		is-flag -O? || append-flags -O2
 	fi
 
-	# debug useflag used to emulate debug make targets. See bug #112980 and the
-	# xine maintainers guide.
-	use debug && append-flags -UNDEBUG -DDEBUG
-
 	local myconf
 
 	# enable/disable appropiate optimizations on sparc
@@ -122,10 +107,12 @@ src_compile() {
 	# So that the relative path is used to identify them.
 	mkdir "${WORKDIR}/build"
 
+	elibtoolize
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable gnome gnomevfs) \
 		$(use_enable nls) \
 		$(use_enable ipv6) \
+		$(use_enable samba) \
 		$(use_enable altivec) \
 		$(use_enable v4l) \
 		\
@@ -134,13 +121,16 @@ src_compile() {
 		$(use_enable gtk gdkpixbuf) \
 		\
 		$(use_enable aac faad) \
-		$(use_enable flac) \
+		$(use_with flac libflac) \
 		$(use_with vorbis) \
 		$(use_with speex) \
 		$(use_with theora) \
-		$(use_enable a52) --with-external-a52dec \
+		$(use_with wavpack) \
+		$(use_enable modplug) \
+		$(use_enable a52 a52dec) --with-external-a52dec \
 		$(use_enable mad) --with-external-libmad \
 		$(use_enable dts) --with-external-libdts \
+		$(use_enable musepack) --with-external-libmpcdec \
 		\
 		$(use_with X x) \
 		$(use_enable xinerama) \
@@ -153,38 +143,40 @@ src_compile() {
 		$(use_with libcaca caca) \
 		$(use_with sdl) \
 		$(use_enable xvmc) \
+		$(use_with xcb) \
 		\
 		$(use_enable oss) \
 		$(use_with alsa) \
 		$(use_with arts) \
 		$(use_with esd esound) \
 		$(use_with pulseaudio) \
+		$(use_with jack) \
+		\
 		$(use_enable vcd) --without-internal-vcdlibs \
 		\
 		$(use_enable win32codecs w32dll) \
-		$(use_enable modplug) \
+		$(use_enable real real-codecs) \
 		\
 		$(use_enable mmap) \
-		$(use_with truetype freetype) $(use_with truetype fontconfig ) \
+		$(use_with truetype freetype) $(use_with truetype fontconfig) \
+		\
+		$(use_enable debug) \
 		--enable-asf \
 		--with-external-ffmpeg \
 		--disable-optimizations \
 		--disable-syncfb \
-		--disable-samba \
 		${myconf} \
 		--with-xv-path=/usr/$(get_libdir) \
-		--with-w32-path=/usr/lib/win32 \
+		--with-w32-path=/usr/$(ABI=x86 get_libdir)/win32 \
+		--with-real-codecs-path=/usr/$(get_libdir)/codecs \
 		--enable-fast-install \
-		--disable-dependency-tracking || die "econf failed"
+		--disable-dependency-tracking || die "econf failed."
 
-	emake || die "emake failed"
+	emake || die "emake failed."
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	dodoc AUTHORS ChangeLog README TODO doc/README* doc/faq/faq.txt
-	dohtml doc/faq/faq.html doc/hackersguide/*.html doc/hackersguide/*.png
-
-	rm -rf "${D}/usr/share/doc/xine"
+	emake -j1 DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" htmldir="/usr/share/doc/${PF}/html" \
+		install || die "emake install failed."
 }