Import Enrico Tagliavini's ati-drivers-11.5.ebuild from the x11 overlay.

Package-Manager: portage-2.2.0_alpha33/cvs/Linux x86_64

3 files changed, 89 insertions, 90 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 949d9b244888..f20087c26c0b 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.249 2011/05/09 08:05:58 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.250 2011/05/17 15:27:37 chithanh Exp $
+
+*ati-drivers-11.5 (17 May 2011)
+
+  17 May 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -ati-drivers-8.840.ebuild, +ati-drivers-11.5.ebuild:
+  Import Enrico Tagliavini's ati-drivers-11.5.ebuild from the x11 overlay.
 
   09 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> ati-drivers-11.3.ebuild:
   x86 stable wrt bug #363965
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index e626847adcf9..67e305a40e6b 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ati-drivers-2.6.36.patch 876 RMD160 955b55c92a3b0a75b205c4563bc00d312298e72e SHA1 ab5234057cbd88ae5ff346e62a8a9f511d4cc2aa SHA256 00ffca26787d4c2cab6848cf0bec043e6c099c60738aebacb2148e920738fcb6
 AUX ati-drivers-2.6.37.patch 495 RMD160 2e1b3e6f2ebcd52b5e0584793956a3c24bca7dac SHA1 80ed7b03dd87fdf750a7124c7e392d124e3ba90f SHA256 acce741df8842178c54db4a01ed68a9dd54c331b0d6c153ecaf4f088cf0f18a2
 AUX ati-drivers-2.6.38.patch 1645 RMD160 f91dc5e16c89e942cca63252e186b5d97d7db1c7 SHA1 f17a853df364b0942116c7fafe8372e483c1542f SHA256 46ae66c3985ce3af21e36d3bd71019a6b81e2884099253e2772384bd67a77c24
@@ -13,20 +10,13 @@ DIST ati-driver-installer-10-12-x86.x86_64.run 125184835 RMD160 6f863fe37ed80e11
 DIST ati-driver-installer-11-2-x86.x86_64.run 87023769 RMD160 ca67202bd5b49c700fcb5d503e25593e4335d392 SHA1 adfa10cfc75d0859538ecefa953c982567bbf49e SHA256 5a538e256487dc45441e907e5f0644446c5e2d6e50d724419c3df5b17e8585f8
 DIST ati-driver-installer-11-3-x86.x86_64.run 72899696 RMD160 8e1e0dfa5decde85a6f2fae46141dfbcb1b18fd9 SHA1 1f69ca14766ca0dcba8f7ccef2c0357c528c6ca0 SHA256 e0bcb7e6c12ff1961c057df58fba396ab59356aaebbb1f5dd508c40b8610ed5e
 DIST ati-driver-installer-11-4-x86.x86_64.run 75710303 RMD160 983d8ec36c154016c3b6ab172ba2e8cccde4faff SHA1 013d99ee025e1e97d01f6f68475c5a4b1df283cd SHA256 6101bf01c9bec7fab95595c0e19741f3692cc2cfd8e9b905f4f0df5b445ae45e
