Remove weird dyn_unpack hack (removal requested by Kugelfang). Should have no effect for "normal" portage versions, users of the experimental portage the hack was for should be fine on 8.34.8.

Package-Manager: portage-2.1.2.2

11 files changed, 78 insertions, 113 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 1e5c8e497354..9075fa3b1092 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.68 2007/03/04 18:58:04 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.69 2007/03/10 21:40:29 marienz Exp $
+
+  10 Mar 2007; Marien Zwart <marienz@gentoo.org>
+  ati-drivers-8.27.10-r1.ebuild, ati-drivers-8.28.8.ebuild,
+  ati-drivers-8.28.8-r1.ebuild, ati-drivers-8.29.6.ebuild,
+  ati-drivers-8.30.3.ebuild, ati-drivers-8.30.3-r1.ebuild,
+  ati-drivers-8.32.5.ebuild, ati-drivers-8.33.6.ebuild,
+  ati-drivers-8.33.6-r1.ebuild:
+  Remove weird dyn_unpack hack (removal requested by Kugelfang). Should have
+  no effect for "normal" portage versions, users of the experimental portage
+  the hack was for should be fine on 8.34.8.
 
   04 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
   ati-drivers-8.28.8-r1.ebuild:
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 3841828b03e2..314c958f331d 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -41,54 +41,54 @@ DIST ati-driver-installer-8.30.3.run 58041208 RMD160 d4481bba9313cf9bcb71b760303
 DIST ati-driver-installer-8.32.5-x86.x86_64.run 58503169 RMD160 45bf6649227081f6ec10f65305661417c0314748 SHA1 a7411f8e43bb08a822e94d2db7630f868e23afe8 SHA256 d30b7302d4d7952e82ada8a28df0fb8ddd995d2e3f7aac53b67de450c7895475
 DIST ati-driver-installer-8.33.6-x86.x86_64.run 58620730 RMD160 141531330a77d2981d56fd5682d3220d757cc51d SHA1 d1c364698e524da3f4cd8d43bfbd2cd261ed0ae3 SHA256 7e758637c578fe00de00e2bcdf561d92036c73125ef98512be7f1a1405e8f2ae
 DIST ati-driver-installer-8.34.8-x86.x86_64.run 49705555 RMD160 c778c5070673f3b027f5e5cdd2cfbd86e4318ffc SHA1 d7bd2804ecf5aa067aa6b1f3b3adeb8767243e79 SHA256 936f74031151fc9cf09fd8da035bd0cab3b8e6f56ffd76e8feb1f431196e915b
