Install in the correct location when modular xorg-server is installed but the xorg-x11 meta is not. Add RESTRICT=stricter.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 108 insertions, 7 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 23c09a1c1059..3f849de04e25 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.19 2006/01/21 21:15:52 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.20 2006/02/03 21:15:45 marienz Exp $
+
+  03 Feb 2006; Marien Zwart <marienz@gentoo.org> ati-drivers-8.21.7.ebuild:
+  Install in the correct location when modular xorg-server is installed but
+  the xorg-x11 meta is not. Add RESTRICT=stricter.
 
   21 Jan 2006; <anarchy@gentoo.org>
   +files/ati-drivers-8.21.7-linux-2.6.15.patch, ati-drivers-8.21.7.ebuild:
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index ac980d2ed673..ebda4355f40d 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,42 +1,136 @@
-MD5 414eaaa8333f0ec6aa7e7a64b91ae23c ChangeLog 25279
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 37c0374663d631856896d458d8d7c24d ChangeLog 25483
+RMD160 4713ce0b11146bff5615e0e02a69d5370e243767 ChangeLog 25483
+SHA256 1e1422b78f7f5a1634912793056a9f2676c17b02503dcc0506902f81b1989769 ChangeLog 25483
 MD5 ad343861ae1ccea97bf3bbcdb61ba9e0 ati-drivers-8.14.13-r2.ebuild 7005
+RMD160 fdb66565c4601869a9770d995fee4c055090978f ati-drivers-8.14.13-r2.ebuild 7005
+SHA256 e12b64254b2459337c7e6a9e16ec31add663375d74cfdc78e3b5e489eed5e211 ati-drivers-8.14.13-r2.ebuild 7005
 MD5 fff3d657c788a8d71b363ae449d9a845 ati-drivers-8.14.13-r3.ebuild 7914
+RMD160 1690203ba690c7f6df07db3a4c3392676ffc3248 ati-drivers-8.14.13-r3.ebuild 7914
+SHA256 8a85e10923b79654260a895b620818ab7abbc0222b76a02b50210ac6ee51e97c ati-drivers-8.14.13-r3.ebuild 7914
 MD5 c49603b680cc13d2dc3cecec1d8b45d7 ati-drivers-8.14.13-r4.ebuild 7497
+RMD160 6761a01f848b9d04afdf3642ea7db4076b6725e8 ati-drivers-8.14.13-r4.ebuild 7497
+SHA256 fa00b89bfb25bed6a185c715013a79510da83897b9e890e925f373c1150ee219 ati-drivers-8.14.13-r4.ebuild 7497
 MD5 9b0cd120ff46c57fde8096fe17892be8 ati-drivers-8.14.13-r5.ebuild 7779
+RMD160 de26b6ad95f3fa45065181edae7e916ca34b3484 ati-drivers-8.14.13-r5.ebuild 7779
+SHA256 dabfa3ed2d694d9c7287caaa3854ae414db0c51c119c799637cfd6fba49a4e6d ati-drivers-8.14.13-r5.ebuild 7779
 MD5 2e36e30cc577eec302628a9ea8ac1689 ati-drivers-8.16.20-r1.ebuild 6515
+RMD160 189dd717a4b84d3f651d022834b7fc4314b27de3 ati-drivers-8.16.20-r1.ebuild 6515
+SHA256 c5aeab159a2d7f55253ea7d0a523dd7c567e3c76d130a1271653cfc93b7033ef ati-drivers-8.16.20-r1.ebuild 6515
 MD5 7834be6cf5952828e059827cc9b4ed57 ati-drivers-8.16.20.ebuild 6229
+RMD160 a4015a61f10909a52192b5977a2feecf4efce145 ati-drivers-8.16.20.ebuild 6229
+SHA256 7a92d8f3a25e17c45be3e2ac333722f7b5eb7099933f8ba0415525232cede0c3 ati-drivers-8.16.20.ebuild 6229
 MD5 709b23aa0176849c66ed9b1ed702dc29 ati-drivers-8.18.6-r1.ebuild 7910