-DIST fglrx-installer_8.840.orig.tar.gz 71129855 RMD160 4ab6c233565a4436b8a477ba9e0b3f7ba2c89a16 SHA1 db707bc9732c1698658c71db7f92cc88dd72cde9 SHA256 4a788929d8415b4b9b813aaf951eb0b63c01ba1b6b721bae92cc8c77c0c0a06c
+DIST ati-driver-installer-11-5-x86.x86_64.run 74585606 RMD160 1ada69dc9d3a4514dc658481e4db34671668b114 SHA1 e715d28bc0e3284b6e06d698fd7f7c547b625707 SHA256 052d496c7931bf201ecd4fce6afc9d8df454ad50f71fd695053b404239296f58
 EBUILD ati-drivers-10.10.ebuild 19776 RMD160 00c7ea8b0d9b2ff88010fa05606b7f29182cf49d SHA1 bae618daca204b70a711acff0cb68b4c998e1ea9 SHA256 0471423ded33e1e194ff6406abd0492c4c512d464ef41247486e8fc3670ff641
 EBUILD ati-drivers-10.11.ebuild 19772 RMD160 87ff0d1086dd754603c44c4c74487bd986726494 SHA1 4837a24906454a2dc453b7debd4c92e67df46556 SHA256 749b527601834b529d2f574806058db02b5df26222df888d85334512506773ed
 EBUILD ati-drivers-10.12.ebuild 19996 RMD160 fe099682e3d10cfabd7c62c7212fb558ebc7eafb SHA1 a9d10b7133ac68e49ba6415a3aa6bb69d77702b9 SHA256 3c2f80f1b8c7db128a9761461e66650de0b3269e75f8b32e4fccce204896b8b4
 EBUILD ati-drivers-11.2.ebuild 19695 RMD160 678ffdc48256ae2f4f693e4a3e94e43d5696fbf6 SHA1 fe1e5bb42f28aa1c2b0b974da02b34b02c0c20c5 SHA256 1d9dafbe3e18a9b771768139f152d4b3fe02f5f964b7dd74295bfb33b82ead5a
 EBUILD ati-drivers-11.3.ebuild 18366 RMD160 d4f5e62d43d5ac925358dd5826302404b6a0f523 SHA1 d0de565b678e26f7bb94680fbc8032eac008d717 SHA256 25063f69b8b8cce2a44d0b1a4e56933a42b56d0426bc05e595182af3c3f1485d
 EBUILD ati-drivers-11.4.ebuild 17516 RMD160 afeaf85d9cc5db751fe5d556c76c74aaf8804fbd SHA1 b4124f1657fdabf18f56b39587647c445701464a SHA256 d3fccbf62fae93b6a5fe4ed97eba2b69c1bd79b244a9e32cfcbe3cc2f8a641c1
-EBUILD ati-drivers-8.840.ebuild 18380 RMD160 a4d16179f270ef6b2b691ad50e229bce17051bd7 SHA1 8cd200cc044b73c60a87d50918041e9ddf5f5895 SHA256 3738b86033a03d5c98e2f1778ff314d5a7ed104f271dd9f23b8d18988890573a
-MISC ChangeLog 70120 RMD160 d8a2199418161730269e5c64613a6a02e569a0e2 SHA1 6ca45f083735e85f52b8e6d53a69740d848158e5 SHA256 4689d5af5c0f5e02fd889811695b449fc9da4ebfdb369052cbe0fb76a002a4cc
+EBUILD ati-drivers-11.5.ebuild 18195 RMD160 0853d318b1cc0c0fea3d37bbc8c2265c9ed5f67f SHA1 8cd92fa4d6f85995dcaf7a92ca1d040aa3739ad6 SHA256 80d207ab5e1514889cfa221d0a31f61440510048805bbac1f2f5899a07588fe8
+MISC ChangeLog 70351 RMD160 84c83ea95e8912a69f13e60331214ae5920ba630 SHA1 cb31f5a8b4ac9a38043321195630a05805586cdf SHA256 aa223236ec65071440d13f9b9a9112b9f2c6d94eea710ac46871d43c6117c622
 MISC metadata.xml 570 RMD160 0a020753d41a48670dccdf8da444e29531426bbb SHA1 4b0d5dace7a76499468fe40c9645ef11ff864776 SHA256 e20880954026ec88b69b99b3015edbfcb3bb3067b693064aecf8770a8cf76072
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk3HoGYACgkQuUQtlDBCeQK/2gCfWgjaPC5lwNbdSH50wpH4uT0d
-UioAn0Lc/xZduJDyDCxzQib1A7GljABJ
-=puEt
------END PGP SIGNATURE-----
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.840.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.5.ebuild
index a8c3d8d29646..6117f6012e2b 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.840.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-11.5.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2011 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.840.ebuild,v 1.1 2011/04/04 14:03:24 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-11.5.ebuild,v 1.1 2011/05/17 15:27:37 chithanh Exp $
 
-EAPI="2"
+EAPI=4
 
-inherit eutils multilib linux-mod toolchain-funcs versionator
+inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
 
 DESCRIPTION="Ati precompiled drivers for r600 (HD Series) and newer chipsets"
 HOMEPAGE="http://www.ati.com"
 # 8.ble will be used for beta releases.
 if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
+	ATI_URL="http://www2.ati.com/drivers/linux/"
 	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
 	FOLDER_PREFIX="common/"
 else
@@ -24,7 +24,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="1"
 
 RDEPEND="
-	>=x11-base/xorg-server-1.10
+	<=x11-base/xorg-server-1.10.99
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
 	>=app-admin/eselect-opengl-1.0.7
