Merge PR, thanks mm1ke for preperation, fixes #518144 & #466832; correct QA_PREBUILT...

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/media-gfx/nvidia-cg-toolkit/ChangeLog b/media-gfx/nvidia-cg-toolkit/ChangeLog
index fb58cb565a4604524332ad73ccbab0a029c0d2f7..149044ddd4dd8a5f1a806270c06cab7eba172b8b 100644 (file)
--- a/media-gfx/nvidia-cg-toolkit/ChangeLog
+++ b/media-gfx/nvidia-cg-toolkit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/nvidia-cg-toolkit
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/ChangeLog,v 1.63 2014/12/28 12:11:16 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/ChangeLog,v 1.64 2015/02/19 21:44:15 jlec Exp $
+
+*nvidia-cg-toolkit-3.1.0013-r4 (19 Feb 2015)
+
+  19 Feb 2015; Justin Lecher <jlec@gentoo.org>
+  +nvidia-cg-toolkit-3.1.0013-r4.ebuild, metadata.xml,
+  nvidia-cg-toolkit-3.1.0013-r2.ebuild, nvidia-cg-toolkit-3.1.0013-r3.ebuild:
+  Merge PR, thanks mm1ke for preperation, fixes #518144 & #466832; correct
+  QA_PREBUILT for USE=examples; make exmaples executable; drop unnecessary deps
 
   28 Dec 2014; Agostino Sarubbo <ago@gentoo.org>
   nvidia-cg-toolkit-3.1.0013-r3.ebuild:

diff --git a/media-gfx/nvidia-cg-toolkit/Manifest b/media-gfx/nvidia-cg-toolkit/Manifest
index 7e97297562dfe4dacf2085d519fa2b539b1893c2..3695b4962b966af27f38c1bce503242299723afd 100644 (file)
--- a/media-gfx/nvidia-cg-toolkit/Manifest
+++ b/media-gfx/nvidia-cg-toolkit/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 80cgc 251 SHA256 89f976c536d4bb658821cabb402f7cfa15def6410599928ad737cf4b741d3a06 SHA512 f93845dab92d825f41598ab4514f056674ddfbe29a47f298c286a188274a6d1c39cbbd3ab3c2fd3d0b91383fe5b10e126cbc5974f5f791e15684f14c60be20d9 WHIRLPOOL 62e355d20401441263c3e3bbd4f80c133778a9b0fca5ad8aee7b0e0b0a8bc7c03ea54f7ecbd4c27344a242c4f451d90539092c6c42d4b9d0b41ed0dc2379d2b3
 AUX 80cgc-opt 221 SHA256 eb93be46a61060b66f35ba2596d3826e2cf51194e05cb716885b5f315a068a8c SHA512 9036933bac477e42c2d0092ea414e061865a9f2498345fe5a824df80194ba73f7ac2fb5a4a8aca827ec99a3f31e4ae772fa31eeab4b3b390189178d523289cda WHIRLPOOL 6c9cf823880971fc9bee4dd54cbd9eddfdaaf18d3bca28c3f45dc4f2b097b8ae61f02dff3d4207200ccf8b978d50412c00f7a13c68f7e4c35a42435458604fea
