Bump revision fixing definitely the i18n issues so that they work.

(Portage version: 2.1)
 (Signed Manifest commit)

3 files changed, 15 insertions, 286 deletions

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 50939cff8e21..c92cc4517869 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -7,7 +7,7 @@ DIST xine-lib-1.1.2cvs20060606.tar.bz2 6509453 RMD160 a53a32bc5df800ad2072973224
 DIST xine-lib-patches-24.tar.bz2 18687 RMD160 68bf0ae79ba27e30f7b719862fd378b1871bc661 SHA256 86367ba64e81cf75f4f877c348777c791cf372aff29043fcf838d5f23cc3175f
 DIST xine-lib-patches-43.tar.bz2 36962 RMD160 b53a603b141bfee5121809e19bf4ad618cc50412 SHA1 82a7f58d76c8685df98773c75ec4fe21c890d20b SHA256 0cb9545171e4024a8ce1b6b1e2211b06c51adfe4650b2423862355331dd3650b
 DIST xine-lib-patches-45.tar.bz2 40494 RMD160 bffb9c08ba2386fb9c33ee15cec01436c9804612 SHA1 aaca1ea745e2f8f5c886555a74479a7a62a21f4a SHA256 97cbbc99ac9999d78640bd57d24c6839c57d3761ba9124b75df41222fb3cf34b
-DIST xine-lib-patches-48.tar.bz2 74435 RMD160 c46a8f0682ae5dd9a0559d477741d37f78b3e5cd SHA1 38d000ae5dd799562e8c1b9496fd3c2643823807 SHA256 1bde6baa3a954ce09ebc42ae9511422b1f8a356e01c32e638c4f66741c77aa37
+DIST xine-lib-patches-49.tar.bz2 76226 RMD160 291e1ddde13025b81fc793da263d396c28480862 SHA1 9b616c360f8f9218a4c521db5a9ea10e1dcf78f0 SHA256 3fd2eefaed3e37140f188d0e528dd10e7de9bf1e9446cadae8910a7f73e6180c
 EBUILD xine-lib-1.1.1-r3.ebuild 7232 RMD160 6a7024dedd3646e054cbe2731af58eed8013e9bd SHA1 92c83023f1f2cf42accb15ea9a6463ca1eba2f81 SHA256 1a281ed1ce771661ae909ecfe5de3e83e8fe5be6b93ed1ebc07b59227301cc25
 MD5 578712f99de216da48aefcc69567dcf1 xine-lib-1.1.1-r3.ebuild 7232
 RMD160 6a7024dedd3646e054cbe2731af58eed8013e9bd xine-lib-1.1.1-r3.ebuild 7232
@@ -20,14 +20,14 @@ EBUILD xine-lib-1.1.2_pre20060328-r9.ebuild 7407 RMD160 83b13a9259130e561393405d
 MD5 b4b3e1fbb76fef104d82fbfd365f3054 xine-lib-1.1.2_pre20060328-r9.ebuild 7407
 RMD160 83b13a9259130e561393405d494af52777f8b377 xine-lib-1.1.2_pre20060328-r9.ebuild 7407
 SHA256 61bcc856a900fe0c1bbbc9e561d35fe7fd610c9141a534301a58b58cd4a35a63 xine-lib-1.1.2_pre20060328-r9.ebuild 7407