@@ -44,7 +44,7 @@ RDEPEND="
 			x11-libs/libXxf86vm
 			x11-libs/qt-core
 			x11-libs/qt-gui
-		 )
+	)
 "
 
 DEPEND="${RDEPEND}
@@ -156,19 +156,7 @@ _check_kernel_config() {
 		eerror "    Power management and ACPI options --->"
 		eerror "        [*] Power Management support"
 		eerror "in the 'menuconfig'"
-		error="${error} CONFIG_ACPI disabled"
-		failed=1
-	fi
-
-	if ! linux_chkconfig_present MAGIC_SYSRQ; then
-		eerror "${P} requires the magic SysRq keys in the kernel."
-		eerror "Please enable it:"
-		eerror "    CONFIG_MAGIC_SYSRQ=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Kernel hacking  --->"
-		eerror "        [*] Magic SysRq key"
-		eerror "in the 'menuconfig'"
-		error="${error} CONFIG_MAGIC_SYSRQ disabled"
+		error+=" CONFIG_ACPI disabled;"
 		failed=1
 	fi
 
@@ -180,7 +168,7 @@ _check_kernel_config() {
 		eerror "    Bus options (PCI etc.)  --->"
 		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
 		eerror "in the kernel config."
-		error="${error} CONFIG_PCI_MSI disabled"
+		error+=" CONFIG_PCI_MSI disabled;"
 		failed=1
 	fi
 
@@ -195,7 +183,7 @@ _check_kernel_config() {
 		eerror "        [ ] Lock debugging: prove locking correctness"
 		eerror "        [ ] Lock usage statistics"
 		eerror "in 'menuconfig'"
-		error="${error} LOCKDEP enabled"
+		error+=" LOCKDEP enabled;"
 		failed=1
 	fi
 
@@ -208,7 +196,7 @@ _check_kernel_config() {
 		eerror "if this doesn't enable CONFIG_COMPAT add"
 		eerror "    CONFIG_COMPAT=y"
 		eerror "in /usr/src/linux/.config"
-		error="${error} COMPAT disabled"
+		error+=" COMPAT disabled;"
 		failed=1
 	fi
 
@@ -221,27 +209,39 @@ _check_kernel_config() {
 		eerror "or add"
 		eerror "    CONFIG_BKL=y"
 		eerror "in /usr/src/linux/.config"
-		error="${error} BKL disabled"
+		error+=" BKL disabled;"
 		failed=1
 	fi
 
-	[ "x${failed}" != "x0" ] && die "${error}"
+	[[ ${failed} -ne 0 ]] && die "${error}"
+}
+
+pkg_pretend() {
+	# workaround until bug 365543 is solved
+	if use modules; then
+		linux-info_pkg_setup
+		require_configured_kernel
+		_check_kernel_config
+	fi
 }
 
 pkg_setup() {
+	if use modules; then
+		MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod/2.6.x)"
+		BUILD_TARGETS="kmod_build"
+		linux-mod_pkg_setup
+		BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
+		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
+		if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
+			BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
+		else
+			BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
+		fi
+	fi
 	# Define module dir.
 	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
 	# get the xorg-server version and set BASE_DIR for that
-	local ver_str=$(qatom `best_version x11-base/xorg-server` | cut -d ' ' -f 3)
-	case ${ver_str} in
-		1\.10*) BASE_DIR="${S}/xpic" ;;
-		1\.9*) BASE_DIR="${S}/xpic" ;;
-		9999*) BASE_DIR="${S}/xpic"
-			ewarn "Experimental xorg-server-${ver_str}"
-			ewarn "Picking the last implementation" ;;
-		1\.8*|1\.7*) BASE_DIR="${S}/xpic" ;;
-		*) die "xorg-server-${ver_str} not supported" ;;
-	esac
+	BASE_DIR="${S}/xpic"
 
 	# amd64/x86
 	if use amd64 ; then
@@ -254,20 +254,6 @@ pkg_setup() {
 		ARCH_DIR="${S}/arch/x86"
 	fi
 
-	if use modules; then
-		MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod/2.6.x)"
-		BUILD_TARGETS="kmod_build"
-		linux-mod_pkg_setup
-		BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-		if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-			BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-		else
-			BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-		fi
-		_check_kernel_config
-	fi
-
 	elog
 	elog "Please note that this driver supports only graphic cards based on"
 	elog "r600 chipset and newer."
