bug #112427 fixes

(Portage version: 2.1_pre5-r4)

3 files changed, 36 insertions, 10 deletions

diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 33f376155809..152b54a39c4e 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -40,15 +40,15 @@ SHA256 8054e0a5061e2881161e73c522040477f46a305b5b36e92182dce90e941ea25f ati-driv
 MD5 3316753abad1e8f0badfe252e3cae416 ati-drivers-8.20.8.ebuild 8387
 RMD160 e63c28e2b8206331678b36b79e1699b5c63c9ee5 ati-drivers-8.20.8.ebuild 8387
 SHA256 8601e455bd7a6161bfeb47d95ad2c02cc867357a9b2a3a77fe4cb7b8aaf4b535 ati-drivers-8.20.8.ebuild 8387
-MD5 4f83874ccf6c35277fdfff545c900edf ati-drivers-8.21.7-r1.ebuild 8466
-RMD160 d070c6efe1ebd5d0a55b8ebbed912d03c372088a ati-drivers-8.21.7-r1.ebuild 8466
-SHA256 b2a85fe2c3b07f5d9451d1f5c3384755f8c164f793cb4e549098bfa398b70942 ati-drivers-8.21.7-r1.ebuild 8466
+MD5 74c2cf0f11b389be13bd8952f52bf553 ati-drivers-8.21.7-r1.ebuild 8881
+RMD160 4c64e91053dff228d160895ef4ee76f943ffcc11 ati-drivers-8.21.7-r1.ebuild 8881
+SHA256 d1170a34bdc27261aa53ec953be6d47a8ff5bf547017a45456985a60fec5c3d2 ati-drivers-8.21.7-r1.ebuild 8881
 MD5 938ae1a4bff6e6e33ee859dd2a3ca5a6 ati-drivers-8.21.7.ebuild 8469
 RMD160 68784475bce2aefee05a6ef9eea3ea03476ea2d5 ati-drivers-8.21.7.ebuild 8469
 SHA256 ae67a291c40ed09e8726c4ed65a6f93cc4cca90b9eb5d16105f23638a2b10096 ati-drivers-8.21.7.ebuild 8469
-MD5 1f0101eea99453e4c8e413fee79c76f9 ati-drivers-8.22.5.ebuild 8479
-RMD160 9701aedb16dbd8b19a382dac028c61f96c54d606 ati-drivers-8.22.5.ebuild 8479
-SHA256 24bf3497ec3837f0f3d16b6e9ceaa7818a0e61b8c48d3b3fc32056cc4367dcf2 ati-drivers-8.22.5.ebuild 8479
+MD5 7448f3b8b70a8e2bf0bd7f38b0228890 ati-drivers-8.22.5.ebuild 8894
+RMD160 9a04c16805b7061aa13d4fae2f2cef39e3a4491f ati-drivers-8.22.5.ebuild 8894
+SHA256 e0362cdb517c0466a31111fa0d2d904bce218cb26af4aaae32b0b5c2686879a7 ati-drivers-8.22.5.ebuild 8894
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
 RMD160 2eb917685ae226a6913f00d0247514faf998d92f files/09ati 39
 SHA256 44336cd56c2712a3260a1289c1085f08e4cb61e6a73175eac4a7b3ebabe5011e files/09ati 39
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.21.7-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.21.7-r1.ebuild
index 454293e561c6..b9e7ff60d2a3 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.21.7-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.21.7-r1.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-r1.ebuild,v 1.1 2006/03/08 14:16:31 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.21.7-r1.ebuild,v 1.2 2006/03/08 15:11:38 anarchy Exp $
 
 IUSE="opengl"
 
@@ -99,6 +99,11 @@ pkg_setup(){
 	# Set up X11 implementation
 	if has_version "x11-base/xorg-server"; then
 		X11_IMPLEM=xorg-x11
+	elif has_version "<x11-base/xorg-x11-6.8.99"; then
+		X11_IMPLEM=xorg-x11
+		X11_IMPLEM_V="$(best_version x11-base/xorg-x11)"
+		X11_IMPLEM_V="${X11_IMPLEM_V/${X11_IMPLEM}-/}"
+		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
 	else
 		X11_IMPLEM_P="$(best_version virtual/x11)"
 		X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
@@ -284,8 +289,16 @@ src_install-libs() {
 		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
 	fi
 
-	cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
+	if has_version ">=x11-base/xorg-x11-6.8.99" || \
+		has_version "x11-base/xorg-server"
+	then
+		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
 			${D}/usr/$(get_libdir)
+	else
+		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig.a} \
+			${D}/usr/$(get_libdir)
+	fi
+
 	#Not the best place
 	insinto ${X11_DIR}/include/X11/extensions
 	doins ${COMMON_DIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.22.5.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.22.5.ebuild
index a58131822583..7d25f02d53b4 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.22.5.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.22.5.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.22.5.ebuild,v 1.3 2006/02/23 21:08:51 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.22.5.ebuild,v 1.4 2006/03/08 15:11:38 anarchy Exp $
 
 IUSE="opengl"
 
@@ -99,6 +99,11 @@ pkg_setup(){
 	# Set up X11 implementation
 	if has_version "x11-base/xorg-server"; then
 		X11_IMPLEM=xorg-x11
+	elif has_version "<x11-base/xorg-x11-6.8.99"; then
+		X11_IMPLEM=xorg-x11
+		X11_IMPLEM_V="$(best_version x11-base/xorg-x11)"
+		X11_IMPLEM_V="${X11_IMPLEM_V/${X11_IMPLEM}-/}"
+		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
 	else
 		X11_IMPLEM_P="$(best_version virtual/x11)"
 		X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
@@ -284,8 +289,16 @@ src_install-libs() {
 		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
 	fi
 
-	cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
+	if has_version ">=x11-base/xorg-x11-6.8.99" || \
+		has_version "x11-base/xorg-server"
+	then
+		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
 			${D}/usr/$(get_libdir)
+	else
+		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig.a} \
+			${D}/usr/$(get_libdir)
+	fi
+
 	#Not the best place
 	insinto ${X11_DIR}/include/X11/extensions
 	doins ${COMMON_DIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h