summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bevitt <cyfred@gentoo.org>2004-07-17 09:43:00 +0000
committerAndrew Bevitt <cyfred@gentoo.org>2004-07-17 09:43:00 +0000
commit94adf05b819d8ae0f7128ddaaa486e5bfe92c357 (patch)
tree217e3ea17527cbe5d7a87aa320062222f6e09127 /x11-base
parentAdded to ~ppc (diff)
downloadhistorical-94adf05b819d8ae0f7128ddaaa486e5bfe92c357.tar.gz
historical-94adf05b819d8ae0f7128ddaaa486e5bfe92c357.tar.bz2
historical-94adf05b819d8ae0f7128ddaaa486e5bfe92c357.zip
Fixing xfree vs xorg depend problems..
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/opengl-update/Manifest4
-rw-r--r--x11-base/opengl-update/metadata.xml5
-rw-r--r--x11-base/opengl-update/opengl-update-1.8.ebuild21
3 files changed, 24 insertions, 6 deletions
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest
index 9465566cc51f..2beab75879d6 100644
--- a/x11-base/opengl-update/Manifest
+++ b/x11-base/opengl-update/Manifest
@@ -1,7 +1,7 @@
MD5 fe9d5a762b674e506e1f518d2ab5a777 opengl-update-1.7.2.ebuild 543
-MD5 20405a640e2f2d31efd92b68a84de661 opengl-update-1.8.ebuild 705
+MD5 de8b9a1c44a6df2c85bb94621c424240 opengl-update-1.8.ebuild 1162
MD5 536a92bce64cc5d0a58d862ac613749e ChangeLog 5633
-MD5 15888db563d723a724ef6cdd2818893d metadata.xml 284
+MD5 c3cadbedd505ea68c030746be518104e metadata.xml 322
MD5 4a7ace3be813461bd5d0f76e0828314c opengl-update-1.7.1.ebuild 543
MD5 cc81df3075c6bf5afa45740b87ae047e opengl-update-1.5.ebuild 527
MD5 030aafb9c2fc8b4510edcf0ddf09a471 files/opengl-update-1.7.1 4922
diff --git a/x11-base/opengl-update/metadata.xml b/x11-base/opengl-update/metadata.xml
index d8ef6bd5fa84..74de443c9e22 100644
--- a/x11-base/opengl-update/metadata.xml
+++ b/x11-base/opengl-update/metadata.xml
@@ -2,5 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>xfree</herd>
-<longdescription>Utility to change the OpenGL interface being used. Used with nvidia or ati binary drivers.</longdescription>
+<maintainer>
+ <email>xfree@gentoo.org</email>
+</maintainer>
+<longdescription>Utility to switch opengl implementations between various providers.</longdescription>
</pkgmetadata>
diff --git a/x11-base/opengl-update/opengl-update-1.8.ebuild b/x11-base/opengl-update/opengl-update-1.8.ebuild
index 853063ce8a73..9795cb4a552a 100644
--- a/x11-base/opengl-update/opengl-update-1.8.ebuild
+++ b/x11-base/opengl-update/opengl-update-1.8.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/x11-base/opengl-update/opengl-update-1.8.ebuild,v 1.1 2004/07/17 03:25:31 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-1.8.ebuild,v 1.2 2004/07/17 09:43:00 cyfred Exp $
DESCRIPTION="Utility to change the OpenGL interface being used"
HOMEPAGE="http://www.gentoo.org/"
@@ -12,8 +12,23 @@ KEYWORDS="~x86 ~amd64"
IUSE=""
GLEXT="20040714"
-DEPEND="virtual/libc
- >=x11-base/xorg-x11-6.7.0-r2"
+DEPEND="virtual/libc"
+
+pkg_setup() {
+ if ( has_version "x11-base/xfree" || has_version "<x11-base/xorg-x11-6.7.0-r2" )
+ then
+ echo
+ ewarn "This version of opengl-update is designed for use with xorg-x11-6.7.0-r2"
+ ewarn "Please mask this version of opengl-update by doing the following"
+ echo
+ ewarn "echo \"=x11-base/opengl-update-1.8\" >> /etc/portage/pacakge.mask"
+ echo
+ ewarn "Alternatively you can upgrade your system to x11-base/xorg-x11-6.7.0-r2"
+ echo
+
+ die "Please mask this pacakge"
+ fi
+}
src_install() {
newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die