version bump, close #25779

8 files changed, 29 insertions, 80 deletions

diff --git a/media-video/nvclock/ChangeLog b/media-video/nvclock/ChangeLog
index d6c8af1910ab..f753bd0674e2 100644
--- a/media-video/nvclock/ChangeLog
+++ b/media-video/nvclock/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/nvclock
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.6 2003/04/16 02:44:03 malverian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.7 2003/10/30 15:38:00 malverian Exp $
+
+*nvclock-0.7 (30 Oct 2003)
+
+  30 Oct 2003; Philip Walls <malverian@gentoo.org> nvclock-0.7.ebuild :
+  Version bump, closes bug #25779; Ebuild cleanups, no more GTK1 frontend
 
 *nvclock-0.6.2-r1 (15 Apr 2003)
 
diff --git a/media-video/nvclock/Manifest b/media-video/nvclock/Manifest
index e89a2efc3141..4fc50dbebac8 100644
--- a/media-video/nvclock/Manifest
+++ b/media-video/nvclock/Manifest
@@ -1,3 +1,4 @@
-MD5 7c69f7b4ce154bd190cb24a9fce4c8af ChangeLog 1457
-MD5 7a1c7186a0ad896af12d46f0e1685f6b nvclock-0.7.ebuild 890
+MD5 cfb5d4e6a072f93a5cd11bdf24f7f0d2 ChangeLog 1457
+MD5 98b2717ecd2b700dda1dbef254c3d5dd nvclock-0.7.ebuild 888
+MD5 18e357d8033ba8530d4c6b8a2c6e0a57 metadata.xml 324
 MD5 fd8ac9ae1a4d86f822f0b84ce8f5723a files/digest-nvclock-0.7 61
