Remove USE="qt3" support wrt bug #284046.

(Portage version: 2.2_rc61/cvs/Linux x86_64)

3 files changed, 16 insertions, 28 deletions

diff --git a/media-video/nvclock/ChangeLog b/media-video/nvclock/ChangeLog
index ad4b41714b0c..d2dcd88468a6 100644
--- a/media-video/nvclock/ChangeLog
+++ b/media-video/nvclock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/nvclock
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.42 2009/12/15 07:51:57 vapier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.43 2010/01/03 15:57:01 ssuominen Exp $
+
+  03 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+  nvclock-0.8_beta4-r4.ebuild, nvclock-9999.ebuild:
+  Remove USE="qt3" support wrt bug #284046.
 
   15 Dec 2009; Mike Frysinger <vapier@gentoo.org>
   nvclock-0.8_beta4-r4.ebuild, +files/nvclock-0.8_beta4-headers.patch:
diff --git a/media-video/nvclock/nvclock-0.8_beta4-r4.ebuild b/media-video/nvclock/nvclock-0.8_beta4-r4.ebuild
index eab1617b75e6..15e07aea51c0 100644
--- a/media-video/nvclock/nvclock-0.8_beta4-r4.ebuild
+++ b/media-video/nvclock/nvclock-0.8_beta4-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.8_beta4-r4.ebuild,v 1.5 2009/12/15 07:51:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.8_beta4-r4.ebuild,v 1.6 2010/01/03 15:57:01 ssuominen Exp $
 
 EAPI="2"
 
@@ -15,16 +15,11 @@ SRC_URI="http://www.linuxhardware.org/nvclock/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="gtk qt3"
+IUSE="gtk"
 
-RDEPEND="gtk? ( =x11-libs/gtk+-2* )
-	qt3? ( =x11-libs/qt-3* )"
+RDEPEND="gtk? ( =x11-libs/gtk+-2* )"
 
 src_prepare() {
-	# 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
-
 	# Bug #240846:
 	epatch "${FILESDIR}"/${P}-flags.patch
 	epatch "${FILESDIR}"/${P}-as-needed.patch
@@ -39,24 +34,18 @@ src_prepare() {
 
 src_configure() {
 	tc-export CC CXX
-	# Needed to ensure it compiles against Qt3 rather than Qt4
-	export QTDIR=/usr/qt/3
-	export MOC=${QTDIR}/bin/moc
 
 	local myconf
 
 	myconf="--bindir=/usr/bin"
 
-	# Qt3 package doesn't install symlinks from ${QTDIR}/lib64 to ${QTDIR}/lib
-	use amd64 && myconf="${myconf} --with-qt-libs=${QTDIR}/lib64"
-
-	if use gtk || use qt3; then
+	if use gtk; then
 		myconf="${myconf} --enable-nvcontrol"
 	else
 		myconf="${myconf} --disable-nvcontrol"
 	fi
 
-	econf $(use_enable qt3 qt) $(use_enable gtk) ${myconf} || die
+	econf --disable-qt $(use_enable gtk) ${myconf} || die
 }
 
 src_compile() {
diff --git a/media-video/nvclock/nvclock-9999.ebuild b/media-video/nvclock/nvclock-9999.ebuild
index d1ca3dc8f39f..8ec2df79259b 100644
--- a/media-video/nvclock/nvclock-9999.ebuild
+++ b/media-video/nvclock/nvclock-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-9999.ebuild,v 1.1 2009/07/28 17:14:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-9999.ebuild,v 1.2 2010/01/03 15:57:01 ssuominen Exp $
 
 EAPI="2"
 
@@ -17,11 +17,10 @@ HOMEPAGE="http://www.linuxhardware.org/nvclock/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="gtk qt3"
+IUSE="gtk"
 
 RDEPEND="
 	gtk? ( x11-libs/gtk+:2 )
-	qt3? ( x11-libs/qt:3 )
 "
 DEPEND="${RDEPEND}"
 
@@ -32,11 +31,7 @@ src_prepare() {
 }
 
 src_configure() {
-	# Needed to ensure it compiles against Qt3 rather than Qt4
-	export QTDIR=/usr/qt/3
-	export MOC=${QTDIR}/bin/moc
-
-	econf $(use_enable qt3 qt) $(use_enable gtk) || die "econf failed"
+	econf --disable-qt $(use_enable gtk) || die "econf failed"
 }
 
 src_compile() {