Broken with xorg-7.1. Disallow building with xorg-7.1.

Package-Manager: portage-2.1.1-r1

3 files changed, 19 insertions, 12 deletions

diff --git a/x11-drivers/xf86-video-ivtvdev/ChangeLog b/x11-drivers/xf86-video-ivtvdev/ChangeLog
index d75321bdb65f..1d354363f9f2 100644
--- a/x11-drivers/xf86-video-ivtvdev/ChangeLog
+++ b/x11-drivers/xf86-video-ivtvdev/ChangeLog
@@ -1,6 +1,10 @@
 # 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.1 2006/10/12 15:15:23 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtvdev/ChangeLog,v 1.2 2006/10/16 23:17:21 je_fro Exp $
+
+  16 Oct 2006; Jeff Gardner <je_fro@gentoo.org>
+  xf86-video-ivtvdev-0.10.6.ebuild:
+  Disallow building with xorg-7.1
 
 *xf86-video-ivtvdev-0.10.6 (12 Oct 2006)
 
diff --git a/x11-drivers/xf86-video-ivtvdev/Manifest b/x11-drivers/xf86-video-ivtvdev/Manifest
index 693ee7caa4cb..c5521c75b416 100644
--- a/x11-drivers/xf86-video-ivtvdev/Manifest
+++ b/x11-drivers/xf86-video-ivtvdev/Manifest
@@ -3,14 +3,14 @@ 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 992 RMD160 77c0d3a0a578a51bc3df9bd0ac5172e8b26d3dd7 SHA1 5e5f62a9d2addd378f7b291da236d922a61d5162 SHA256 96f7f642b0477581295e6933543d5ba82ad236f9463641979979fe6933f857f2
-MD5 48dfb9f1f359b3a6873c0e63923994f8 xf86-video-ivtvdev-0.10.6.ebuild 992
-RMD160 77c0d3a0a578a51bc3df9bd0ac5172e8b26d3dd7 xf86-video-ivtvdev-0.10.6.ebuild 992
-SHA256 96f7f642b0477581295e6933543d5ba82ad236f9463641979979fe6933f857f2 xf86-video-ivtvdev-0.10.6.ebuild 992
-MISC ChangeLog 447 RMD160 b42279eaa32bf799b20d803263365a7bd78da8f1 SHA1 e569dacc9f52ed35ae2d76d0322d9cb41d4b98b9 SHA256 3d9083d83a72eb0ae38de86c429033ca9bdf789baddd1a2be5065420c5600964
-MD5 10d26ff77e46377e443bf7dd8bfa7ec7 ChangeLog 447
-RMD160 b42279eaa32bf799b20d803263365a7bd78da8f1 ChangeLog 447
-SHA256 3d9083d83a72eb0ae38de86c429033ca9bdf789baddd1a2be5065420c5600964 ChangeLog 447
+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
 MISC metadata.xml 304 RMD160 dd8f44beb660d049dc89b2e820ce4d78ecb728d9 SHA1 1051710172e5a0841f5ac6f415ae7de277b4c682 SHA256 5d1948256efe3036c87ae2431c81e91d369a4c1cc32c02e8fb50f76c5dd372dd
 MD5 8bbbe4ee4ed418427d26045d67d0e677 metadata.xml 304
 RMD160 dd8f44beb660d049dc89b2e820ce4d78ecb728d9 metadata.xml 304
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 071188e07ebe..ee795ef6e060 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,6 +1,6 @@
 # Copyright 1999-2006 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.1 2006/10/12 15:15:23 je_fro Exp $
+# $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"
 
 inherit eutils x-modular
@@ -23,19 +23,22 @@ DEPEND="x11-proto/xextproto
 	x11-proto/videoproto
 	x11-proto/xproto
 	x11-misc/imake
-	x11-base/xorg-server"
+	=x11-base/xorg-server-1.0.2-r7"
+
+# This package is currently broken with xorg-7.1.
 
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/ivtv_xdriver-unified.patch
 	cd ${S}
-	sed -i -e "/DependTarget/a USRLIBDIR=\/usr\/$(get_libdir)/xorg" Imakefile
+	sed -i -e "/DependTarget/a USRLIBDIR=\/usr\/$(get_libdir)\/xorg" Imakefile
 
 }
 
 src_compile() {
 
 	xmkmf || die "Running xmkmf failed!"
+	x-modular_src_compile || die "make failed"
 
 }