-EBUILD ati-drivers-8.27.10-r1.ebuild 11283 RMD160 6453079c69f3019a5cf01af885abeb77a59f87a4 SHA1 c7f7cb42ef294f16b043654877bfcbc4a725a1fd SHA256 53c4bfbc5a72637ad6fe6c4caeca5dcac1c7b08676ff286e7e1d9c411c5cfe60
-MD5 ed22a46365152134f6befb644d164871 ati-drivers-8.27.10-r1.ebuild 11283
-RMD160 6453079c69f3019a5cf01af885abeb77a59f87a4 ati-drivers-8.27.10-r1.ebuild 11283
-SHA256 53c4bfbc5a72637ad6fe6c4caeca5dcac1c7b08676ff286e7e1d9c411c5cfe60 ati-drivers-8.27.10-r1.ebuild 11283
-EBUILD ati-drivers-8.28.8-r1.ebuild 11341 RMD160 05d86f41126e7e6087bfc176669d9e5f9d5da5ab SHA1 09c0fac30bb1cec3533afd58957f64aad3d4bf03 SHA256 9a3b64dadb40bdc4cc877c78ad3f375dee9bfb1180f439b0f897f4884d733c08
-MD5 162adf8415973b3bdac8d2f2d82f70b8 ati-drivers-8.28.8-r1.ebuild 11341
-RMD160 05d86f41126e7e6087bfc176669d9e5f9d5da5ab ati-drivers-8.28.8-r1.ebuild 11341
-SHA256 9a3b64dadb40bdc4cc877c78ad3f375dee9bfb1180f439b0f897f4884d733c08 ati-drivers-8.28.8-r1.ebuild 11341
-EBUILD ati-drivers-8.28.8.ebuild 11199 RMD160 7f7a47d1506f94eafc1f18048be01b9f689298ae SHA1 76cac5aba9e1e4f199332212e379eafbf75026cf SHA256 89fd2d598517edae14abc9de0d0f0d995fa75aa2a2870fb47464bf83a4ff5deb
-MD5 e2ca39f3db33b3f739cb9fb1eaf79444 ati-drivers-8.28.8.ebuild 11199
-RMD160 7f7a47d1506f94eafc1f18048be01b9f689298ae ati-drivers-8.28.8.ebuild 11199
-SHA256 89fd2d598517edae14abc9de0d0f0d995fa75aa2a2870fb47464bf83a4ff5deb ati-drivers-8.28.8.ebuild 11199
-EBUILD ati-drivers-8.29.6.ebuild 11199 RMD160 3a8c6ef276bc246298488cbb379f057dcd7fbab2 SHA1 55395904f1dcd76b42582932385d9bce73e2dc4c SHA256 d7e759385c6f6e258bc020882172cb9d263d0e6e356b9682ab8c5c9c7ffec473
-MD5 4551a8aaaaa9afd8addb70753ca45625 ati-drivers-8.29.6.ebuild 11199
-RMD160 3a8c6ef276bc246298488cbb379f057dcd7fbab2 ati-drivers-8.29.6.ebuild 11199
-SHA256 d7e759385c6f6e258bc020882172cb9d263d0e6e356b9682ab8c5c9c7ffec473 ati-drivers-8.29.6.ebuild 11199
-EBUILD ati-drivers-8.30.3-r1.ebuild 10603 RMD160 a562fe315e2538ff4c4b8637ef59b77d331432b4 SHA1 f9f27472df73614ac7eb072f22f89f443d187381 SHA256 dc09a54d8d1e210bc09f27c78202c51d331205ddf4d543707894f3d21868725a
-MD5 264438a1ee8e3b45f85299c219249971 ati-drivers-8.30.3-r1.ebuild 10603
-RMD160 a562fe315e2538ff4c4b8637ef59b77d331432b4 ati-drivers-8.30.3-r1.ebuild 10603
-SHA256 dc09a54d8d1e210bc09f27c78202c51d331205ddf4d543707894f3d21868725a ati-drivers-8.30.3-r1.ebuild 10603
-EBUILD ati-drivers-8.30.3.ebuild 11194 RMD160 6cef5a7467098dc471000bf7baf24776db056a0f SHA1 8b33c55477abc25a53ec821d07df5fedf679bf27 SHA256 3422ebee63d8418afe1855cba0e0625d9aca39b9aa37054b18fd1323d96cc684
-MD5 dd66ec8951ad6e44f8959dabc43702f0 ati-drivers-8.30.3.ebuild 11194
-RMD160 6cef5a7467098dc471000bf7baf24776db056a0f ati-drivers-8.30.3.ebuild 11194
-SHA256 3422ebee63d8418afe1855cba0e0625d9aca39b9aa37054b18fd1323d96cc684 ati-drivers-8.30.3.ebuild 11194
-EBUILD ati-drivers-8.32.5.ebuild 10634 RMD160 4e8fc7df874534425b0960e63a8cfcf25339bbe0 SHA1 3201db4c350b70515778fc3d23e4db457ab4e007 SHA256 0094c4211ad825bc3d49088176abd8766f545920afd1aae5a5784356d08cf22d
-MD5 0a39ed2b07ac04a6b96ecde812547b1a ati-drivers-8.32.5.ebuild 10634
-RMD160 4e8fc7df874534425b0960e63a8cfcf25339bbe0 ati-drivers-8.32.5.ebuild 10634
-SHA256 0094c4211ad825bc3d49088176abd8766f545920afd1aae5a5784356d08cf22d ati-drivers-8.32.5.ebuild 10634
-EBUILD ati-drivers-8.33.6-r1.ebuild 10692 RMD160 ac52c596ea7058badee43394ece56e08d07e62a6 SHA1 87d7a32cf6edfd6d07ae4bb1e9b6674746534cb2 SHA256 1995ea7c6a44a009bdfe8e19449575ed6eaba06be3e0571a504afa600d51e6fe
-MD5 2dca63d5b244e740ca113495bbd4f88f ati-drivers-8.33.6-r1.ebuild 10692
-RMD160 ac52c596ea7058badee43394ece56e08d07e62a6 ati-drivers-8.33.6-r1.ebuild 10692
-SHA256 1995ea7c6a44a009bdfe8e19449575ed6eaba06be3e0571a504afa600d51e6fe ati-drivers-8.33.6-r1.ebuild 10692
+EBUILD ati-drivers-8.27.10-r1.ebuild 11064 RMD160 4e421f43e2a19cb5486ba90aef8a20f7940db809 SHA1 f2e114908275d963ecaa0c1c08f037d96e3e749d SHA256 a7372cde7098ca995f34a6bbc994120ea9ed7db20d535bc5969702ac176353cd
+MD5 dd800b74e110ef7f3179cdd3a68fb565 ati-drivers-8.27.10-r1.ebuild 11064
+RMD160 4e421f43e2a19cb5486ba90aef8a20f7940db809 ati-drivers-8.27.10-r1.ebuild 11064
+SHA256 a7372cde7098ca995f34a6bbc994120ea9ed7db20d535bc5969702ac176353cd ati-drivers-8.27.10-r1.ebuild 11064
+EBUILD ati-drivers-8.28.8-r1.ebuild 11125 RMD160 d38f468df6cb066d3d9c0971fa30ae6c84363251 SHA1 a362142c04d8085459e7e167c6f041361c9ed4bb SHA256 df095e4b42f484c86d05db305c282028c3f27799c22efa0ff763a71e1f4e8d3f
+MD5 32cf9b1718bcbc2fca9ec56ee2e6f664 ati-drivers-8.28.8-r1.ebuild 11125
+RMD160 d38f468df6cb066d3d9c0971fa30ae6c84363251 ati-drivers-8.28.8-r1.ebuild 11125
+SHA256 df095e4b42f484c86d05db305c282028c3f27799c22efa0ff763a71e1f4e8d3f ati-drivers-8.28.8-r1.ebuild 11125
+EBUILD ati-drivers-8.28.8.ebuild 10980 RMD160 0e8e9fa7e1b9a6e9f54da443e065c060ffe5eb61 SHA1 2a670682769d5e812dd8ce429788e547298e71a7 SHA256 5b2f6d2385a1e47fa4b0122b2c03497a039b682270bdc749819021cc25bff08e
+MD5 c692b2b270968101f6300b41cd058c79 ati-drivers-8.28.8.ebuild 10980
+RMD160 0e8e9fa7e1b9a6e9f54da443e065c060ffe5eb61 ati-drivers-8.28.8.ebuild 10980
+SHA256 5b2f6d2385a1e47fa4b0122b2c03497a039b682270bdc749819021cc25bff08e ati-drivers-8.28.8.ebuild 10980
+EBUILD ati-drivers-8.29.6.ebuild 10980 RMD160 52fa1b1f77ea9b1ac49b816e222c180faf9b16b2 SHA1 7dc80e4adbd0ee8fb2048d2805c158f29924fc32 SHA256 9bcb741da8c8ad1e76de3251df1b3d6b7236ce048236f87e1e208342641d877b
+MD5 bf8f50be84ae89adac083c59a8ed8860 ati-drivers-8.29.6.ebuild 10980
+RMD160 52fa1b1f77ea9b1ac49b816e222c180faf9b16b2 ati-drivers-8.29.6.ebuild 10980
+SHA256 9bcb741da8c8ad1e76de3251df1b3d6b7236ce048236f87e1e208342641d877b ati-drivers-8.29.6.ebuild 10980
+EBUILD ati-drivers-8.30.3-r1.ebuild 10385 RMD160 3a1f8ddd4382e9ef64829a712063e84461b67e79 SHA1 8610704780e64a1369b55e203b6a272c16421efa SHA256 94df02716bc0d546b863d756c331c479111fcf9dad8d9a08278a5e1108ac5850
+MD5 abdd8ee15add2facc61de1ddbdcf99af ati-drivers-8.30.3-r1.ebuild 10385
+RMD160 3a1f8ddd4382e9ef64829a712063e84461b67e79 ati-drivers-8.30.3-r1.ebuild 10385
+SHA256 94df02716bc0d546b863d756c331c479111fcf9dad8d9a08278a5e1108ac5850 ati-drivers-8.30.3-r1.ebuild 10385
+EBUILD ati-drivers-8.30.3.ebuild 10976 RMD160 cd44195e7ca562f88063e6de4d4e9bb8c50c3a94 SHA1 422c69addd3bb66ab136f5a2237ed216f2028be9 SHA256 294d65a61cd4f6519123b3bc18aee2285bde2f85f8d71c04db03f952ea38dffc
+MD5 af71e3f65e5707ac5bd556cf51eca9dc ati-drivers-8.30.3.ebuild 10976
+RMD160 cd44195e7ca562f88063e6de4d4e9bb8c50c3a94 ati-drivers-8.30.3.ebuild 10976
+SHA256 294d65a61cd4f6519123b3bc18aee2285bde2f85f8d71c04db03f952ea38dffc ati-drivers-8.30.3.ebuild 10976
+EBUILD ati-drivers-8.32.5.ebuild 10418 RMD160 3b68511f1dbc552d80063d2141ff8d3f6ac48187 SHA1 b1f96dfd4a4d046b3a94d8c6ef2f07be6db302d8 SHA256 404783ce839748b6c2a8f6fd121a1908736bfbd5f16383a094d3395c88b0446e
+MD5 11a05f9cba6572bbcf9fbd869140f343 ati-drivers-8.32.5.ebuild 10418
+RMD160 3b68511f1dbc552d80063d2141ff8d3f6ac48187 ati-drivers-8.32.5.ebuild 10418
+SHA256 404783ce839748b6c2a8f6fd121a1908736bfbd5f16383a094d3395c88b0446e ati-drivers-8.32.5.ebuild 10418
+EBUILD ati-drivers-8.33.6-r1.ebuild 10474 RMD160 326fae173f9be2431f9b910202d547b53b5788f9 SHA1 b24870698b3876f7dfbed181267937feb2675796 SHA256 4290aba942249b6504167bb1c848657b4411f65cecbd7bfb8b101e7e0706f348
+MD5 c9dd128751dddf5e938bb07a59ae6c2d ati-drivers-8.33.6-r1.ebuild 10474
+RMD160 326fae173f9be2431f9b910202d547b53b5788f9 ati-drivers-8.33.6-r1.ebuild 10474
+SHA256 4290aba942249b6504167bb1c848657b4411f65cecbd7bfb8b101e7e0706f348 ati-drivers-8.33.6-r1.ebuild 10474
 EBUILD ati-drivers-8.33.6-r2.ebuild 13269 RMD160 e16f5631066c161a583064149f0d0a8df9a76f53 SHA1 33b55e11b24bd9ba55cf049e6a515e82bdf3257b SHA256 8dd7465a855ca4e64843d15fb0f3091d7d007f857b8ff3a8c47dbd51e213517d
 MD5 0f2e1cca391c3481e2c3adb6dfc9ff94 ati-drivers-8.33.6-r2.ebuild 13269
 RMD160 e16f5631066c161a583064149f0d0a8df9a76f53 ati-drivers-8.33.6-r2.ebuild 13269
 SHA256 8dd7465a855ca4e64843d15fb0f3091d7d007f857b8ff3a8c47dbd51e213517d ati-drivers-8.33.6-r2.ebuild 13269
