diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-06-17 15:24:18 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-06-17 15:24:18 +0000 |
| commit | 9114a18207aa9ed629588a64853e628658ceb7b7 (patch) | |
| tree | a7179f2f06ec5c9a57e3b76fb1df99d786372cfc /dev-qt | |
| parent | Version bump. (diff) | |
| download | gentoo-2-9114a18207aa9ed629588a64853e628658ceb7b7.tar.gz gentoo-2-9114a18207aa9ed629588a64853e628658ceb7b7.tar.bz2 gentoo-2-9114a18207aa9ed629588a64853e628658ceb7b7.zip | |
Version bump.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtwidgets/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-qt/qtwidgets/metadata.xml | 4 | ||||
| -rw-r--r-- | dev-qt/qtwidgets/qtwidgets-5.4.2.ebuild (renamed from dev-qt/qtwidgets/qtwidgets-5.4.1.ebuild) | 27 |
3 files changed, 15 insertions, 24 deletions
diff --git a/dev-qt/qtwidgets/ChangeLog b/dev-qt/qtwidgets/ChangeLog index 8a6d31ac51aa..d1798386f001 100644 --- a/dev-qt/qtwidgets/ChangeLog +++ b/dev-qt/qtwidgets/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-qt/qtwidgets # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/ChangeLog,v 1.16 2015/05/16 10:26:06 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/ChangeLog,v 1.17 2015/06/17 15:24:18 pesa Exp $ + +*qtwidgets-5.4.2 (17 Jun 2015) + + 17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtwidgets-5.4.2.ebuild, + -qtwidgets-5.4.1.ebuild, metadata.xml: + Version bump. 16 May 2015; Jeroen Roovers <jer@gentoo.org> qtwidgets-5.4.1.ebuild: Mark ~ppc64 too. diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml index 1fed4b142e53..4727795ad761 100644 --- a/dev-qt/qtwidgets/metadata.xml +++ b/dev-qt/qtwidgets/metadata.xml @@ -3,12 +3,12 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="gles2">Use OpenGL ES 2.0 instead of desktop OpenGL</flag> + <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag> <flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active GTK+ theme</flag> </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> - <doc>http://qt-project.org/doc/</doc> + <doc>http://doc.qt.io/</doc> </upstream> </pkgmetadata> diff --git a/dev-qt/qtwidgets/qtwidgets-5.4.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.4.2.ebuild index c034198e5fc3..f640aa9c8c95 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.4.1.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-5.4.2.ebuild @@ -1,30 +1,23 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/qtwidgets-5.4.1.ebuild,v 1.5 2015/05/16 10:26:06 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/qtwidgets-5.4.2.ebuild,v 1.1 2015/06/17 15:24:18 pesa Exp $ EAPI=5 - QT5_MODULE="qtbase" - inherit qt5-build DESCRIPTION="Set of UI elements for creating classic desktop-style user interfaces for the Qt5 framework" -if [[ ${QT5_BUILD_TYPE} == live ]]; then - KEYWORDS="~ppc64" -else +if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" fi # keep IUSE defaults in sync with qtgui -IUSE="gles2 gtkstyle +opengl +png +xcb" -REQUIRED_USE=" - gles2? ( opengl ) -" +IUSE="gles2 gtkstyle +png +xcb" DEPEND=" - ~dev-qt/qtcore-${PV}[debug=] - ~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,opengl=,png=,xcb?] + ~dev-qt/qtcore-${PV} + ~dev-qt/qtgui-${PV}[gles2=,gtkstyle=,png=,xcb?] " RDEPEND="${DEPEND}" @@ -38,17 +31,9 @@ QT5_GENTOO_CONFIG=( ) src_configure() { - local gl="-no-opengl" - if use gles2; then - gl="-opengl es2" - elif use opengl; then - gl="-opengl desktop" - fi - local myconf=( - # copied from qtgui - ${gl} $(qt_use gtkstyle) + -opengl $(usex gles2 es2 desktop) $(qt_use png libpng system) $(qt_use xcb xcb system) $(qt_use xcb xkbcommon system) |