Add patch to build with GCC 4.1, thanks to Matteo Azzali and Mark Loeser in bug #126593.

Package-Manager: portage-2.1_pre6-r3

4 files changed, 27 insertions, 23 deletions

diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog
index a79c76160f81..d067665dcd2d 100644
--- a/media-tv/xawtv/ChangeLog
+++ b/media-tv/xawtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xawtv
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.35 2006/03/08 23:37:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.36 2006/03/18 16:03:27 flameeyes Exp $
+
+  18 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> xawtv-3.95-r1.ebuild:
+  Add patch to build with GCC 4.1, thanks to Matteo Azzali and Mark Loeser in
+  bug #126593.
 
   08 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> xawtv-3.95-r1.ebuild:
   Update patchlevel, adding a patch to avoid binaries to be stripped during
diff --git a/media-tv/xawtv/Manifest b/media-tv/xawtv/Manifest
index dd4ab61205ba..04438647b16d 100644
--- a/media-tv/xawtv/Manifest
+++ b/media-tv/xawtv/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ff4c350a798b0a0a178a5d870d50a1f6 ChangeLog 11246
-RMD160 09329a1639576c49e75e3bf4674ecad03dc26286 ChangeLog 11246
-SHA256 f6afbfba10db12a0d0f493d45e38b970457250a7da6585604f229d94c3d0309a ChangeLog 11246
+MD5 69ceffe8e53b5e1d6cfc78009dd854c4 ChangeLog 11415
+RMD160 bab0f2138ebef6ec60f291a5f10d07da1a217528 ChangeLog 11415
+SHA256 ec39047508b942b9f24f6b67e4fac359799d992b88520a09dc0e44aab45219e5 ChangeLog 11415
 MD5 439d1ef32593121b9afe079f635a9ba0 files/digest-xawtv-3.94-r1 205
 RMD160 316ae590608e7cef1608e81e71fbf573ff01325c files/digest-xawtv-3.94-r1 205
 SHA256 87c18e89f921d4b819cac23058f96621a37019235678a822ea25639f79cb8aa7 files/digest-xawtv-3.94-r1 205
 MD5 574b3e5a0bf3441afda6d974b838f411 files/digest-xawtv-3.95 540
 RMD160 6122f90c534a0b44fcd631d7108194e515aa37db files/digest-xawtv-3.95 540
 SHA256 9737e9f26040e1114931dbb5191b2809e3dca75621a149b4e73bf055f21ee597 files/digest-xawtv-3.95 540
-MD5 a20031f44a74dc1a416fdeb62ba58f7b files/digest-xawtv-3.95-r1 714
-RMD160 0a3229bd17274c6a8e58cc225a9cbb00d4d6f63d files/digest-xawtv-3.95-r1 714
-SHA256 e25be5ec9686513a82fc9a60682ac9716363f2113b5b30795e5ca84ab78a5682 files/digest-xawtv-3.95-r1 714
+MD5 4a63e09e64e9865f37ffbe99325948dd files/digest-xawtv-3.95-r1 714
+RMD160 459de7078f55d87837cfeccf22df94336419217c files/digest-xawtv-3.95-r1 714
+SHA256 cc4a97179d92e21f82a1a44c09f3870e5f68729031927dfac25be9c05332c0e9 files/digest-xawtv-3.95-r1 714
 MD5 04a2ce4d8937cc7dfc255082396fa5fe files/webcamrc 597
 RMD160 54897fefd31711f402da3e39cb97d4ef63bb200b files/webcamrc 597
 SHA256 9cf61695be6b8005c663a6c73f90bd4b048f9e16f95ba659b6bc1087bc6e248e files/webcamrc 597
@@ -28,16 +28,16 @@ SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd metadata
 MD5 ddaee2d76f650fa8b2839b5c103c68ec xawtv-3.94-r1.ebuild 2347
 RMD160 3e763a9820922a173383d31a73d01f6d42116785 xawtv-3.94-r1.ebuild 2347
 SHA256 bda8ce4856719beedbf5a10f468b58746c71aaf2386032e60e9d1af3d0e3d1a2 xawtv-3.94-r1.ebuild 2347
