Remove old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

6 files changed, 8 insertions, 359 deletions

diff --git a/sys-power/nvclock/ChangeLog b/sys-power/nvclock/ChangeLog
index b353e2b37ab6..ce6ef0c036b2 100644
--- a/sys-power/nvclock/ChangeLog
+++ b/sys-power/nvclock/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/nvclock
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nvclock/ChangeLog,v 1.18 2013/12/24 12:51:00 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nvclock/ChangeLog,v 1.19 2014/03/22 18:05:34 kensington Exp $
+
+  22 Mar 2014; Michael Palimaka <kensington@gentoo.org>
+  -files/nvclock-0.8_beta4-as-needed.patch,
+  -files/nvclock-0.8_beta4-flags.patch, -files/nvclock-0.8_beta4-headers.patch,
+  -files/nvclock-0.8_p20110102-make.patch, -nvclock-0.8_beta4-r4.ebuild:
+  Remove old.
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org>
   nvclock-0.8_p20110102-r2.ebuild:
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
deleted file mode 100644
index de02a67e8ea6..000000000000
--- a/sys-power/nvclock/files/nvclock-0.8_beta4-as-needed.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Change linking order to make it possible to use -Wl,--as-needed in LDFLAGS
-
---- a/src/Makefile.in	2009-01-03 12:02:54.000000000 -0500
-+++ b/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
deleted file mode 100644
index a2800c29ae62..000000000000
--- a/sys-power/nvclock/files/nvclock-0.8_beta4-flags.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- a/src/backend/Makefile.in	2007-12-27 17:05:38.000000000 +0100
-+++ b/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:
---- a/src/gtk/Makefile.in	2008-05-11 12:25:46.000000000 +0200
-+++ b/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
---- a/src/Makefile.in	2009-01-03 18:02:54.000000000 +0100
-+++ b/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
---- a/src/nvcontrol/Makefile.in	2005-12-09 20:46:05.000000000 +0100
-+++ b/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:
---- a/src/qt/Makefile.in	2008-05-11 12:25:46.000000000 +0200
-+++ b/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
deleted file mode 100644
index 006d99daeb7b..000000000000
--- a/sys-power/nvclock/files/nvclock-0.8_beta4-headers.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- 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;
-
---- 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"
- 
-
---- 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"
- 
- /*
-
---- 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);
-
---- 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"
-
---- 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-0.8_p20110102-make.patch b/sys-power/nvclock/files/nvclock-0.8_p20110102-make.patch
deleted file mode 100644
index f0d0ab7652f3..000000000000
--- a/sys-power/nvclock/files/nvclock-0.8_p20110102-make.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-- Fix building with --as-needed
-- Fix parallel make by defining two new targets
-- Fix one spelling error
-- Respect CFLAGS, 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
---- a/src/backend/Makefile.in	2011-01-02 19:48:13.000000000 +0100
-+++ b/src/backend/Makefile.in	2011-04-25 05:00:22.000000000 +0200
-@@ -1,11 +1,11 @@
--CC=@CC@ -O0
-+CC=@CC@
- 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= @CFLAGS@ -O0 @X11_CFLAGS@ -I../.. -I../nvcontrol
- 
- ifeq ($(system), FreeBSD)
-     OBJECTS+=back_bsd.o
-@@ -40,4 +40,4 @@
- 	rm -f Makefile
- 
- install:
--uninstall:
-\ No newline at end of file
-+uninstall:
diff --git a/sys-power/nvclock/nvclock-0.8_beta4-r4.ebuild b/sys-power/nvclock/nvclock-0.8_beta4-r4.ebuild
deleted file mode 100644
index e9627702d079..000000000000
--- a/sys-power/nvclock/nvclock-0.8_beta4-r4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nvclock/nvclock-0.8_beta4-r4.ebuild,v 1.3 2012/09/05 08:12:47 jlec 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"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Bug #240846:
-	epatch "${FILESDIR}"/${P}-flags.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-headers.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
-
-	local myconf
-
-	myconf="--bindir=/usr/bin"
-
-	if use gtk; then
-		myconf="${myconf} --enable-nvcontrol"
-	else
-		myconf="${myconf} --disable-nvcontrol"
-	fi
-
-	econf --disable-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
-
-	#domenu 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"
-}