Make amdcccle optional since it depends on qt4

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 29 insertions, 15 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/Manifest b/x11-drivers/ati-drivers/Manifest
index 886bcc9b04ed..7e9f11ca3d44 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -19,9 +19,9 @@ EBUILD ati-drivers-10.1.ebuild 18409 RMD160 faa029fcb5513a974ffcd358c316a9b1f5ad
 EBUILD ati-drivers-10.2.ebuild 18409 RMD160 5e74a47b314128ba4c2e5397992607f86764f081 SHA1 e9695670e2a069fcab9fb2afb68a0714db4636ed SHA256 1d0078fa500754acf1502c6b237ef6e3f4c5a8ed716562c0203127078cd6b88d
 EBUILD ati-drivers-8.552-r2.ebuild 15154 RMD160 d41da317a256df7ea94aa8a206748f4e1ec484ca SHA1 90909da4f960af12bbdbe99f3cbf368997a6ed40 SHA256 93f3685069866522dcad08f04d67f3a160d01455d63c1b051a39d6eca676c34e
 EBUILD ati-drivers-8.593.ebuild 15053 RMD160 a3dbfe4c37711b94c32de563565b420688f6fe36 SHA1 fe5d8f8fef80e6c1ab2c86b1e5839ca19fddd36a SHA256 7eeb0a77548c4e21eaa8be827009e1ee9907c8a28977af31267d83ca1b43010e
-EBUILD ati-drivers-8.721.ebuild 18449 RMD160 5577de5e387681d908497306fe72eef7d95930ba SHA1 f9e5bbe3a69ee76caf1d2e88b6b2b90d2a8a8db7 SHA256 7ceec0b01d9f36c8d94758a5ba2c4bb5b460476281511a5dc77e4a9f03cb8563
+EBUILD ati-drivers-8.721.ebuild 18623 RMD160 dc247b60febbad51ff86843657d3dec8a7b8f59f SHA1 ced0992fee51a7e0f84350d6d5b44df42c5c3ce3 SHA256 d5007606b4be98f41cedde862d8ec7d56c5ba9b1bf19784596e75c2b0454f6b1
 EBUILD ati-drivers-9.10.ebuild 18465 RMD160 921e8a7b9352b51e429dc13c7dda185028daa938 SHA1 f9a761b857f2ec488ee798ff0fdfc03707199a34 SHA256 9e1f002bd754995363656614314ba360c057553a4b5409b6d89c16da5364d678
 EBUILD ati-drivers-9.11.ebuild 18497 RMD160 a2788516d46415227ecbc0e2087f8c472521b03a SHA1 bffc3035e7585be1638d08780079d68143c3ebde SHA256 68afcef3ca9afd30211f0e1539b209e9b3d4d5a4188c300b3ca6fc52d8ac27c1
 EBUILD ati-drivers-9.9-r2.ebuild 18603 RMD160 478de170d9064ac958ceabaf54b5c26a8239a484 SHA1 138aa96fff22f473cb91a84cd317562879976e2c SHA256 2a29c232d71a4b379af7bbd6e58f45fee1e799ad31df388c76775785932db35f
-MISC ChangeLog 62960 RMD160 2857d07bf73bb78dffba3e72387adff6228461c0 SHA1 e91d7a13b3b6104d537fed996334d3f0a8eb07db SHA256 bfedbe2be63de71a9bf69c9121df17169538471f03bfbc11a57b42b5ae1aa29a
-MISC metadata.xml 292 RMD160 b7147d33f577e620cc3619c33e4998d934db4ae3 SHA1 50d77810085e2dd55517ffae1882619b774844e0 SHA256 dca87597dda4c00f1252c7ae492afb80e1e026a4ec2a1ab025a7f6af52cd0429
+MISC ChangeLog 63145 RMD160 109fbae8cb8eeedcedd5fa8fd519d953d189e97a SHA1 3bdb15716ff5024947902cdde1da354aa30290e0 SHA256 6ef1ae05f155735a0295b80ce9cedb3b4d2ca280c0caf0a8d83cd55f0d06411e
+MISC metadata.xml 406 RMD160 4350052ec01b1d9697733e9d2a745a1c5d0662cd SHA1 595532748b12106a7d2fc8cf360fdb8bfb1bbe3a SHA256 3967bf8a649d675ca070ce281343d1a7f6dc524661658bcee50b35b55157e814
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>