Make amdcccle optional since it depends on qt4

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 26 insertions, 12 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 6b6eac86a99f..fa608a1ccfe2 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.210 2010/03/21 12:42:44 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.211 2010/03/23 23:15:28 lu_zero Exp $
+
+  23 Mar 2010; Luca Barbato <lu_zero@gentoo.org> metadata.xml,
+  ati-drivers-8.721.ebuild:
+  Make amdcccle optional in the beta ebuild, thanks to Enrico again for the
+  proposed patch
 
 *ati-drivers-8.721 (21 Mar 2010)
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.721.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.721.ebuild
index de4a00b7b692..1b7bb461db38 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.721.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.721.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.721.ebuild,v 1.1 2010/03/21 12:42:44 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.721.ebuild,v 1.2 2010/03/23 23:15:28 lu_zero Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://launchpad.net/ubuntu/lucid/+source/fglrx-installer/2:${PV}-0ubuntu2/+files/fglrx-installer_${PV}.orig.tar.gz"
 	FOLDER_PREFIX=""
 fi
-IUSE="debug +modules multilib"
+IUSE="debug +modules multilib qt4"
 
 LICENSE="AMD GPL-2 QPL-1.0 as-is"
 KEYWORDS="~amd64 ~x86"
@@ -30,6 +30,7 @@ RDEPEND="
 	>=app-admin/eselect-opengl-1.0.7
 	sys-power/acpid
 	x11-apps/xauth
+	qt4? ( x11-libs/qt-gui )
 	>=x11-base/xorg-server-1.7
 	!<x11-base/xorg-server-1.7
 	x11-libs/libXinerama
@@ -239,6 +240,9 @@ src_prepare() {
 		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
 		|| die "bin rm failed"
 
+	# in this version amdcccle isn't static, thus we depend on qt4
+	use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle
+
 	# ACPI fixups
 	sed -i \
 		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
@@ -407,15 +411,15 @@ src_install() {
 	# Just the atigetsysteminfo.sh script.
 	into /usr
 	dosbin ${FOLDER_PREFIX}usr/sbin/* || die
-
-	# data files for the control panel.
-	insinto /usr/share
-	doins -r ${FOLDER_PREFIX}usr/share/ati || die
-	insinto /usr/share/pixmaps
-	doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm || die
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
+	if use qt4; then
+		# data files for the control panel.
+		insinto /usr/share
+		doins -r ${FOLDER_PREFIX}usr/share/ati || die
+		insinto /usr/share/pixmaps
+		doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm || die
+		make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
+			ccc_large System
+	fi
 	# doc.
 	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx || die
 
diff --git a/x11-drivers/ati-drivers/metadata.xml b/x11-drivers/ati-drivers/metadata.xml
index eee0c2c2b163..c3c2f06ceec6 100644
--- a/x11-drivers/ati-drivers/metadata.xml
+++ b/x11-drivers/ati-drivers/metadata.xml
@@ -6,6 +6,11 @@
 		<email>lu_zero@gentoo.org</email>
 	</maintainer>
 	<use>
+		<flag name='qt4'>
+			Install qt4 dependent optional tools (e.g Catalyst Control Panel)
+		</flag>
+	</use>
+	<use>
 		<flag name='modules'>Build the kernel modules</flag>
 	</use>
 </pkgmetadata>