configure fixes #15123

5 files changed, 110 insertions, 3 deletions

diff --git a/media-video/nvclock/ChangeLog b/media-video/nvclock/ChangeLog
index b12fd9672947..64901b91d867 100644
--- a/media-video/nvclock/ChangeLog
+++ b/media-video/nvclock/ChangeLog
@@ -1,17 +1,20 @@
 # ChangeLog for media-video/nvclock
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.2 2002/06/04 06:44:20 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.3 2003/02/10 21:07:21 vapier Exp $
+
+*nvclock-0.6.2 (10 Feb 2003)
+
+  10 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + configure fixes #15123.
 
 *nvclock-0.5 (2 Jun 2002)
 
   2 Jun 2002; Joachim Blaabjerg <styx@SuxOS.org> nvclock-0.5.ebuild:
-
   Version bump to 0.5, QT GUI support, minor cleanup.
 
 *nvclock-0.4.2 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/media-video/nvclock/files/0.6.2-configure.in.patch b/media-video/nvclock/files/0.6.2-configure.in.patch
new file mode 100644
index 000000000000..ccf6fda5ebba
--- /dev/null
+++ b/media-video/nvclock/files/0.6.2-configure.in.patch
@@ -0,0 +1,46 @@
+--- 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
new file mode 100644
index 000000000000..4a18796b489e
--- /dev/null
+++ b/media-video/nvclock/files/0.6.2-qt-version-check.patch
@@ -0,0 +1,14 @@
+--- 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 b/media-video/nvclock/files/digest-nvclock-0.6.2
new file mode 100644
index 000000000000..53bf20fb3795
--- /dev/null
+++ b/media-video/nvclock/files/digest-nvclock-0.6.2
@@ -0,0 +1 @@
+MD5 dac2fc84ad104fc869b2f872d6e7fb71 nvclock0.6.2.tar.gz 86716
diff --git a/media-video/nvclock/nvclock-0.6.2.ebuild b/media-video/nvclock/nvclock-0.6.2.ebuild
new file mode 100644
index 000000000000..571f0d3301ab
--- /dev/null
+++ b/media-video/nvclock/nvclock-0.6.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2002 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.ebuild,v 1.1 2003/02/10 21:07:21 vapier Exp $
+
+inherit eutils
+
+MY_P="${PN}${PV}"
+S=${WORKDIR}/${MY_P}
+SRC_URI="http://www.linuxhardware.org/nvclock/${MY_P}.tar.gz"
+DESCRIPTION="NVIDIA overclocking utility"
+HOMEPAGE="http://www.linuxhardware.org/nvclock/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="gtk gtk2 qt"
+
+DEPEND="virtual/glibc
+	|| (
+		gtk2? ( virtual/x11 =x11-libs/gtk+-2* )
+		gtk? ( virtual/x11 =x11-libs/gtk+-1* )
+	)
+	qt? ( virtual/x11 =x11-libs/qt-3* )"
+DEPEND="${RDEPEND} sys-devel/autoconf"
+
+src_compile() {
+	epatch ${FILESDIR}/${PV}-configure.in.patch
+	epatch ${FILESDIR}/${PV}-qt-version-check.patch
+	autoconf || die
+
+	export QTDIR=/usr/qt/3
+	local myconf="`use_enable qt`"
+	[ -z "`use gtk``use gtk2`" ] \
+		&& myconf="${myconf} --disable-gtk" \
+		|| myconf="${myconf} --enable-gtk"
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	make prefix=${D}/usr install
+	dodoc AUTHORS COPYING README ABOUT ChangeLog FAQ NEWS INSTALL
+}