-EBUILD xine-lib-1.1.2_pre20060606.ebuild 7647 RMD160 a2471d47296b5d48425bd0941d71fdeaab26cdb8 SHA1 2cdf7b758d5b04c3a5d35efda6a74d0b927e1bd0 SHA256 7b048609c6867c65591164e27b5f204291711814b57f729459425121eb332ec4
-MD5 2c4ecf7a0a95666f3adbf4d693b6df4e xine-lib-1.1.2_pre20060606.ebuild 7647
-RMD160 a2471d47296b5d48425bd0941d71fdeaab26cdb8 xine-lib-1.1.2_pre20060606.ebuild 7647
-SHA256 7b048609c6867c65591164e27b5f204291711814b57f729459425121eb332ec4 xine-lib-1.1.2_pre20060606.ebuild 7647
-MISC ChangeLog 33175 RMD160 2c1c95a7087db93bfd480266c798d0f09e488fda SHA1 597c29638ad44cd02e65f962fed915999de9a7df SHA256 941b33bd2efb3b9e79953aaddacb2f7b7542fe0767f056adef21fe11c04593e2
-MD5 597e845af91502668c90680b8451ac9a ChangeLog 33175
-RMD160 2c1c95a7087db93bfd480266c798d0f09e488fda ChangeLog 33175
-SHA256 941b33bd2efb3b9e79953aaddacb2f7b7542fe0767f056adef21fe11c04593e2 ChangeLog 33175
+EBUILD xine-lib-1.1.2_pre20060606-r1.ebuild 7727 RMD160 54092ecc39470ac1518716034978056693c26d09 SHA1 e3a09e6e8ee5369930daf8718c6e545aeb21f7f4 SHA256 257a1c53b65b2e4318aff3474c9d7e82bb79b4def32b132852173a92a90e123b
+MD5 cf4ea9708de3bb706f8d9d83414fb0bd xine-lib-1.1.2_pre20060606-r1.ebuild 7727
+RMD160 54092ecc39470ac1518716034978056693c26d09 xine-lib-1.1.2_pre20060606-r1.ebuild 7727
+SHA256 257a1c53b65b2e4318aff3474c9d7e82bb79b4def32b132852173a92a90e123b xine-lib-1.1.2_pre20060606-r1.ebuild 7727
+MISC ChangeLog 33421 RMD160 587c566e405256282221c47a3491ac61caf41c0d SHA1 0989e2054347039bd2bf5123bf3b708166e00d72 SHA256 760479b2dd1d9293897906cb4f9ed2075b54ce87e97631bb0217322d76769257
+MD5 84f2f667d60b6a8ea3c2249df3d37565 ChangeLog 33421
+RMD160 587c566e405256282221c47a3491ac61caf41c0d ChangeLog 33421
+SHA256 760479b2dd1d9293897906cb4f9ed2075b54ce87e97631bb0217322d76769257 ChangeLog 33421
 MISC metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 SHA1 6e47671ad5629f45f8bba068ae87a7b27b4c9750 SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 metadata.xml 330
@@ -41,13 +41,13 @@ SHA256 fbc356822d9d60ecf6bb0c32bd753695b8bb78374fe40211a192b4f2f28b30cf files/di
 MD5 95279f3962ea45c87765c2a43af06b76 files/digest-xine-lib-1.1.2_pre20060328-r9 539
 RMD160 401f695b1d0d33bbe37a83da7107c4cc0a77299d files/digest-xine-lib-1.1.2_pre20060328-r9 539
 SHA256 fa56204f68229db6ab2e26b3c62f9951eea925a8299c363112cdcd4059a6b003 files/digest-xine-lib-1.1.2_pre20060328-r9 539
