Do not install manpage into datadir. Add desktop entry and icon.

Resolves bug #114720, thanks to Peter Hyman <pete4abw@comcast.net>.

(Portage version: 2.0.53)

6 files changed, 83 insertions, 11 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index 946365efea73..ee612932a6b3 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/nvidia-settings
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.16 2005/12/07 00:30:00 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.17 2005/12/07 12:07:11 azarah Exp $
+
+*nvidia-settings-1.0.20051122-r2 (07 Dec 2005)
+
+  07 Dec 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/icon/nvidia-settings.desktop, +files/icon/nvidia-settings.png,
+  +nvidia-settings-1.0.20051122-r2.ebuild:
+  Do not install manpage into datadir.  Add desktop entry and icon.
+  Resolves bug #114720, thanks to Peter Hyman <pete4abw@comcast.net>.
 
 *nvidia-settings-1.0.20051122-r1 (07 Dec 2005)
 
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index 9c3e2c4bd0cd..c73cf803d63a 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -1,27 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f86c6c09a736128b7f0d97f1710cdf50 ChangeLog 2998
 MD5 ba114bf17302ecdb08e065953295cc03 files/digest-nvidia-settings-1.0.20050525 81
 MD5 47ecc5e991834fd43188034d76fbbc96 files/digest-nvidia-settings-1.0.20050729 81
 MD5 5f2cbe0077553362cfec46c11a1839fa files/digest-nvidia-settings-1.0.20051122 81
 MD5 5f2cbe0077553362cfec46c11a1839fa files/digest-nvidia-settings-1.0.20051122-r1 81
+MD5 5f2cbe0077553362cfec46c11a1839fa files/digest-nvidia-settings-1.0.20051122-r2 81
 MD5 d15804c20077d1318d338ec3db0ac495 files/digest-nvidia-settings-1.0.6111 76
 MD5 0a39b5babdda1f3d78fee4db5b053b0a files/digest-nvidia-settings-1.0.6629 76
 MD5 ce276d6edd87a8f9f2bfc81f2d4fcfed files/digest-nvidia-settings-1.0.7167 76
+MD5 596d93feba5f2012ed21d3b44bfd0b10 files/icon/nvidia-settings.desktop 194
+MD5 0ffd3b3060cafae792a0b7461614a480 files/icon/nvidia-settings.png 3790
 MD5 92faa535f9924a7ef5a2578d13d43fb3 files/libXNVCtrl.a.bz2 2797
 MD5 b48738468061c96675a782947951d3d8 metadata.xml 300
 MD5 6a85441f269b195cfa3f1a8a6422120c nvidia-settings-1.0.20050525.ebuild 1539
 MD5 7bbeebd18631e196cdf02e30c2008310 nvidia-settings-1.0.20050729.ebuild 1607
 MD5 5016b0fa9d39b1ed1d46603957c66c7e nvidia-settings-1.0.20051122-r1.ebuild 1659
+MD5 766563ec6dec4ab691ff81c9b2f3d029 nvidia-settings-1.0.20051122-r2.ebuild 1781
 MD5 e7136664ccde2a8050e6b17b803fbdb0 nvidia-settings-1.0.20051122.ebuild 1607
 MD5 9df89547cf34bfb5ffa1177e2ce00c00 nvidia-settings-1.0.6111.ebuild 1128
 MD5 230d885c5f928254a3791e8f7b2bcc17 nvidia-settings-1.0.6629.ebuild 1128
 MD5 d7f90e0d8347493b76fad3613ccd4c91 nvidia-settings-1.0.7167.ebuild 1322
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDli5F1ZcsMnZjRyIRAoBAAJ4zMIJkFGDaHvaB7a8nX+ZD6MkOvgCeLK95
-Wb5CZIZJN8AdSwf4cOepFek=
-=Nqt+
------END PGP SIGNATURE-----
diff --git a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20051122-r2 b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20051122-r2
new file mode 100644
index 000000000000..c850c0cf2f64
--- /dev/null
+++ b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20051122-r2
@@ -0,0 +1 @@
+MD5 36f53ad25a171cf4be4c9912445cfcdb nvidia-settings-1.0.20051122.tar.gz 1091361
diff --git a/media-video/nvidia-settings/files/icon/nvidia-settings.desktop b/media-video/nvidia-settings/files/icon/nvidia-settings.desktop
new file mode 100644
index 000000000000..65f2fd56b7f6
--- /dev/null
+++ b/media-video/nvidia-settings/files/icon/nvidia-settings.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=NVIDIA X Server Settings
+Comment=Configure NVIDIA X Server Settings
+Exec=nvidia-settings
+Icon=nvidia-settings
+Categories=Application;System;
diff --git a/media-video/nvidia-settings/files/icon/nvidia-settings.png b/media-video/nvidia-settings/files/icon/nvidia-settings.png
new file mode 100644
index 000000000000..361c20050d59
--- /dev/null
+++ b/media-video/nvidia-settings/files/icon/nvidia-settings.png
diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r2.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r2.ebuild
new file mode 100644
index 000000000000..5e991bde1dee
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 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-r2.ebuild,v 1.1 2005/12/07 12:07:11 azarah Exp $
+
+inherit eutils toolchain-funcs multilib
+
+NVIDIA_VERSION="1.0.7664"
+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="-* ~x86 ~amd64"
+IUSE=
+
+DEPEND="virtual/libc
+	virtual/x11
+	>=x11-libs/gtk+-2"
+RDEPEND=">=media-video/nvidia-glx-${NVIDIA_VERSION}
+	>=media-video/nvidia-kernel-${NVIDIA_VERSION}"
+
+src_compile() {
+	cd ${S}/src/libXNVCtrl
+	einfo "Building libXNVCtrl..."
+	# 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
+	xmkmf -a || die "Running xmkmf failed!"
+	make CCOPTIONS="${CFLAGS}" clean 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
+}