No need for virtual/libc. Fix trivial spelling error. Make sure --enable-nvcontrol is only set when either toolkit is in USE (bug #265804).

Package-Manager: portage-2.2_rc40/cvs/Linux i686

3 files changed, 92 insertions, 2 deletions

diff --git a/media-video/nvclock/ChangeLog b/media-video/nvclock/ChangeLog
index 5d91901e6a80..9ac8d8084f2c 100644
--- a/media-video/nvclock/ChangeLog
+++ b/media-video/nvclock/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/nvclock
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.36 2009/07/28 17:15:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.37 2009/09/07 18:21:38 jer Exp $
+
+*nvclock-0.8_beta4-r4 (07 Sep 2009)
+
+  07 Sep 2009; Jeroen Roovers <jer@gentoo.org> +nvclock-0.8_beta4-r4.ebuild:
+  No need for virtual/libc. Fix trivial spelling error. Make sure
+  --enable-nvcontrol is only set when either toolkit is in USE (bug
+  #265804).
 
   28 Jul 2009; Jeroen Roovers <jer@gentoo.org> -nvclock-0.8_beta2.ebuild,
   -nvclock-0.8_beta4.ebuild, -nvclock-0.8_beta4-r2.ebuild:
diff --git a/media-video/nvclock/Manifest b/media-video/nvclock/Manifest
index 6e52a8852046..6f995c2224c4 100644
--- a/media-video/nvclock/Manifest
+++ b/media-video/nvclock/Manifest
@@ -10,6 +10,7 @@ DIST nvclock0.7.tar.gz 68966 RMD160 aacdc3718a65ec63d1b16039294cd2976736402b SHA
 DIST nvclock0.8b4.tar.gz 336999 RMD160 02dbfde37514b34c7f0e5a8b71e8205e32575dcc SHA1 758b3848b036e2b3e25368cfec4c6cd82a963dc9 SHA256 bdb695e869822c4740c361bcace81b5527b774002d42785c986da9a92d7a9b0b
 EBUILD nvclock-0.7-r2.ebuild 1366 RMD160 85ad9382e9a0ca9ee51d1421b13ae73f01607a10 SHA1 dc4cfb869350b2351dc5888e4f12a415ba9fe664 SHA256 0e3d12af86a3222c18e98d1b3a99866d2d7eedd00ee2ed8bdde6ab5298ddd359
 EBUILD nvclock-0.8_beta4-r3.ebuild 1948 RMD160 28ed60f5106b7f67eebe93eb712533c868d81adf SHA1 54ea122195cdc669b19489584e43331e79964740 SHA256 0f62edb3b7318cbc1c3ff0fad190f0b63276719df357c2091f089d34ab240647
+EBUILD nvclock-0.8_beta4-r4.ebuild 2138 RMD160 9aa8c5b09e2ac581f37907fc1563416029d0b380 SHA1 631ffe8494ea7061cbfd45cbb0478cfdd9ea6b30 SHA256 45d8cf1d239e4f2c0f2e63982e6f159fe42821e4b0f6d149448c52d2dcea8a2c
 EBUILD nvclock-9999.ebuild 1291 RMD160 f09c9ad4be916a7fdbec235cd6d023519dc30710 SHA1 fc2fdb5716eb12608b46fa4fc77a24353dafddbd SHA256 42a353b8f009c65347aff035fb037a86da823ac0c5e930dcca28470a0ce7c269
-MISC ChangeLog 5553 RMD160 39cf44338dc1114a6b01980e5686cbda2bcb8b72 SHA1 2568b2615b391964a713f109664d2bca5b88fb01 SHA256 4c3a3313a1854a91347115d3aa535e7d2dbf51e84d652de2edd516cf254734af
+MISC ChangeLog 5814 RMD160 10229be215e230801fa345907f14c8563b85d76e SHA1 f8c05d902fb1fa5e5936dc3c7bd66d031492bb39 SHA256 5658d4335e4c0e57bceaa9a24390aa029aeab4a115587489320f0532a65f5649
 MISC metadata.xml 356 RMD160 266bfd1a7680755f1a85d6a4cb7e0d9bf9a13402 SHA1 6d07e6b742deebf8c7b8574d93bc5cdc67aeb378 SHA256 37a1c5f99f89514304b9f42168390c6b75ce1c0fc34fc43a41f620638731c955
diff --git a/media-video/nvclock/nvclock-0.8_beta4-r4.ebuild b/media-video/nvclock/nvclock-0.8_beta4-r4.ebuild
new file mode 100644
index 000000000000..775bb2a01d6b
--- /dev/null
+++ b/media-video/nvclock/nvclock-0.8_beta4-r4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.8_beta4-r4.ebuild,v 1.1 2009/09/07 18:21:38 jer Exp $
+
+EAPI="2"
+
+inherit eutils autotools toolchain-funcs
+
+MY_P="${PN}${PV/_beta/b}"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="NVIDIA Overclocking Utility"
+HOMEPAGE="http://www.linuxhardware.org/nvclock/"
+SRC_URI="http://www.linuxhardware.org/nvclock/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk qt3"
+
+RDEPEND="virtual/libc
+	gtk? ( =x11-libs/gtk+-2* )
+	qt3? ( =x11-libs/qt-3* )"
+
+src_prepare() {
+	# Patch to fix broken autoconf macro "--with-qt-libs" needed below
+	# Submitted upstream, hopefully fixed in a later version
+	use qt3 && epatch "${FILESDIR}"/nvclock_acinclude_qtlibs.patch
+
+	# Bug #240846:
+	epatch "${FILESDIR}"/${P}-flags.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+
+	sed -e 's:NV-CONROL:NV-CONTROL:g' -i configure.in
+	sed -i Makefile.in -e "s:/share/doc/nvclock:/share/doc/${PF}:g" || \
+		die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC CXX
+	# Needed to ensure it compiles against Qt3 rather than Qt4
+	export QTDIR=/usr/qt/3
+	export MOC=${QTDIR}/bin/moc
+
+	local myconf
+
+	myconf="--bindir=/usr/bin"
+
+	# Qt3 package doesn't install symlinks from ${QTDIR}/lib64 to ${QTDIR}/lib
+	use amd64 && myconf="${myconf} --with-qt-libs=${QTDIR}/lib64"
+
+	if use gtk || use qt3; then
+		myconf="${myconf} --enable-nvcontrol"
+	else
+		myconf="${myconf} --disable-nvcontrol"
+	fi
+
+	econf $(use_enable qt3 qt) $(use_enable gtk) ${myconf} || die
+}
+
+src_compile() {
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	emake DESTDIR="${D}" install || die
+	#dodoc AUTHORS README
+
+	newinitd "${FILESDIR}"/nvclock_initd nvclock
+	newconfd "${FILESDIR}"/nvclock_confd nvclock
+
+	#insinto /usr/share/applications
+	#doins nvclock.desktop
+	#validate_desktop_entries /usr/share/applications/nvclock.desktop
+}
+
+pkg_postinst() {
+	elog "To enable card overclocking at startup, edit your /etc/conf.d/nvclock"
+	elog "accordingly and then run: rc-update add nvclock default"
+}