Changing to support xfree for the time being

4 files changed, 21 insertions, 6 deletions

diff --git a/media-video/mmsv2/Manifest b/media-video/mmsv2/Manifest
new file mode 100644
index 000000000000..ba01b6bdeddc
--- /dev/null
+++ b/media-video/mmsv2/Manifest
@@ -0,0 +1,7 @@
+MD5 5bf3ce68ed1923dc3a3996a58987a360 metadata.xml 247
+MD5 f8d59b4cb6f9b372a564baac1fa66177 mmsv2-0.93.ebuild 2056
+MD5 19ec3d8f00ae62830c1774d1814166b3 ChangeLog 321
+MD5 930867e107776e2dbea0db0152cebbf0 files/digest-mmsv2-0.93 64
+MD5 15f841e3a249b011bec2ecda0ee6c223 files/config.diff 628
+MD5 f4458312970b2d8e986d84a9d05a3a22 files/input-keyboard.diff 547
+MD5 c37b9e69a333c9c7eaead7353ea5ee9a files/input-lirc.diff 544
diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index 576fcc59b483..938995f27edd 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/nvidia-glx
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.64 2004/11/07 02:00:47 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.65 2004/11/10 01:02:36 cyfred Exp $
+
+  10 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> nvidia-glx-1.0.6629.ebuild:
+  Changing to error on xfree install, as opposed to dieing
 
   07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
   nvidia-glx-1.0.4363-r1.ebuild, nvidia-glx-1.0.4496-r2.ebuild,
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index cf33dde8db20..731324529cba 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,13 +1,13 @@
 MD5 5025856a53112a23b3e8cade84c55c57 nvidia-glx-1.0.5336-r2.ebuild 3442
 MD5 e31c13df7b44daed03369803d775e79d nvidia-glx-1.0.5332-r2.ebuild 3686
 MD5 cdadf248426f5017991d3b50167d6487 nvidia-glx-1.0.4496-r2.ebuild 3373
-MD5 d08b7a63b14a059158da697c6c3149e3 nvidia-glx-1.0.6629.ebuild 5063
+MD5 05af77daf27b604ac0e80928d50694e9 nvidia-glx-1.0.6629.ebuild 5099
 MD5 53fb35c058a5a1d4f52fde2b2cef1a65 nvidia-glx-1.0.5328-r2.ebuild 3229
 MD5 1a4026ee5f4a6fbe2acb0680668e1c4c nvidia-glx-1.0.6106-r3.ebuild 5356
 MD5 ed39be4005f57c4145735f26e5e20635 nvidia-glx-1.0.6111.ebuild 5348
 MD5 851f1ad90c1849aa9f230def5f131820 nvidia-glx-1.0.4363-r1.ebuild 2985
 MD5 98fc0b231f8ca3f1645a5e9dbcf391fa nvidia-glx-1.0.4499-r1.ebuild 2714
-MD5 b8ee5c512ab7c76ee700781816114a04 ChangeLog 13140
+MD5 af795d5ab3e45c4b2e0a4f259259a481 ChangeLog 13277
 MD5 a877edb407b63894d17386ea0aaca151 metadata.xml 286
 MD5 97f35a7b23f2e60d2abc5eff121bea3f files/nvidia-glx-1.0.4499-defines.patch 437
 MD5 cea66cc5b458a313a9ac72b56e32e10b files/README.gentoo 200
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6629.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6629.ebuild
index a6c5ab0c5ee2..fc7c86567e51 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.6629.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6629.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6629.ebuild,v 1.1 2004/11/07 01:52:37 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6629.ebuild,v 1.2 2004/11/10 01:02:36 cyfred Exp $
 
 inherit eutils
 
@@ -41,12 +41,17 @@ PDEPEND="amd64? ( multilib? ( >=app-emulation/emul-linux-x86-nvidia-${PV} ) )"
 PROVIDE="virtual/opengl"
 export _POSIX2_VERSION="199209"
 
-pkg_setup() {
+check_xfree() {
 	# This isn't necessary, true. But its about time people got the idea.
 	if has_version "x11-base/xfree"
 	then
-		die "Support for x11-base/xfree is deprecated. Upgrade to x11-base/xorg-x11."
+		eerror "Support for x11-base/xfree is deprecated. Upgrade to x11-base/xorg-x11."
 	fi
+}
+
+pkg_setup() {
+	check_xfree
+
 	# Provide some information to the users
 	if use amd64 ; then
 		einfo