[gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     78b0c9299ff3a798ad42fab97f60a0abb7693b00
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue May 22 14:07:50 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May 22 14:07:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=78b0c929

[x11-libs/qt-core] Updates for 4.8.2.

  * Pass -no-openvg to configure.
  * Link to openssl at build-time if USE=ssl is enabled, instead of
    relying on run-time loading.

---
 x11-libs/qt-core/qt-core-4.8.9999.ebuild |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index 2341b70..18b773a 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -21,7 +21,7 @@ DEPEND="
 	icu? ( >=dev-libs/icu-49 )
 	ssl? ( dev-libs/openssl )
 	!<x11-libs/cairo-1.10.2-r2
-	!<x11-libs/qt-4.4.0:4
+	!x11-libs/qt:4
 "
 RDEPEND="${DEPEND}"
 PDEPEND="
@@ -94,14 +94,14 @@ src_configure() {
 		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
 		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
 		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
-		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg
 		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
 		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
 		$(qt_use glib)
 		$(qt_use iconv)
 		$(qt_use icu)
 		$(qt_use optimized-qmake)
-		$(qt_use ssl openssl)
+		$(use ssl && echo -openssl-linked || echo -no-openssl)
 		$(qt_use qt3support)"
 
 	qt4-build_src_configure