Add patch to fix for xorg-7.1. Thanks to Wilhelm Eger and Ian Campbell.

Package-Manager: portage-2.1.1-r2

4 files changed, 28 insertions, 21 deletions

diff --git a/x11-drivers/xf86-video-ivtvdev/ChangeLog b/x11-drivers/xf86-video-ivtvdev/ChangeLog
index 1d354363f9f2..babe277a1fae 100644
--- a/x11-drivers/xf86-video-ivtvdev/ChangeLog
+++ b/x11-drivers/xf86-video-ivtvdev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-ivtvdev
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtvdev/ChangeLog,v 1.2 2006/10/16 23:17:21 je_fro Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtvdev/ChangeLog,v 1.3 2007/01/16 07:53:17 je_fro Exp $
+
+  16 Jan 2007; Jeff Gardner <je_fro@gentoo.org>
+  xf86-video-ivtvdev-0.10.6.ebuild:
+  Added a new patch to (hopefully) fix for xorg-7.1, thanks to work by Wilhelm
+  Eger and Ian Campbell.
 
   16 Oct 2006; Jeff Gardner <je_fro@gentoo.org>
   xf86-video-ivtvdev-0.10.6.ebuild:
diff --git a/x11-drivers/xf86-video-ivtvdev/Manifest b/x11-drivers/xf86-video-ivtvdev/Manifest
index c5521c75b416..d5a2a63f35b4 100644
--- a/x11-drivers/xf86-video-ivtvdev/Manifest
+++ b/x11-drivers/xf86-video-ivtvdev/Manifest
@@ -3,18 +3,19 @@ MD5 bc04c3994ecc55347d8a14a1139bd0a0 files/ivtv_xdriver-unified.patch 11489
 RMD160 60c5b1e6a3f7bcc86fd12b38e53db752659617f3 files/ivtv_xdriver-unified.patch 11489
 SHA256 49436db7b26dbf9ed33736de1b98d5eb745264e93ba19091bbda79ad819ba71c files/ivtv_xdriver-unified.patch 11489
 DIST ivtv_xdriver_src_0.10.6.tgz 18822 RMD160 16d75d78fb786170dd092c4a26cbe6b8420daebb SHA1 c8349662caac42b5b04cd6dd2ba80705c49f3b97 SHA256 0dea841bcb88fe1aef6ecbd9ca2d2331b3dad6e27a2a40d85604d2890b31d269
-EBUILD xf86-video-ivtvdev-0.10.6.ebuild 1098 RMD160 334d885f3ded02760ad3da6cf4d2125fe7fb8426 SHA1 92bc35a82101127adea7e0f2334aa1368e9df229 SHA256 a954956fd3a9b212019117ca2299bfc7da0b7d61d17f89d0fdf816afced219de
-MD5 e59bb3485c8da778aafd191b8fdb4674 xf86-video-ivtvdev-0.10.6.ebuild 1098
-RMD160 334d885f3ded02760ad3da6cf4d2125fe7fb8426 xf86-video-ivtvdev-0.10.6.ebuild 1098
-SHA256 a954956fd3a9b212019117ca2299bfc7da0b7d61d17f89d0fdf816afced219de xf86-video-ivtvdev-0.10.6.ebuild 1098
-MISC ChangeLog 566 RMD160 9da719c2fad75f9d831d0f085cb2082dbb7419a9 SHA1 d89517b53477ac8f8770b6824465b4e496599a71 SHA256 0b1799a0f8d99383610cc0e560b1ad50b60d9744f02de2f42fe9a41c9f0f5bb4
-MD5 1bf562a56e915797d08f54fd57ee87c4 ChangeLog 566
-RMD160 9da719c2fad75f9d831d0f085cb2082dbb7419a9 ChangeLog 566
-SHA256 0b1799a0f8d99383610cc0e560b1ad50b60d9744f02de2f42fe9a41c9f0f5bb4 ChangeLog 566
+DIST xf86-video-ivtvdev-0.10.6.patch.tar.bz2 7699 RMD160 fcb7ce96f46c6a5e077079536eece8fd6ee1242c SHA1 476246890b242b463a11394c8d02a0aafe8e9633 SHA256 89acd57c89edc5edeaf0c49d08e31f9be9f6c433dd830bab70d59064189c4366
+EBUILD xf86-video-ivtvdev-0.10.6.ebuild 1054 RMD160 d158013260616419ea6fb5ebc1362afe7c5096ec SHA1 92de1200f0e737892881cebdb84571ed247cb023 SHA256 1e9a0c66dacf852927cd805acc55cc5c0d26f6edd2975c6c627d9d8a11d284f0
+MD5 4afd09f72331297ead7c07e7b49a057b xf86-video-ivtvdev-0.10.6.ebuild 1054
+RMD160 d158013260616419ea6fb5ebc1362afe7c5096ec xf86-video-ivtvdev-0.10.6.ebuild 1054
+SHA256 1e9a0c66dacf852927cd805acc55cc5c0d26f6edd2975c6c627d9d8a11d284f0 xf86-video-ivtvdev-0.10.6.ebuild 1054
+MISC ChangeLog 755 RMD160 2d6fe36f097ec257249774942c3012bf26f4638c SHA1 ce2ec542ff45316526f26a428b5111b7418b0e68 SHA256 374c6763d669cd14619a5259439452e35fa05d45362fda97f4d63ffe4394807d
+MD5 2626af415534a7d2cb4d32614fe13bb9 ChangeLog 755
+RMD160 2d6fe36f097ec257249774942c3012bf26f4638c ChangeLog 755
+SHA256 374c6763d669cd14619a5259439452e35fa05d45362fda97f4d63ffe4394807d ChangeLog 755
 MISC metadata.xml 304 RMD160 dd8f44beb660d049dc89b2e820ce4d78ecb728d9 SHA1 1051710172e5a0841f5ac6f415ae7de277b4c682 SHA256 5d1948256efe3036c87ae2431c81e91d369a4c1cc32c02e8fb50f76c5dd372dd
 MD5 8bbbe4ee4ed418427d26045d67d0e677 metadata.xml 304
 RMD160 dd8f44beb660d049dc89b2e820ce4d78ecb728d9 metadata.xml 304
 SHA256 5d1948256efe3036c87ae2431c81e91d369a4c1cc32c02e8fb50f76c5dd372dd metadata.xml 304
