Fixed Bug #76090 where xine-lib will not build with -libcaca in use.

9 files changed, 53 insertions, 34 deletions

diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 950e226aa502..5c1d9d7bd824 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -1,8 +1,20 @@
-MD5 f8a296576331df10296a3614988531cb ChangeLog 2149
-MD5 b3fb52be9358ee56d0b7f3f8e371519c libtheora-1.0_alpha3.ebuild 840
-MD5 64ec3e3e33e074dcfc3470160bb23015 libtheora-1.0_alpha2.ebuild 742
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2f0173102219694a7ab1a94950c2438d ChangeLog 2370
+MD5 c0f2735e4500394caa3395eadb9e77cd libtheora-1.0_alpha2-r1.ebuild 835
+MD5 1bda603a66c9a018d9c926099761b3c5 libtheora-1.0_alpha2.ebuild 744
+MD5 eeada0a668f294293134f3555dd1aecb libtheora-1.0_alpha3.ebuild 844
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 ac7c58e2610e53fbe396a49ee7004ae7 libtheora-1.0_alpha2-r1.ebuild 833
-MD5 43363432588af784deac91552ac3a636 files/digest-libtheora-1.0_alpha2-r1 71
+MD5 61f495ac838cf56e7245f7f297cb1c81 libtheora-1.0_alpha4.ebuild 870
 MD5 43363432588af784deac91552ac3a636 files/digest-libtheora-1.0_alpha2 71
+MD5 43363432588af784deac91552ac3a636 files/digest-libtheora-1.0_alpha2-r1 71
 MD5 a9f9ea68a0659a1bd63f423e5028d5bf files/digest-libtheora-1.0_alpha3 72
+MD5 f828864823910f80ec4368be981c0a61 files/digest-libtheora-1.0_alpha4 73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB1jrcFdQwWVoAgN4RAlnaAJ4wrqGPwT+Xze56ZcqDnOFX3WWFzwCg+Jtw
+H5j8c77jPzPxYmg8QejIhFE=
+=1HMT
+-----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 78c3866e36e6..b3357356a301 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/xine-lib
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.179 2005/01/01 04:47:53 eradicator Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.180 2005/01/01 05:54:49 chriswhite Exp $
+
+  01 Jan 2005; Chris White <chriswhite@gentoo.org> xine-lib-1.0.ebuild:
+  Fixed Bug #76090 where xine-lib will not build with -libcaca in use.
 
   31 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   xine-lib-1.0.ebuild, xine-lib-1_rc5-r3.ebuild, xine-lib-1_rc6.ebuild,
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 84a5eb640ac5..bee57adf365e 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,11 +1,14 @@
-MD5 85a55a647fa79f5750dc522b001874fd ChangeLog 30384
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 578831f13c207728d49ea123fb0f0b3d ChangeLog 30528
 MD5 af08cabbae4b191018ca153392a86bea metadata.xml 304
-MD5 3bb3d6f5d2eb62ad69b609b19f6a1bed xine-lib-1.0.ebuild 8140
-MD5 b25152bddc933afdf390149b07f2ff43 xine-lib-1_rc5-r3.ebuild 5473
-MD5 3798cf13e6aea9317e8968184f7cf532 xine-lib-1_rc6.ebuild 5401
-MD5 22339f949dcaaf0f8bf1a7b26c0105b6 xine-lib-1_rc7.ebuild 5370
-MD5 966c44305e055b7ab4fc85b7c22eb14d xine-lib-1_rc8-r1.ebuild 6308
-MD5 7219c5c0086b41d56d27fb4bdd35f146 xine-lib-1_rc8.ebuild 5423
+MD5 428c0cbe487d97c63ae25c7f92da0d25 xine-lib-1.0.ebuild 7992
+MD5 4052265429970e0a67ed0d039d770515 xine-lib-1_rc5-r3.ebuild 5473
+MD5 9b1839aa704083ac8bc733e78fe15bd2 xine-lib-1_rc6.ebuild 5401
+MD5 f9634de2e799d22a319aa81a2b38bd1d xine-lib-1_rc7.ebuild 5370
+MD5 e265b04adc53abe28a90afedff3d0e26 xine-lib-1_rc8-r1.ebuild 6308
+MD5 d7d43244f336b4e0826eedf8a3d3dbc1 xine-lib-1_rc8.ebuild 5423
 MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
 MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65
 MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r3 67