+RMD160 76c98ed65660d592cabc990e2ba95857b60bc02a ati-drivers-8.18.6-r1.ebuild 7910
+SHA256 28c1af572c4fc4cb1a2d465477dd5bccf58613dbfe364a18f6b54397e984de0d ati-drivers-8.18.6-r1.ebuild 7910
 MD5 e1a0e8561a29e904bd4f5381da97d219 ati-drivers-8.18.6.ebuild 7086
+RMD160 e0889cd4f53153319e06192cde38a6f4db22b719 ati-drivers-8.18.6.ebuild 7086
+SHA256 0807e2e23784594b943ffa8cee76a6d167846d2743f4c93b90ce2d05d5f84d3a ati-drivers-8.18.6.ebuild 7086
 MD5 5d3dbd42e474d44115bc1a882763e204 ati-drivers-8.18.8-r1.ebuild 8174
+RMD160 19c8a13707886e9cc3b056366f3026fb35f23502 ati-drivers-8.18.8-r1.ebuild 8174
+SHA256 74ca29fd9d41b215ff3517bcafdf46f5fb7435da339bfc4d08c396e7b93d0ed9 ati-drivers-8.18.8-r1.ebuild 8174
 MD5 224722f6f6fe46600354602a1a858d7b ati-drivers-8.18.8-r2.ebuild 8167
+RMD160 9e168083a53a6abaa3e330bbff8ff7ea1c449d4d ati-drivers-8.18.8-r2.ebuild 8167
+SHA256 0dcb3c1d41ebe8f79b168d2c7c998f6040e57433030238b05195554d8e6cf95c ati-drivers-8.18.8-r2.ebuild 8167
 MD5 c9629a18ef6fc50af7d610577e287d58 ati-drivers-8.18.8.ebuild 7857
+RMD160 8b006019fbb7eb91f0c8b7702648d7ff7768bc66 ati-drivers-8.18.8.ebuild 7857
+SHA256 db242a81b6642f3a8ec0de502be6cbefe0b7ddd6683260cb095464c228956ab4 ati-drivers-8.18.8.ebuild 7857
 MD5 d870b6a0318da9f732c271d923aea32e ati-drivers-8.19.10.ebuild 8221
+RMD160 90095e94fc8c39e641a7132318b740fc57cd9a5c ati-drivers-8.19.10.ebuild 8221
+SHA256 8a6e8daaa409346d18ace02046b4e0e899cb86d6b32fd77dee226d715c16e74a ati-drivers-8.19.10.ebuild 8221
 MD5 fbf3f393a9d60dcb7f425e2fc9ed448e ati-drivers-8.20.8.ebuild 8365
-MD5 31d233b15ed4264cc19dc59af867e2f7 ati-drivers-8.21.7.ebuild 8518
+RMD160 4524c29cc880b18e42bac9a1f1a41412303a9db1 ati-drivers-8.20.8.ebuild 8365
+SHA256 549ad9580ce55f79ad1f14510a3beccf6719d0eace6f46f5510ea43ce6d14532 ati-drivers-8.20.8.ebuild 8365
+MD5 3645bd39afeba42bad868ef2ee7c59ec ati-drivers-8.21.7.ebuild 8569
+RMD160 0ad4425199a44e23b16655d4e28d2e09875f41b3 ati-drivers-8.21.7.ebuild 8569
+SHA256 4c03e6daecc3cd0b7e530fe2ab27c762c84785928c5436016bf81babc9026184 ati-drivers-8.21.7.ebuild 8569
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
+RMD160 2eb917685ae226a6913f00d0247514faf998d92f files/09ati 39
+SHA256 44336cd56c2712a3260a1289c1085f08e4cb61e6a73175eac4a7b3ebabe5011e files/09ati 39
 MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376
+RMD160 1cdbb501940e54baa5b3ecec3f1100c83d944b97 files/8.8.25-smp.patch 376
+SHA256 9505ac06d77ba0fdd30c93b8b59d01fa2a3e585702dc5a728dd85b02a49c69dd files/8.8.25-smp.patch 376
 MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198