-EBUILD ati-drivers-8.33.6.ebuild 10670 RMD160 4eca26a8283930b042bc8a4179fa0496320316db SHA1 ec662c4a89b8c55fef39a2efefc74b2c0105fb8f SHA256 f58a7b26609f2007136f7ca7a843bd2329bc6cf5d78678ace670a208bc5fea0c
-MD5 484bad00c19c5743bc0cca2a135bc909 ati-drivers-8.33.6.ebuild 10670
-RMD160 4eca26a8283930b042bc8a4179fa0496320316db ati-drivers-8.33.6.ebuild 10670
-SHA256 f58a7b26609f2007136f7ca7a843bd2329bc6cf5d78678ace670a208bc5fea0c ati-drivers-8.33.6.ebuild 10670
+EBUILD ati-drivers-8.33.6.ebuild 10452 RMD160 d193e396d1acd37384436723d0d750a44d5b5e7f SHA1 de69f472786b1ce4185e19c2d77302dd9c35f9c1 SHA256 4dcf0dd419b0315f57525bd12aff4f75cdbb35fbbd399b7f0c99ac12b581f882
+MD5 053e9b051f406e44f5d24405f30b152c ati-drivers-8.33.6.ebuild 10452
+RMD160 d193e396d1acd37384436723d0d750a44d5b5e7f ati-drivers-8.33.6.ebuild 10452
+SHA256 4dcf0dd419b0315f57525bd12aff4f75cdbb35fbbd399b7f0c99ac12b581f882 ati-drivers-8.33.6.ebuild 10452
 EBUILD ati-drivers-8.34.8.ebuild 13011 RMD160 54e5f8e813d92810c436e7ac1e77f2b1e449a6d0 SHA1 876effdbc4b0b9665891de4288976cf8b9dc90d5 SHA256 2fdc3e5c3666018d8ca0f724c97d6dc49b00d421dfcb579c76dea73661508387
 MD5 c6544b4ed00dc5a057a7d9a4eff30801 ati-drivers-8.34.8.ebuild 13011
 RMD160 54e5f8e813d92810c436e7ac1e77f2b1e449a6d0 ati-drivers-8.34.8.ebuild 13011
 SHA256 2fdc3e5c3666018d8ca0f724c97d6dc49b00d421dfcb579c76dea73661508387 ati-drivers-8.34.8.ebuild 13011
