--- ati-drivers-8.37.6-r1.ebuild	2007-06-28 14:08:29.000000000 +1000
+++ ati-drivers-8.38.6.ebuild	2007-06-28 15:23:27.000000000 +1000
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.37.6-r1.ebuild,v 1.2 2007/06/17 14:02:12 marienz Exp $
 
-IUSE="acpi qt3 multilib"
+IUSE="acpi multilib"
 
 inherit eutils multilib linux-mod toolchain-funcs versionator
 
@@ -11,7 +11,7 @@
 ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
 SRC_URI="${ATI_URL}/ati-driver-installer-${PV}-x86.x86_64.run"
 
-LICENSE="ATI GPL-2 QPL-1.0"
+LICENSE="AMD GPL-2 QPL-1.0 as-is"
 KEYWORDS="~amd64 ~x86"
 
 # The portage dep is for COLON_SEPARATED support in env-update.
@@ -26,7 +26,6 @@
 		x11-apps/xauth
 		sys-power/acpid
 	)
-	qt3? ( =x11-libs/qt-3* )
 	>=sys-apps/portage-2.1.1-r1"
 
 DEPEND="${RDEPEND}
@@ -95,12 +94,7 @@
 		die "CONFIG_PARAVIRT enabled"
 	fi
 
-	# xorg-server 1.1 and its prereleases correspond to xorg 7.1.
-	if has_version ">=x11-base/xorg-server-1.0.99"; then
-		BASE_DIR="${S}/x710"
-	else
-		BASE_DIR="${S}/x690"
-	fi
+	BASE_DIR="${S}/x710"
 
 	if use amd64 ; then
 		BASE_DIR="${BASE_DIR}_64a"
@@ -123,7 +117,7 @@
 
 	gunzip common/usr/share/man/man8/atieventsd.8 || die "manpage unzip failed"
 	# These are the userspace utilities that we also have source for.
-	# We rebuild those in ati-drivers-extra.
+	# We rebuild those later.
 	rm \
 		"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
 		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
@@ -157,13 +151,8 @@
 		|| die "MODVERSIONS sed failed"
 	popd >/dev/null
 
-	mkdir panel extra || die "mkdirs failed"
+	mkdir extra || die "mkdirs failed"
 	# The ./ in these unpacks is required (or unpack looks in ${DISTDIR})
-	if use qt3; then
-		cd panel
-		unpack ./../common/usr/src/ati/fglrx_panel_sources.tgz
-		cd ..
-	fi
 	cd extra
 	unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
 	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
@@ -202,13 +191,6 @@
 		-I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \
 		fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
 		|| die "fglrx_gamma util build failed"
-
-	if use qt3; then
-		einfo "Building the QT panel"
-		cd "${S}"/panel
-		emake CDEBFLAGS="${CFLAGS}" CCDEBFLAGS="${CXXFLAGS}" STRIP=true \
-			|| die "panel build failed"
-	fi
 }
 
 src_install() {
@@ -343,13 +325,6 @@
 	doman extra/programs/fglrx_gamma/fglrx_xgamma.1
 	newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma
 
-	if use qt3; then
-		dobin panel/fireglcontrol
-		make_desktop_entry fireglcontrol 'ATI Control' ati.xpm System
-		insinto /usr/share/pixmaps
-		doins common/usr/share/icons/ati.xpm
-	fi
-
 	# Gentoo-specific stuff:
 
 	if use acpi; then