@@ -9,24 +9,27 @@ AUX nvidia-cg-toolkit-gl.pc.in 278 SHA256 b800521305775a76c77e63da7812e8bbce82c0
 AUX nvidia-cg-toolkit.pc.in 242 SHA256 0fc7856647d74b07e5b3a5f964b5ba871bbdbb75eeec4fa6c58c0089fc79d418 SHA512 601505a228eb4f70813d3ab6346a51c1552751278549c81b7721273dd58c053639cad49cfe82982455b1399d8b494f8351a0a479efbdb33171d28c3dd0b69073 WHIRLPOOL bde45d5d3bcd93420b1f625cf4461908b6df6c47f6df683313ec97d406ca91316394e446bb18f404c5b5be4c81d2205b89c0211bc811875f15d08a20a87ce219
 DIST Cg-3.1_April2012_x86.tgz 23332348 SHA256 cef3591e436f528852db0e8c145d3842f920e0c89bcfb219c466797cb7b18879 SHA512 7b2addad157e151eb42b320aea31ccddfd53ec5640cb97bc86a3d461c1b08a2dff280bfc3f7859d124c311e1710e39d40405c387e5724ebc82d95303b250837a WHIRLPOOL f15f3e8f65310a47661a0473cdf7dc1ef195aff8422ad8a0ec26a2302a52d73f9f22922180482cb2724197037eb619cb9389f9732718a08dca8889d2be5dff1d
 DIST Cg-3.1_April2012_x86_64.tgz 24829131 SHA256 e8ff01e6cc38d1b3fd56a083f5860737dbd2f319a39037528fb1a74a89ae9878 SHA512 591b51195193e7e3bbb9f1c2579336d24a179b0a88b955a01f4661bda55543fbccd73cac53033912f2eea8a1068e4c1394c6d286f195963cfb33a0d8b4428e27 WHIRLPOOL c4295473b82d67f6cf370e725a36189fbdbc3bfd02369e4afc0f510b6ab06a160a7de5e47931689dccc5ff52f95f0e10ebd03b32c8c30881d6d2f02183cad2a9
