Remove USE="qt3" wrt #301377, thanks to Ben de Groot for reporting.

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

9 files changed, 14 insertions, 553 deletions

diff --git a/dev-util/oprofile/ChangeLog b/dev-util/oprofile/ChangeLog
index d80b57268659..f5c220caad47 100644
--- a/dev-util/oprofile/ChangeLog
+++ b/dev-util/oprofile/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/oprofile
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/ChangeLog,v 1.63 2010/02/04 03:05:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/ChangeLog,v 1.64 2010/02/16 16:45:29 ssuominen Exp $
+
+  16 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> oprofile-0.9.6.ebuild:
+  Remove USE="qt3" wrt #301377, thanks to Ben de Groot for reporting.
 
   04 Feb 2010; Jeroen Roovers <jer@gentoo.org> oprofile-0.9.6.ebuild:
   Stable for HPPA PPC (bug #297610).
diff --git a/dev-util/oprofile/files/oprofile-0.9.3-gcc43.patch b/dev-util/oprofile/files/oprofile-0.9.3-gcc43.patch
deleted file mode 100644
index 722c87c73fa6..000000000000
--- a/dev-util/oprofile/files/oprofile-0.9.3-gcc43.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-diff -urp oprofile-0.9.3-orig/gui/oprof_start_util.cpp oprofile-0.9.3/gui/oprof_start_util.cpp
---- oprofile-0.9.3-orig/gui/oprof_start_util.cpp	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/gui/oprof_start_util.cpp	2008-05-04 18:52:58.000000000 +0200
-@@ -19,6 +19,7 @@
- #include <sstream>
- #include <iostream>
- #include <fstream>
-+#include <cstdlib>
- 
- #include <qfiledialog.h>
- #include <qmessagebox.h>
-diff -urp oprofile-0.9.3-orig/libabi/opimport.cpp oprofile-0.9.3/libabi/opimport.cpp
---- oprofile-0.9.3-orig/libabi/opimport.cpp	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/libabi/opimport.cpp	2008-05-04 18:52:58.000000000 +0200
-@@ -17,6 +17,8 @@
- #include <iostream>
- #include <vector>
- #include <cassert>
-+#include <cstring>
-+#include <cstdlib>
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-diff -urp oprofile-0.9.3-orig/libpp/op_header.cpp oprofile-0.9.3/libpp/op_header.cpp
---- oprofile-0.9.3-orig/libpp/op_header.cpp	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/libpp/op_header.cpp	2008-05-04 18:52:58.000000000 +0200
-@@ -14,6 +14,7 @@
- #include <iomanip>
- #include <set>
- #include <sstream>
-+#include <cstring>
- 
- #include "op_exception.h"
- #include "odb.h"
-Only in oprofile-0.9.3/libpp: op_header.cpp.orig
-diff -urp oprofile-0.9.3-orig/libpp/profile.cpp oprofile-0.9.3/libpp/profile.cpp
---- oprofile-0.9.3-orig/libpp/profile.cpp	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/libpp/profile.cpp	2008-05-04 18:52:58.000000000 +0200
-@@ -15,6 +15,7 @@
- #include <iostream>
- #include <string>
- #include <sstream>
-+#include <cstring>
- 
- #include <cerrno>
- 
-diff -urp oprofile-0.9.3-orig/libpp/sample_container.cpp oprofile-0.9.3/libpp/sample_container.cpp
---- oprofile-0.9.3-orig/libpp/sample_container.cpp	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/libpp/sample_container.cpp	2008-05-04 18:52:58.000000000 +0200
-@@ -9,6 +9,7 @@
-  * @author John Levon
-  */
- 
-+#include <climits>
- #include <set>
- #include <numeric>
- #include <algorithm>
-diff -urp oprofile-0.9.3-orig/libregex/demangle_symbol.cpp oprofile-0.9.3/libregex/demangle_symbol.cpp
---- oprofile-0.9.3-orig/libregex/demangle_symbol.cpp	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/libregex/demangle_symbol.cpp	2008-05-04 18:52:58.000000000 +0200
-@@ -8,6 +8,8 @@
-  * @author John Levon
-  */
- 
-+#include <cstdlib>
-+
- #include "config.h"
- 
- #include "demangle_symbol.h"
-diff -urp oprofile-0.9.3-orig/libutil++/bfd_spu_support.cpp oprofile-0.9.3/libutil++/bfd_spu_support.cpp
---- oprofile-0.9.3-orig/libutil++/bfd_spu_support.cpp	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/libutil++/bfd_spu_support.cpp	2008-05-04 18:52:58.000000000 +0200
-@@ -19,6 +19,7 @@
- #include <fstream>
- #include <sstream>
- #include <string>
-+#include <cstring>
- #include <sys/types.h>
- 
- struct spu_elf {
-Only in oprofile-0.9.3/libutil++: bfd_spu_support.cpp.orig
-diff -urp oprofile-0.9.3-orig/libutil++/bfd_support.cpp oprofile-0.9.3/libutil++/bfd_support.cpp
---- oprofile-0.9.3-orig/libutil++/bfd_support.cpp	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/libutil++/bfd_support.cpp	2008-05-04 18:52:58.000000000 +0200
-@@ -19,6 +19,8 @@
- #include <fstream>
- #include <sstream>
- #include <string>
-+#include <cstring>
-+#include <cstdlib>
- 
- using namespace std;
- 
-diff -urp oprofile-0.9.3-orig/libutil++/child_reader.cpp oprofile-0.9.3/libutil++/child_reader.cpp
---- oprofile-0.9.3-orig/libutil++/child_reader.cpp	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/libutil++/child_reader.cpp	2008-05-04 18:52:58.000000000 +0200
-@@ -11,10 +11,13 @@
- 
- #include <unistd.h>
- #include <sys/wait.h>
-+#include <limits.h>
- 
- #include <cerrno>
- #include <sstream>
- #include <iostream>
-+#include <cstring>
-+#include <cstdlib>
- 
- #include "op_libiberty.h"
- #include "child_reader.h"
-diff -urp oprofile-0.9.3-orig/libutil++/cverb.cpp oprofile-0.9.3/libutil++/cverb.cpp
---- oprofile-0.9.3-orig/libutil++/cverb.cpp	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/libutil++/cverb.cpp	2008-05-04 18:52:58.000000000 +0200
-@@ -13,6 +13,7 @@
- #include <iostream>
- #include <map>
- #include <string>
-+#include <cstring>
- 
- #include "cverb.h"
- 
-diff -urp oprofile-0.9.3-orig/libutil++/file_manip.cpp oprofile-0.9.3/libutil++/file_manip.cpp
---- oprofile-0.9.3-orig/libutil++/file_manip.cpp	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/libutil++/file_manip.cpp	2008-05-04 18:52:58.000000000 +0200
-@@ -15,6 +15,8 @@
- #include <dirent.h>
- #include <fnmatch.h>
- #include <utime.h>
-+#include <limits.h>
-+#include <stdlib.h>
- 
- #include <cstdio>
- #include <cerrno>
-diff -urp oprofile-0.9.3-orig/libutil++/op_spu_bfd.cpp oprofile-0.9.3/libutil++/op_spu_bfd.cpp
---- oprofile-0.9.3-orig/libutil++/op_spu_bfd.cpp	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/libutil++/op_spu_bfd.cpp	2008-05-04 18:52:58.000000000 +0200
-@@ -14,6 +14,8 @@
- #include <sys/stat.h>
- 
- #include <iostream>
-+#include <cstring>
-+#include <cstdlib>
- 
- #include "op_bfd.h"
- #include "op_libiberty.h"
-Only in oprofile-0.9.3/libutil++: op_spu_bfd.cpp.orig
-diff -urp oprofile-0.9.3-orig/pp/common_option.cpp oprofile-0.9.3/pp/common_option.cpp
---- oprofile-0.9.3-orig/pp/common_option.cpp	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/pp/common_option.cpp	2008-05-04 18:52:58.000000000 +0200
-@@ -12,6 +12,7 @@
- #include <iostream>
- #include <sstream>
- #include <iterator>
-+#include <cstdlib>
- 
- #include "op_config.h"
- #include "locate_images.h"
-diff -urp oprofile-0.9.3-orig/pp/opannotate_options.cpp oprofile-0.9.3/pp/opannotate_options.cpp
---- oprofile-0.9.3-orig/pp/opannotate_options.cpp	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/pp/opannotate_options.cpp	2008-05-04 18:52:58.000000000 +0200
-@@ -13,6 +13,7 @@
- #include <list>
- #include <iterator>
- #include <iostream>
-+#include <cstdlib>
- 
- #include "profile_spec.h"
- #include "arrange_profiles.h"
-diff -urp oprofile-0.9.3-orig/pp/oparchive.cpp oprofile-0.9.3/pp/oparchive.cpp
---- oprofile-0.9.3-orig/pp/oparchive.cpp	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/pp/oparchive.cpp	2008-05-04 18:52:58.000000000 +0200
-@@ -12,6 +12,7 @@
- 
- #include <iostream>
- #include <fstream>
-+#include <cstdlib>
- 
- #include <errno.h>
- #include <string.h>
-diff -urp oprofile-0.9.3-orig/pp/opgprof_options.cpp oprofile-0.9.3/pp/opgprof_options.cpp
---- oprofile-0.9.3-orig/pp/opgprof_options.cpp	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/pp/opgprof_options.cpp	2008-05-04 18:52:58.000000000 +0200
-@@ -13,6 +13,7 @@
- #include <list>
- #include <iterator>
- #include <iostream>
-+#include <cstdlib>
- 
- #include "opgprof_options.h"
- #include "popt_options.h"
-diff -urp oprofile-0.9.3-orig/libabi/tests/abi_test.cpp oprofile-0.9.3/libabi/tests/abi_test.cpp
---- oprofile-0.9.3-orig/libabi/tests/abi_test.cpp	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/libabi/tests/abi_test.cpp	2008-05-23 14:31:44.000000000 +0200
-@@ -17,6 +17,8 @@
- 
- #include <fstream>
- #include <iostream>
-+#include <cstdlib>
-+#include <cstring>
- 
- using namespace std;
- 
-diff -urp oprofile-0.9.3-orig/libregex/tests/regex_test.cpp oprofile-0.9.3/libregex/tests/regex_test.cpp
---- oprofile-0.9.3-orig/libregex/tests/regex_test.cpp	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3/libregex/tests/regex_test.cpp	2008-05-23 14:32:25.000000000 +0200
-@@ -20,6 +20,7 @@
- 
- #include <iostream>
- #include <fstream>
-+#include <cstdlib>
- 
- using namespace std;
- 
diff --git a/dev-util/oprofile/files/oprofile-0.9.4+glibc-2.10.patch b/dev-util/oprofile/files/oprofile-0.9.4+glibc-2.10.patch
deleted file mode 100644
index fa3d5bb53a56..000000000000
--- a/dev-util/oprofile/files/oprofile-0.9.4+glibc-2.10.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: oprofile-0.9.4/configure.in
-===================================================================
---- oprofile-0.9.4.orig/configure.in
-+++ oprofile-0.9.4/configure.in
-@@ -96,6 +96,9 @@ ORIG_SAVE_LIBS="$LIBS"
- dnl advanced glibc features which we need but may not be present
- AC_CHECK_FUNCS(sched_setaffinity perfmonctl)
- 
-+AC_USE_SYSTEM_EXTENSIONS
-+AC_CHECK_DECLS_ONCE([basename])
-+
- AC_CHECK_LIB(popt, poptGetContext,, AC_MSG_ERROR([popt library not found]))
- 
- AX_BINUTILS
diff --git a/dev-util/oprofile/files/oprofile-0.9.4-gcc43.patch b/dev-util/oprofile/files/oprofile-0.9.4-gcc43.patch
deleted file mode 100644
index 2acc961ea05f..000000000000
--- a/dev-util/oprofile/files/oprofile-0.9.4-gcc43.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- libregex/tests/java_test.cpp.old	2008-09-03 00:57:19.357004497 +0200
-+++ libregex/tests/java_test.cpp	2008-09-03 00:57:38.234025373 +0200
-@@ -16,6 +16,7 @@
- 
- #include <iostream>
- #include <fstream>
-+#include <cstdlib>
- 
- using namespace std;
- 
---- libregex/tests/regex_test.cpp.old	2008-09-03 00:55:18.564005266 +0200
-+++ libregex/tests/regex_test.cpp	2008-09-03 00:55:43.576001018 +0200
-@@ -20,6 +20,7 @@
- 
- #include <iostream>
- #include <fstream>
-+#include <cstdlib>
- 
- using namespace std;
- 
---- libabi/tests/abi_test.cpp.old	2005-08-17 21:15:42.000000000 +0200
-+++ libabi/tests/abi_test.cpp	2008-09-03 01:00:04.091003916 +0200
-@@ -17,6 +17,8 @@
- 
- #include <fstream>
- #include <iostream>
-+#include <cstring>
-+#include <cstdlib>
- 
- using namespace std;
- 
diff --git a/dev-util/oprofile/files/oprofile-0.9.4-open.patch b/dev-util/oprofile/files/oprofile-0.9.4-open.patch
deleted file mode 100644
index e8c792629e90..000000000000
--- a/dev-util/oprofile/files/oprofile-0.9.4-open.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libutil++/file_manip.cpp.old	2009-02-07 18:28:59.000000000 +0300
-+++ libutil++/file_manip.cpp	2009-02-07 18:32:24.000000000 +0300
-@@ -44,7 +44,7 @@
- 	if (!in)
- 		return false;
- 
--	int fd = open(destination.c_str(), O_RDWR|O_CREAT);
-+	int fd = open(destination.c_str(), O_RDWR|O_CREAT, 0666);
- 	if (fd < 0)
- 		return false;
- 	close(fd);
diff --git a/dev-util/oprofile/oprofile-0.9.3.ebuild b/dev-util/oprofile/oprofile-0.9.3.ebuild
deleted file mode 100644
index 17c2a3350c5e..000000000000
--- a/dev-util/oprofile/oprofile-0.9.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/oprofile-0.9.3.ebuild,v 1.8 2009/06/05 22:23:27 spock Exp $
-
-EAPI=1
-
-inherit eutils qt3 linux-info
-
-DESCRIPTION="A transparent low-overhead system-wide profiler"
-HOMEPAGE="http://oprofile.sourceforge.net"
-SRC_URI="mirror://sourceforge/oprofile/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ~ppc64 ~sparc x86"
-# IUSE: it also needs kernel sources but all gentoo users have them
-IUSE="qt3"
-DEPEND=">=dev-libs/popt-1.7-r1
-	>=sys-devel/binutils-2.14.90.0.6-r3
-	>=sys-libs/glibc-2.3.2-r1
-	qt3? ( x11-libs/qt:3 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/oprofile-0.9.4-open.patch
-}
-
-src_compile() {
-	local myconf=""
-
-	if use qt3
-	then
-		REALHOME="$HOME"
-		mkdir -p "$T"/fakehome/.kde
-		mkdir -p "$T"/fakehome/.qt
-		export HOME="$T/fakehome"
-		addwrite "${QTDIR}/etc/settings"
-
-		# things that should access the real homedir
-		[ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
-	else
-		myconf="${myconf} --with-qt-dir=/void"
-	fi
-
-	myconf="${myconf} --with-x"
-
-	case ${KV_FULL} in
-	2.2.*|2.4.*) myconf="${myconf} --with-linux=${KV_DIR}";;
-	2.5.*|2.6.*) myconf="${myconf} --with-kernel-support";;
-	*) die "Kernel version '${KV_FULL}' not supported";;
-	esac
-	econf ${myconf} || die "econf failed"
-
-	local mymake=""
-
-	sed -i -e "s,depmod -a,:,g" Makefile
-	emake ${mymake} || die "emake failed"
-}
-
-src_install() {
-	local myinst=""
-
-	myinst="${myinst} MODINSTALLDIR=${D}/lib/modules/${KV_FULL}"
-	make DESTDIR="${D}" ${myinst} install || die "make install failed"
-
-	dodoc ChangeLog* README TODO
-}
-
-pkg_postinst() {
-	if [[ ${ROOT} == / ]] ; then
-		[[ -x /sbin/update-modules ]] && /sbin/update-modules || /sbin/modules-update
-	fi
-
-	echo
-	elog "Now load the oprofile module by running:"
-	elog "  # opcontrol --init"
-	elog "Then read manpages and this html doc:"
-	elog "  /usr/share/doc/oprofile/oprofile.html"
-	echo
-}
diff --git a/dev-util/oprofile/oprofile-0.9.4.ebuild b/dev-util/oprofile/oprofile-0.9.4.ebuild
deleted file mode 100644
index 766c09e788f8..000000000000
--- a/dev-util/oprofile/oprofile-0.9.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/oprofile-0.9.4.ebuild,v 1.8 2009/05/26 20:45:09 flameeyes Exp $
-
-EAPI=1
-
-inherit eutils qt3 linux-info autotools
-
-DESCRIPTION="A transparent low-overhead system-wide profiler"
-HOMEPAGE="http://oprofile.sourceforge.net"
-SRC_URI="mirror://sourceforge/oprofile/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="qt3"
-DEPEND=">=dev-libs/popt-1.7-r1
-	>=sys-devel/binutils-2.14.90.0.6-r3
-	>=sys-libs/glibc-2.3.2-r1
-	qt3? ( x11-libs/qt:3 )"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if ! linux_chkconfig_present OPROFILE; then
-		elog "In order for oprofile to work, you need to configure your kernel"
-		elog "with CONFIG_OPROFILE set to 'm' or 'y'."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-	epatch "${FILESDIR}/${P}-open.patch"
-	epatch "${FILESDIR}/${P}+glibc-2.10.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	local myconf=""
-
-	if use qt3
-	then
-		REALHOME="$HOME"
-		mkdir -p "$T"/fakehome/.kde
-		mkdir -p "$T"/fakehome/.qt
-		export HOME="$T/fakehome"
-		addwrite "${QTDIR}/etc/settings"
-
-		# things that should access the real homedir
-		[ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
-	else
-		myconf="${myconf} --with-qt-dir=/void"
-	fi
-
-	myconf="${myconf} --with-x"
-
-	case ${KV_FULL} in
-	2.2.*|2.4.*) myconf="${myconf} --with-linux=${KV_DIR}";;
-	2.5.*|2.6.*) myconf="${myconf} --with-kernel-support";;
-	*) die "Kernel version '${KV_FULL}' not supported";;
-	esac
-	econf ${myconf} || die "econf failed"
-
-	local mymake=""
-
-	sed -i -e "s,depmod -a,:,g" Makefile
-	emake ${mymake} || die "emake failed"
-}
-
-src_install() {
-	local myinst=""
-
-	myinst="${myinst} MODINSTALLDIR=${D}/lib/modules/${KV_FULL}"
-	make DESTDIR="${D}" ${myinst} htmldir="/usr/share/doc/${PF}" install || die "make install failed"
-
-	dodoc ChangeLog* README TODO
-}
-
-pkg_postinst() {
-	if [[ ${ROOT} == / ]] ; then
-		[[ -x /sbin/update-modules ]] && /sbin/update-modules || /sbin/modules-update
-	fi
-
-	echo
-	elog "Now load the oprofile module by running:"
-	elog "  # opcontrol --init"
-	elog "Then read manpages and this html doc:"
-	elog "  /usr/share/doc/${PF}/oprofile.html"
-	echo
-}
diff --git a/dev-util/oprofile/oprofile-0.9.5.ebuild b/dev-util/oprofile/oprofile-0.9.5.ebuild
deleted file mode 100644
index f6dcc7a01283..000000000000
--- a/dev-util/oprofile/oprofile-0.9.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/oprofile-0.9.5.ebuild,v 1.1 2009/08/02 22:57:48 spock Exp $
-
-EAPI=1
-
-inherit qt3 linux-info
-
-DESCRIPTION="A transparent low-overhead system-wide profiler"
-HOMEPAGE="http://oprofile.sourceforge.net"
-SRC_URI="mirror://sourceforge/oprofile/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="qt3"
-DEPEND=">=dev-libs/popt-1.7-r1
-	>=sys-devel/binutils-2.14.90.0.6-r3
-	>=sys-libs/glibc-2.3.2-r1
-	qt3? ( x11-libs/qt:3 )"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if ! linux_chkconfig_present OPROFILE; then
-		elog "In order for oprofile to work, you need to configure your kernel"
-		elog "with CONFIG_OPROFILE set to 'm' or 'y'."
-	fi
-}
-
-src_compile() {
-	local myconf=""
-
-	if use qt3
-	then
-		REALHOME="$HOME"
-		mkdir -p "$T"/fakehome/.kde
-		mkdir -p "$T"/fakehome/.qt
-		export HOME="$T/fakehome"
-		addwrite "${QTDIR}/etc/settings"
-
-		# things that should access the real homedir
-		[ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
-	else
-		myconf="${myconf} --with-qt-dir=/void"
-	fi
-
-	myconf="${myconf} --with-x"
-
-	case ${KV_FULL} in
-	2.2.*|2.4.*) myconf="${myconf} --with-linux=${KV_DIR}";;
-	2.5.*|2.6.*) myconf="${myconf} --with-kernel-support";;
-	*) die "Kernel version '${KV_FULL}' not supported";;
-	esac
-	econf ${myconf} || die "econf failed"
-
-	local mymake=""
-
-	sed -i -e "s,depmod -a,:,g" Makefile
-	emake ${mymake} || die "emake failed"
-}
-
-src_install() {
-	local myinst=""
-
-	myinst="${myinst} MODINSTALLDIR=${D}/lib/modules/${KV_FULL}"
-	make DESTDIR="${D}" ${myinst} htmldir="/usr/share/doc/${PF}" install || die "make install failed"
-
-	dodoc ChangeLog* README TODO
-}
-
-pkg_postinst() {
-	if [[ ${ROOT} == / ]] ; then
-		[[ -x /sbin/update-modules ]] && /sbin/update-modules || /sbin/modules-update
-	fi
-
-	echo
-	elog "Now load the oprofile module by running:"
-	elog "  # opcontrol --init"
-	elog "Then read manpages and this html doc:"
-	elog "  /usr/share/doc/${PF}/oprofile.html"
-	echo
-}
diff --git a/dev-util/oprofile/oprofile-0.9.6.ebuild b/dev-util/oprofile/oprofile-0.9.6.ebuild
index a2a8a2b91ea5..92992054850c 100644
--- a/dev-util/oprofile/oprofile-0.9.6.ebuild
+++ b/dev-util/oprofile/oprofile-0.9.6.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/oprofile-0.9.6.ebuild,v 1.4 2010/02/04 03:05:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/oprofile-0.9.6.ebuild,v 1.5 2010/02/16 16:45:29 ssuominen Exp $
 
 EAPI=1
