Style touchups and create relative symlinks in /usr/lib.

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 83d4f5411ad0e69325aa215b0387e74d162b75cb..6c0acb56eb649337d89c322e6466bd02bd8f7ab2 100644 (file)
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.35 2006/12/12 14:46:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.36 2006/12/26 05:06:14 vapier Exp $
+
+  26 Dec 2006; Mike Frysinger <vapier@gentoo.org>
+  nvidia-drivers-1.0.9742.ebuild:
+  Style touchups and create relative symlinks in /usr/lib.
 
   12 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   nvidia-drivers-1.0.9631.ebuild, nvidia-drivers-1.0.9742.ebuild:

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index c4ee110551deba10a8e356b181f29b7c1b6189c3..40881fd553924f42d4b2374b55f1676c29c514b6 100644 (file)
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -53,14 +53,14 @@ EBUILD nvidia-drivers-1.0.9631.ebuild 12971 RMD160 f0416cc07e8c8cc26bd85d4411bfd
 MD5 20d2d8781149dd482ae6ab2f44c848c3 nvidia-drivers-1.0.9631.ebuild 12971
 RMD160 f0416cc07e8c8cc26bd85d4411bfdd88858e81f8 nvidia-drivers-1.0.9631.ebuild 12971
 SHA256 13ba85bc9edcd7b555c0ee006b0179bea81ec1345b0740491d2ff27e67511cda nvidia-drivers-1.0.9631.ebuild 12971
-EBUILD nvidia-drivers-1.0.9742.ebuild 13096 RMD160 f7bbd310b1841e963cd3923a380a647e9c30b446 SHA1 4d98b7dc5fbeb85881045eff4c7ae5a81641b9e1 SHA256 b97c132bb77e0f1e22bf4f1683c3a315fe420a595ca14a9c8fd82ff338e1d18b
-MD5 fe5837df80f28a8ed1d90d3d7c23d7cc nvidia-drivers-1.0.9742.ebuild 13096
-RMD160 f7bbd310b1841e963cd3923a380a647e9c30b446 nvidia-drivers-1.0.9742.ebuild 13096
-SHA256 b97c132bb77e0f1e22bf4f1683c3a315fe420a595ca14a9c8fd82ff338e1d18b nvidia-drivers-1.0.9742.ebuild 13096
-MISC ChangeLog 8228 RMD160 45cf1aa953f5d79ac86dca8a0b089f9c8ba50dc9 SHA1 2601ac5656cfa8bdfed55a302ba88acbfad523bc SHA256 0acddeb9dae5694b0b649baa06e5d7f1b1e3c8a2b4594a0a9064439dd4a00c0d
-MD5 8e936b72dbd66c42bb3de8c4f55be83f ChangeLog 8228
-RMD160 45cf1aa953f5d79ac86dca8a0b089f9c8ba50dc9 ChangeLog 8228
-SHA256 0acddeb9dae5694b0b649baa06e5d7f1b1e3c8a2b4594a0a9064439dd4a00c0d ChangeLog 8228
+EBUILD nvidia-drivers-1.0.9742.ebuild 13109 RMD160 9f68b035d8c4b92e505737d1a6707e67b469d9ef SHA1 ccdec2d549aa16ef88ad523470c812c1ab034ffe SHA256 5e58ca506b0d81a21d86b8f29799ea2487049346917f9ee6a27d5bb31608d246
+MD5 4074e60f3575732f1bae0e46d335e5c8 nvidia-drivers-1.0.9742.ebuild 13109
+RMD160 9f68b035d8c4b92e505737d1a6707e67b469d9ef nvidia-drivers-1.0.9742.ebuild 13109
+SHA256 5e58ca506b0d81a21d86b8f29799ea2487049346917f9ee6a27d5bb31608d246 nvidia-drivers-1.0.9742.ebuild 13109
+MISC ChangeLog 8370 RMD160 5e3cf5fb8ecb492e0948cef54c1b9fa25be60a8a SHA1 2a4996f9a65412ebdc32d086736071bd6b9528e2 SHA256 b8dc2cfea58fbbe02d524efd954316c7a84c9e253a51aeaeba2d059c5c17fd48
+MD5 a762df903fafb46ff129892951888a71 ChangeLog 8370
+RMD160 5e3cf5fb8ecb492e0948cef54c1b9fa25be60a8a ChangeLog 8370
+SHA256 b8dc2cfea58fbbe02d524efd954316c7a84c9e253a51aeaeba2d059c5c17fd48 ChangeLog 8370
 MISC metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 SHA1 47dde751e4e0c833a65f32e106e594f449fe58a2 SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f
 MD5 643cec14f7f1dda9a26f163853dbf080 metadata.xml 302
 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 metadata.xml 302