-MISC ChangeLog 35769 RMD160 7cad5b5c9618c736c4fd18559906ed3e6d075609 SHA1 61394a3c07175de391115dc8372c192502182e51 SHA256 92d26eb06415c224cd3faedb9ef4a4c7a75206e4ed98ce9c683436345d381136
-MD5 89898f93aca839bb25efde35ec784d25 ChangeLog 35769
-RMD160 7cad5b5c9618c736c4fd18559906ed3e6d075609 ChangeLog 35769
-SHA256 92d26eb06415c224cd3faedb9ef4a4c7a75206e4ed98ce9c683436345d381136 ChangeLog 35769
+MISC ChangeLog 36286 RMD160 289de3a2ac721fba46cdd26228007fbf15fa7d2c SHA1 94d202e414cd4624a7b30e263442cea43b949011 SHA256 6d293f2e11fa2cdc793e29270ca9f1e9823307ccb653cce70fa444b30fa91567
+MD5 af4bf135cf43309c694c37188050335b ChangeLog 36286
+RMD160 289de3a2ac721fba46cdd26228007fbf15fa7d2c ChangeLog 36286
+SHA256 6d293f2e11fa2cdc793e29270ca9f1e9823307ccb653cce70fa444b30fa91567 ChangeLog 36286
 MISC metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a SHA1 3ba9ee03c89575c03788c087c2dea8c208b398e9 SHA256 457f40aec01e7f047adfab46ed13813853102027c1f4cd68efa45a2bd39aff08
 MD5 f462ad2ddb101d99fc4860e39a197a9f metadata.xml 494
 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a metadata.xml 494
