diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2005-12-19 01:14:41 +0000 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2005-12-19 01:14:41 +0000 |
| commit | dbb041d3a044055fa48fab6629361ce3a422efa1 (patch) | |
| tree | 477c16743fb34f51408e9de6277827dcbb0716e4 | |
| parent | initial import to tree (diff) | |
| download | gentoo-2-dbb041d3a044055fa48fab6629361ce3a422efa1.tar.gz gentoo-2-dbb041d3a044055fa48fab6629361ce3a422efa1.tar.bz2 gentoo-2-dbb041d3a044055fa48fab6629361ce3a422efa1.zip | |
fixed for modular X
(Portage version: 2.0.53)
| -rw-r--r-- | x11-drivers/ati-drivers/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-drivers/ati-drivers/Manifest | 4 | ||||
| -rw-r--r-- | x11-drivers/ati-drivers/ati-drivers-8.20.8.ebuild | 14 |
3 files changed, 14 insertions, 9 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog index 099fe148fef5..8478be91389d 100644 --- a/x11-drivers/ati-drivers/ChangeLog +++ b/x11-drivers/ati-drivers/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-drivers/ati-drivers # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.13 2005/12/11 03:55:47 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.14 2005/12/19 01:14:41 anarchy Exp $ + + 19 Dec 2005; Jory A. Pratt <anarchy@gentoo.org> ati-drivers-8.20.8.ebuild: + fixed for modular X *ati-drivers-8.20.8 (11 Dec 2005) diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest index c0a56a9c827f..2096c1a69dd5 100644 --- a/x11-drivers/ati-drivers/Manifest +++ b/x11-drivers/ati-drivers/Manifest @@ -1,4 +1,4 @@ -MD5 ec85de6054546b369e49f23818abe92e ChangeLog 24528 +MD5 a46785e35f9a88469c8d15117302294a ChangeLog 24628 MD5 ad343861ae1ccea97bf3bbcdb61ba9e0 ati-drivers-8.14.13-r2.ebuild 7005 MD5 fff3d657c788a8d71b363ae449d9a845 ati-drivers-8.14.13-r3.ebuild 7914 MD5 c49603b680cc13d2dc3cecec1d8b45d7 ati-drivers-8.14.13-r4.ebuild 7497 @@ -11,7 +11,7 @@ MD5 5d3dbd42e474d44115bc1a882763e204 ati-drivers-8.18.8-r1.ebuild 8174 MD5 224722f6f6fe46600354602a1a858d7b ati-drivers-8.18.8-r2.ebuild 8167 MD5 c9629a18ef6fc50af7d610577e287d58 ati-drivers-8.18.8.ebuild 7857 MD5 d870b6a0318da9f732c271d923aea32e ati-drivers-8.19.10.ebuild 8221 -MD5 d52e45511633c66f54952ff8303eea62 ati-drivers-8.20.8.ebuild 8106 +MD5 55e2e58c3b2f7f211f4888685ef62e93 ati-drivers-8.20.8.ebuild 8128 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39 MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376 MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198 diff --git a/x11-drivers/ati-drivers/ati-drivers-8.20.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.20.8.ebuild index de87a28567d8..28460d2d0581 100644 --- a/x11-drivers/ati-drivers/ati-drivers-8.20.8.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-8.20.8.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-drivers/ati-drivers/ati-drivers-8.20.8.ebuild,v 1.1 2005/12/11 03:55:47 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.20.8.ebuild,v 1.2 2005/12/19 01:14:41 anarchy Exp $ IUSE="opengl" @@ -14,7 +14,7 @@ SRC_URI="x86? ( mirror://gentoo/ati-driver-installer-${PV}-i386.run ) LICENSE="ATI" KEYWORDS="~amd64 ~x86" -RDEPEND=">=x11-base/xorg-x11-6.8.0 +RDEPEND="|| ( x11-base/xorg-server virtual/x11 ) app-admin/eselect-opengl || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )" @@ -31,9 +31,7 @@ MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)" choose_driver_folder() { #new modular X paths, 0 is a workaround. - if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 7 ] \ - || [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 0 ] - then + if has_version "x11-base/xorg-server"; then BASE_NAME="${WORKDIR}/x690" xlibdir="xorg" else @@ -93,7 +91,11 @@ pkg_setup(){ fi # Set up X11 implementation - X11_IMPLEM_P="$(best_version virtual/x11)" + if has_version "x11-base/xorg-server"; then + X11_IMPLEM_P="$(best_version xorg-x11)" + else + X11_IMPLEM_P="$(best_version virtual/x11)" + fi X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}" X11_IMPLEM="${X11_IMPLEM##*\/}" X11_IMPLEM_V="${X11_IMPLEM_P/${X11_IMPLEM}-/}" |