summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bevitt <cyfred@gentoo.org>2004-11-10 01:02:36 +0000
committerAndrew Bevitt <cyfred@gentoo.org>2004-11-10 01:02:36 +0000
commit23bf5afb00d07018350ce79026341693e37e3aa9 (patch)
tree7992cbb969acc8d19a4277a1b38d826498416c51 /media-video
parentmark 043 stable (Manifest recommit) (diff)
downloadgentoo-2-23bf5afb00d07018350ce79026341693e37e3aa9.tar.gz
gentoo-2-23bf5afb00d07018350ce79026341693e37e3aa9.tar.bz2
gentoo-2-23bf5afb00d07018350ce79026341693e37e3aa9.zip
Changing to support xfree for the time being
Diffstat (limited to 'media-video')
-rw-r--r--media-video/nvidia-glx/ChangeLog5
-rw-r--r--media-video/nvidia-glx/nvidia-glx-1.0.6629.ebuild11
2 files changed, 12 insertions, 4 deletions
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/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