-MD5 1616f165a4b153999f484dbd194fb5d3 files/digest-xf86-video-ivtvdev-0.10.6 259
-RMD160 9a119b6286304e29e537306f584508a6d32bddf0 files/digest-xf86-video-ivtvdev-0.10.6 259
-SHA256 51d895cface7d5cfbf407d151f55d9788b2a744940a2df5c6b00c305e6e8188d files/digest-xf86-video-ivtvdev-0.10.6 259
+MD5 17da1a718ab03c1b5619ed424ea15825 files/digest-xf86-video-ivtvdev-0.10.6 551
+RMD160 771d4301191eb22efc077a2406b24abd0818be40 files/digest-xf86-video-ivtvdev-0.10.6 551
+SHA256 8e336c543646ddf69f9271fdea1a6b91f7f214ff6b6ee470c7dc75d2e9c3dfcc files/digest-xf86-video-ivtvdev-0.10.6 551
diff --git a/x11-drivers/xf86-video-ivtvdev/files/digest-xf86-video-ivtvdev-0.10.6 b/x11-drivers/xf86-video-ivtvdev/files/digest-xf86-video-ivtvdev-0.10.6
index b7e077b4989d..429fc4acd167 100644
--- a/x11-drivers/xf86-video-ivtvdev/files/digest-xf86-video-ivtvdev-0.10.6
+++ b/x11-drivers/xf86-video-ivtvdev/files/digest-xf86-video-ivtvdev-0.10.6
@@ -1,3 +1,6 @@
 MD5 e3033ac52629c6f9f432ad232b79f5f2 ivtv_xdriver_src_0.10.6.tgz 18822
 RMD160 16d75d78fb786170dd092c4a26cbe6b8420daebb ivtv_xdriver_src_0.10.6.tgz 18822
 SHA256 0dea841bcb88fe1aef6ecbd9ca2d2331b3dad6e27a2a40d85604d2890b31d269 ivtv_xdriver_src_0.10.6.tgz 18822
+MD5 0731eb326c201e243e8edf6171b05708 xf86-video-ivtvdev-0.10.6.patch.tar.bz2 7699
+RMD160 fcb7ce96f46c6a5e077079536eece8fd6ee1242c xf86-video-ivtvdev-0.10.6.patch.tar.bz2 7699
+SHA256 89acd57c89edc5edeaf0c49d08e31f9be9f6c433dd830bab70d59064189c4366 xf86-video-ivtvdev-0.10.6.patch.tar.bz2 7699
diff --git a/x11-drivers/xf86-video-ivtvdev/xf86-video-ivtvdev-0.10.6.ebuild b/x11-drivers/xf86-video-ivtvdev/xf86-video-ivtvdev-0.10.6.ebuild
index ee795ef6e060..5f461f891d8e 100644
--- a/x11-drivers/xf86-video-ivtvdev/xf86-video-ivtvdev-0.10.6.ebuild
+++ b/x11-drivers/xf86-video-ivtvdev/xf86-video-ivtvdev-0.10.6.ebuild
@@ -1,7 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtvdev/xf86-video-ivtvdev-0.10.6.ebuild,v 1.2 2006/10/16 23:17:21 je_fro Exp $
-# SNAPSHOT="yes"
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtvdev/xf86-video-ivtvdev-0.10.6.ebuild,v 1.3 2007/01/16 07:53:17 je_fro Exp $
 
 inherit eutils x-modular
 
@@ -10,7 +9,8 @@ MY_P="ivtv_xdriver_${PV}"
 MY_PN="ivtv_xdriver_src_${PV}"
 S=${WORKDIR}/${MY_P}/ivtvdrv/xc/programs/Xserver/hw/xfree86/drivers/ivtv/
 
-SRC_URI="http://dl.ivtvdriver.org/xdriver/${PV}/${MY_PN}.tgz"
+SRC_URI="http://dl.ivtvdriver.org/xdriver/${PV}/${MY_PN}.tgz
+		mirror://gentoo/${PF}.patch.tar.bz2"
 HOMEPAGE="http://ivtvdriver.org/"
 KEYWORDS="~amd64"
 LICENSE="X11"
@@ -23,13 +23,11 @@ DEPEND="x11-proto/xextproto
 	x11-proto/videoproto
 	x11-proto/xproto
 	x11-misc/imake
-	=x11-base/xorg-server-1.0.2-r7"
-
-# This package is currently broken with xorg-7.1.
+	>=x11-base/xorg-server-1.1.1-r4"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/ivtv_xdriver-unified.patch
+	epatch ${FILESDIR}/${PF}.patch
 	cd ${S}
 	sed -i -e "/DependTarget/a USRLIBDIR=\/usr\/$(get_libdir)\/xorg" Imakefile