Fix typo in econf line, thanks to David Watzke in bug #155463.

Package-Manager: portage-2.1.2_rc2-r1

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 3b3e736aad7b984f30d1df59e5e9f50f3f047af7..ba43184f97a525de01208362f52a4cd81d6a5050 100644 (file)
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -2,7 +2,6 @@
 Hash: SHA1
 
 DIST xine-lib-1.1.2.tar.bz2 6457108 RMD160 21322d6d7e085237926741495d70f5ce7764910b SHA1 07e454e2287e34414b598faf78ae6d8ab8ffbb69 SHA256 871933c745f5824808a88720518c0164166906536c7f8723bd38e84f78319226
-DIST xine-lib-1.1.3_pre20061112.tar.bz2 6667706 RMD160 9534d252cadac2d7b67892802245aff2be05446f SHA1 92a69115d3e5f5dd44071432cc2724538a43bd46 SHA256 083c27a638f1d13b4cf9b37cb1744057b0b1757c909385c30938c41e50dcfe46
 DIST xine-lib-1.1.3_pre20061119.tar.bz2 6978305 RMD160 53ce5e1ec3aed8a79b9c217ddcb1588dc08e21ef SHA1 3673204a211032f670dfc49021c33586779196b8 SHA256 2a7336e141fccd638d2bd686e3e6c95aee8e9811108fb2f122d31e7ca708066c
 DIST xine-lib-patches-61.tar.bz2 9701 RMD160 4e58b5cbbaa97a4a9ac90713ea9997a86722b1ac SHA1 0d749e3c46ea58e961d48f86aca997b16e72803b SHA256 39ad08a08cb3f9b71ec062b7fac6bf3d089f31f421d10d4e12b9f51d684030c2
 DIST xine-lib-patches-63.tar.bz2 22862 RMD160 1aa3c0541e9d739968f6f62c09567caa2a646414 SHA1 ac1a6a40c8b783c40d823905e8db69f5139784d4 SHA256 7e7a137a27605addad5c4e96c46984293c5febdfa08eec976600be8b206448f6
@@ -10,18 +9,14 @@ EBUILD xine-lib-1.1.2-r2.ebuild 7179 RMD160 209e9efc0812378f7ec800cf3c625d433f46
 MD5 043ef6b29d6f265d0aee1650cd852500 xine-lib-1.1.2-r2.ebuild 7179
 RMD160 209e9efc0812378f7ec800cf3c625d433f46cc71 xine-lib-1.1.2-r2.ebuild 7179
 SHA256 b00c968bc3fecace431cdac9887e5fcb702c9312d7d7d0047fd98ffe4f8ef223 xine-lib-1.1.2-r2.ebuild 7179
