Deal with more portage 'improvements'

3 files changed, 90 insertions, 104 deletions

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 7ec882b..3690daf 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -12,6 +12,6 @@ AUX nvidia.udev-rule 462 SHA256 37b152a5055a16d1947171567178e2841679ddf03dba9d48
 DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
-EBUILD nvidia-drivers-96.43.23-r1.ebuild 15483 SHA256 a70fa23aa7ebffd3d75f7a2af8d4c712e6659b92914bb8fd53bd24434469e963 SHA512 0e9eea09d90c9a313becb73544a007241aebe7a6ea32c00ca6200b819690f9fd95e78a34ac293a6fbf77fdae0bfac09e3f9a4b8177242aa8a54d0cdcbf48b745 WHIRLPOOL 5a6e3f1318e4c0cc86f7e7c9116f636eb9d2829318f3afcc5fc02f76af0614b29521e2acdcc79ed354c7ab26ce03eb2957395412be475fc6b3b1b5eb531ad1f6
-EBUILD nvidia-drivers-96.43.23-r2.ebuild 15483 SHA256 e653c24fb830a6bafd898f93eca55c929409710a97a784d8f0b59c04817010c1 SHA512 549e7268ebc58cb3991798c2febcefd05d83ef009863d196734e62236bd7f92a98cdb46757e69f8f8a698ffc5c129d1b0f004ac538facde2942925c285982a11 WHIRLPOOL 117217afbcba47a25987638f73c7563348427c4b828ef51b870b1156d2d6992f7444f66f8edaaa0ae4e9487c70873c136777877800e08246fe453258e7e6f596
+EBUILD nvidia-drivers-96.43.23-r1.ebuild 14466 SHA256 1831536715fb341fba7d924e0fc343805cf899ac6f000f127cdf6d5872f5ccfc SHA512 c56de87045412fd8aebcc3dc2882f76d1ea2ceccc3ef201d8275944fca7c38347d7758e06f21195fb34bdc2dd307ead45fd1f1a9cf27825a9f1f5936ff74df13 WHIRLPOOL b6547e2f57e81adb6ab8080bc273c5a4a52479ffdb5aa3525e57f63547f7bcbafe2b377c228dc53b9b60fdeceeabea2be587e11181c9bd4872e8aea887863a1d
+EBUILD nvidia-drivers-96.43.23-r2.ebuild 14466 SHA256 b712a5e0808c7a00bc5bb3ba9ecdb43150ce88a391287db6e340f3460fda8855 SHA512 21ae807aae6294924acc45ae3e384efb45a51ce6110917bacf330c16996c0b0af189948c54d167f7d818a29861ba8d163fc05a83a1176edc55fd6e4940a217c6 WHIRLPOOL 7242b4b4e5869eb733733c4a903c80324260d43e605793a517f8754f2c4b44f353b59e1ff43c5d37367085ec4b234716ae3eddadbcaf2096184debeed9a2a818
 MISC metadata.xml 678 SHA256 02f45452a129ba14ad5ef0f6bf0031887aead328a7bfaa6977949bc6e8969e61 SHA512 dfc9494e01db7ee3e7ef64dc67c5e26b1a3b0c90ed2850f75c904a76a11df8b3cb137959fe471c788b7a33f555090a9c764af5cfff7f24253127484d4e518e84 WHIRLPOOL 2940677faa8b8183237d9797025079a68164584d2afd09b6e3846cdbbd5824f3c56da545b2f7d1c7d1e72746f540048e4256bde939a28ac785fa598ee2017abd
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23-r1.ebuild
index 107bc56..86f87ab 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild,v 1.12 2013/03/30 17:02:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild,v 1.19 2013/12/31 16:01:26 jer Exp $
 
-EAPI="2"
-
-inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability \
-	unpacker user versionator
+EAPI=5
+inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability unpacker user versionator
 
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
@@ -13,9 +11,9 @@ X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
 
 DESCRIPTION="NVIDIA X11 driver and GLX libraries"
 HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
