summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-10-29 22:41:46 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2017-10-31 00:31:39 +0100
commit8981c67d9d80acc30c10c36c7b432c07937e3b78 (patch)
tree6ff2037d8ebca2a5f8f8bd53b383f13b8ebd9e5a /dev-qt/qtgui
parentdev-util/automoc: De-stabilise hppa (diff)
downloadgentoo-8981c67d9d80acc30c10c36c7b432c07937e3b78.tar.gz
gentoo-8981c67d9d80acc30c10c36c7b432c07937e3b78.tar.bz2
gentoo-8981c67d9d80acc30c10c36c7b432c07937e3b78.zip
dev-qt: Drop Qt 5.6.2, de-stabilise hppa
Closes: https://github.com/gentoo/gentoo/pull/6077 Package-Manager: Portage-2.3.13, Repoman-2.3.4
Diffstat (limited to 'dev-qt/qtgui')
-rw-r--r--dev-qt/qtgui/Manifest1
-rw-r--r--dev-qt/qtgui/qtgui-4.8.7.ebuild2
-rw-r--r--dev-qt/qtgui/qtgui-5.6.2.ebuild174
3 files changed, 1 insertions, 176 deletions
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index f5259bbe8e83..cd5573813d5c 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,5 +1,4 @@
DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtbase-opensource-src-5.6.2.tar.xz 46825164 SHA256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 SHA512 ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321 WHIRLPOOL 4a68aae4e471b0cfac3abf3652bb18cac8ffce17c941c8589a154bf07eb8d26945fab535f2e1acb866a584584c1811e953aa19fb1b3709831d85a620f0b6dc5a
DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682
DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95
DIST qtgui-systemtrayicon-plugin-system.patch 51377 SHA256 e8582ebb2a5db99bf85789585516459ace42fc2b57fc7d5ff6156a2819bda282 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679 WHIRLPOOL 03cc247a2a0e3b77fc541fa0b47abb125c8f7b304037f2067488861f12fdab25d3b3b3a7cf90626c229aa85a2d43ae4319c0f838b6eeb5ecdfe838a365ed8a58
diff --git a/dev-qt/qtgui/qtgui-4.8.7.ebuild b/dev-qt/qtgui/qtgui-4.8.7.ebuild
index dda69ac8593d..cb2eede7312f 100644
--- a/dev-qt/qtgui/qtgui-4.8.7.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.7.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="The GUI module for the Qt toolkit"
SRC_URI+=" https://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
fi
IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
diff --git a/dev-qt/qtgui/qtgui-5.6.2.ebuild b/dev-qt/qtgui/qtgui-5.6.2.ebuild
deleted file mode 100644
index da1e04dd3df2..000000000000
--- a/dev-qt/qtgui/qtgui-5.6.2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-# TODO: linuxfb
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
- ibus jpeg libinput +png tslib tuio +udev +xcb"
-REQUIRED_USE="
- || ( eglfs xcb )
- accessibility? ( dbus xcb )
- eglfs? ( egl )
- ibus? ( dbus )
- libinput? ( udev )
- xcb? ( gles2? ( egl ) )
-"
-
-RDEPEND="
- dev-libs/glib:2
- ~dev-qt/qtcore-${PV}
- media-libs/fontconfig
- >=media-libs/freetype-2.6.1:2
- >=media-libs/harfbuzz-1.0.6:=
- >=sys-libs/zlib-1.2.5
- virtual/opengl
- dbus? ( ~dev-qt/qtdbus-${PV} )
- egl? ( media-libs/mesa[egl] )
- eglfs? (
- media-libs/mesa[gbm]
- x11-libs/libdrm
- )
- evdev? ( sys-libs/mtdev )
- gtkstyle? (
- x11-libs/gtk+:2
- x11-libs/pango
- !!x11-libs/cairo[qt4]
- )
- gles2? ( media-libs/mesa[gles2] )
- jpeg? ( virtual/jpeg:0 )
- libinput? (
- dev-libs/libinput:=
- x11-libs/libxkbcommon
- )
- png? ( media-libs/libpng:0= )
- tslib? ( x11-libs/tslib )
- tuio? ( ~dev-qt/qtnetwork-${PV} )
- udev? ( virtual/libudev:= )
- xcb? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libXi-1.7.4
- x11-libs/libXrender
- >=x11-libs/libxcb-1.10:=[xkb]
- >=x11-libs/libxkbcommon-0.4.1[X]
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
-"
-DEPEND="${RDEPEND}
- evdev? ( sys-kernel/linux-headers )
- udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
- ibus? ( app-i18n/ibus )
-"
-
-QT5_TARGET_SUBDIRS=(
- src/gui
- src/openglextensions
- src/platformheaders
- src/platformsupport
- src/plugins/generic
- src/plugins/imageformats
- src/plugins/platforms
- src/plugins/platforminputcontexts
- src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
- accessibility:accessibility-atspi-bridge
- egl
- eglfs
- eglfs:eglfs_egldevice:
- eglfs:eglfs_gbm:
- evdev
- evdev:mtdev:
- :fontconfig
- :system-freetype:FREETYPE
- !:no-freetype:
- !gif:no-gif:
- gles2::OPENGL_ES
- gles2:opengles2:OPENGL_ES_2
- gtkstyle:gtkstyle:
- gtkstyle:gtk2:STYLE_GTK
- !:no-gui:
- :system-harfbuzz:HARFBUZZ
- !:no-harfbuzz:
- jpeg:system-jpeg:IMAGEFORMAT_JPEG
- !jpeg:no-jpeg:
- libinput
- libinput:xkbcommon-evdev:
- :opengl
- png:png:
- png:system-png:IMAGEFORMAT_PNG
- !png:no-png:
- tslib
- udev:libudev:
- xcb:xcb:
- xcb:xcb-glx:
- xcb:xcb-plugin:
- xcb:xcb-render:
- xcb:xcb-sm:
- xcb:xcb-xlib:
- xcb:xinput2:
- xcb::XKB
- xcb:xrender
-)
-
-src_prepare() {
- # egl_x11 is activated when both egl and xcb are enabled
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
-
- # avoid automagic dep on qtdbus
- use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
- src/platformsupport/platformsupport.pro || die
-
- qt_use_disable_mod ibus dbus \
- src/plugins/platforminputcontexts/platforminputcontexts.pro
-
- # avoid automagic dep on qtnetwork
- use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \
- src/plugins/generic/generic.pro || die
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- local myconf=(
- $(usex dbus -dbus-linked '')
- $(qt_use egl)
- $(qt_use eglfs)
- $(usex eglfs '-gbm -kms' '')
- $(qt_use evdev)
- $(qt_use evdev mtdev)
- -fontconfig
- -system-freetype
- $(usex gif '' -no-gif)
- $(qt_use gtkstyle)
- -system-harfbuzz
- $(qt_use jpeg libjpeg system)
- $(qt_use libinput)
- $(qt_use libinput xkbcommon-evdev)
- -opengl $(usex gles2 es2 desktop)
- $(qt_use png libpng system)
- $(qt_use tslib)
- $(qt_use udev libudev)
- $(qt_use xcb xcb system)
- $(qt_use xcb xkbcommon-x11 system)
- $(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
- )
- qt5-build_src_configure
-}