+RMD160 12b795f41f3f81ded2bbb1bb470fbef1807c0b0e files/8.8.25-via-amd64.patch 1198
+SHA256 ac416243670c5c7d3f66162cf6cee50823def0e9cd3b19d7470cad965c82a744 files/8.8.25-via-amd64.patch 1198
 MD5 193e384c325f1483353da6ea4ca87da3 files/ati-drivers-8.20.8-linux-2.6.15.patch 522
+RMD160 d36a5b6cc84e2e69d8057c3cd15a3aea1f3d613a files/ati-drivers-8.20.8-linux-2.6.15.patch 522
+SHA256 0e5a1cf04bd4d45be694e6df82a5c784fa5e4257ea738a98178168cfb1808999 files/ati-drivers-8.20.8-linux-2.6.15.patch 522
 MD5 12b0f155a9a1089d55b85d9c89c2ef86 files/ati-drivers-8.21.7-linux-2.6.15.patch 447
+RMD160 4c2f538cda5a52f8696a99cc722137b08d86fcea files/ati-drivers-8.21.7-linux-2.6.15.patch 447
+SHA256 134172104d1e7bcf056e723b05eff9d16745b49a4911a765666f4f5c81c59c51 files/ati-drivers-8.21.7-linux-2.6.15.patch 447
 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r2 157
+RMD160 64a8113b9d97d97e499206831806f92b9fbd08e7 files/digest-ati-drivers-8.14.13-r2 157
+SHA256 835d5b4060013736135b0a18a0e8805c379a2b811f326489c6194ecf0b947f00 files/digest-ati-drivers-8.14.13-r2 157
 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r3 157
+RMD160 64a8113b9d97d97e499206831806f92b9fbd08e7 files/digest-ati-drivers-8.14.13-r3 157
+SHA256 835d5b4060013736135b0a18a0e8805c379a2b811f326489c6194ecf0b947f00 files/digest-ati-drivers-8.14.13-r3 157
 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r4 157
+RMD160 64a8113b9d97d97e499206831806f92b9fbd08e7 files/digest-ati-drivers-8.14.13-r4 157
+SHA256 835d5b4060013736135b0a18a0e8805c379a2b811f326489c6194ecf0b947f00 files/digest-ati-drivers-8.14.13-r4 157
 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r5 157
+RMD160 64a8113b9d97d97e499206831806f92b9fbd08e7 files/digest-ati-drivers-8.14.13-r5 157
+SHA256 835d5b4060013736135b0a18a0e8805c379a2b811f326489c6194ecf0b947f00 files/digest-ati-drivers-8.14.13-r5 157
 MD5 ac17fe94be90be4ac158d26cd759884f files/digest-ati-drivers-8.16.20 158
+RMD160 94712edc64ec2b1fdd9f426829a2c9efefd019d8 files/digest-ati-drivers-8.16.20 158
+SHA256 a1f284e887a88eb0b8971d0c7d6fb6dca7ba549827bf32b64c93cae89ca86a00 files/digest-ati-drivers-8.16.20 158
 MD5 ac17fe94be90be4ac158d26cd759884f files/digest-ati-drivers-8.16.20-r1 158
+RMD160 94712edc64ec2b1fdd9f426829a2c9efefd019d8 files/digest-ati-drivers-8.16.20-r1 158
+SHA256 a1f284e887a88eb0b8971d0c7d6fb6dca7ba549827bf32b64c93cae89ca86a00 files/digest-ati-drivers-8.16.20-r1 158
 MD5 3e29001f6bcfcec91a4802e6c6e37fc1 files/digest-ati-drivers-8.18.6 156
+RMD160 1829c69833f8ae7e4ddc9a40bb221a8460797920 files/digest-ati-drivers-8.18.6 156
+SHA256 53e65e45d358d1c31afa2149a69acbd30cbc1c21bb7a1f5ee3b5f79fa10458ad files/digest-ati-drivers-8.18.6 156
 MD5 3f9c6083c83f1c87c4b860ef4eca55f6 files/digest-ati-drivers-8.18.6-r1 168
