From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 29F431382C5 for ; Sat, 3 Mar 2018 20:20:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2BFC0E093D; Sat, 3 Mar 2018 20:20:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7E23E093D for ; Sat, 3 Mar 2018 20:20:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 81F83335C0A for ; Sat, 3 Mar 2018 20:20:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA1111F1 for ; Sat, 3 Mar 2018 20:20:29 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1520108209.635465968fb08d5da2d318b47cc5ffd35198a700.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtgui/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtgui/qtgui-5.9.4-r1.ebuild dev-qt/qtgui/qtgui-5.9.4-r2.ebuild X-VCS-Directories: dev-qt/qtgui/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 635465968fb08d5da2d318b47cc5ffd35198a700 X-VCS-Branch: master Date: Sat, 3 Mar 2018 20:20:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3bd94507-f552-488d-8aec-b441a51454b4 X-Archives-Hash: 005e28c62c8b33da4678b4f7c73128fd commit: 635465968fb08d5da2d318b47cc5ffd35198a700 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Mar 3 20:15:33 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 3 20:16:49 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63546596 dev-qt/qtgui: Drop 5.9.4-r{1,2} Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-qt/qtgui/qtgui-5.9.4-r1.ebuild | 173 ------------------------------------ dev-qt/qtgui/qtgui-5.9.4-r2.ebuild | 174 ------------------------------------- 2 files changed, 347 deletions(-) diff --git a/dev-qt/qtgui/qtgui-5.9.4-r1.ebuild b/dev-qt/qtgui/qtgui-5.9.4-r1.ebuild deleted file mode 100644 index 97069b8f2c4..00000000000 --- a/dev-qt/qtgui/qtgui-5.9.4-r1.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2018 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 ibus - jpeg +libinput +png tslib tuio +udev vnc +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 ) - 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:= ) - vnc? ( ~dev-qt/qtnetwork-${PV} ) - xcb? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - >=x11-libs/libXi-1.7.5 - >=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 ) -" - -PATCHES=( - "${FILESDIR}/${P}-qsimpledrag.patch" # QTBUG-66103 -) - -QT5_TARGET_SUBDIRS=( - src/gui - src/openglextensions - src/platformheaders - src/platformsupport - src/plugins/generic - src/plugins/imageformats - src/plugins/platforms - src/plugins/platforminputcontexts -) - -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 - !: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 -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :gui -) - -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) - - qt_use_disable_config dbus dbus \ - src/platformsupport/themes/genericunix/genericunix.pri - - qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro - - qt_use_disable_mod ibus dbus \ - src/plugins/platforminputcontexts/platforminputcontexts.pro - - use vnc || sed -i -e '/SUBDIRS += vnc/d' \ - src/plugins/platforms/platforms.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) - -gui - -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' '') - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtgui/qtgui-5.9.4-r2.ebuild b/dev-qt/qtgui/qtgui-5.9.4-r2.ebuild deleted file mode 100644 index 35f85253ada..00000000000 --- a/dev-qt/qtgui/qtgui-5.9.4-r2.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2018 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 ibus - jpeg +libinput +png tslib tuio +udev vnc +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 ) - 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:= ) - vnc? ( ~dev-qt/qtnetwork-${PV} ) - xcb? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - >=x11-libs/libXi-1.7.5 - >=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 ) -" - -PATCHES=( - "${FILESDIR}/${P}-qsimpledrag.patch" # QTBUG-66103 - "${FILESDIR}/${P}-libinput-pixeldelta.patch" # QTBUG-59261 -) - -QT5_TARGET_SUBDIRS=( - src/gui - src/openglextensions - src/platformheaders - src/platformsupport - src/plugins/generic - src/plugins/imageformats - src/plugins/platforms - src/plugins/platforminputcontexts -) - -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 - !: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 -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :gui -) - -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) - - qt_use_disable_config dbus dbus \ - src/platformsupport/themes/genericunix/genericunix.pri - - qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro - - qt_use_disable_mod ibus dbus \ - src/plugins/platforminputcontexts/platforminputcontexts.pro - - use vnc || sed -i -e '/SUBDIRS += vnc/d' \ - src/plugins/platforms/platforms.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) - -gui - -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' '') - ) - qt5-build_src_configure -}