Move from media-video/nvclock to sys-power/nvclock.

(Portage version: 2.2_rc77/cvs/Linux i686, RepoMan options: --force)

5 files changed, 248 insertions, 0 deletions

diff --git a/sys-power/nvclock/files/nvclock-0.8_beta4-as-needed.patch b/sys-power/nvclock/files/nvclock-0.8_beta4-as-needed.patch
new file mode 100644
index 000000000000..5b2d3ea1a6f3
--- /dev/null
+++ b/sys-power/nvclock/files/nvclock-0.8_beta4-as-needed.patch
@@ -0,0 +1,14 @@
+Change linking order to make it possible to use -Wl,--as-needed in LDFLAGS
+
+diff -ru nvclock0.8b4.orig/src/Makefile.in nvclock0.8b4/src/Makefile.in
+--- nvclock0.8b4.orig/src/Makefile.in	2009-01-03 12:02:54.000000000 -0500
++++ nvclock0.8b4/src/Makefile.in	2009-04-02 20:04:12.678271229 -0400
+@@ -15,7 +15,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..
diff --git a/sys-power/nvclock/files/nvclock-0.8_beta4-flags.patch b/sys-power/nvclock/files/nvclock-0.8_beta4-flags.patch
new file mode 100644
index 000000000000..6f00fc1a3f3b
--- /dev/null
+++ b/sys-power/nvclock/files/nvclock-0.8_beta4-flags.patch
@@ -0,0 +1,114 @@
+--- ./nvclock0.8b4/src/backend/Makefile.in.orig	2007-12-27 17:05:38.000000000 +0100
++++ ./nvclock0.8b4/src/backend/Makefile.in	2009-04-02 09:07:53.000000000 +0200
+@@ -1,11 +1,10 @@
+-CC=@CC@ -O0
+ AR=ar
+ RANLIB=@RANLIB@
+ 
+ system=@system@
+ HAVE_NVCONTROL=@HAVE_NVCONTROL@
+ OBJECTS=backend.o bios.o config.o error.o nv30.o nv40.o nv50.o info.o overclock.o utils.o i2c.o xf86i2c.o adt7473.o f75375.o lm99.o w83781d.o w83l785r.o libc_wrapper.o
+-CFLAGS=@X11_CFLAGS@ -I../.. -I../nvcontrol
++CFLAGS+=@X11_CFLAGS@ -I../.. -I../nvcontrol
+ 
+ ifeq ($(system), FreeBSD)
+     OBJECTS+=back_bsd.o
+@@ -36,4 +35,4 @@
+ 	rm -f Makefile
+ 
+ install:
+-uninstall:
+\ No newline at end of file
++uninstall:
+--- ./nvclock0.8b4/src/gtk/Makefile.in.orig	2008-05-11 12:25:46.000000000 +0200
++++ ./nvclock0.8b4/src/gtk/Makefile.in	2009-04-02 09:12:10.000000000 +0200
+@@ -1,7 +1,6 @@
+-CC=@CC@
+ INSTALL=@INSTALL@
+ 
+-CFLAGS=@GTK_CFLAGS@ -I../backend -I../nvcontrol -I../..
++CFLAGS+=@GTK_CFLAGS@ -I../backend -I../nvcontrol -I../..
+ HAVE_GTK2=@HAVE_GTK2@
+ HAVE_NVCONTROL=@HAVE_NVCONTROL@
+ libbackend=../backend/libbackend.a
+@@ -34,7 +33,7 @@
+ all: $(PROGRAM)
+ 
+ nvclock_gtk: $(DEPS) $(OBJECTS)
+-	$(CC) -o nvclock_gtk $(OBJECTS) $(libbackend) $(LIBS)
++	$(CC) -o nvclock_gtk $(LDFLAGS) $(OBJECTS) $(libbackend) $(LIBS)
+ 
+ clean:
+ 	rm -f nvclock_gtk *.core *.o *.exe
+--- ./nvclock0.8b4/src/Makefile.in.orig	2009-01-03 18:02:54.000000000 +0100
++++ ./nvclock0.8b4/src/Makefile.in	2009-04-02 09:12:24.000000000 +0200
+@@ -1,4 +1,3 @@
+-CC=@CC@
+ INSTALL=@INSTALL@
+ 
+ nvclock_SOURCES=nvclock.c
+@@ -31,10 +30,10 @@
+ 
+ 
+ nvclock: $(DEPS) $(LIB) nvclock.c
+-	$(CC) -o nvclock $(nvclock_SOURCES) $(INCLUDES) $(LIBS)
++	$(CC) -o nvclock $(CFLAGS) $(LDFLAGS) $(nvclock_SOURCES) $(INCLUDES) $(LIBS)
+ 
+ smartdimmer: $(DEPS) $(LIB) smartdimmer.c
+-	$(CC) -o smartdimmer $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS)
++	$(CC) -o smartdimmer $(CFLAGS) $(LDFLAGS) $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS)
+ 
+ 
+ clean: clean-recursive clean-app
+@@ -50,8 +49,8 @@
+ install: install-recursive install-app
+ install-app:
+ 	mkdir -p $(bindir)
+-	$(INSTALL) -c nvclock $(DESTDIR)$(bindir)/nvclock
+-	$(INSTALL) -c smartdimmer $(DESTDIR)$(bindir)/smartdimmer
++	$(INSTALL) -c nvclock $(bindir)/nvclock
++	$(INSTALL) -c smartdimmer $(bindir)/smartdimmer
+ 
+ 
+ uninstall: uninstall-recursive uninstall-app
+--- ./nvclock0.8b4/src/nvcontrol/Makefile.in.orig	2005-12-09 20:46:05.000000000 +0100
++++ ./nvclock0.8b4/src/nvcontrol/Makefile.in	2009-04-02 09:07:53.000000000 +0200
+@@ -1,8 +1,7 @@
+-CC=@CC@
+ AR=ar
+ RANLIB=@RANLIB@
+ system=@system@
+-CFLAGS=@X11_CFLAGS@ -I../backend
++CFLAGS+=@X11_CFLAGS@ -I../backend
+ HAVE_X11=@HAVE_NVCONTROL@
+ OBJECTS=libnvcontrol.o nvcontrol.o
+ 
+@@ -26,4 +25,4 @@
+ 	rm -f Makefile
+ 
+ install:
+-uninstall:
+\ No newline at end of file
++uninstall:
+--- ./nvclock0.8b4/src/qt/Makefile.in.orig	2008-05-11 12:25:46.000000000 +0200
++++ ./nvclock0.8b4/src/qt/Makefile.in	2009-04-02 09:11:51.000000000 +0200
+@@ -1,9 +1,8 @@
+-CXX=@CXX@
+ INSTALL=@INSTALL@
+ MOC=@MOC@
+ 
+ OBJECTS=main.o qt_nvclock.o qt_nvclock.moc.o qt_xfree.o qt_xfree.moc.o
+-CXXFLAGS=@QT_CFLAGS@ -I../backend
++CXXFLAGS+=@QT_CFLAGS@ -I../backend
+ HAVE_NVCONTROL=@HAVE_NVCONTROL@
+ HAVE_QT=@HAVE_QT@
+ libbackend=../backend/libbackend.a
+@@ -32,7 +31,7 @@
+ all: $(PROGRAM)
+ 
+ nvclock_qt: $(DEPS) qt_nvclock.moc qt_xfree.moc $(OBJECTS)
+-	$(CXX) -o nvclock_qt $(CXXFLAGS) $(OBJECTS) $(LIBS) 
++	$(CXX) -o nvclock_qt $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) 
+ 
+ clean:
+ 	rm -f nvclock_qt *.core *.moc *.o
diff --git a/sys-power/nvclock/files/nvclock-0.8_beta4-headers.patch b/sys-power/nvclock/files/nvclock-0.8_beta4-headers.patch
new file mode 100644
index 000000000000..1ec76eea780e
--- /dev/null
+++ b/sys-power/nvclock/files/nvclock-0.8_beta4-headers.patch
@@ -0,0 +1,99 @@
+bios.c: In function ‘dump_bios’:
+bios.c:909: warning: implicit declaration of function ‘load_bios_pramin’
+bios.c:911: warning: implicit declaration of function ‘load_bios_prom’
+
+diff --git a/src/backend/bios.c b/src/backend/bios.c
+index 3266b57..20fadc8 100644
+--- a/src/backend/bios.c
++++ b/src/backend/bios.c
+@@ -891,6 +891,8 @@ int main(int argc, char **argv)
+ 
+ 
+ #else
++int load_bios_pramin(char *data);
++int load_bios_prom(char *data);
+ void dump_bios(const char *filename)
+ {
+ 	int i;
+
+libc_wrapper.c: In function ‘xf86usleep’:
+libc_wrapper.c:53: warning: implicit declaration of function ‘usleep’
+
+diff --git a/src/backend/libc_wrapper.c b/src/backend/libc_wrapper.c
+index 4787205..9e490cd 100644
+--- a/src/backend/libc_wrapper.c
++++ b/src/backend/libc_wrapper.c
+@@ -25,6 +25,7 @@
+  *
+  */
+ 
++#include <config.h>
+ #include <stdio.h>
+ #include "xfree.h"
+ 
+
+nv40.c: In function ‘nv43_get_gpu_temp’:
+nv40.c:393: warning: implicit declaration of function ‘usleep’
+
+diff --git a/src/backend/nv40.c b/src/backend/nv40.c
+index 73472fa..63c9609 100644
+--- a/src/backend/nv40.c
++++ b/src/backend/nv40.c
+@@ -68,6 +68,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <unistd.h>
+ #include "backend.h"
+ 
+ /*
+
+banner.c: In function ‘banner_set_text’:
+banner.c:115: warning: format not a string literal and no format arguments
+
+diff --git a/src/gtk/banner.c b/src/gtk/banner.c
+index df2eb55..69851ae 100644
+--- a/src/gtk/banner.c
++++ b/src/gtk/banner.c
+@@ -112,7 +112,7 @@ void banner_set_text(Banner *banner, char *text, int type)
+ 	if(banner->text)
+ 		g_free(banner->text);
+ 
+-	banner->text = g_strdup_printf(text);
++	banner->text = g_strdup(text);
+ 	banner->type = type;
+ 	/* Refresh the banner */
+ 	banner_expose(GTK_WIDGET(banner), NULL, banner);
+
+main.c: In function ‘gui_init’:
+main.c:235: warning: implicit declaration of function ‘XOpenDisplay’
+main.c:235: warning: cast to pointer from integer of different size
+
+diff --git a/src/gtk/main.c b/src/gtk/main.c
+index b3bbacb..df7e5b1 100644
+--- a/src/gtk/main.c
++++ b/src/gtk/main.c
+@@ -25,6 +25,7 @@
+ 
+ #include <stdlib.h>
+ #include <gtk/gtk.h>
++#include <X11/Xlib.h>
+ 
+ #include "banner.h"
+ #include "interface.h"
+
+smartdimmer.c: In function ‘main’:
+smartdimmer.c:107: warning: implicit declaration of function ‘isdigit’
+
+diff --git a/src/smartdimmer.c b/src/smartdimmer.c
+index 295cd49..769c1bc 100644
+--- a/src/smartdimmer.c
++++ b/src/smartdimmer.c
+@@ -38,6 +38,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <getopt.h>
++#include <ctype.h>
+ #include "nvclock.h"
+ 
+ /* for command line arguments */
diff --git a/sys-power/nvclock/files/nvclock_confd b/sys-power/nvclock/files/nvclock_confd
new file mode 100644
index 000000000000..ff7f15bdd746
--- /dev/null
+++ b/sys-power/nvclock/files/nvclock_confd
@@ -0,0 +1,9 @@
+# Config file for /etc/init.d/nvclock
+
+# Set the core clock speed after -n and the memory clock speed after -m
+# Check your current speeds by running 'nvclock -s' at the command line
+# so you don't overclock too much and burn out the card
+# Test out your overclocking before adding this to the bootup!
+
+CLOCKOPTS="-s"
+#CLOCKOPTS="-n <corespeed> -m <memspeed>"
diff --git a/sys-power/nvclock/files/nvclock_initd b/sys-power/nvclock/files/nvclock_initd
new file mode 100644
index 000000000000..bcab3b581b23
--- /dev/null
+++ b/sys-power/nvclock/files/nvclock_initd
@@ -0,0 +1,12 @@
+#!/sbin/runscript
+
+depend() {
+	need xdm
+}
+
+start() {
+	ebegin "Setting nvidia card overclock speed"
+	nvclock ${CLOCKOPTS} >/dev/null
+	eend $?
+}
+