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.

(Portage version: 2.1.2.2)

10 files changed, 34 insertions, 69 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/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)