-EBUILD nvidia-cg-toolkit-3.1.0013-r2.ebuild 3309 SHA256 989fc8c178fc34b4ff0d2061b151bd76a2a0355476630a11cf8293af96bbe8e5 SHA512 16ceb26ab43c87a287c57c6db44a9de4c0c3b75336b5517029598859905f7fd929f8525308e20f44175ec91fae2979ac9d949c9e36444f4a5d38865ac1f6c86b WHIRLPOOL bda9091b2ed88861f9217d2d95d3568393e2f859975bca0f0ecbdfed6a4a68afb8e95a32f683ca198a3c766273dc6c75d3490adb87694c7de89c8054f8842e3f
-EBUILD nvidia-cg-toolkit-3.1.0013-r3.ebuild 3017 SHA256 4ed92e8aa33d46b0dbecb189f10ff84c34519d0e614312bfc134985d95408b12 SHA512 b90b98a95a3bb09a51c70d0545449f68d953a769f8f1c6ca2adf27e3ff19661e712bda2c082193c265de77505ebf5cda37e88dea62d878bd5d8b17dd1ec0590b WHIRLPOOL 84de357b229249dd27d3afebdf4387b4d3f91dc244ba10962b89a00d02d8d0f785451d03de4773e2b19674c75372723ba5f2329a778bd4b2a51667df343ba098
-MISC ChangeLog 10897 SHA256 c451bcd463c3c0c12b05c3c26a36952a3e7d81563ff31022af1660e73cc6fd74 SHA512 8c2f62c47022073419b51c976feb35efd5f03812dfa20e7cc6e0d0d4dab578a45bcdb5e7077cf02de45634fbcd31e79da86791b2d911ff1be049439e16eab5a7 WHIRLPOOL 43d01b1093e99b4f7f4c918458e86125d9e2cecdd7f2f51e2fd9cc6f4c03e639585d894cc4d10cb344cbad32eb81888a81c42a364ab6d60a64d55b68b1877c40
-MISC metadata.xml 550 SHA256 a497674dff49bd23d0d418b2ee0ce420af486773be86df978d7a4266198f7f9c SHA512 0def79ab24fb8b67c8eb97f4b9f638c649bbc297e9ec6e5f54703c0f1363d0a7cf95e59afcdc238b3a33335c030f25942f3ef6644ff8b7beb801755c539e15dd WHIRLPOOL e435fc0425b30a1541efa66b7d59a6a1cf028e4540a2daf33341d774917ab536db4ca44c1379940dbb2834d61a6531ed1bfe595c00df6878a26841b0cc7183e5
+EBUILD nvidia-cg-toolkit-3.1.0013-r2.ebuild 3298 SHA256 7913474841c14369858149663b8a176a3c67d5143d392ccba3140fafa175ab61 SHA512 2f1760def778fd0d7ea229b5e7f0089980861095a5d4a4a84b00af7d0399c8d5688d3f45cb0cdd0602cbf1f9eb0c9e0a5df1d32d9c255a7359966cc594d8a31e WHIRLPOOL 2d4a74567e5f57b1cb532ced5be5eacdb6df4dd2155478a1821806243b86ad1bee64d08ff85484fedbc0326f7d3b6972c51f1c0da7d5de1500f9d9b2574485be
+EBUILD nvidia-cg-toolkit-3.1.0013-r3.ebuild 3638 SHA256 9cf827730c44f73a19658357704eb1740ec80f9cbfca4b25f5a2d128748e2f5a SHA512 984cd7e7b3f75020dfb6f089b15bd3cb363c1d09e99a8dd51d3305a080cac7bbeefdb96f82fb515a86067a2c4f1180347964e61062b9e06e1aae965c0a31632d WHIRLPOOL 7c9beb83f671f92560fa9aadd3dad648407b2b90a03396d15bc9ed568309b2c3d9cf25a26634eecf1ff2789ba239bfe7ed774d3e48940d09e968dd90ab371aa6
+EBUILD nvidia-cg-toolkit-3.1.0013-r4.ebuild 3674 SHA256 553749ce1a64f9e0b5b5f84d5a2ea057394a7a93af2d3e05d37e4e5be440c7e8 SHA512 ca86408f96e644e097ac364cddea97ce9c04393ca4bd8e86641f1a74fc783001a383d07bc180b1940f405722496ca115e4b1809da517e525f2f3c663f5ca375f WHIRLPOOL fbeb5f637f91e1f9ba398d131d9ddcf6cc69a99d8424d1ffb798842fd453cf2009addce414308803474d823a657a4fcf1b31d828c3036394764cfac15aa9798e
+MISC ChangeLog 11280 SHA256 74173a7f9152ac991567cc84c0e2ecbc7cc40a06ab76fb71c332f9010b169758 SHA512 8869eef2b74066ff25404da8919ff8b23449dc96752bb2eb5bbeaeedc6a0322bbf277ba4c79d5d4ce67706aa8af9f1cb51bd7fa643bb7b7ca7482557d1d51174 WHIRLPOOL 36cf0528ab94b9a864301e2f2dea50b47ee1e469838f5969af714cc135878471e03030d76301bf378ac681f99b4589c942c17baff435b7abb2be13fa8ca48e0f
+MISC metadata.xml 647 SHA256 1dd50cd492d5cdaafbfd8d72424726550a0bc8176af9f5d7fd3c087cf35dac12 SHA512 e2cb7725a7ebb399b67af9b762c5399ea2d9d41cb33667694485dd7486470829f4dbdaa75b1df8e45a7af9439c2718c6c4d43e9aba798b65a00044bb4deee5eb WHIRLPOOL e54482c95c5c59430837365859d461296203e4496f87865cba8e14110dba37981753a5043831facf37f31db3b046d42bef38f7378d5e1d01ab0fcbb1ddd78a2c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUn/NlAAoJELp701BxlEWfUz4P/3hV8Out+4yq00x0b0vlrMBE
-TRIN8UDcTYgFNPxyf2OQdr9G5ZL8S4aztGUaxmRIUpJb+InJtfov2RQm26CUJZz1
-RS7ctuBd9uWNTT6Yi5CNUdw9gRbVqYcdykPvNJmOi60ljiIwl+jJWdLgpvQJX4Xm
-IFjzTjRTrEfUJaRj3tpykA06jllqtDWZ4euBHLZaZusF2q6NKr2sO592U7fD7qAe
-ic6uAtZHB26p/eaPh9MB5XgnLX8WZF7M+2Ztq4nyZNUU9WfhYio2XTXegWT0HyCx
-fsx+dX/Cnql7BHzMtGtn6xBsPQsxN9BmJn+flmppkLfHagemn9iMkdZhOrHZLZtb
-RNMBprQjNYU3yZ5Lwxp2JW6l4R7GnGpt9ywiNip7UdMApcaX5ShlvqlP943ON/a4
-B9AClX7OQdpfnZiqGut7x1/qX9ARKN16cZSSbx6HwVWt4v3AdhKqZGrd2NPBoovI
-tsq0CF/MsWoq2xzN/2s//1WIs9/qfn2IdxqAetpsCf8L8DOP3h8mglEpHobb/fKL
-PN3IDEAkoTCOla9TJCyCMZ3hm84hx9XGx/bFvJlRvtYYOggrwX4kIitVOUOzTjK4
-vuahi9GZc7Bdqz5219r+yBej9f6asev3tocf48d8myjFXE+YfLQ29C+02Ir5m0Iy
-10TuAONDf9mU46QJeol1
-=L17Y
+iQJ8BAEBCgBmBQJU5lo4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirlUsP/0OtGttjoLJxqo4xnJun/BZO
+UCR4p5z5+CuY9/GOKLV30/+YZkHcstbCo90xwzHI0PkIOV4tfMa4Eye/fBIPjmo8
+4+5rKLepZl3Zi2TbA0Oe3Gzq+xH+pbe8fre2ZTRGn485Zqpdl7YPW1aSdJXw1wjY
+t1o8MDAl7j9O6zh/4FaNW5trZbAaLPTrgniTpP7g4ExY5vDlAXbgSbCnZPD22b/2
+fLbdDniKbbMlBRnqTKNxFvbaabLR5FK3wWHXGjfFyPC0xqmldXkaI2BdzZWHl3UH
+RpbdBLDqhb9UWzhg1+UbBwatVgh56gt5o/+R+SP6QWaGRGfn8yjip+ulb00FaSMT
+bbzacqxuxLiyvRSnT73kkM44iTkIZtKs7ogRzZ8tAlKuxRcWX/jta8Qbb2B4up/b
+MpdQRQ25PTO6wI4UbeP/l3bQAKBp4dL5/rVNWG/LKs/lx2Vq7GZVtDd2GnJl6zMo
+XU8WDm0qA8T7qXZFNDhekP2FAkkq0rTUY1mKM+46pyDsDktIsWZXxF5Ae6oGnd8h
+7JSc822AouYvnCG1ICh1RHlu9rXNEu8zZBjXyRNOIYcR3cmfz3AKLZTj0bVSpZ/U
+jbpOm1VLeGMHxNTOt4FYRLoXIdt2DqGZx0nTNHtld6ZX4xX61dMBgdxZSZJ3iFpP
+MDFG1XO10L/cdTR0HehQ
+=dWJ/
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/nvidia-cg-toolkit/metadata.xml b/media-gfx/nvidia-cg-toolkit/metadata.xml
index 27668c513a99dd751ffc993a5e7be1e68f01b794..84b9190efd25f31db15ad12942cd39543aeebd66 100644 (file)
--- a/media-gfx/nvidia-cg-toolkit/metadata.xml
+++ b/media-gfx/nvidia-cg-toolkit/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>graphics</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
+  </maintainer>
   <longdescription>
 The Cg Toolkit provides a compiler for the Cg language, runtime libraries for
 use with both leading graphics APIs, runtime libraries for CgFX, example

diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r2.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r2.ebuild
index c42e5c69394365909d639623ff756d31543f865f..fccbeed5e6fe53155a2b70b7824a24f056e15305 100644 (file)
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r2.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r2.ebuild,v 1.4 2014/01/26 10:54:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r2.ebuild,v 1.5 2015/02/19 21:44:15 jlec Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ MY_PV="$(get_version_component_range 1-2)"
 MY_DATE="April2012"
 
 DESCRIPTION="NVIDIA's C graphics compiler toolkit"
-HOMEPAGE="http://developer.nvidia.com/object/cg_toolkit.html"
+HOMEPAGE="http://developer.nvidia.com/cg_toolkit"
 X86_URI="http://developer.download.nvidia.com/cg/Cg_${MY_PV}/Cg-${MY_PV}_${MY_DATE}_x86.tgz"
 SRC_URI="
        amd64? (

diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild
index f98716d5bf9102f0383508d3342c36cf81159a6d..91ab56499bc8b8f0b86009de3804527f490cdfb3 100644 (file)
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild,v 1.3 2014/12/28 12:11:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild,v 1.4 2015/02/19 21:44:15 jlec Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ MY_PV="$(get_version_component_range 1-2)"
 MY_DATE="April2012"
 
 DESCRIPTION="NVIDIA's C graphics compiler toolkit"
-HOMEPAGE="http://developer.nvidia.com/object/cg_toolkit.html"
+HOMEPAGE="http://developer.nvidia.com/cg_toolkit"
 SRC_URI="
        abi_x86_32? (
                http://developer.download.nvidia.com/cg/Cg_${MY_PV}/Cg-${MY_PV}_${MY_DATE}_x86.tgz
@@ -29,11 +29,36 @@ REQUIRED_USE="amd64? ( multilib? ( abi_x86_32 ) )"
 RESTRICT="strip"
 
 RDEPEND="
+       x11-libs/libICE
+       x11-libs/libSM
+       x11-libs/libX11
+       x11-libs/libXext
+       x11-libs/libXi
+       x11-libs/libXmu
+       x11-libs/libXt
+       media-libs/glu
+       media-libs/mesa
        media-libs/freeglut
        amd64? ( abi_x86_32? (
                || (
+                       (
+                               >=media-libs/glu-9.0.0-r1[abi_x86_32(-)]
+                               >=media-libs/mesa-9.1.6[abi_x86_32(-)]
+                               >=media-libs/freeglut-2.8.1[abi_x86_32(-)]
+                       )
                        app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-                       >=media-libs/freeglut-2.8.1[abi_x86_32(-)]
+               )
+               || (
+                       (
+                               >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
+                               >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+                               >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+                               >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+                               >=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+                               >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)]
+                               >=x11-libs/libXt-1.1.4[abi_x86_32(-)]
+                       )
+                       app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
                )
        ) )
        x86? ( virtual/libstdc++:3.3 )"

diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r4.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r4.ebuild
new file mode 100644 (file)
index 0000000..aca1136
--- /dev/null
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r4.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r4.ebuild,v 1.1 2015/02/19 21:44:15 jlec Exp $
+
+EAPI=5
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit eutils multilib multilib-minimal prefix versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+MY_DATE="April2012"
+
+DESCRIPTION="NVIDIA's C graphics compiler toolkit"
+HOMEPAGE="http://developer.nvidia.com/cg_toolkit"
+SRC_URI="
+       abi_x86_32? (
+               http://developer.download.nvidia.com/cg/Cg_${MY_PV}/Cg-${MY_PV}_${MY_DATE}_x86.tgz
+       )
+       abi_x86_64? (
+               http://developer.download.nvidia.com/cg/Cg_${MY_PV}/Cg-${MY_PV}_${MY_DATE}_x86_64.tgz
+       )"
+
+LICENSE="NVIDIA-r1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples multilib"
+
+REQUIRED_USE="amd64? ( multilib? ( abi_x86_32 ) )"
+
+RESTRICT="strip"
+
+RDEPEND="
+       media-libs/glu
+       x11-libs/libICE
+       x11-libs/libSM
+       x11-libs/libX11
+       x11-libs/libXext
+       x11-libs/libXi
+       x11-libs/libXmu
+       x11-libs/libXt
+       virtual/opengl
+       amd64? (
+               abi_x86_32? (
+                       || (
+                               (
+                                       >=media-libs/freeglut-2.8.1[abi_x86_32(-)]
+                                       >=media-libs/glu-9.0.0-r1[abi_x86_32(-)]
+                                       >=virtual/opengl-7.0-r1[abi_x86_32(-)]
+                               )
+                               app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+                       )
+                       || (
+                               (
+                                       >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
+                                       >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+                                       >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+                                       >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+                                       >=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+                                       >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)]
+                                       >=x11-libs/libXt-1.1.4[abi_x86_32(-)]
+                               )
+                               app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+                       )
+               )
+       )"
+DEPEND=""
+
+S=${WORKDIR}
+
+DEST=/opt/${PN}
+
+QA_PREBUILT="${DEST}/.* /usr/share/.*"
+
+src_unpack() {
+       multilib_src_unpack() {
+               mkdir -p "${BUILD_DIR}" || die
+               cd "${BUILD_DIR}" || die
+
+               local i
+               for i in ${A}; do
+                       if [[ ${i} == *x86_64* && ${ABI} == amd64 ]]; then
+                               unpack "${i}"
+                       elif [[ ${i} != *x86_64* && ${ABI} != amd64 ]]; then
+                               unpack "${i}"
+                       fi
+               done
+       }
+
+       multilib_foreach_abi multilib_src_unpack
+}
+
+install_pkgconfig() {
+       # One arg: .pc file
+       insinto /usr/$(get_libdir)/pkgconfig
+       sed \
+               -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
+               -e "s:DESCRIPTION:${DESCRIPTION}:g" \
+               -e "s:VERSION:${PV}:g" \
+               -e "s|HOMEPAGE|${HOMEPAGE}|g" \
+               -e "s:SUFFIX::g" \
+               "${FILESDIR}/${1}.in" > "${T}/${1}" || die
+               eprefixify "${T}/${1}"
+       doins "${T}/${1}"
+}
+
+src_install() {
+       local LDPATH=()
+
+       multilib-minimal_src_install
+}
+
+multilib_src_install() {
+       LDPATH+=( "${EPREFIX}${DEST}/$(get_libdir)" )
+       into ${DEST}
+
+       if [[ ${ABI} == amd64 ]]; then
+               dolib usr/lib64/*
+       else
+               dolib usr/lib/*
+       fi
+       install_pkgconfig nvidia-cg-toolkit.pc
+       install_pkgconfig nvidia-cg-toolkit-gl.pc
+
+       insinto ${DEST}/include
+       doins -r usr/include/Cg
+
+       if multilib_is_native_abi; then
+               dobin usr/bin/{cgc,cgfxcat,cginfo}
+
+               insinto ${DEST}
+               dodoc usr/local/Cg/README
+               if use doc; then
+                       DOCS=( usr/local/Cg/docs/*.{txt,pdf} )
+                       HTML_DOCS=( usr/local/Cg/docs/html/. )
+                       einstalldocs
+               fi
+               if use examples; then
+                       dodir /usr/share/${PN}
+                       mv usr/local/Cg/examples "${ED}"/usr/share/${PN}/
+               fi
+       fi
+}
+
+multilib_src_install_all() {
+       local ldpath=${LDPATH[*]}
+
+       sed \
+               -e "s|ELDPATH|${ldpath// /:}|g" \
+               "${FILESDIR}"/80cgc-opt-2 > "${T}"/80cgc-opt || die
+       eprefixify "${T}"/80cgc-opt
+       doenvd "${T}"/80cgc-opt
+}
+
+pkg_postinst() {
+       if [[ ${REPLACING_VERSIONS} < 2.1.0016 ]]; then
+               einfo "Starting with ${CATEGORY}/${PN}-2.1.0016, ${PN} is installed in"
+               einfo "${DEST}. Packages might have to add something like:"
+               einfo "  append-cppflags -I${DEST}/include"
+       fi
+}