-MD5 217bf8371921bdb161b68f4993011c87 xawtv-3.95-r1.ebuild 3638
-RMD160 faf5a757789b9c4d5ee143452f7f2fca4ccc8eba xawtv-3.95-r1.ebuild 3638
-SHA256 a92b091f8eee15c18dd8e1f8b55cb5e203b6a414c6802ab1bfc02242efb2e1cb xawtv-3.95-r1.ebuild 3638
+MD5 1b03592b55d04c1109a110e544829d50 xawtv-3.95-r1.ebuild 3580
+RMD160 a263d5043ca97aa9947195fec66fa02b962a7eec xawtv-3.95-r1.ebuild 3580
+SHA256 570d1f2669e22b4851ed6a3c49c52d45fe00ff79126c32ee58b86318cebf52b8 xawtv-3.95-r1.ebuild 3580
 MD5 b064e0e4b0b954f5ba03f5dc52cbdd2a xawtv-3.95.ebuild 3550
 RMD160 287b3f2925062dde4f82e1ee6f594cb3b8059a1f xawtv-3.95.ebuild 3550
 SHA256 e8ebd966c113c10bcaac45a6bec0eb12589a1e05a1530a3a27a4c25e11cea728 xawtv-3.95.ebuild 3550
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFED2rYAiZjviIA2XgRAssPAJ9sGQgVExLjQTPeNRrAAuMBKDmn1QCePAyn
-33sigvyOstzAjXdoMx4A/MA=
-=j2mt
+iD8DBQFEHC92AiZjviIA2XgRAglxAKCY85zCS8L4lYqK/l94DKrQRAzsHACfQ56W
+uRZ8pNzlJ64S9ntALniK1NU=
+=1zJe
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xawtv/files/digest-xawtv-3.95-r1 b/media-tv/xawtv/files/digest-xawtv-3.95-r1
index 2ebbde275f51..99042eb2004e 100644
--- a/media-tv/xawtv/files/digest-xawtv-3.95-r1
+++ b/media-tv/xawtv/files/digest-xawtv-3.95-r1
@@ -4,6 +4,6 @@ SHA256 0194dd03ac9b384951e7f5ed7d08c6fc5f6d94efcd08516732720a1a4704d9f6 tv-fonts
 MD5 ad25e03f7e128b318e392cb09f52207d xawtv-3.95.tar.gz 555731
 RMD160 1dc7b564bec0515cc409c723904ec9c6f8dae998 xawtv-3.95.tar.gz 555731
 SHA256 1204212c59d10df4e29a9a0ddce96cab78342859ec44bf6fd1c5f260b5c7216f xawtv-3.95.tar.gz 555731
-MD5 06b87f1a6ba2864028a486d55762c3b8 xawtv-patches-2.tar.bz2 2826
-RMD160 1d9460293ecdeb353af8cd62f474cc6a9fd399f8 xawtv-patches-2.tar.bz2 2826
-SHA256 6f7dceec19483ce75326f2645b2f13939518a3e57c8fc4af50af8b18689e70db xawtv-patches-2.tar.bz2 2826
+MD5 d24506f5a999154c110c6033d4e49be8 xawtv-patches-3.tar.bz2 3006
+RMD160 778d6a230f1765d42975143f75a7d35dba41d206 xawtv-patches-3.tar.bz2 3006
+SHA256 c86f6402707f3f65168afae168ebcfbd8b77b5a531f463e21d87b8b4c92692e7 xawtv-patches-3.tar.bz2 3006
diff --git a/media-tv/xawtv/xawtv-3.95-r1.ebuild b/media-tv/xawtv/xawtv-3.95-r1.ebuild
index 306d522ca5ec..dee9fef13636 100644
--- a/media-tv/xawtv/xawtv-3.95-r1.ebuild
+++ b/media-tv/xawtv/xawtv-3.95-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.95-r1.ebuild,v 1.5 2006/03/08 23:37:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.95-r1.ebuild,v 1.6 2006/03/18 16:03:27 flameeyes Exp $
 
 inherit eutils font autotools flag-o-matic
 
-PATCHLEVEL="2"
+PATCHLEVEL="3"
 
 IUSE="aalib alsa dv lirc mmx motif nls opengl quicktime X xv zvbi xext"
 
@@ -35,14 +35,14 @@ RDEPEND=">=sys-libs/ncurses-5.1
 			x11-libs/libXft
 			x11-libs/libXext
 			x11-libs/libXrender
-		) virtual/x11 )
-		xext? ( || ( (
+			xext? (
 				x11-libs/libXinerama
 				x11-libs/libXxf86dga
 				x11-libs/libXrandr
 				x11-libs/libXxf86vm
-			) virtual/x11 ) )
-		xv? ( || ( x11-libs/libXv virtual/x11 ) )
+			)
+			xv? ( x11-libs/libXv )
+		) virtual/x11 )
 	)
 	motif? ( x11-libs/openmotif
 		app-text/recode )
@@ -59,8 +59,8 @@ DEPEND="${RDEPEND}
 				x11-proto/videoproto
 				x11-proto/xproto
 				x11-proto/xextproto
+				xext? ( x11-proto/xineramaproto )
 			) virtual/x11 )
-			xext? ( || ( x11-proto/xineramaproto virtual/x11 ) )
 		)"
 
 pkg_setup() {