-
-inherit qt3 linux-info
+inherit linux-info
 
 DESCRIPTION="A transparent low-overhead system-wide profiler"
 HOMEPAGE="http://oprofile.sourceforge.net"
 SRC_URI="mirror://sourceforge/oprofile/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 hppa ppc ~ppc64 ~sparc x86"
-IUSE="qt3"
+IUSE=""
+
 DEPEND=">=dev-libs/popt-1.7-r1
 	>=sys-devel/binutils-2.14.90.0.6-r3
-	>=sys-libs/glibc-2.3.2-r1
-	qt3? ( x11-libs/qt:3 )"
+	>=sys-libs/glibc-2.3.2-r1"
 
 pkg_setup() {
 	linux-info_pkg_setup
@@ -28,42 +27,26 @@ pkg_setup() {
 }
 
 src_compile() {
-	local myconf=""
-
-	if use qt3
-	then
-		REALHOME="$HOME"
-		mkdir -p "$T"/fakehome/.kde
-		mkdir -p "$T"/fakehome/.qt
-		export HOME="$T/fakehome"
-		addwrite "${QTDIR}/etc/settings"
-
-		# things that should access the real homedir
-		[ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
-	else
-		myconf="${myconf} --with-qt-dir=/void"
-	fi
-
-	myconf="${myconf} --with-x"
+	local myconf="--with-qt-dir=/void --with-x"
 
 	case ${KV_FULL} in
 	2.2.*|2.4.*) myconf="${myconf} --with-linux=${KV_DIR}";;
 	2.5.*|2.6.*) myconf="${myconf} --with-kernel-support";;
 	*) die "Kernel version '${KV_FULL}' not supported";;
 	esac
-	econf ${myconf} || die "econf failed"
+	econf ${myconf} || die
 
 	local mymake=""
 
 	sed -i -e "s,depmod -a,:,g" Makefile
-	emake ${mymake} || die "emake failed"
+	emake ${mymake} || die
 }
 
 src_install() {
 	local myinst=""
 
 	myinst="${myinst} MODINSTALLDIR=${D}/lib/modules/${KV_FULL}"
-	make DESTDIR="${D}" ${myinst} htmldir="/usr/share/doc/${PF}" install || die "make install failed"
+	make DESTDIR="${D}" ${myinst} htmldir="/usr/share/doc/${PF}" install || die
 
 	dodoc ChangeLog* README TODO
 }