From: Piotr Jaroszyński Date: Wed, 7 Mar 2007 21:57:40 +0000 (+0000) Subject: Version bump and a little clean up. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9a3270cdbd69e4f3f98682aa971a896682d7f6c0;p=gentoo.git Version bump and a little clean up. Package-Manager: portage-2.1.2.1-r1 --- diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog index e8a1a5e8c8c5..9deaec5d3fbf 100644 --- a/media-video/nvidia-settings/ChangeLog +++ b/media-video/nvidia-settings/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-video/nvidia-settings -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.30 2006/11/10 15:34:19 augustus Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.31 2007/03/07 21:57:40 peper Exp $ + +*nvidia-settings-1.0.20070302 (07 Mar 2007) + + 07 Mar 2007; Piotr Jaroszyński metadata.xml, + nvidia-settings-1.0.20051122-r3.ebuild, + -nvidia-settings-1.0.20060516-r1.ebuild, + -nvidia-settings-1.0.20060919.ebuild, nvidia-settings-1.0.20061102.ebuild, + +nvidia-settings-1.0.20070302.ebuild: + Version bump and a little clean up. *nvidia-settings-1.0.20061102 (10 Nov 2006) diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest index 7d4d5560355a..2c0835f16a64 100644 --- a/media-video/nvidia-settings/Manifest +++ b/media-video/nvidia-settings/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX icon/nvidia-settings.desktop 194 RMD160 a59dae254f65d9665118629b489b33b0fd87c8d5 SHA1 eac0735769b28d7c217d6ab15a3dca3e2adff9b1 SHA256 af43af5db203c1acf9301fa7fb285a7fdfe5aab5ce1aa30a239fd7db1b588168 MD5 596d93feba5f2012ed21d3b44bfd0b10 files/icon/nvidia-settings.desktop 194 RMD160 a59dae254f65d9665118629b489b33b0fd87c8d5 files/icon/nvidia-settings.desktop 194 @@ -7,42 +10,41 @@ MD5 0ffd3b3060cafae792a0b7461614a480 files/icon/nvidia-settings.png 3790 RMD160 a0a8c319ca4b0100d2b7502b6a3dba20a3dc71b9 files/icon/nvidia-settings.png 3790 SHA256 171e2d20dfe7fbbb86bf9d3c0bb22909529b351fb06b614018a9597ff2456f12 files/icon/nvidia-settings.png 3790 DIST nvidia-settings-1.0.20051122.tar.gz 1091361 RMD160 742998d4de33217bbb07f99d2af9480548aeaa07 SHA1 a1a374bb57cd611d26e841d277e7cb7df824ee5f SHA256 d9df3d743f39a5e6961a4f42f77fcf10e57e61b2af68cec03630a1edf5a0a8b1 -DIST nvidia-settings-1.0.20060516.tar.gz 1119552 RMD160 784cb63001dae40bcd0c2298f3fbc519438a7266 SHA1 713f6ca7c3d21f8c21e1004becc2b9d305ddc3c9 SHA256 884a1152899ffccfa3180dfc1af9d1e5c7f3bb7367882f1971bd601aa715fada -DIST nvidia-settings-1.0.20060919.tar.gz 1298171 RMD160 674a1cd4f43ba19495ea174a457b1bfe051d9b73 SHA1 315e1ec3626b60ab4e9ef290ff7e95f3d6a28ed7 SHA256 ffde9c181f6769d3de41c5b61b2931fdee764c3bb62a536d732bc701a7e78477 DIST nvidia-settings-1.0.20061102.tar.gz 1098727 RMD160 9d182e66ed40799046f213ef4685278f9b4ebf3a SHA1 218560127f9ec9cd34817d7f3cefd86d6421fac3 SHA256 c9cd5f33a8a60c91b6a64915967456289c13ebfee6d83b82fa1b02cd2652b84c -EBUILD nvidia-settings-1.0.20051122-r3.ebuild 3022 RMD160 0fd576e32d58e842454e534229479b881299f23a SHA1 8fe37c8dda894950c3862b4a8d3cf83ff149ec60 SHA256 7220f21e02854aac8c56f6f176b48c085e119360c6f45e542696d3f008c0378e -MD5 e61d5fc045c8c3e230e70f9404aea663 nvidia-settings-1.0.20051122-r3.ebuild 3022 -RMD160 0fd576e32d58e842454e534229479b881299f23a nvidia-settings-1.0.20051122-r3.ebuild 3022 -SHA256 7220f21e02854aac8c56f6f176b48c085e119360c6f45e542696d3f008c0378e nvidia-settings-1.0.20051122-r3.ebuild 3022 -EBUILD nvidia-settings-1.0.20060516-r1.ebuild 3024 RMD160 08a22c90b1b9739e0bb48b26bb10a6b9b8ff402f SHA1 3eddf4fc24174c63324751bc377f1a9de8fa1074 SHA256 dbbc174573fcdc9dbff062f0643c3c7324e28e8b5f90bb81c0f7bb4397a7ab08 -MD5 f7c09ddc21cdb771928bd9356d77aac8 nvidia-settings-1.0.20060516-r1.ebuild 3024 -RMD160 08a22c90b1b9739e0bb48b26bb10a6b9b8ff402f nvidia-settings-1.0.20060516-r1.ebuild 3024 -SHA256 dbbc174573fcdc9dbff062f0643c3c7324e28e8b5f90bb81c0f7bb4397a7ab08 nvidia-settings-1.0.20060516-r1.ebuild 3024 -EBUILD nvidia-settings-1.0.20060919.ebuild 2957 RMD160 216e7df33729d1cff387b1f2c27cd4ff3245445b SHA1 a67c270308af247f9ddcacc30049e20f142440b7 SHA256 e471cdf18e0a2ff162e0b5f15389f32b643637f7c0248f7baa2d0d5be8d90ea3 -MD5 69c290d9ae83c4fd677f5efea9eb3e48 nvidia-settings-1.0.20060919.ebuild 2957 -RMD160 216e7df33729d1cff387b1f2c27cd4ff3245445b nvidia-settings-1.0.20060919.ebuild 2957 -SHA256 e471cdf18e0a2ff162e0b5f15389f32b643637f7c0248f7baa2d0d5be8d90ea3 nvidia-settings-1.0.20060919.ebuild 2957 -EBUILD nvidia-settings-1.0.20061102.ebuild 2959 RMD160 fea3d0aeae8c22fc5fc8e34407daf31ba249dadb SHA1 3f38fc9f23dea164d75e6a7eb302d8ad0adf280a SHA256 1dbdf4aa5c48752fceeb66c058e9844bfd8f402b2c0fc577363865e5c97df187 -MD5 0e03bcdcbcc934da4caff5e02a76e010 nvidia-settings-1.0.20061102.ebuild 2959 -RMD160 fea3d0aeae8c22fc5fc8e34407daf31ba249dadb nvidia-settings-1.0.20061102.ebuild 2959 -SHA256 1dbdf4aa5c48752fceeb66c058e9844bfd8f402b2c0fc577363865e5c97df187 nvidia-settings-1.0.20061102.ebuild 2959 -MISC ChangeLog 6067 RMD160 3c7b148890994042aa805b99271adfd324767293 SHA1 1e405b5e81a1be42ecc5a8565390997d65841a15 SHA256 2f8095853f86243ae794493ce6a9c5b1ad5e5b1db5c019bf1f104a2828573540 -MD5 d018213eea361ee275b90fbcf19b71da ChangeLog 6067 -RMD160 3c7b148890994042aa805b99271adfd324767293 ChangeLog 6067 -SHA256 2f8095853f86243ae794493ce6a9c5b1ad5e5b1db5c019bf1f104a2828573540 ChangeLog 6067 -MISC metadata.xml 300 RMD160 cddb69f00f395764e999cccb9fc4b6b1dd6cbd14 SHA1 2415e6b7839abe6194b5350ed9b294fede7fef5b SHA256 f5c7eb2d5ad573c0737f4d5596df2ca5f4b453508e3cdff138fe33f44075ee03 -MD5 02675b53e64ba06267b5b9d689381693 metadata.xml 300 -RMD160 cddb69f00f395764e999cccb9fc4b6b1dd6cbd14 metadata.xml 300 -SHA256 f5c7eb2d5ad573c0737f4d5596df2ca5f4b453508e3cdff138fe33f44075ee03 metadata.xml 300 +DIST nvidia-settings-1.0.tar.gz 1100735 RMD160 96f68ecde52aba2e58976406f4a907e4932b5f32 SHA1 ee81d837cf20fbfa45d4f9d9338e715229d581a5 SHA256 48e0a8b6a0b1cae6881e3c33cb0bdbddb34f7f7d009c91dc0a6826f94736c480 +EBUILD nvidia-settings-1.0.20051122-r3.ebuild 2997 RMD160 85c3cf5d9bad318d20a228b9e33a87671cf0f901 SHA1 abc51ab001cb56f4db13ac10391001d05e081352 SHA256 ed06e1f2c6f4bf19be11e421c8f0583f924970ec89d5e6acac35d1820e12b272 +MD5 14958353a3375c7228a964e43d18a4b1 nvidia-settings-1.0.20051122-r3.ebuild 2997 +RMD160 85c3cf5d9bad318d20a228b9e33a87671cf0f901 nvidia-settings-1.0.20051122-r3.ebuild 2997 +SHA256 ed06e1f2c6f4bf19be11e421c8f0583f924970ec89d5e6acac35d1820e12b272 nvidia-settings-1.0.20051122-r3.ebuild 2997 +EBUILD nvidia-settings-1.0.20061102.ebuild 2934 RMD160 3a71594b14218ac63baeee99b2e7d855a85d8bed SHA1 49baaff9a53296fff5ccec7fae0b46052ea27803 SHA256 e40d17444901ef52227558355362491e4b12b9a73da9c1a8f4e41a02f37e94c8 +MD5 16b5588e58b92291f5e4519d17e0fc7d nvidia-settings-1.0.20061102.ebuild 2934 +RMD160 3a71594b14218ac63baeee99b2e7d855a85d8bed nvidia-settings-1.0.20061102.ebuild 2934 +SHA256 e40d17444901ef52227558355362491e4b12b9a73da9c1a8f4e41a02f37e94c8 nvidia-settings-1.0.20061102.ebuild 2934 +EBUILD nvidia-settings-1.0.20070302.ebuild 2750 RMD160 ce9253844bdc6dfc869194fa1049162dbd8ecbb2 SHA1 a19c8e0f92a5459d734a07255425a466735a461a SHA256 8f86ad60135cae31ef2d1c91fdb47cc336e760fb39cb7b6d277206f987f05b3e +MD5 7f6d9c2487e03dab0fb2b7e75f0f7a48 nvidia-settings-1.0.20070302.ebuild 2750 +RMD160 ce9253844bdc6dfc869194fa1049162dbd8ecbb2 nvidia-settings-1.0.20070302.ebuild 2750 +SHA256 8f86ad60135cae31ef2d1c91fdb47cc336e760fb39cb7b6d277206f987f05b3e nvidia-settings-1.0.20070302.ebuild 2750 +MISC ChangeLog 6417 RMD160 a4c5612c6f2586de34e87d064a1770c820491351 SHA1 300823a1c2758ff804265fac09b03fd33e205647 SHA256 a5b720810bc8d07c13967b30fb1ba797d48dedfdf3c0ed5c19dc6cff6be998d5 +MD5 e5bf29987b0d0a4cd20d5faef09fe424 ChangeLog 6417 +RMD160 a4c5612c6f2586de34e87d064a1770c820491351 ChangeLog 6417 +SHA256 a5b720810bc8d07c13967b30fb1ba797d48dedfdf3c0ed5c19dc6cff6be998d5 ChangeLog 6417 +MISC metadata.xml 312 RMD160 3f48a9c5af3729238ee2b7b7d8079095593a074a SHA1 a554ca74853c83d3895b1bb65a3489ecc54bd2c7 SHA256 4c5ee3ae30dc1353639de923975c1adbba82362c167dd60b8a90a192085c1fb3 +MD5 8cc89ece64d97d47dbb01662331caf77 metadata.xml 312 +RMD160 3f48a9c5af3729238ee2b7b7d8079095593a074a metadata.xml 312 +SHA256 4c5ee3ae30dc1353639de923975c1adbba82362c167dd60b8a90a192085c1fb3 metadata.xml 312 MD5 50df0fb8012dbd61fca92c8a5e012ce1 files/digest-nvidia-settings-1.0.20051122-r3 289 RMD160 d4d92f05460f7d479aa6923bb162f8c9d64a57c5 files/digest-nvidia-settings-1.0.20051122-r3 289 SHA256 e9fe910e1bd16eb80e57cea532819984097376a6287b1f03e9f6cb90938ea009 files/digest-nvidia-settings-1.0.20051122-r3 289 -MD5 8f267f01d4240bae508663a667abdeb8 files/digest-nvidia-settings-1.0.20060516-r1 289 -RMD160 1bfae97fa4662223c93eda89b37eac48616a32f7 files/digest-nvidia-settings-1.0.20060516-r1 289 -SHA256 175d7bc1eb49f717f571325404133184bf1fd48abb7de5f235146fdeae0412b4 files/digest-nvidia-settings-1.0.20060516-r1 289 -MD5 bd3b3edb6b41da666a9d87b1c57f2c37 files/digest-nvidia-settings-1.0.20060919 289 -RMD160 5ad2acbe32b6ff573a10a90a793eec8ea8bf7aac files/digest-nvidia-settings-1.0.20060919 289 -SHA256 c3816b195b5c9ffe7cd8a990df6f01bc41a364c54ccb1f8a75e30152b2aea0e6 files/digest-nvidia-settings-1.0.20060919 289 MD5 d3b3cbc5d5e06bae9c84e70e8c05ade3 files/digest-nvidia-settings-1.0.20061102 289 RMD160 daa3471f169de0adfeaef2204ad267d1ef410eee files/digest-nvidia-settings-1.0.20061102 289 SHA256 51b4ef9efb1c18bfa936a205c3fa23f7b4d41dcc9fdd6269f6a46a97f24b9b16 files/digest-nvidia-settings-1.0.20061102 289 +MD5 3660f596b0726fd0f16a17032d8ec295 files/digest-nvidia-settings-1.0.20070302 262 +RMD160 d1ee2d46c4d988be6ad1292ac369b97bb214f6d4 files/digest-nvidia-settings-1.0.20070302 262 +SHA256 99a06054b6380bbf635380869b5b4529d60abde83da9571c09dd18a320bfba04 files/digest-nvidia-settings-1.0.20070302 262 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFF7zVcppoStNGKGywRAs3QAKCeBMXlkOzBajndw7x9qL3CDhYQHwCgtbJZ +fl8XZnRFV6WhP2X6pOzpgdg= +=vzY1 +-----END PGP SIGNATURE----- diff --git a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060516-r1 b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060516-r1 deleted file mode 100644 index fab3235ecb7f..000000000000 --- a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060516-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 42eb8e6795b6b7c98e121e4b2b042ff7 nvidia-settings-1.0.20060516.tar.gz 1119552 -RMD160 784cb63001dae40bcd0c2298f3fbc519438a7266 nvidia-settings-1.0.20060516.tar.gz 1119552 -SHA256 884a1152899ffccfa3180dfc1af9d1e5c7f3bb7367882f1971bd601aa715fada nvidia-settings-1.0.20060516.tar.gz 1119552 diff --git a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060919 b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060919 deleted file mode 100644 index 3301a744653e..000000000000 --- a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060919 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 6b70f0a178573b685f6c76e55067756c nvidia-settings-1.0.20060919.tar.gz 1298171 -RMD160 674a1cd4f43ba19495ea174a457b1bfe051d9b73 nvidia-settings-1.0.20060919.tar.gz 1298171 -SHA256 ffde9c181f6769d3de41c5b61b2931fdee764c3bb62a536d732bc701a7e78477 nvidia-settings-1.0.20060919.tar.gz 1298171 diff --git a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20070302 b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20070302 new file mode 100644 index 000000000000..9481c118f50c --- /dev/null +++ b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20070302 @@ -0,0 +1,3 @@ +MD5 414a838f01093ceb0ae8535c35e21eac nvidia-settings-1.0.tar.gz 1100735 +RMD160 96f68ecde52aba2e58976406f4a907e4932b5f32 nvidia-settings-1.0.tar.gz 1100735 +SHA256 48e0a8b6a0b1cae6881e3c33cb0bdbddb34f7f7d009c91dc0a6826f94736c480 nvidia-settings-1.0.tar.gz 1100735 diff --git a/media-video/nvidia-settings/metadata.xml b/media-video/nvidia-settings/metadata.xml index 7b57e87f2cc7..25c7a498245d 100644 --- a/media-video/nvidia-settings/metadata.xml +++ b/media-video/nvidia-settings/metadata.xml @@ -1,9 +1,12 @@ -x11-drivers - - x11-drivers@gentoo.org - -NVIDIA Linux X11 Settings Utility + x11-drivers + + peper@gentoo.org + Piotr Jaroszyński + + + + diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild index c0e77afe35a7..fce6bffaa8ea 100644 --- a/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.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/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild,v 1.7 2006/10/30 15:22:36 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild,v 1.8 2007/03/07 21:57:40 peper Exp $ inherit eutils toolchain-funcs multilib @@ -25,8 +25,7 @@ IUSE= # This also allows us to optimize out a lot of the other dependancies, as # between gtk and xorg-server, almost all libraries and headers are accounted # for. -DEPEND="virtual/libc - >=x11-libs/gtk+-2 +DEPEND=">=x11-libs/gtk+-2 dev-util/pkgconfig || ( ( x11-base/xorg-server x11-libs/libXt @@ -52,7 +51,7 @@ src_unpack() { # This next voodoo is just to work around xmkmf's broken behaviour # after the Xorg move to /usr (or I think, as I have not messed # with it in ages). - ln -snf ${ROOT}/usr/include/X11 include + ln -snf /usr/include/X11 include # Ensure that libNVCtrl.a is actually built # Regardless of how NormalLibXrandr was built diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20060516-r1.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20060516-r1.ebuild deleted file mode 100644 index e46751f48a74..000000000000 --- a/media-video/nvidia-settings/nvidia-settings-1.0.20060516-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20060516-r1.ebuild,v 1.4 2006/10/30 15:22:36 wolf31o2 Exp $ - -inherit eutils toolchain-funcs multilib - -# The following were added to work with the new nvidia-drivers and -# nvidia-legacy-drivers ebuilds. -NVIDIA_NEW_VERSION="1.0.8178" -NVIDIA_LEGACY_VERSION="1.0.7182" -S="${WORKDIR}/${PN}-1.0" -DESCRIPTION="NVIDIA Linux X11 Settings Utility" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="mirror://gentoo/${P}.tar.gz - http://dev.gentoo.org/~azarah/nvidia/${P}.tar.gz" -# Real SRC_URI: ftp://download.nvidia.com/XFree86/nvidia-settings/ - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE= - -# xorg-server is used in the depends as nvidia-settings builds against some -# headers in /usr/include/xorg/. -# This also allows us to optimize out a lot of the other dependancies, as -# between gtk and xorg-server, almost all libraries and headers are accounted -# for. -DEPEND="virtual/libc - >=x11-libs/gtk+-2 - dev-util/pkgconfig - || ( ( x11-base/xorg-server - x11-libs/libXt - x11-libs/libXv - x11-proto/xf86driproto - x11-misc/imake - x11-misc/gccmakedep ) - virtual/x11 - )" -RDEPEND="|| ( - >=x11-drivers/nvidia-drivers-${NVIDIA_NEW_VERSION} - >=x11-drivers/nvidia-legacy-drivers-${NVIDIA_LEGACY_VERSION} ) - >=x11-libs/gtk+-2 - || ( ( x11-base/xorg-server - x11-libs/libXt ) - virtual/x11 - )" - -src_unpack() { - unpack ${A} - cd ${S}/src/libXNVCtrl - einfo "Tweaking libXNVCtrl for build..." - # This next voodoo is just to work around xmkmf's broken behaviour - # after the Xorg move to /usr (or I think, as I have not messed - # with it in ages). - ln -snf ${ROOT}/usr/include/X11 include - - # Ensure that libNVCtrl.a is actually built - # Regardless of how NormalLibXrandr was built - # (NormalLibXrandr indicates if Xrandr was built as static or not) - # NormalLibXrandr was 'YES' in Xorg-6.8, but is 'NO' in 7.0. - sed -i.orig \ - -e 's,DoNormalLib NormalLibXrandr,DoNormalLib YES,g' \ - Imakefile - - # for a rainy day, when we need a shared libXNVCtrl.so - #-e 'a#define DoSharedLib YES\n' \ -} - -src_compile() { - einfo "Building libXNVCtrl..." - cd ${S}/src/libXNVCtrl - xmkmf -a || die "Running xmkmf failed!" - make clean || die "Cleaning old libXNVCtrl failed" - emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" all || die "Building libXNVCtrl failed!" - - cd ${S} - einfo "Building nVidia-Settings..." - emake CC="$(tc-getCC)" || die "Failed to build nvidia-settings" -} - -src_install() { - # Install the executable - exeinto /usr/bin - doexe nvidia-settings - - # Install libXNVCtrl and headers - insinto "/usr/$(get_libdir)" - doins src/libXNVCtrl/libXNVCtrl.a - insinto /usr/include/NVCtrl - doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h - - # Install icon and .desktop entry - doicon "${FILESDIR}/icon/${PN}.png" - domenu "${FILESDIR}/icon/${PN}.desktop" - - # Install manpage - doman doc/nvidia-settings.1 - - # Now install documentation - dodoc doc/*.txt -} diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20061102.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20061102.ebuild index d8cdc3fe5bba..83bfe3767b22 100644 --- a/media-video/nvidia-settings/nvidia-settings-1.0.20061102.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-1.0.20061102.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/media-video/nvidia-settings/nvidia-settings-1.0.20061102.ebuild,v 1.1 2006/11/10 15:34:19 augustus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20061102.ebuild,v 1.2 2007/03/07 21:57:40 peper Exp $ inherit eutils toolchain-funcs multilib @@ -25,8 +25,7 @@ IUSE= # This also allows us to optimize out a lot of the other dependancies, as # between gtk and xorg-server, almost all libraries and headers are accounted # for. -DEPEND="virtual/libc - >=x11-libs/gtk+-2 +DEPEND=">=x11-libs/gtk+-2 dev-util/pkgconfig x11-base/xorg-server x11-libs/libXt @@ -48,7 +47,7 @@ src_unpack() { # This next voodoo is just to work around xmkmf's broken behaviour # after the Xorg move to /usr (or I think, as I have not messed # with it in ages). - ln -snf ${ROOT}/usr/include/X11 include + ln -snf /usr/include/X11 include # Ensure that libNVCtrl.a is actually built # Regardless of how NormalLibXrandr was built diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20060919.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20070302.ebuild similarity index 70% rename from media-video/nvidia-settings/nvidia-settings-1.0.20060919.ebuild rename to media-video/nvidia-settings/nvidia-settings-1.0.20070302.ebuild index 75af6fef89a4..dfd9752df832 100644 --- a/media-video/nvidia-settings/nvidia-settings-1.0.20060919.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-1.0.20070302.ebuild @@ -1,54 +1,54 @@ -# 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/media-video/nvidia-settings/nvidia-settings-1.0.20060919.ebuild,v 1.2 2006/10/30 15:22:36 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20070302.ebuild,v 1.1 2007/03/07 21:57:40 peper Exp $ inherit eutils toolchain-funcs multilib -# The following were added to work with the new nvidia-drivers and -# nvidia-legacy-drivers ebuilds. +MY_P="${PN}-1.0" NVIDIA_NEW_VERSION="1.0.9625" NVIDIA_LEGACY_VERSION="1.0.7182" -S="${WORKDIR}/${PN}-1.0" + DESCRIPTION="NVIDIA Linux X11 Settings Utility" HOMEPAGE="http://www.nvidia.com/" -SRC_URI="mirror://gentoo/${P}.tar.gz - http://dev.gentoo.org/~azarah/nvidia/${P}.tar.gz" -#SRC_URI="ftp://download.nvidia.com/XFree86/nvidia-settings/${P}.tar.gz" +SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE= +IUSE="" # xorg-server is used in the depends as nvidia-settings builds against some # headers in /usr/include/xorg/. # This also allows us to optimize out a lot of the other dependancies, as # between gtk and xorg-server, almost all libraries and headers are accounted # for. -DEPEND="virtual/libc - >=x11-libs/gtk+-2 - dev-util/pkgconfig - x11-base/xorg-server - x11-libs/libXt - x11-libs/libXv - x11-proto/xf86driproto - x11-misc/imake - x11-misc/gccmakedep" -RDEPEND="|| ( - >=x11-drivers/nvidia-drivers-${NVIDIA_NEW_VERSION} - >=x11-drivers/nvidia-legacy-drivers-${NVIDIA_LEGACY_VERSION} ) - >=x11-libs/gtk+-2 - x11-base/xorg-server - x11-libs/libXt" +DEPEND=">=x11-libs/gtk+-2 + dev-util/pkgconfig + x11-base/xorg-server + x11-libs/libXt + x11-libs/libXv + x11-proto/xf86driproto + x11-misc/imake + x11-misc/gccmakedep" + +RDEPEND=">=x11-libs/gtk+-2 + x11-base/xorg-server + x11-libs/libXt + || ( >=x11-drivers/nvidia-drivers-${NVIDIA_NEW_VERSION} + >=x11-drivers/nvidia-legacy-drivers-${NVIDIA_LEGACY_VERSION} )" + +S="${WORKDIR}/${MY_P}" src_unpack() { unpack ${A} - cd ${S}/src/libXNVCtrl + + cd "${S}/src/libXNVCtrl" einfo "Tweaking libXNVCtrl for build..." + # This next voodoo is just to work around xmkmf's broken behaviour # after the Xorg move to /usr (or I think, as I have not messed # with it in ages). - ln -snf ${ROOT}/usr/include/X11 include + #ln -snf /usr/include/X11 include # Ensure that libNVCtrl.a is actually built # Regardless of how NormalLibXrandr was built @@ -64,12 +64,12 @@ src_unpack() { src_compile() { einfo "Building libXNVCtrl..." - cd ${S}/src/libXNVCtrl + cd "${S}/src/libXNVCtrl" xmkmf -a || die "Running xmkmf failed!" make clean || die "Cleaning old libXNVCtrl failed" emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" all || die "Building libXNVCtrl failed!" - cd ${S} + cd "${S}" einfo "Building nVidia-Settings..." emake CC="$(tc-getCC)" || die "Failed to build nvidia-settings" }