@@ -38,6 +41,13 @@ MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
 MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
 MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
 MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
-MD5 ddf48f1eb00a6985b6fba5fff9386ad0 files/xine-lib-hardened-mmx.patch 2558
 MD5 5d2c3c00bf3ae9a89dfcaa8b5c5b17a2 files/xine-lib-x11.patch 703
 MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
+MD5 ddf48f1eb00a6985b6fba5fff9386ad0 files/xine-lib-hardened-mmx.patch 2558
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB1jpjFdQwWVoAgN4RAlqHAKDkCCoDT4Xe/S3trI1TJU+4aSZdZgCg+HHD
+BSU9YHuQ7fynHn8s6hvnVbo=
+=5T5p
+-----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/xine-lib-1.0.ebuild b/media-libs/xine-lib/xine-lib-1.0.ebuild
index 6e080c8d430e..f37424abe183 100644
--- a/media-libs/xine-lib/xine-lib-1.0.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.0.ebuild,v 1.8 2005/01/01 04:34:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.0.ebuild,v 1.9 2005/01/01 05:54:49 chriswhite Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -16,8 +16,7 @@ LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="arts esd avi nls dvd X directfb oggvorbis alsa gnome sdl speex
-	theora ipv6 altivec opengl aac fb xv xvmc nvidia i8x0 libcaca
-	samba dxr3 vidix png mng pic"
+	theora ipv6 altivec opengl aac fb xv xvmc nvidia i8x0 samba dxr3 vidix png mng pic"
 
 RDEPEND="oggvorbis? ( media-libs/libvorbis )
 	!amd64? ( X? ( virtual/x11 ) )
@@ -155,11 +154,6 @@ src_compile() {
 	use !png && export ac_cv_lib_png_png_create_read_struct=no
 	use !mng && export ac_cv_header_libmng_h=no
 
-	# quite a dirt hack but it should work as expected
-	if ! use libcaca; then
-		myconf="${myconf} --with-caca-prefix=/tmp/non-existant"
-	fi
-
 	if use xvmc; then
 		if use nvidia && use i8x0; then
 			eerror "Invalid combination of USE flags"
diff --git a/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild b/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild
index 01d0b75f7dcb..af597e7c5d9d 100644
--- a/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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_rc5-r3.ebuild,v 1.17 2004/12/09 07:28:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild,v 1.18 2005/01/01 05:54:49 chriswhite Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
diff --git a/media-libs/xine-lib/xine-lib-1_rc6.ebuild b/media-libs/xine-lib/xine-lib-1_rc6.ebuild
index e058a36fbaaf..ef08bec1fca5 100644
--- a/media-libs/xine-lib/xine-lib-1_rc6.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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_rc6.ebuild,v 1.17 2005/01/01 04:34:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc6.ebuild,v 1.18 2005/01/01 05:54:49 chriswhite Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
diff --git a/media-libs/xine-lib/xine-lib-1_rc7.ebuild b/media-libs/xine-lib/xine-lib-1_rc7.ebuild
index 5ed29f0e013c..26481f100bf3 100644
--- a/media-libs/xine-lib/xine-lib-1_rc7.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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_rc7.ebuild,v 1.4 2005/01/01 04:34:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc7.ebuild,v 1.5 2005/01/01 05:54:49 chriswhite Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
diff --git a/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild b/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild
index 358fa4a842c4..96dcbf3cee7b 100644
--- a/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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_rc8-r1.ebuild,v 1.11 2005/01/01 04:34:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild,v 1.12 2005/01/01 05:54:49 chriswhite Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
diff --git a/media-libs/xine-lib/xine-lib-1_rc8.ebuild b/media-libs/xine-lib/xine-lib-1_rc8.ebuild
index 72bf93af75b7..e64308227958 100644
--- a/media-libs/xine-lib/xine-lib-1_rc8.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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_rc8.ebuild,v 1.5 2005/01/01 04:34:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc8.ebuild,v 1.6 2005/01/01 05:54:49 chriswhite Exp $
 
 inherit eutils flag-o-matic gcc libtool