+RMD160 920751660490bb6288bc5d8591d07d6f777c2d5a files/digest-ati-drivers-8.18.6-r1 168
+SHA256 d16c2f859c4a4bc4efb3b652f8034f9e5249c2e784408292c0f6b7ee8d0c131a files/digest-ati-drivers-8.18.6-r1 168
 MD5 b9b5079b56d44f5056ac6b7e846943be files/digest-ati-drivers-8.18.8 168
+RMD160 35aea4caff83e415de8dce4b2f209738b13cd39e files/digest-ati-drivers-8.18.8 168
+SHA256 a18543540156aa5fbb2b749b0eefed2682e1624ae381c8dc88c018bfe6698ae5 files/digest-ati-drivers-8.18.8 168
 MD5 b9b5079b56d44f5056ac6b7e846943be files/digest-ati-drivers-8.18.8-r1 168
+RMD160 35aea4caff83e415de8dce4b2f209738b13cd39e files/digest-ati-drivers-8.18.8-r1 168
+SHA256 a18543540156aa5fbb2b749b0eefed2682e1624ae381c8dc88c018bfe6698ae5 files/digest-ati-drivers-8.18.8-r1 168
 MD5 b9b5079b56d44f5056ac6b7e846943be files/digest-ati-drivers-8.18.8-r2 168
+RMD160 35aea4caff83e415de8dce4b2f209738b13cd39e files/digest-ati-drivers-8.18.8-r2 168
+SHA256 a18543540156aa5fbb2b749b0eefed2682e1624ae381c8dc88c018bfe6698ae5 files/digest-ati-drivers-8.18.8-r2 168
 MD5 77910c352e4cc0789f1e084337fe75c4 files/digest-ati-drivers-8.19.10 170
+RMD160 baeaeba7214b2dcc5a07fc6b76db0f62f3027ad9 files/digest-ati-drivers-8.19.10 170
+SHA256 58d25054ba49a959cb36d14ee9e93787110343366b80fb5cc4026fbeee1783d7 files/digest-ati-drivers-8.19.10 170
 MD5 296c8e8d4fe969297f60e5772ccf4058 files/digest-ati-drivers-8.20.8 168
-MD5 2d49f096ae9218e587285203aa2ad5d1 files/digest-ati-drivers-8.21.7 168
+RMD160 784f7c44a5f1b15f761ab068b42dff67c63e70b3 files/digest-ati-drivers-8.20.8 168
+SHA256 842abb3720cb86c90681fd053da430e0a1841eef595ebea00f327d4aa162012e files/digest-ati-drivers-8.20.8 168
+MD5 e5296c265380cfc62e0bcafc5360807d files/digest-ati-drivers-8.21.7 380
+RMD160 d495f79088708ad02c366a318a710a4e676562cd files/digest-ati-drivers-8.21.7 380
+SHA256 208b78962cd284d7ed81af4eac174a269384a5e66bba64324e4466ed963f31f5 files/digest-ati-drivers-8.21.7 380
 MD5 9ae27a9d7736cb6ce30b41ff384004d8 files/fglrx-2.6.12-inter_module_get.patch 1265
+RMD160 1c349a894ed606b8f51b4caf0b63a0dc152626f8 files/fglrx-2.6.12-inter_module_get.patch 1265
+SHA256 f1aedd70278cb8a11fdc9139ab698056dcc7ad2922aaa902fa7a8816ec10c43b files/fglrx-2.6.12-inter_module_get.patch 1265
 MD5 0850638c4f5ac2466c793df428fc5d84 files/fglrx-2.6.12-pci_name.patch 2807
+RMD160 dd81ef92ddf35e915682e40ae7042c15bcb6d040 files/fglrx-2.6.12-pci_name.patch 2807
+SHA256 80300e0810a35f42e6d1323c6aef1cd1a4d6c40ebf8d508269c5d06f3cc79817 files/fglrx-2.6.12-pci_name.patch 2807
 MD5 27685e5b509889cb606108eec627aaac files/fglrx-2.6.14-access_ok.patch 521