-MD5 22e281494aca6d91d99e774086556015 files/digest-xine-lib-1.1.2_pre20060606 542
-RMD160 ec01b1ff0c53fb79c3501df5cf10eeedbb3c82f8 files/digest-xine-lib-1.1.2_pre20060606 542
-SHA256 f143e49ef331edd7c9e6481a5100b006ad4e3000276dd5d0faa1fa438fa41275 files/digest-xine-lib-1.1.2_pre20060606 542
+MD5 bb67ac3ec3cb056ee60faac4e466ecf7 files/digest-xine-lib-1.1.2_pre20060606-r1 542
+RMD160 ed8b29dbd3b20c62b113d2368b6c3db58dc7ca78 files/digest-xine-lib-1.1.2_pre20060606-r1 542
+SHA256 7b3cf8e4dcb4a0802b5799b9dab875785b57257ffe48552b9ee785c0b1580f08 files/digest-xine-lib-1.1.2_pre20060606-r1 542
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEiMWCAiZjviIA2XgRAnkJAJ9GVEbnVSWPJ10TZGTH0BwwYzUNCACfVYqM
-CsUoGgA8FkIrT0ZzqCaTO7U=
-=AS32
+iD8DBQFEiqeyAiZjviIA2XgRAs0+AKCWto9vfPEqa1lDdF1Pl+s62IT6DACeOInH
++4189Z1hegAdUvNVqI5i0Jc=
+=owBu
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060606 b/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060606
deleted file mode 100644
index 6cf6ba994b5c..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060606
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 04248860a422a7fd2a050bf3333f5954 xine-lib-1.1.2cvs20060606.tar.bz2 6509453
-RMD160 a53a32bc5df800ad2072973224fe8c426caaefa7 xine-lib-1.1.2cvs20060606.tar.bz2 6509453
-SHA256 c00e378c87e669c60936b71aaaa6eb320dcf202835f7d7fca168efc026bcfb94 xine-lib-1.1.2cvs20060606.tar.bz2 6509453
-MD5 17f382a8a514b13cdf545cdf15787582 xine-lib-patches-48.tar.bz2 74435
-RMD160 c46a8f0682ae5dd9a0559d477741d37f78b3e5cd xine-lib-patches-48.tar.bz2 74435
-SHA256 1bde6baa3a954ce09ebc42ae9511422b1f8a356e01c32e638c4f66741c77aa37 xine-lib-patches-48.tar.bz2 74435
diff --git a/media-libs/xine-lib/xine-lib-1.1.2_pre20060606.ebuild b/media-libs/xine-lib/xine-lib-1.1.2_pre20060606.ebuild
deleted file mode 100644
index 3824833d8ecc..000000000000
--- a/media-libs/xine-lib/xine-lib-1.1.2_pre20060606.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2006 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_pre20060606.ebuild,v 1.3 2006/06/09 00:48:57 flameeyes Exp $
-
-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
-	MY_PKG_SUFFIX=""
-	MY_P="${PN}-${PV/_/-}${MY_PKG_SUFFIX}"
-	S="${WORKDIR}/${MY_P}"
-
-	SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz"
-else
-	MY_P="${PN}-${PV/_pre/cvs}"
-	S="${WORKDIR}/${MY_P}"
-
-	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-fi
-
-PATCHLEVEL="48"
-
-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 ~sh ~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
-samba dxr3 vidix mng flac oss v4l xinerama vcd a52 mad imagemagick dts asf
-ffmpeg debug modplug ${IUSE_VIDEO_CARDS}"
-
-RDEPEND="vorbis? ( media-libs/libvorbis )
-	X? ( || ( (
-			x11-libs/libXext
-			x11-libs/libX11 )
-		virtual/x11 ) )
-	xv? ( || ( x11-libs/libXv virtual/x11 ) )
-	xvmc? (
-		|| ( x11-libs/libXvMC virtual/x11 )
-		video_cards_nvidia? ( media-video/nvidia-glx )
-		video_cards_via? ( || ( x11-drivers/xf86-video-via virtual/x11 ) )
-		video_cards_i810? ( || ( x11-drivers/xf86-video-i810 virtual/x11 ) )
-	)
-	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )
-	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.0.4 )
-	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 )
-	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 )
-	ffmpeg? ( >=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-base/xorg-server
-			x11-libs/libXt
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-proto/videoproto
-			x11-proto/xf86vidmodeproto
-			xinerama? ( x11-proto/xineramaproto ) )
-		virtual/x11 )
-		)
-	v4l? ( virtual/os-headers )
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	if use nls && [[ -d "${WORKDIR}/patches/poupdate/" ]]; then
-		ebegin "Updating translation files"
-		cp "${WORKDIR}/patches/poupdate/"*.po "${S}/po"
-		find "${S}/po" -name '*.po' -exec basename {} .po \; \
-			> "${S}/po/LINGUAS"
-		eend
-	fi
-
-	# ffmpeg doesn'g use libtool, so the condition for PIC code
-	# is __PIC__, not PIC.
-	sed -i -e 's/#\(\(.*def *\)\|\(.*defined *\)\|\(.*defined(*\)\)PIC/#\1__PIC__/' \
-		src/libffmpeg/libavcodec/i386/dsputil_mmx{.c,_rnd.h,_avg.h} \
-		src/libffmpeg/libavcodec/msmpeg4.c \
-		|| die "sed failed (__PIC__)"
-
-	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
-		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 -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) \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
-		$(use_enable samba) \
-		$(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 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) \
-		$(use_with ffmpeg external-ffmpeg) \
-		--disable-polypaudio \
-		--disable-optimizations \
-		${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
-		einfo "You choose to build win32codecs support but disabled ASF"
-		einfo "demuxer. This way you'll have support for win32codecs in"
-		einfo "formats like AVI or Matroska, but not in WMV/WMA files."
-		einfo ""
-		einfo "To be able to play WMV/WMA files, please add asf useflag."
-	fi
-}