@@ -127,9 +127,9 @@ MD5 d961a3ee4dca0fb1803fa70466a8b942 files/digest-ati-drivers-8.34.8 313
 RMD160 c35e6eeac5deb2ccac0a5e08ef1c43bc8770b553 files/digest-ati-drivers-8.34.8 313
 SHA256 817e0ef6514267acd75aa95716be2b008a506029776060602d491985f1616d4f files/digest-ati-drivers-8.34.8 313
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF6xacNQqtfCuFneMRAoxhAJ9IXTHRMHsPdZZlbIk6RJDhWb7F0wCePlaJ
-wqv2g2hy4AKq51PwGoH/kic=
-=JN0q
+iD8DBQFF8yYEUElL7eJpfEQRAq/cAJ4kkelHGvicEe1CXkga9nm8Y8J60QCgk+iD
+XvBoewSBeanAMYh6p2oKw8s=
+=p4oR
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild
index a74d94510c45..a471c8f3212f 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.27.10-r1.ebuild,v 1.4 2006/10/13 15:38:52 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild,v 1.5 2007/03/10 21:40:29 marienz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -210,18 +210,13 @@ src_install() {
 	use x86 && native_dir="lib"
 	use amd64 && native_dir="lib64"
 
-	# Install the libs
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if [ "${MLTEST/set_abi/}" = "${MLTEST}" ] && has_multilib_profile; then
+	if has_multilib_profile; then
 		local OABI=${ABI}
 		for ABI in $(get_install_abis); do
 			src_install-libs
 		done
 		ABI=${OABI}
 		unset OABI
-	elif has_multilib_profile; then
-		src_install-libs
 	elif use amd64; then
 		src_install-libs lib $(get_multilibdir)
 		src_install-libs lib64 $(get_libdir)
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.28.8-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.28.8-r1.ebuild
index 0d2021a472d8..b0de2f0ca71e 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.28.8-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.28.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.28.8-r1.ebuild,v 1.2 2007/03/04 18:58:04 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.28.8-r1.ebuild,v 1.3 2007/03/10 21:40:29 marienz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -215,18 +215,13 @@ src_install() {
 	use x86 && native_dir="lib"
 	use amd64 && native_dir="lib64"
 
-	# Install the libs
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if [ "${MLTEST/set_abi/}" = "${MLTEST}" ] && has_multilib_profile; then
+	if has_multilib_profile; then
 		local OABI=${ABI}
 		for ABI in $(get_install_abis); do
 			src_install-libs
 		done
 		ABI=${OABI}
 		unset OABI
-	elif has_multilib_profile; then
-		src_install-libs
 	elif use amd64; then
 		src_install-libs lib $(get_multilibdir)
 		src_install-libs lib64 $(get_libdir)
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild
index b6921013dd22..68bb1e2184d7 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.28.8.ebuild,v 1.2 2006/10/13 15:38:52 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild,v 1.3 2007/03/10 21:40:29 marienz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -209,18 +209,13 @@ src_install() {
 	use x86 && native_dir="lib"
 	use amd64 && native_dir="lib64"
 
-	# Install the libs
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if [ "${MLTEST/set_abi/}" = "${MLTEST}" ] && has_multilib_profile; then
+	if has_multilib_profile; then
 		local OABI=${ABI}
 		for ABI in $(get_install_abis); do
 			src_install-libs
 		done
 		ABI=${OABI}
 		unset OABI
-	elif has_multilib_profile; then
-		src_install-libs
 	elif use amd64; then
 		src_install-libs lib $(get_multilibdir)
 		src_install-libs lib64 $(get_libdir)
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild
index f5cdfd4ba754..f3850e649f61 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.29.6.ebuild,v 1.2 2006/10/13 15:38:52 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild,v 1.3 2007/03/10 21:40:29 marienz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -209,18 +209,13 @@ src_install() {
 	use x86 && native_dir="lib"
 	use amd64 && native_dir="lib64"
 
-	# Install the libs
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if [ "${MLTEST/set_abi/}" = "${MLTEST}" ] && has_multilib_profile; then
+	if has_multilib_profile; then
 		local OABI=${ABI}
 		for ABI in $(get_install_abis); do
 			src_install-libs
 		done
 		ABI=${OABI}
 		unset OABI
-	elif has_multilib_profile; then
-		src_install-libs
 	elif use amd64; then
 		src_install-libs lib $(get_multilibdir)
 		src_install-libs lib64 $(get_libdir)
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild
index feea2b4cf590..0c7ec5daaf66 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.30.3-r1.ebuild,v 1.3 2006/12/03 20:09:58 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild,v 1.4 2007/03/10 21:40:29 marienz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -183,18 +183,13 @@ src_install() {
 	use x86 && native_dir="lib"
 	use amd64 && native_dir="lib64"
 
-	# Install the libs
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if [ "${MLTEST/set_abi/}" = "${MLTEST}" ] && has_multilib_profile; then
+	if has_multilib_profile; then
 		local OABI=${ABI}
 		for ABI in $(get_install_abis); do
 			src_install-libs
 		done
 		ABI=${OABI}
 		unset OABI
-	elif has_multilib_profile; then
-		src_install-libs
 	elif use amd64; then
 		src_install-libs lib $(get_multilibdir)
 		src_install-libs lib64 $(get_libdir)
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild
index 0bfc3c5d3b05..57464b3fa113 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.30.3.ebuild,v 1.1 2006/11/01 16:21:53 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild,v 1.2 2007/03/10 21:40:29 marienz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -209,18 +209,13 @@ src_install() {
 	use x86 && native_dir="lib"
 	use amd64 && native_dir="lib64"
 
-	# Install the libs
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if [ "${MLTEST/set_abi/}" = "${MLTEST}" ] && has_multilib_profile; then
+	if has_multilib_profile; then
 		local OABI=${ABI}
 		for ABI in $(get_install_abis); do
 			src_install-libs
 		done
 		ABI=${OABI}
 		unset OABI
-	elif has_multilib_profile; then
-		src_install-libs
 	elif use amd64; then
 		src_install-libs lib $(get_multilibdir)
 		src_install-libs lib64 $(get_libdir)
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild
index d86372e0843e..58ad407803d2 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.32.5.ebuild,v 1.4 2007/02/12 00:25:18 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild,v 1.5 2007/03/10 21:40:29 marienz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -184,18 +184,13 @@ src_install() {
 	use x86 && native_dir="lib"
 	use amd64 && native_dir="lib64"
 
-	# Install the libs
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if [ "${MLTEST/set_abi/}" = "${MLTEST}" ] && has_multilib_profile; then
+	if has_multilib_profile; then
 		local OABI=${ABI}
 		for ABI in $(get_install_abis); do
 			src_install-libs
 		done
 		ABI=${OABI}
 		unset OABI
-	elif has_multilib_profile; then
-		src_install-libs
 	elif use amd64; then
 		src_install-libs lib $(get_multilibdir)
 		src_install-libs lib64 $(get_libdir)
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild
index e184f90ef268..09e8a1d92c4e 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.33.6-r1.ebuild,v 1.1 2007/02/09 01:34:48 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild,v 1.2 2007/03/10 21:40:29 marienz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -189,18 +189,13 @@ src_install() {
 	use x86 && native_dir="lib"
 	use amd64 && native_dir="lib64"
 
-	# Install the libs
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if [ "${MLTEST/set_abi/}" = "${MLTEST}" ] && has_multilib_profile; then
+	if has_multilib_profile; then
 		local OABI=${ABI}
 		for ABI in $(get_install_abis); do
 			src_install-libs
 		done
 		ABI=${OABI}
 		unset OABI
-	elif has_multilib_profile; then
-		src_install-libs
 	elif use amd64; then
 		src_install-libs lib $(get_multilibdir)
 		src_install-libs lib64 $(get_libdir)
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.33.6.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.33.6.ebuild
index f07f4f677d66..35496b0ffa53 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.33.6.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.33.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.33.6.ebuild,v 1.1 2007/02/05 10:01:57 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.33.6.ebuild,v 1.2 2007/03/10 21:40:29 marienz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -189,18 +189,13 @@ src_install() {
 	use x86 && native_dir="lib"
 	use amd64 && native_dir="lib64"
 
-	# Install the libs
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if [ "${MLTEST/set_abi/}" = "${MLTEST}" ] && has_multilib_profile; then
+	if has_multilib_profile; then
 		local OABI=${ABI}
 		for ABI in $(get_install_abis); do
 			src_install-libs
 		done
 		ABI=${OABI}
 		unset OABI
-	elif has_multilib_profile; then
-		src_install-libs
 	elif use amd64; then
 		src_install-libs lib $(get_multilibdir)
 		src_install-libs lib64 $(get_libdir)