+RMD160 e05b7cb791e45cbe14d0ae0a3a441f8ea070d54e files/fglrx-2.6.14-access_ok.patch 521
+SHA256 f004c293df8e9587445288ad1243806138c60a632f0950e42c29fa6df18f1b7e files/fglrx-2.6.14-access_ok.patch 521
 MD5 2e151bc6c93225be53fd1a68d36ee877 files/fglrx-2.6.14-compat_ioctl.patch 3227
+RMD160 1ea3344cf626a24e4a4d9a71736885a5029a144b files/fglrx-2.6.14-compat_ioctl.patch 3227
+SHA256 db9cb37b566cff3877f1afeeb25c56daf476959c7271992ddfcf13fc50fa9de6 files/fglrx-2.6.14-compat_ioctl.patch 3227
 MD5 275238baa6d2db2b96bc8b98275a7928 files/fglrx-8.14.13-alt-2.6.12-agp.patch 2586
+RMD160 bc92bd50af60009784c694a18dc22a5d9ac32a26 files/fglrx-8.14.13-alt-2.6.12-agp.patch 2586
+SHA256 21a33f12f7383fb5485055078a6e4baca4adab4939c9ed0dee2cd82fce13689b files/fglrx-8.14.13-alt-2.6.12-agp.patch 2586
 MD5 73907ca81a7435350b4529ddaa7305d5 files/ioctl32.patch 368
+RMD160 69a753f5f02206fbef9c7e84a1f062c9817c9538 files/ioctl32.patch 368
+SHA256 d74890440560671e65ae12c7345675ff95baa01420dfbd2ccdde04de86b674c0 files/ioctl32.patch 368
 MD5 0a9c95a134ef4f317240c54f62e9480e files/p1.patch 1120
+RMD160 363335f5acee2e39b1fb3f6b2437fc4211c825fe files/p1.patch 1120
+SHA256 7d6317988ae9a533a60baf70ac7fa86f46375a6f9083aef292e847b04c026410 files/p1.patch 1120
 MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
+RMD160 e2ed1445a0405b39e40741d3d1f67746daab8fff metadata.xml 227
+SHA256 4fbed7030b32bcdc95b70000adbbcb6f1d73092c4a2f20e6cfb737a1b44d6e07 metadata.xml 227
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD48gWW78445TWHXcRAhNhAJwIWXAHl/Z6HxKJUpVCrNflIFgWVgCeMuDW
+c/twdWEvIScyfy+0azRcdIg=
+=CL8O
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.21.7.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.21.7.ebuild
index 578ede3bca0e..6a9811e7662d 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.21.7.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.21.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.21.7.ebuild,v 1.2 2006/01/21 21:15:52 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.21.7.ebuild,v 1.3 2006/02/03 21:15:45 marienz Exp $
 
 IUSE="opengl"
 
@@ -24,7 +24,7 @@ DEPEND=">=virtual/linux-sources-2.4
 PROVIDE="virtual/opengl"
 
 ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip multilib-pkg-force"
+RESTRICT="nostrip multilib-pkg-force stricter"
 
 MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
 
@@ -276,7 +276,8 @@ src_install-libs() {
 
 	exeinto ${X11_LIB_DIR}/modules/linux
 	# In X.org 6.8.99 / 6.9 this is a .so
-	if has_version ">=x11-base/xorg-x11-6.8.99"
+	if has_version ">=x11-base/xorg-x11-6.8.99" || \
+		has_version "x11-base/xorg-server"
 	then
 		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
 	else
diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.21.7 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.21.7
index e1f4f7b76efd..30dd40202e9b 100644
--- a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.21.7
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.21.7
@@ -1,2 +1,4 @@
 MD5 d20ca4b2d9da8249461c4bb7c75333b6 ati-driver-installer-8.21.7-i386.run 37095872
+RMD160 22d241eaa060c8bf6fbcd3bb340cfa603b7e4bd6 ati-driver-installer-8.21.7-i386.run 37095872
+SHA256 8fe26909c49d6dab64aa97e840c07abf8be0bd0abfbff2285cf2ebfb5a51a93d ati-driver-installer-8.21.7-i386.run 37095872
 MD5 6895783811017aad8e1d9316641f2b65 ati-driver-installer-8.21.7-x86_64.run 28235137