xine-lib 1.1.3 release does not work that well with flac 1.1.3 (although it builds...

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index e20326481476e351beeedc9b516e80bdcacb386f..d1c523aaa26f443f235bd09a911db70d553c7317 100644 (file)
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -3,7 +3,6 @@ Hash: SHA1
 
 DIST xine-lib-1.1.2.tar.bz2 6457108 RMD160 21322d6d7e085237926741495d70f5ce7764910b SHA1 07e454e2287e34414b598faf78ae6d8ab8ffbb69 SHA256 871933c745f5824808a88720518c0164166906536c7f8723bd38e84f78319226
 DIST xine-lib-1.1.3.tar.gz 8508884 RMD160 8e28638385ea48e7d4d4d702573ca92c4eca77c8 SHA1 c0886910ddb1afa1a72572decf12c0251bba40bf SHA256 96e50c6e7b2fb1209c52dcab6b38f2a99aa1c9d6e028b479a800cafef11bccb0
-DIST xine-lib-1.1.3_pre20061129.tar.bz2 6979033 RMD160 66beb6757b8642925c24828eb555d1147fe9c742 SHA1 20bef44159c2980f30f87f46acff43c65463472c SHA256 8620c2ad309554c3ebc7acc358d41c7278b743c83442d14b0d432cd7c8b2b483
 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
 DIST xine-lib-patches-64.tar.bz2 23578 RMD160 6a4272d82c7d8de004e71e2991e0cdf66ab833c2 SHA1 d7a059d487e3d05af687f501e3394ee625b5f295 SHA256 d5fcf477e59d6963235c6d6f682d887e21f849bc76441d915152b83f93d44884
@@ -15,18 +14,14 @@ EBUILD xine-lib-1.1.2-r3.ebuild 7175 RMD160 acb05bd30361cc015cb811deed81ed2d9351
 MD5 d68833a09937d20ffa114aa9ee939649 xine-lib-1.1.2-r3.ebuild 7175
 RMD160 acb05bd30361cc015cb811deed81ed2d93514270 xine-lib-1.1.2-r3.ebuild 7175
 SHA256 dfac4b676cd5d25e4809875b164621e953a52f21d0a1bb373587d35d05385405 xine-lib-1.1.2-r3.ebuild 7175
-EBUILD xine-lib-1.1.3.ebuild 5369 RMD160 908ac5bf2e494920a83a5449b00ec84edb73e3ab SHA1 0f1356f62b1b0d86537c4ec0bdb2aa31f68d5dcc SHA256 29492f3a19de237ff96d02f1ed27644767be6668dbfdf27977e2b00f36088e6b
-MD5 acb859237d6a103e7f258ab374cceb9d xine-lib-1.1.3.ebuild 5369
-RMD160 908ac5bf2e494920a83a5449b00ec84edb73e3ab xine-lib-1.1.3.ebuild 5369
-SHA256 29492f3a19de237ff96d02f1ed27644767be6668dbfdf27977e2b00f36088e6b xine-lib-1.1.3.ebuild 5369
-EBUILD xine-lib-1.1.3_pre20061129.ebuild 5386 RMD160 0bc821f3eec2def18a8cd3c984aba4b2899a31a4 SHA1 1a8495c74cd042f70fd2e160ba1a17f03b69046b SHA256 5f105074d2c5d9b6777ce235004f1d1d471f35394f169bf4c105132e3de3ed41
-MD5 3f27aa26b59c41f09f52e69cce58b5b8 xine-lib-1.1.3_pre20061129.ebuild 5386
-RMD160 0bc821f3eec2def18a8cd3c984aba4b2899a31a4 xine-lib-1.1.3_pre20061129.ebuild 5386
-SHA256 5f105074d2c5d9b6777ce235004f1d1d471f35394f169bf4c105132e3de3ed41 xine-lib-1.1.3_pre20061129.ebuild 5386
-MISC ChangeLog 45271 RMD160 29dcaa01be322f3c206ce7660c56f0603307aeab SHA1 4bb1937ca6874b04194b85f4c17f039f414afe0a SHA256 41c362dcdf094235def78674d739a19160106b3ca6768bda6148a3cad0357276
-MD5 83f8cf3241aeb88ea82d46a51428bf4d ChangeLog 45271
-RMD160 29dcaa01be322f3c206ce7660c56f0603307aeab ChangeLog 45271
-SHA256 41c362dcdf094235def78674d739a19160106b3ca6768bda6148a3cad0357276 ChangeLog 45271
+EBUILD xine-lib-1.1.3.ebuild 5368 RMD160 638dbdc6fbe307c39e388d79db792da1fddd56c0 SHA1 a0b7e7546a31dd7667d69f19335b0fa7a4f032a2 SHA256 fd1de397795d6f818476a38531d07878fc00c4e06896b42c8517dff826439316
+MD5 10ac2d25fe485913848902930ef7415e xine-lib-1.1.3.ebuild 5368
+RMD160 638dbdc6fbe307c39e388d79db792da1fddd56c0 xine-lib-1.1.3.ebuild 5368
+SHA256 fd1de397795d6f818476a38531d07878fc00c4e06896b42c8517dff826439316 xine-lib-1.1.3.ebuild 5368
+MISC ChangeLog 45516 RMD160 8bdc8dc8e6dfee2175ff7e030ce1f8e43dec1870 SHA1 3716f4cd578952c4e7b9734c91b8b07bbc423ceb SHA256 5c10ed7f4168f2b33f0657bf52c031f4932e92ca9840ecc80a0e27d77b8a0bb4
+MD5 4cff04ca10513dab7a565e387222114e ChangeLog 45516
+RMD160 8bdc8dc8e6dfee2175ff7e030ce1f8e43dec1870 ChangeLog 45516
+SHA256 5c10ed7f4168f2b33f0657bf52c031f4932e92ca9840ecc80a0e27d77b8a0bb4 ChangeLog 45516
 MISC metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 SHA1 6e47671ad5629f45f8bba068ae87a7b27b4c9750 SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 metadata.xml 330
@@ -40,13 +35,10 @@ SHA256 36f6f5bccde0b9770fbec9da49cb24f6deafa2a1de535444ab0e84f6db4a52e0 files/di
 MD5 e70a92a55ccfaaa3934cf8a0ea88c02f files/digest-xine-lib-1.1.3 503
 RMD160 b98f18e11423d064b4b204f8aacf78a501b3bbe2 files/digest-xine-lib-1.1.3 503
 SHA256 83dd50e3811d24cf06b3a85449f7f5b4380f86470951d88252920da09f930b4b files/digest-xine-lib-1.1.3 503
-MD5 8f40c71cd1506a04e1756c6d5ab3a1aa files/digest-xine-lib-1.1.3_pre20061129 542
-RMD160 cccded9597ed88c53a8a107be71cb2187186c297 files/digest-xine-lib-1.1.3_pre20061129 542
-SHA256 deede9b16659fa75f1dfa022975f4419ef3ca5b6568120fd45b1f6003ffdb4d2 files/digest-xine-lib-1.1.3_pre20061129 542
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFdFIDAiZjviIA2XgRAoU3AJ468n7uJFywY8qDEsJLoD5308KQ5ACfdhq6
-KK0fM4R3wrTXT6IP1oZ9bKM=
-=bdpS
+iD8DBQFFkCN0AiZjviIA2XgRAj30AJ9hnWFk4vdpXF11H2uF5wRwunQulwCghMK1
+CMEPnClqaIPMXIdJeJwqJBQ=
+=1LZ6
 -----END PGP SIGNATURE-----

diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.3_pre20061129 b/media-libs/xine-lib/files/digest-xine-lib-1.1.3_pre20061129
deleted file mode 100644 (file)
index ac4339d..0000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.3_pre20061129
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9ce1f6a6dcf86cabe1c07f16742ea773 xine-lib-1.1.3_pre20061129.tar.bz2 6979033
-RMD160 66beb6757b8642925c24828eb555d1147fe9c742 xine-lib-1.1.3_pre20061129.tar.bz2 6979033
-SHA256 8620c2ad309554c3ebc7acc358d41c7278b743c83442d14b0d432cd7c8b2b483 xine-lib-1.1.3_pre20061129.tar.bz2 6979033
-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_pre20061129.ebuild b/media-libs/xine-lib/xine-lib-1.1.3_pre20061129.ebuild
deleted file mode 100644 (file)
index 641fe51..0000000
--- a/media-libs/xine-lib/xine-lib-1.1.3_pre20061129.ebuild
+++ /dev/null
@@ -1,184 +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_pre20061129.ebuild,v 1.4 2006/12/01 03:10:24 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 ~hppa ~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
-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-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
-       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
-       sys-devel/libtool
-       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 gdkpixbuf) \
-               \
-               $(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"
-}