diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2005-05-24 07:49:36 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2005-05-24 07:49:36 +0000 |
| commit | 2e1a3edebbd1b872eda76e0c1a05d1115994a8a5 (patch) | |
| tree | a02746e893fb48a3ce548e691a5ba165fd35d418 /x11-base | |
| parent | Backports from 6.8.99.x. 1) Fix find syntax. 2) Stop setting BuildLinuxDocText. (diff) | |
| download | historical-2e1a3edebbd1b872eda76e0c1a05d1115994a8a5.tar.gz historical-2e1a3edebbd1b872eda76e0c1a05d1115994a8a5.tar.bz2 historical-2e1a3edebbd1b872eda76e0c1a05d1115994a8a5.zip | |
Backports from 6.8.99.x, continued: Depend on opengl-update-2.2 for fixed --use-old.
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-x11/Manifest | 4 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild | 12 |
3 files changed, 12 insertions, 11 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index b9249fe548c8..587e34b20164 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.393 2005/05/24 07:46:52 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.394 2005/05/24 07:49:36 spyderous Exp $ + + 24 May 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-x11-6.8.2-r2.ebuild: + Backports from 6.8.99.x, continued: Depend on opengl-update-2.2 for fixed + --use-old. 24 May 2005; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.8.2-r2.ebuild: diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index 1d0a0f22e5a1..8387c4693e7b 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,7 +1,7 @@ MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230 MD5 2a9834518373d30105bf3deba9f2624e xorg-x11-6.8.99.3.ebuild 60101 -MD5 73488a9217d059e3232d709de5a8f34b xorg-x11-6.8.2-r2.ebuild 60197 -MD5 39a8804fbe13f6d99773c9237049fb81 ChangeLog 92956 +MD5 de4ebd8b61efaad59c2aca5413a0e717 xorg-x11-6.8.2-r2.ebuild 60074 +MD5 f7b797c7cd5278e4e9bc953fdc8581ca ChangeLog 93129 MD5 0c888a243b7ab0116ef83ae5b4266499 xorg-x11-6.8.99.8.ebuild 60422 MD5 fb5fe55f00e3567aeb6ea6d4465fc62b xorg-x11-6.8.2-r1.ebuild 59275 MD5 8b76b2dd6d719ed8a204fddccc3d3481 xorg-x11-6.8.99.5.ebuild 60280 diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild index c8df66634b5f..6da20e4b5351 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild,v 1.15 2005/05/24 07:46:52 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild,v 1.16 2005/05/24 07:49:36 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -98,7 +98,7 @@ DEPEND=">=sys-libs/ncurses-5.1 >=dev-libs/expat-1.95.3 >=media-libs/freetype-2.1.8 >=media-libs/fontconfig-2.1-r1 - opengl? ( >=x11-base/opengl-update-2.1.1 ) + opengl? ( >=x11-base/opengl-update-2.2.0 ) >=x11-misc/ttmkfdir-3.0.9-r2 >=sys-apps/sed-4 sys-apps/util-linux @@ -115,7 +115,7 @@ RDEPEND=" >=dev-libs/expat-1.95.3 >=media-libs/freetype-2.1.8 >=media-libs/fontconfig-2.1-r1 - opengl? ( >=x11-base/opengl-update-2.1.1 ) + opengl? ( >=x11-base/opengl-update-2.2.0 ) >=x11-misc/ttmkfdir-3.0.9-r2 media-libs/libpng >=sys-libs/ncurses-5.1 @@ -1923,11 +1923,7 @@ switch_opengl_implem() { # OpenGL interface ... echo local opengl_implem="$(${ROOT}/usr/sbin/opengl-update --get-implementation)" - if [ "${opengl_implem}" = "xfree" -o -z "${opengl_implem}" ]; then - ${ROOT}/usr/sbin/opengl-update ${PN} - else - ${ROOT}/usr/sbin/opengl-update ${opengl_implem} - fi + ${ROOT}/usr/sbin/opengl-update --use-old ${PN} } remove_old_compose_files() { |