-EBUILD xine-lib-1.1.3_pre20061112.ebuild 5338 RMD160 31ddc30405285bde34c0bea03d173ac7ba53f513 SHA1 ec3275386822f931ad311731cc69add96e367d9d SHA256 a161ed918603781c543e4fc0d0b3ea77283de2c2a25318c132415568a0cde3f3
-MD5 2c537975cf64e7eed766cd3e1d59320e xine-lib-1.1.3_pre20061112.ebuild 5338
-RMD160 31ddc30405285bde34c0bea03d173ac7ba53f513 xine-lib-1.1.3_pre20061112.ebuild 5338
-SHA256 a161ed918603781c543e4fc0d0b3ea77283de2c2a25318c132415568a0cde3f3 xine-lib-1.1.3_pre20061112.ebuild 5338
-EBUILD xine-lib-1.1.3_pre20061119.ebuild 5348 RMD160 318a2e6121bfe6a67555dcde41c47dccd9e69fab SHA1 f0f1eaf959bc3ddab5d5b1afb134a70c7600d297 SHA256 86ddccecdfc0b454914751e258b09f88aa08d101874f4b93a3882c622bb9d647
-MD5 68047a01590ed23dd842769692dd7d2d xine-lib-1.1.3_pre20061119.ebuild 5348
-RMD160 318a2e6121bfe6a67555dcde41c47dccd9e69fab xine-lib-1.1.3_pre20061119.ebuild 5348
-SHA256 86ddccecdfc0b454914751e258b09f88aa08d101874f4b93a3882c622bb9d647 xine-lib-1.1.3_pre20061119.ebuild 5348
-MISC ChangeLog 43210 RMD160 e753c68d4edec14d76da13ad8ab8e94dbe71eaaa SHA1 41129c6a31734fc1aa0c3566baf2e408a2495d83 SHA256 8cb50be389b7fc8e9a3daeb5b50283dde58056cfddcb0ec0aa0e583723b0e4bf
-MD5 73794408bab459ff192ee31bcc5f9af0 ChangeLog 43210
-RMD160 e753c68d4edec14d76da13ad8ab8e94dbe71eaaa ChangeLog 43210
-SHA256 8cb50be389b7fc8e9a3daeb5b50283dde58056cfddcb0ec0aa0e583723b0e4bf ChangeLog 43210
+EBUILD xine-lib-1.1.3_pre20061119.ebuild 5348 RMD160 ecd2868f3f41301f775c72ce55eb4d0dd8993c76 SHA1 572577e00e7c43d3f1a38e9c9de872ddaf9c03ad SHA256 f59e387959433560d12ac6defa4d57cb841fc4f68f03660133260721f98e5378
+MD5 4fc36cc61744884eadfb8652bb938968 xine-lib-1.1.3_pre20061119.ebuild 5348
+RMD160 ecd2868f3f41301f775c72ce55eb4d0dd8993c76 xine-lib-1.1.3_pre20061119.ebuild 5348
+SHA256 f59e387959433560d12ac6defa4d57cb841fc4f68f03660133260721f98e5378 xine-lib-1.1.3_pre20061119.ebuild 5348
+MISC ChangeLog 43402 RMD160 90dd8378d440bb547a8f1be6256ded24ef0c26a8 SHA1 da21372ae8ba6db6932c30061f45fb38999fd8c0 SHA256 54031412cb926d1060ed36cd1e4871020fc5dc14cbd64084dcce43b41d6402bb
+MD5 1c0bb108a9f18ed8e80f41f7fdb4c2eb ChangeLog 43402
+RMD160 90dd8378d440bb547a8f1be6256ded24ef0c26a8 ChangeLog 43402
+SHA256 54031412cb926d1060ed36cd1e4871020fc5dc14cbd64084dcce43b41d6402bb ChangeLog 43402
 MISC metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 SHA1 6e47671ad5629f45f8bba068ae87a7b27b4c9750 SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 metadata.xml 330
@@ -29,16 +24,13 @@ SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92 metadata
 MD5 f27667d2c33a9d999ec4b153cb53f81d files/digest-xine-lib-1.1.2-r2 509
 RMD160 d6b86118869621f916d506c6041f747e016dd592 files/digest-xine-lib-1.1.2-r2 509
 SHA256 9c987dc9ad1a1fa5fbaf02ce0e17493f4f77aa500ab3881dc62736325de62acb files/digest-xine-lib-1.1.2-r2 509
-MD5 c5f930d383df75295753ae5fe3cfa603 files/digest-xine-lib-1.1.3_pre20061112 542
-RMD160 7da306b42e6bf2b676f68ac1ec519de6ac9f9e59 files/digest-xine-lib-1.1.3_pre20061112 542
-SHA256 ff3e9d497ff59732ea4ec18e641877e8533b68faee054ff4e5901ce0b333d696 files/digest-xine-lib-1.1.3_pre20061112 542
 MD5 a707cfc4ee4360462fbd3167bbcbf82f files/digest-xine-lib-1.1.3_pre20061119 542
 RMD160 9b381b13dd17fc8881d23962fc54fa685f69937f files/digest-xine-lib-1.1.3_pre20061119 542
 SHA256 3c89969535c94cd4acacb09048f66d0ad05708054ab9e4a7076c47147a52f9d2 files/digest-xine-lib-1.1.3_pre20061119 542
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFYIeiAiZjviIA2XgRAsRfAJwIwm0n5zFIVhxoqY6OYe4bD3nDXgCeKGgA
-XSKvkSanwiswuUTwE/EwQEI=
-=sKhN
+iD8DBQFFaCZTAiZjviIA2XgRAhOSAJ45sHbE95jEGKltVdVFVh96tz7kOwCgpkom
+mnHEVOdLWwtXA8RHEs62zs8=
+=pVol
 -----END PGP SIGNATURE-----

diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.3_pre20061112 b/media-libs/xine-lib/files/digest-xine-lib-1.1.3_pre20061112
deleted file mode 100644 (file)
index 83a3149..0000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.3_pre20061112
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 bdba7b9e7fa1b8434a9a46ffb0f22ad0 xine-lib-1.1.3_pre20061112.tar.bz2 6667706
-RMD160 9534d252cadac2d7b67892802245aff2be05446f xine-lib-1.1.3_pre20061112.tar.bz2 6667706
-SHA256 083c27a638f1d13b4cf9b37cb1744057b0b1757c909385c30938c41e50dcfe46 xine-lib-1.1.3_pre20061112.tar.bz2 6667706
-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/xine-lib-1.1.3_pre20061112.ebuild b/media-libs/xine-lib/xine-lib-1.1.3_pre20061112.ebuild
deleted file mode 100644 (file)
index 8ea9fbf..0000000
--- a/media-libs/xine-lib/xine-lib-1.1.3_pre20061112.ebuild
+++ /dev/null
@@ -1,183 +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.3_pre20061112.ebuild,v 1.4 2006/11/18 17:15:16 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
-       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="61"
-
-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="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-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
-debug modplug gtk pulseaudio mmap truetype"
-
-RDEPEND="
-       X? ( x11-libs/libXext
-                x11-libs/libX11 )
-       xv? ( x11-libs/libXv )
-       xvmc? ( x11-libs/libXvMC )
-       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 )
-       vorbis? ( media-libs/libogg media-libs/libvorbis )
-       theora? ( media-libs/libogg media-libs/libvorbis media-libs/libtheora )
-       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
-       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*"
-
-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
-       nls? ( sys-devel/gettext )"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       # EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-       epatch "${WORKDIR}/patches/120"*
-
-       # AT_M4DIR="m4" eautoreconf
-}
-
-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 -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
-
-       # Too many file names are the same (xine_decoder.c), change the builddir
-       # So that the relative path is used to identify them.
-       mkdir "${WORKDIR}/build"
-
-       ECONF_SOURCE="${S}" econf \
-               $(use_enable gnome gnomevfs) \
-               $(use_enable nls) \
-               $(use_enable ipv6) \
-               $(use_enable samba) \
-               $(use_enable altivec) \
-               $(use_enable v4l) \
-               \
-               $(use_enable mng) \
-               $(use_with imagemagick) \
-               $(use_enable gtk gdkpxibuf) \
-               \
-               $(use_enable aac faad) \
-               $(use_enable flac) \
-               $(use_with vorbis) \
-               $(use_with speex) \
-               $(use_with theora) \
-               $(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_with libcaca caca) \
-               $(use_with sdl) \
-               $(use_enable xvmc) \
-               \
-               $(use_enable oss) \
-               $(use_with alsa) \
-               $(use_with arts) \
-               $(use_with esd esound) \
-               $(use_with pulseaudio) \
-               $(use_enable vcd) --without-internal-vcdlibs \
-               \
-               $(use_enable win32codecs w32dll) \
-               $(use_enable modplug) \
-               \
-               $(use_enable mmap) \
-               $(use_enable truetype freetype) $(use_enable truetype fontconfig ) \
-               --enable-asf \
-               --with-external-ffmpeg \
-               --disable-optimizations \
-               ${myconf} \
-               --with-xv-path=/usr/$(get_libdir) \
-               --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"
-}