-	 amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
-	 x86-fbsd? ( ftp://download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
+SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
+	 amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
+	 x86-fbsd? ( http://us.download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
 
 LICENSE="GPL-2 NVIDIA-r1"
 SLOT="0"
@@ -24,7 +22,7 @@ IUSE="acpi custom-cflags gtk multilib kernel_linux"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
 
-COMMON="<x11-base/xorg-server-1.12.99
+COMMON="
 	gtk? (
 		!media-video/nvidia-settings
 		dev-libs/atk
@@ -37,12 +35,24 @@ COMMON="<x11-base/xorg-server-1.12.99
 		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
 	)
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	multilib? ( app-emulation/emul-linux-x86-opengl )
-	>=app-admin/eselect-opengl-1.0.9"
+	>=app-admin/eselect-opengl-1.0.9
+"
 DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )"
+	kernel_linux? ( virtual/linux-sources )
+"
 RDEPEND="${COMMON}
-	acpi? ( sys-power/acpid )"
+	<x11-base/xorg-server-1.12.99
+	acpi? ( sys-power/acpid )
+	multilib? (
+		|| (
+			(
+				x11-libs/libX11[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+			)
+			app-emulation/emul-linux-x86-opengl
+		)
+	)
+"
 
 QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
@@ -294,56 +304,49 @@ src_install() {
 		fi
 
 		# Add the aliases
-		[ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR"
 		sed -e 's:PACKAGE:'${PF}':g' \
 			-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \
-			"${WORKDIR}"/nvidia
+			"${WORKDIR}"/nvidia || die
 		insinto /etc/modprobe.d
-		newins "${WORKDIR}"/nvidia nvidia.conf || die
+		newins "${WORKDIR}"/nvidia nvidia.conf
 	elif use x86-fbsd; then
 		insinto /boot/modules
-		doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die
+		doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld"
 
 		exeinto /boot/modules
-		doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die
+		doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko"
 	fi
 
 	# NVIDIA kernel <-> userspace driver config lib
-	dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \
-		die "failed to install libnvidia-cfg"
+	dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER}
 
 	# Xorg DDX driver
 	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so"
+	doins ${NV_X11_DRV}/nvidia_drv.so
 
 	# Xorg GLX driver
 	insinto /usr/$(get_libdir)/opengl/nvidia/extensions
-	doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \
-		die "failed to install libglx.so"
+	doins ${NV_X11_EXT}/libglx.so.${NV_SOVER}
 	dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \
-		/usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \
-		die "failed to create libglx.so symlink"
+		/usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so
 
 	# XvMC driver
-	dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
-		die "failed to install libXvMCNVIDIA.so"
-	dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \
-		die "failed to install libXvMCNVIDIA.so"
-	dosym libXvMCNVIDIA.so.${NV_SOVER} /usr/$(get_libdir)/libXvMCNVIDIA.so || \
-		die "failed to create libXvMCNVIDIA.so symlink"
+	dolib.a ${NV_X11}/libXvMCNVIDIA.a
+	dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER}
+	dosym libXvMCNVIDIA.so.${NV_SOVER} /usr/$(get_libdir)/libXvMCNVIDIA.so
 
 	# CUDA headers (driver to come)
 	if [[ -d ${S}/usr/include/cuda ]]; then
 		dodir /usr/include/cuda
 		insinto /usr/include/cuda
-		doins usr/include/cuda/*.h || die "failed to install cuda headers"
+		doins usr/include/cuda/*.h
 	fi
 
 	# OpenCL headers (driver to come)
 	if [[ -d ${S}/usr/include/CL ]]; then
 		dodir /usr/include/CL
 		insinto /usr/include/CL
-		doins usr/include/CL/*.h || die "failed to install OpenCL headers"
+		doins usr/include/CL/*.h
 	fi
 
 	# Documentation
@@ -361,10 +364,10 @@ src_install() {
 	fi
 
 	# Helper Apps
-	dobin ${NV_EXEC}/nvidia-xconfig || die
-	dobin ${NV_EXEC}/nvidia-bug-report.sh || die
+	dobin ${NV_EXEC}/nvidia-xconfig
+	dobin ${NV_EXEC}/nvidia-bug-report.sh
 	if use gtk; then
-		dobin usr/bin/nvidia-settings || die
+		dobin usr/bin/nvidia-settings
 	fi
 #	if use kernel_linux; then
 #		dobin ${NV_EXEC}/nvidia-smi || die
@@ -382,6 +385,8 @@ src_install() {
 	fi
 
 	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
 }
 
 # Install nvidia library:
@@ -394,8 +399,8 @@ donvidia() {
 
 	libname=$(basename $2)
 
-	doexe $2.$3 || die "failed to install $2"
-	dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2"
+	doexe $2.$3
+	dosym ${libname}.$3 $1/${libname}
 	[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
 }
 
@@ -477,19 +482,7 @@ pkg_postinst() {
 	# Switch to the nvidia implementation
 	eselect opengl set --use-old nvidia
 
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-	elog "This ebuild installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-	elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\""
-	elog
-	elog "NVIDIA has requested that any bug reports submitted have the"
-	elog "output of /usr/bin/nvidia-bug-report.sh included."
-	elog
+	readme.gentoo_print_elog
 }
 
 pkg_postrm() {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23-r2.ebuild
index 0c91273..180ed98 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23-r2.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild,v 1.12 2013/03/30 17:02:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild,v 1.19 2013/12/31 16:01:26 jer Exp $
 
-EAPI="2"
-
-inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability \
-	unpacker user versionator
+EAPI=5
+inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability unpacker user versionator
 
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
@@ -13,9 +11,9 @@ X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
 
 DESCRIPTION="NVIDIA X11 driver and GLX libraries"
 HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
-	 amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
-	 x86-fbsd? ( ftp://download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
+SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
+	 amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
+	 x86-fbsd? ( http://us.download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
 
 LICENSE="GPL-2 NVIDIA-r1"
 SLOT="0"
@@ -24,7 +22,7 @@ IUSE="acpi custom-cflags gtk multilib kernel_linux"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
 
-COMMON="<x11-base/xorg-server-1.12.99
+COMMON="
 	gtk? (
 		!media-video/nvidia-settings
 		dev-libs/atk
@@ -37,12 +35,24 @@ COMMON="<x11-base/xorg-server-1.12.99
 		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
 	)
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	multilib? ( app-emulation/emul-linux-x86-opengl )
-	>=app-admin/eselect-opengl-1.0.9"
+	>=app-admin/eselect-opengl-1.0.9
+"
 DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )"
+	kernel_linux? ( virtual/linux-sources )
+"
 RDEPEND="${COMMON}
-	acpi? ( sys-power/acpid )"
+	<x11-base/xorg-server-1.12.99
+	acpi? ( sys-power/acpid )
+	multilib? (
+		|| (
+			(
+				x11-libs/libX11[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+			)
+			app-emulation/emul-linux-x86-opengl
+		)
+	)
+"
 
 QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
@@ -294,56 +304,49 @@ src_install() {
 		fi
 
 		# Add the aliases
-		[ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR"
 		sed -e 's:PACKAGE:'${PF}':g' \
 			-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \
-			"${WORKDIR}"/nvidia
+			"${WORKDIR}"/nvidia || die
 		insinto /etc/modprobe.d
-		newins "${WORKDIR}"/nvidia nvidia.conf || die
+		newins "${WORKDIR}"/nvidia nvidia.conf
 	elif use x86-fbsd; then
 		insinto /boot/modules
-		doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die
+		doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld"
 
 		exeinto /boot/modules
-		doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die
+		doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko"
 	fi
 
 	# NVIDIA kernel <-> userspace driver config lib
-	dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \
-		die "failed to install libnvidia-cfg"
+	dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER}
 
 	# Xorg DDX driver
 	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so"
+	doins ${NV_X11_DRV}/nvidia_drv.so
 
 	# Xorg GLX driver
 	insinto /usr/$(get_libdir)/opengl/nvidia/extensions
-	doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \
-		die "failed to install libglx.so"
+	doins ${NV_X11_EXT}/libglx.so.${NV_SOVER}
 	dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \
-		/usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \
-		die "failed to create libglx.so symlink"
+		/usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so
 
 	# XvMC driver
-	dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
-		die "failed to install libXvMCNVIDIA.so"
-	dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \
-		die "failed to install libXvMCNVIDIA.so"
-	dosym libXvMCNVIDIA.so.${NV_SOVER} /usr/$(get_libdir)/libXvMCNVIDIA.so || \
-		die "failed to create libXvMCNVIDIA.so symlink"
+	dolib.a ${NV_X11}/libXvMCNVIDIA.a
+	dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER}
+	dosym libXvMCNVIDIA.so.${NV_SOVER} /usr/$(get_libdir)/libXvMCNVIDIA.so
 
 	# CUDA headers (driver to come)
 	if [[ -d ${S}/usr/include/cuda ]]; then
 		dodir /usr/include/cuda
 		insinto /usr/include/cuda
-		doins usr/include/cuda/*.h || die "failed to install cuda headers"
+		doins usr/include/cuda/*.h
 	fi
 
 	# OpenCL headers (driver to come)
 	if [[ -d ${S}/usr/include/CL ]]; then
 		dodir /usr/include/CL
 		insinto /usr/include/CL
-		doins usr/include/CL/*.h || die "failed to install OpenCL headers"
+		doins usr/include/CL/*.h
 	fi
 
 	# Documentation
@@ -361,10 +364,10 @@ src_install() {
 	fi
 
 	# Helper Apps
-	dobin ${NV_EXEC}/nvidia-xconfig || die
-	dobin ${NV_EXEC}/nvidia-bug-report.sh || die
+	dobin ${NV_EXEC}/nvidia-xconfig
+	dobin ${NV_EXEC}/nvidia-bug-report.sh
 	if use gtk; then
-		dobin usr/bin/nvidia-settings || die
+		dobin usr/bin/nvidia-settings
 	fi
 #	if use kernel_linux; then
 #		dobin ${NV_EXEC}/nvidia-smi || die
@@ -382,6 +385,8 @@ src_install() {
 	fi
 
 	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
 }
 
 # Install nvidia library:
@@ -394,8 +399,8 @@ donvidia() {
 
 	libname=$(basename $2)
 
-	doexe $2.$3 || die "failed to install $2"
-	dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2"
+	doexe $2.$3
+	dosym ${libname}.$3 $1/${libname}
 	[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
 }
 
@@ -477,19 +482,7 @@ pkg_postinst() {
 	# Switch to the nvidia implementation
 	eselect opengl set --use-old nvidia
 
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-	elog "This ebuild installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-	elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\""
-	elog
-	elog "NVIDIA has requested that any bug reports submitted have the"
-	elog "output of /usr/bin/nvidia-bug-report.sh included."
-	elog
+	readme.gentoo_print_elog
 }
 
 pkg_postrm() {