Depend on cairo[-qt4] if gtkstyle is enabled, wrt bug 454066. Remove dead code in pkg_setup.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)

2 files changed, 11 insertions, 24 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index e36c2bf66b71..be34c65d3579 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.226 2013/02/10 23:50:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.227 2013/02/11 09:44:48 pesa Exp $
+
+  11 Feb 2013; Davide Pesavento <pesa@gentoo.org> qt-gui-4.8.4-r1.ebuild:
+  Depend on cairo[-qt4] if gtkstyle is enabled, wrt bug 454066. Remove dead code
+  in pkg_setup.
 
   10 Feb 2013; Jeroen Roovers <jer@gentoo.org> qt-gui-4.8.4-r1.ebuild:
   Stable for HPPA (bug #455884).
diff --git a/x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild
index bee6af1967da..710a4b14c657 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild,v 1.7 2013/02/10 23:50:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild,v 1.8 2013/02/11 09:44:48 pesa Exp $
 
 EAPI=4
 
@@ -19,6 +19,7 @@ REQUIRED_USE="
 	gtkstyle? ( glib )
 "
 
+# cairo[-qt4] is needed because of bug 454066
 RDEPEND="
 	app-admin/eselect-qtgraphicssystem
 	media-libs/fontconfig
@@ -43,7 +44,10 @@ RDEPEND="
 	cups? ( net-print/cups )
 	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
 	egl? ( media-libs/mesa[egl] )
-	gtkstyle? ( x11-libs/gtk+:2[aqua=] )
+	gtkstyle? (
+		x11-libs/cairo[-qt4]
+		x11-libs/gtk+:2[aqua=]
+	)
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )
 	tiff? ( media-libs/tiff:0 )
@@ -64,27 +68,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-	# this belongs to pkg_pretend, we have to upgrade to EAPI 4 :)
-	# was planning to use a dep, but to reproduce this you have to
-	# clean-emerge qt-gui[gtkstyle] while having cairo[qt4] installed.
-	# no need to restrict normal first time users for that :)
-	if use gtkstyle && ! has_version x11-libs/qt-gui && has_version x11-libs/cairo[qt4]; then
-		echo
-		eerror "When building qt-gui[gtkstyle] from scratch with cairo present,"
-		eerror "cairo must have the qt4 use flag disabled, otherwise the gtk"
-		eerror "style cannot be built."
-		ewarn
-		eerror "You have the following options:"
-		eerror "  - rebuild cairo with -qt4 USE"
-		eerror "  - build qt-gui with -gtkstyle USE"
-		ewarn
-		eerror "After you successfully install qt-gui, you'll be able to"
-		eerror "re-enable the disabled use flag and/or reinstall cairo."
-		ewarn
-		echo
-		die "can't build ${PN} with USE=gtkstyle if cairo has 'qt4' USE flag enabled"
-	fi
-
 	QT4_TARGET_DIRECTORIES="
 		src/gui
 		src/scripttools