diff --git a/media-video/nvclock/files/0.6.2-configure.in.patch b/media-video/nvclock/files/0.6.2-configure.in.patch
deleted file mode 100644
index ccf6fda5ebba..000000000000
--- a/media-video/nvclock/files/0.6.2-configure.in.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- nvclock0.6.2/configure.in	2003-01-31 15:51:27.000000000 -0500
-+++ configure.in	2003-02-10 16:00:25.000000000 -0500
-@@ -26,11 +26,27 @@
- GTK2_LIBS=$GTK_LIBS
- 
- 
--AC_ARG_ENABLE(gtk, [  --disable-gtk             Don't build the GTK GUI. ], \
--    enable_gtk=no, enable_gtk=yes)
--AC_ARG_ENABLE(qt, [  --enable-qt             Build Qt 2.x/3.x GUI, default=no. ], \
--    enable_qt=yes, enable_qt=no)
--
-+AC_ARG_ENABLE(gtk,
-+[  --disable-gtk             Don't build the GTK GUI. ],
-+[
-+   if test x$enableval = xno; then
-+      enable_gtk=no
-+   else
-+      enable_gtk=yes
-+   fi
-+],
-+enable_gtk=yes)
-+
-+AC_ARG_ENABLE(qt,
-+[  --enable-qt             Build Qt 2.x/3.x GUI, default=no. ],
-+[
-+   if test x$enableval = xno; then
-+      enable_qt=no
-+   else
-+      enable_qt=yes
-+   fi
-+],
-+enable_qt=no)
- 
- dnl We will only compile one NVClock gtk binary, choose the latest version availible
- if test x"$enable_gtk" = "xyes"; then
-@@ -70,8 +86,8 @@
- 	no_qt=no
-     
-     elif test -r $QTDIR/include/qt.h; then
--	QT_LIB_DIR=-L$(QTDIR)/lib -L$QTDIR
--	QT_INC_DIR=-I$(QTDIR)/include
-+	QT_LIB_DIR="$QTDIR/lib -L$QTDIR"
-+	QT_INC_DIR="$QTDIR/include"
-         no_qt=no
- 	
-     else
diff --git a/media-video/nvclock/files/0.6.2-qt-version-check.patch b/media-video/nvclock/files/0.6.2-qt-version-check.patch
deleted file mode 100644
index 4a18796b489e..000000000000
--- a/media-video/nvclock/files/0.6.2-qt-version-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/qt/qt_nvclock.moc.orig	2003-02-06 12:53:23.000000000 -0500
-+++ src/qt/qt_nvclock.moc	2003-02-06 12:53:29.000000000 -0500
-@@ -13,11 +13,6 @@
- #include <qapplication.h>
- 
- #include <private/qucomextra_p.h>
--#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 19)
--#error "This file was generated using the moc from 3.0.5. It"
--#error "cannot be used with the include files from this version of Qt."
--#error "(The moc has changed too much.)"
--#endif
- 
- const char *CTabNVidia::className() const
- {
diff --git a/media-video/nvclock/files/digest-nvclock-0.6.2-r1 b/media-video/nvclock/files/digest-nvclock-0.6.2-r1
deleted file mode 100644
index 53bf20fb3795..000000000000
--- a/media-video/nvclock/files/digest-nvclock-0.6.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dac2fc84ad104fc869b2f872d6e7fb71 nvclock0.6.2.tar.gz 86716
diff --git a/media-video/nvclock/files/digest-nvclock-0.7 b/media-video/nvclock/files/digest-nvclock-0.7
new file mode 100644
index 000000000000..15079aef2372
--- /dev/null
+++ b/media-video/nvclock/files/digest-nvclock-0.7
@@ -0,0 +1 @@
+MD5 a3bb5ff1c2638317f1a69c7c2442b9e4 nvclock0.7.tar.gz 68966
diff --git a/media-video/nvclock/metadata.xml b/media-video/nvclock/metadata.xml
new file mode 100644
index 000000000000..d41bad5b1dc3
--- /dev/null
+++ b/media-video/nvclock/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer>
+		<email>malverian@gentoo.org</email>
+		<name>Philip Walls</name>
+	</maintainer>
+
+	<longdescription>A utility for overclocking NVidia based video cards</longdescription>
+</pkgmetadata>
diff --git a/media-video/nvclock/nvclock-0.6.2-r1.ebuild b/media-video/nvclock/nvclock-0.7.ebuild
index e29d2ed8def5..81aa5d69fc54 100644
--- a/media-video/nvclock/nvclock-0.6.2-r1.ebuild
+++ b/media-video/nvclock/nvclock-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.6.2-r1.ebuild,v 1.3 2003/10/23 17:07:58 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.7.ebuild,v 1.1 2003/10/30 15:38:00 malverian Exp $
 
 inherit eutils
 
@@ -17,33 +17,25 @@ IUSE="gtk gtk2 qt"
 
 DEPEND="virtual/glibc
 	sys-devel/autoconf
-	gtk? (
-		!gtk2? ( =x11-libs/gtk+-1.2* )
-		gtk2? ( =x11-libs/gtk+-2* )
-	)
+	gtk? ( =x11-libs/gtk+-2* )
 	qt? ( x11-libs/qt )"
 
 src_compile() {
-	epatch ${FILESDIR}/${PV}-configure.in.patch
-	use qt && epatch ${FILESDIR}/${PV}-qt-version-check.patch
-
-	autoconf || die
+	./autogen.sh || die
 
 	export QTDIR=/usr/qt/3
 
 	local myconf
 
-	use gtk \
-		&& myconf="${myconf} --disable-gtk" \
-		|| myconf="${myconf} --enable-gtk"
-
+	use gtk || myconf="${myconf} --disable-gtk"
 	use qt && myconf="${myconf} --enable-qt"
 
-	econf ${myconf} || die
-	emake || die
+	./configure ${myconf} || die
+	make || die
 }
 
 src_install() {
-	make prefix=${D}/usr install
+	dodir /usr/bin
+	einstall || die
 	dodoc AUTHORS COPYING README
 }