diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2004-04-12 02:06:11 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2004-04-12 02:06:11 +0000 |
| commit | cf25f06da491cfe6dd9558c2301fc2f159f5ddc3 (patch) | |
| tree | 52e811ef36b885fd20a343c45051a514c31ea386 /eclass | |
| parent | Add some arch-specific CFLAGS mangling. (Manifest recommit) (diff) | |
| download | gentoo-2-cf25f06da491cfe6dd9558c2301fc2f159f5ddc3.tar.gz gentoo-2-cf25f06da491cfe6dd9558c2301fc2f159f5ddc3.tar.bz2 gentoo-2-cf25f06da491cfe6dd9558c2301fc2f159f5ddc3.zip | |
Updates for xorg-x11 compatibility.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/matrox.eclass | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/eclass/matrox.eclass b/eclass/matrox.eclass index 5e1e9daceebf..d53dd2dbbd07 100644 --- a/eclass/matrox.eclass +++ b/eclass/matrox.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/matrox.eclass,v 1.2 2004/04/11 05:46:09 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/matrox.eclass,v 1.3 2004/04/12 02:06:11 spyderous Exp $ # # Author: Donnie Berkholz <spyderous@gentoo.org> # @@ -18,7 +18,7 @@ LICENSE="Matrox" SLOT="${KV}" RESTRICT="fetch nostrip" -RDEPEND=">=x11-base/xfree-4.2.0 +RDEPEND="virtual/x11 virtual/linux-sources" matrox_pkg_setup() { @@ -28,23 +28,34 @@ matrox_pkg_setup() { # Force XFree86 4.3.0, 4.2.1 or 4.2.0 to be installed unless FORCE_VERSION # is set. Need FORCE_VERSION for 4.3.99/4.4.0 compatibility until Matrox # comes up with drivers (spyderous) - local INSTALLED_X="`best_version x11-base/xfree`" - GENTOO_X_VERSION_REVISION="${INSTALLED_X/x11-base\/xfree-}" - GENTOO_X_VERSION="${GENTOO_X_VERSION_REVISION%-*}" - if [ "${GENTOO_X_VERSION}" != "4.3.0" ] + if has_version "x11-base/xfree" then - if [ "${GENTOO_X_VERSION}" != "4.2.1" ] + local INSTALLED_X="`best_version x11-base/xfree`" + GENTOO_X_VERSION_REVISION="${INSTALLED_X/x11-base\/xfree-}" + GENTOO_X_VERSION="${GENTOO_X_VERSION_REVISION%-*}" + if [ "${GENTOO_X_VERSION}" -ne "4.3.0" ] then - if [ "${GENTOO_X_VERSION}" != "4.2.0" ] + if [ "${GENTOO_X_VERSION}" -ne "4.2.1" ] then - if [ -n "${FORCE_VERSION}" ] + if [ "${GENTOO_X_VERSION}" -ne "4.2.0" ] then - GENTOO_X_VERSION="${FORCE_VERSION}" - else - die "These drivers require XFree86 4.3.0, 4.2.1 or 4.2.0. Do FORCE_VERSION=version-you-want emerge ${PN} (4.3.0, 4.2.1 or 4.2.0) to force installation." + if [ -n "${FORCE_VERSION}" ] + then + GENTOO_X_VERSION="${FORCE_VERSION}" + else + die "These drivers require XFree86 4.3.0, 4.2.1 or 4.2.0. Do FORCE_VERSION=version-you-want emerge ${PN} (4.3.0, 4.2.1 or 4.2.0) to force installation." + fi fi fi fi + # xorg-x11 compatibility + elif has_version "x11-base/xorg-x11" + then + if [ "${FORCE_VERSION}" -ne "4.3.0" ] + then + die "Set FORCE_VERSION=4.3.0 to emerge this. Use at your own risk." + fi + GENTOO_X_VERSION="${FORCE_VERSION}" fi } |