@@ -424,18 +410,18 @@ src_install() {
 
 	# X modules.
 	exeinto /usr/$(get_libdir)/xorg/modules/drivers
-	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so || die
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
 	exeinto /usr/$(get_libdir)/xorg/modules/linux
-	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so || die
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
 	exeinto /usr/$(get_libdir)/xorg/modules
-	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so} || die
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so}
 
 	# Arch-specific files.
 	# (s)bin.
 	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd || die
+	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
 	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/* || die
+	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
 
 	# lib.
 	exeinto /usr/$(get_libdir)
@@ -449,54 +435,62 @@ src_install() {
 	# Common files.
 	# etc.
 	insinto /etc/ati
+	exeinto /etc/ati
 	# Everything except for the authatieventsd.sh script.
 	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	insopts -m0755
-	doins ${FOLDER_PREFIX}etc/ati/authatieventsd.sh || die
+	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
 
 	# include.
 	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include || die
+	doins -r ${FOLDER_PREFIX}usr/include
 	insinto /usr/include/X11/extensions
 
 	# Just the atigetsysteminfo.sh script.
 	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/* || die
+	dosbin ${FOLDER_PREFIX}usr/sbin/*
 
 	# data files for the control panel.
 	if use qt4 ; then
 		insinto /usr/share
-		doins -r ${FOLDER_PREFIX}usr/share/ati || die
+		doins -r ${FOLDER_PREFIX}usr/share/ati
 		insinto /usr/share/pixmaps
-		doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm || die
+		doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
 		make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
 			ccc_large System
 	fi
 
 	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx || die
+	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
 
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8 || die
+	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
 
 	pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null
 
 	exeinto /etc/acpi
-	doexe ati-powermode.sh || die
+	doexe ati-powermode.sh
 	insinto /etc/acpi/events
-	doins events/* || die
+	doins events/*
 
 	popd > /dev/null
 
 	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears || die
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears || die
+	dobin extra/fgl_glxgears/fgl_glxgears
+	newdoc extra/fgl_glxgears/README README.fgl_glxgears
 
 	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd \
-		|| die "Failed to install atieventsd.init.d"
+	newinitd "${FILESDIR}"/atieventsd.init atieventsd
 	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	insopts -m0644
-	newconfd "${T}"/atieventsd.conf atieventsd || die
+	newconfd "${T}"/atieventsd.conf atieventsd
+
+	# PowerXpress stuff
+	local alllibdir="$(get_libdir)"
+	use multilib && alllibdir="lib64 lib32"
+	for libdir in ${alllibdir}
+	do
+		dosym /usr/${libdir}/opengl/xorg-x11/lib/libGL.so.1.2 \
+			/usr/${libdir}/fglrx/libGL.so.1.2
+		dosym ./libGL.so.1.2 /usr/${libdir}/fglrx/fglrx-libGL.so.1.2
+	done
 }
 
 src_install-libs() {
@@ -519,27 +513,36 @@ src_install-libs() {
 	# The GLX libraries
 	# (yes, this really is "lib" even on amd64/multilib --marienz)
 	exeinto ${ATI_ROOT}/lib
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver} || die
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor} || die
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so || die
+	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
+		libGL.so.${libver}
+	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
+	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
+	# PowerXpress stuff
+	dosym /usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2 \
+		${ATI_ROOT}/lib/FGL.renamed.libGL.so.1.2
+	dosym ./libGL.so.1.2 ${ATI_ROOT}/lib/fglrx-libGL.so.1.2
 
 	exeinto ${ATI_ROOT}/extensions
-	doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/libglx.so || die
+	doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
+	# PowerXpress stuff
+	dosym /usr/$(get_libdir)/opengl/xorg-x11/extensions/libglx.so \
+		${ATI_ROOT}/extensions/FGL.renamed.libglx.so
+	dosym fglrx-libglx.so ${ATI_ROOT}/extensions/libglx.so
 
 	# DRI modules, installed into the path used by recent versions of mesa.
 	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so || die
+	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
 
 	# AMD Cal libraries
 	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so* || die
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
 
 	local envname="${T}"/04ati-dri-path
 	if [[ -n ${ABI} ]]; then
 		envname="${envname}-${ABI}"
 	fi
 	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}" || die
+	doenvd "${envname}"
 }
 
 pkg_postinst() {