@@ -78,9 +78,9 @@ MD5 64c118e7466e2dbefe2855603cd2e025 files/digest-nvidia-drivers-1.0.9742 873
 RMD160 b1cf6748ec6d8209ad98f9f72cf4dc8151115dc4 files/digest-nvidia-drivers-1.0.9742 873
 SHA256 8dd84c7a6735999dd6c18040ed7dce2e29c6a5e6eef94ae145ecee72fee71c77 files/digest-nvidia-drivers-1.0.9742 873
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFfsDOkT4lNIS36YERAl0DAJ4/8ey9KBzxd1FSptNaGE1NPYVZ1gCgsBRh
-4Zg8uvpH9TbB5cRslalf/8o=
-=t2nd
+iD8DBQFFkK318bi6rjpTunYRAqbKAJ9rBuLSTZDk5k9VY+qm8ChSWrYSRACdH5lu
+QuRuSYCmZ2jZ+fpLWYZN2rI=
+=a7J8
 -----END PGP SIGNATURE-----

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild
index 0ce6077b21bb255d02112e956b52808137a7811d..469981166c7daf992f4cd4030f57dce527f10f6a 100644 (file)
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.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/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild,v 1.4 2006/12/12 14:46:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild,v 1.5 2006/12/26 05:06:14 vapier Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic
 
@@ -139,7 +139,7 @@ src_unpack() {
        fi
 
        if ! use x86-fbsd; then
-               cd ${WORKDIR}
+               cd "${WORKDIR}"
                bash ${DISTDIR}/${NV_PACKAGE}${PKG_V}.run --extract-only
        else
                unpack ${A}
@@ -150,22 +150,22 @@ src_unpack() {
                && cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/doc" \
                || cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}"
        # Use the correct defines to make gtkglext build work
-       epatch ${FILESDIR}/NVIDIA_glx-defines.patch
+       epatch "${FILESDIR}"/NVIDIA_glx-defines.patch
        # Use some more sensible gl headers and make way for new glext.h
-       epatch ${FILESDIR}/NVIDIA_glx-glheader.patch
+       epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
 
        if ! use x86-fbsd; then
                # Quiet down warnings the user do not need to see
                sed -i \
                        -e 's:-Wpointer-arith::g' \
                        -e 's:-Wsign-compare::g' \
-                       ${S}/Makefile.kbuild
+                       "${S}"/Makefile.kbuild
 
                # If you set this then it's your own fault when stuff breaks :)
                [[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
 
                # If greater than 2.6.5 use M= instead of SUBDIR=
-               cd ${S}; convert_to_m Makefile.kbuild
+               cd "${S}"; convert_to_m Makefile.kbuild
        fi
 }
 
@@ -185,15 +185,15 @@ src_compile() {
 src_install() {
        local MLTEST=$(type dyn_unpack)
 
-       cd ${WORKDIR}/${NV_PACKAGE}${PKG_V}
+       cd "${WORKDIR}"/${NV_PACKAGE}${PKG_V}
 
        if ! use x86-fbsd; then
                linux-mod_src_install
 
                # Add the aliases
-               sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
+               sed -e 's:\${PACKAGE}:'${PF}':g' "${FILESDIR}"/nvidia > "${WORKDIR}"/nvidia
                insinto /etc/modules.d
-               newins ${WORKDIR}/nvidia nvidia
+               newins "${WORKDIR}"/nvidia nvidia || die
        else
                insinto /boot/modules
                doins "${WORKDIR}/${X86_FBSD_NV_PACKAGE}/src/nvidia.kld"
@@ -213,8 +213,8 @@ src_install() {
                src_install-libs lib32 $(get_multilibdir)
                src_install-libs lib $(get_libdir)
 
-               rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/include
-               rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/extensions
+               rm -rf "${D}"/usr/$(get_multilibdir)/opengl/nvidia/include
+               rm -rf "${D}"/usr/$(get_multilibdir)/opengl/nvidia/extensions
        else
                src_install-libs
        fi
@@ -325,7 +325,7 @@ src_install-libs() {
                        -e "s:\${ver2}:${ver2}:" \
                        -e "s:\${ver3}:${ver3}:" \
                        -e "s:\${libdir}:${inslibdir}:" \
-                       ${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la
+                       "${FILESDIR}"/libGL.la-r2 > "${D}"/${NV_ROOT}/lib/libGL.la
        fi
 
        exeinto ${X11_LIB_DIR}/modules/drivers
@@ -346,7 +346,7 @@ src_install-libs() {
        # fix Bug 131315
        [[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \
                doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \
-               dosym /usr/${inslibdir}/libXvMCNVIDIA.so.${PV} \
+               dosym libXvMCNVIDIA.so.${PV} \
                        /usr/${inslibdir}/libXvMCNVIDIA.so
 
        exeinto ${NV_ROOT}/extensions