Fix compile problem with USE=qt3 when Qt4 is installed (#114872). Compilation fix with USE=qt3 on AMD64. Version bump (#143023, #107334).

(Portage version: 2.1.2_pre2-r8)

6 files changed, 101 insertions, 7 deletions

diff --git a/media-video/nvclock/ChangeLog b/media-video/nvclock/ChangeLog
index 4502c61fc946..93df277ac588 100644
--- a/media-video/nvclock/ChangeLog
+++ b/media-video/nvclock/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/nvclock
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.17 2006/06/24 01:35:13 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.18 2006/10/14 13:51:42 malverian Exp $
+
+*nvclock-0.8_beta2 (14 Oct 2006)
+
+  14 Oct 2006; <malverian@gentoo.org> +files/nvclock_acinclude_qtlibs.patch,
+  nvclock-0.7-r1.ebuild, +nvclock-0.8_beta2.ebuild, -nvclock-0.8b.ebuild:
+  Fix compile problem with USE=qt3 when Qt4 is installed (#114872).
+  Compilation fix with USE=qt3 on AMD64. Version bump (#143023, #107334).
 
   24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> nvclock-0.7-r1.ebuild,
   nvclock-0.8b.ebuild:
diff --git a/media-video/nvclock/files/digest-nvclock-0.7-r1 b/media-video/nvclock/files/digest-nvclock-0.7-r1
index 15079aef2372..43a189ed06ba 100644
--- a/media-video/nvclock/files/digest-nvclock-0.7-r1
+++ b/media-video/nvclock/files/digest-nvclock-0.7-r1
@@ -1 +1,3 @@
 MD5 a3bb5ff1c2638317f1a69c7c2442b9e4 nvclock0.7.tar.gz 68966
+RMD160 aacdc3718a65ec63d1b16039294cd2976736402b nvclock0.7.tar.gz 68966
+SHA256 469678f436b974b62af51aa4bf71fdf695c402ed0cd890c25fc0b757577657e8 nvclock0.7.tar.gz 68966
diff --git a/media-video/nvclock/files/digest-nvclock-0.8_beta2 b/media-video/nvclock/files/digest-nvclock-0.8_beta2
new file mode 100644
index 000000000000..29b793264f5b
--- /dev/null
+++ b/media-video/nvclock/files/digest-nvclock-0.8_beta2
@@ -0,0 +1,3 @@
+MD5 8b9f55115f3c5b7b9a9a16fe40cec4a5 nvclock0.8b2.tar.gz 316510
+RMD160 1c8aff1a0f2bd472f9d5296d2d575823b2cb5107 nvclock0.8b2.tar.gz 316510
+SHA256 b3c05f1cceb57a816cea096f9b71154c0ce5e2ec31febb85e3db831b0b3407aa nvclock0.8b2.tar.gz 316510
diff --git a/media-video/nvclock/files/nvclock_acinclude_qtlibs.patch b/media-video/nvclock/files/nvclock_acinclude_qtlibs.patch
new file mode 100644
index 000000000000..c2eae73b2b44
--- /dev/null
+++ b/media-video/nvclock/files/nvclock_acinclude_qtlibs.patch
@@ -0,0 +1,21 @@
+--- acinclude.m4.old	2005-08-07 05:58:52.000000000 -0400
++++ acinclude.m4	2006-10-14 08:52:42.000000000 -0400
+@@ -75,8 +75,6 @@
+ 
+ AC_MSG_CHECKING([QTDIR])
+ AC_ARG_WITH([qtdir], [  --with-qtdir=DIR        Qt installation directory [default=$QTDIR]], QTDIR=$withval)
+-AC_ARG_WITH([qt-includes], [  --with-qt-includes=DIR	Directory containing the qt include files ], QT_INC_DIR=$withval)
+-AC_ARG_WITH([qt-libs], [  --with-qt-libraries=DIR	Directory containing the qt libraries ], QT_LIB_DIR=$withval)
+ 
+ # Check that QTDIR is defined or that --with-qtdir given
+ if test x"$QTDIR" = x; then
+@@ -95,6 +93,9 @@
+     QT_LIB_DIR=$QTDIR/lib
+ fi
+ 
++AC_ARG_WITH([qt-includes], [  --with-qt-includes=DIR	Directory containing the qt include files ], QT_INC_DIR=$withval)
++AC_ARG_WITH([qt-libs], [  --with-qt-libs=DIR	Directory containing the qt libraries ], QT_LIB_DIR=$withval)
++
+ #Some distributions don't use QTDIR and use "standard" places like /usr/include/qt3 for headers and /usr/lib for libs
+ #We try to detect qt in those standard places when we haven't found anything in QTDIR
+ if test x$QT_INC_DIR = x; then 
diff --git a/media-video/nvclock/nvclock-0.7-r1.ebuild b/media-video/nvclock/nvclock-0.7-r1.ebuild
index dca822cd1aa4..df01cd3bedda 100644
--- a/media-video/nvclock/nvclock-0.7-r1.ebuild
+++ b/media-video/nvclock/nvclock-0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.7-r1.ebuild,v 1.7 2006/06/24 01:35:13 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.7-r1.ebuild,v 1.8 2006/10/14 13:51:42 malverian Exp $
 
 inherit eutils
 
@@ -32,14 +32,12 @@ src_compile() {
 	mv configure.in configure.ac
 	./autogen.sh || die
 
+	# Needed to ensure it compiles against Qt3 rather than Qt4
 	export QTDIR=/usr/qt/3
+	export MOC=${QTDIR}/bin/moc
 
-	local myconf
+	./configure $(use_enable qt3 qt) $(use_enable gtk) || die
 
-	use gtk || myconf="${myconf} --disable-gtk"
-	use qt3 && myconf="${myconf} --enable-qt"
-
-	./configure ${myconf} || die
 	make || die
 }
 
diff --git a/media-video/nvclock/nvclock-0.8_beta2.ebuild b/media-video/nvclock/nvclock-0.8_beta2.ebuild
new file mode 100644
index 000000000000..d2945e7f0fa9
--- /dev/null
+++ b/media-video/nvclock/nvclock-0.8_beta2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.8_beta2.ebuild,v 1.1 2006/10/14 13:51:42 malverian Exp $
+
+inherit eutils
+
+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="~x86 ~amd64"
+IUSE="gtk qt3"
+
+RDEPEND="virtual/libc
+	gtk? ( =x11-libs/gtk+-2* )
+	qt3? ( =x11-libs/qt-3* )"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Patch to fix broken autoconf macro "--with-qt-libs" needed below
+	# Submitted upstream, hopefully fixed in a later version
+	use qt3 && epatch ${FILESDIR}/nvclock_acinclude_qtlibs.patch
+}
+
+src_compile() {
+	mv configure.in configure.ac
+	./autogen.sh || die
+
+	# Needed to ensure it compiles against Qt3 rather than Qt4
+	export QTDIR=/usr/qt/3
+	export MOC=${QTDIR}/bin/moc
+
+	local myconf
+
+	# Qt3 package doesn't install symlinks from ${QTDIR}/lib64 to ${QTDIR}/lib
+	use amd64 && myconf="${myconf} --with-qt-libs=${QTDIR}/lib64"
+
+	./configure $(use_enable qt3 qt) $(use_enable gtk) ${myconf} || die
+
+	make || die
+}
+
+src_install() {
+	dodir /usr/bin
+	einstall || die
+	dodoc AUTHORS README
+
+	newinitd ${FILESDIR}/nvclock_initd nvclock
+	newconfd ${FILESDIR}/nvclock_confd nvclock
+}
+
+pkg_postinst() {
+	einfo "To enable card overclocking at startup, edit your /etc/conf.d/nvclock"
+	einfo "accordingly and then run: rc-update add nvclock default"
+}