Version bump (happens to fix bug #350328). Clean up ebuild. Merge all patches into one and fix parallel make by adding two new targets.

(Portage version: 2.2.0_alpha11/cvs/Linux i686)

3 files changed, 123 insertions, 1 deletions

diff --git a/sys-power/nvclock/ChangeLog b/sys-power/nvclock/ChangeLog
index feb302786ffc..5ffc3dd38bcd 100644
--- a/sys-power/nvclock/ChangeLog
+++ b/sys-power/nvclock/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/nvclock
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nvclock/ChangeLog,v 1.2 2011/01/02 19:17:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nvclock/ChangeLog,v 1.3 2011/01/03 03:48:31 jer Exp $
+
+*nvclock-0.8_p20110102 (03 Jan 2011)
+
+  03 Jan 2011; Jeroen Roovers <jer@gentoo.org> +nvclock-0.8_p20110102.ebuild,
+  +files/nvclock-0.8_p20110102-make.patch:
+  Version bump (happens to fix bug #350328). Clean up ebuild. Merge all patches
+  into one and fix parallel make by adding two new targets.
 
   02 Jan 2011; Jeroen Roovers <jer@gentoo.org>
   files/nvclock-0.8_beta4-as-needed.patch, files/nvclock-0.8_beta4-flags.patch:
diff --git a/sys-power/nvclock/files/nvclock-0.8_p20110102-make.patch b/sys-power/nvclock/files/nvclock-0.8_p20110102-make.patch
new file mode 100644
index 000000000000..e332d38a2c3f
--- /dev/null
+++ b/sys-power/nvclock/files/nvclock-0.8_p20110102-make.patch
@@ -0,0 +1,69 @@
+- Fix building with --as-needed
+- Fix parallel make by defining two new targets
+- Fix one spelling error
+- Respect LDFLAGS
+
+--- a/configure.in	2011-01-02 19:48:13.000000000 +0100
++++ b/configure.in	2011-01-03 04:35:34.000000000 +0100
+@@ -141,7 +141,7 @@
+ if [test "$HAVE_NVCONTROL" = "yes"]; then
+     echo "- NV-CONTROL support enabled"
+ else
+-    echo "- NV-CONROL support disabled"
++    echo "- NV-CONTROL support disabled"
+ fi
+ if [test "$HAVE_GTK2" = "yes"]; then
+     echo "- GTK2 GUI enabled"
+--- a/src/Makefile.in	2011-01-02 19:48:13.000000000 +0100
++++ b/src/Makefile.in	2011-01-03 04:35:34.000000000 +0100
+@@ -16,7 +16,7 @@
+ ifeq ($(HAVE_NVCONTROL), yes)
+     DEPS=$(libbackend) $(libnvcontrol)
+     INCLUDES=@X11_CFLAGS@ -I./backend -I./nvcontrol -I..
+-    LIBS=@X11_LIBS@ -L./backend -lbackend -L./nvcontrol -lnvcontrol
++    LIBS=-L./backend -lbackend -L./nvcontrol -lnvcontrol @X11_LIBS@
+ else
+     DEPS=$(libbackend)
+     INCLUDES=-I./backend -I./nvcontrol -I..
+@@ -30,12 +30,17 @@
+ 
+ all: all-recursive nvclock smartdimmer
+ 
++$(libbackend):
++	$(MAKE) -C backend
++
++$(libnvcontrol):
++	$(MAKE) -C nvcontrol
+ 
+ nvclock: $(DEPS) $(LIB) nvclock.c
+-	$(CC) $(CFLAGS) -o nvclock $(nvclock_SOURCES) $(INCLUDES) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o nvclock $(nvclock_SOURCES) $(INCLUDES) $(LIBS)
+ 
+ smartdimmer: $(DEPS) $(LIB) smartdimmer.c
+-	$(CC) $(CFLAGS) -o smartdimmer $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o smartdimmer $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS)
+ 
+ 
+ clean: clean-recursive clean-app
+--- a/src/gtk/Makefile.in	2011-01-02 19:48:13.000000000 +0100
++++ b/src/gtk/Makefile.in	2011-01-03 04:35:34.000000000 +0100
+@@ -33,7 +33,7 @@
+ all: $(PROGRAM)
+ 
+ nvclock_gtk: $(DEPS) $(OBJECTS)
+-	$(CC) $(CFLAGS) -o nvclock_gtk $(OBJECTS) $(libbackend) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o nvclock_gtk $(OBJECTS) $(libbackend) $(LIBS)
+ 
+ clean:
+ 	rm -f nvclock_gtk *.core *.o *.exe
+--- a/src/qt/Makefile.in	2011-01-02 19:48:13.000000000 +0100
++++ b/src/qt/Makefile.in	2011-01-03 04:35:34.000000000 +0100
+@@ -31,7 +31,7 @@
+ all: $(PROGRAM)
+ 
+ nvclock_qt: $(DEPS) qt_nvclock.moc qt_xfree.moc $(OBJECTS)
+-	$(CXX) $(CXXFLAGS) -o nvclock_qt $(CXXFLAGS) $(OBJECTS) $(LIBS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o nvclock_qt $(OBJECTS) $(LIBS) 
+ 
+ clean:
+ 	rm -f nvclock_qt *.core *.moc *.o
diff --git a/sys-power/nvclock/nvclock-0.8_p20110102.ebuild b/sys-power/nvclock/nvclock-0.8_p20110102.ebuild
new file mode 100644
index 000000000000..6872606f611b
--- /dev/null
+++ b/sys-power/nvclock/nvclock-0.8_p20110102.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nvclock/nvclock-0.8_p20110102.ebuild,v 1.1 2011/01/03 03:48:31 jer Exp $
+
+EAPI="2"
+
+inherit eutils autotools
+
+DESCRIPTION="NVIDIA Overclocking Utility"
+HOMEPAGE="http://www.linuxhardware.org/nvclock/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk"
+
+RDEPEND="gtk? ( =x11-libs/gtk+-2* )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf --bindir=/usr/bin --disable-qt \
+		$(use_enable gtk) $(use_enable gtk nvcontrol)
+}
+
+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"
+}