commit: 3f9f3082c2a56e007c27483fb5e3eada906b7de5
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 17:52:21 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 17:52:21 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=3f9f3082
dev-qt: drop all Qt4 live ebuilds
The 4.8 branch is completely locked down except for security fixes
which we will backport to 4.8.7 anyway. Therefore the live ebuilds
for Qt4 have no use case, and keeping them just creates confusion.
Documentation/package.keywords/qt4-live | 24 ---
dev-qt/assistant/assistant-4.8.9999.ebuild | 54 -------
.../assistant/files/assistant-4.8.2+gcc-4.7.patch | 12 --
dev-qt/assistant/files/disable-webkit.patch | 26 ----
dev-qt/designer/designer-4.8.9999.ebuild | 58 -------
dev-qt/linguist/linguist-4.8.9999.ebuild | 40 -----
dev-qt/pixeltool/pixeltool-4.8.9999.ebuild | 33 ----
dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild | 40 -----
dev-qt/qt3support/metadata.xml | 13 --
dev-qt/qt3support/qt3support-4.8.9999.ebuild | 34 -----
dev-qt/qtbearer/metadata.xml | 13 --
dev-qt/qtbearer/qtbearer-4.8.9999.ebuild | 44 ------
...ExcludeSocketNotifiers-in-glib-event-loop.patch | 81 ----------
.../qtcore-4.8.5-moc-boost-lexical-cast.patch | 12 --
.../qtcore-4.8.5-qeventdispatcher-recursive.patch | 94 ------------
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 92 ------------
.../qtdbus-4.7-qdbusintegrator-no-const.patch | 11 --
...bus-4.8.4-qdbusconnection-silence-warning.patch | 14 --
dev-qt/qtdbus/qtdbus-4.8.9999.ebuild | 41 -----
dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild | 52 -------
dev-qt/qtdemo/files/qt-demo-4.6-plugandpaint.patch | 13 --
dev-qt/qtdemo/metadata.xml | 21 ---
dev-qt/qtdemo/qtdemo-4.8.9999.ebuild | 97 ------------
dev-qt/qtgui/Manifest | 1 -
dev-qt/qtgui/files/qtgui-4.7.3-cups.patch | 84 -----------
.../qtgui-4.8.5-disable-gtk-theme-check.patch | 22 ---
.../qtgui/files/qtgui-4.8.5-qclipboard-delay.patch | 33 ----
dev-qt/qtgui/qtgui-4.8.9999.ebuild | 167 ---------------------
dev-qt/qthelp/Manifest | 2 -
.../qthelp/files/qthelp-4.8.6-compat-install.patch | 35 -----
.../qthelp/files/qthelp-4.8.6-compat-syncqt.patch | 25 ---
dev-qt/qthelp/qthelp-4.8.9999.ebuild | 112 --------------
.../files/qtmultimedia-4.8.0-alsa.patch | 25 ---
dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild | 44 ------
dev-qt/qtopengl/qtopengl-4.8.9999.ebuild | 46 ------
dev-qt/qtopenvg/metadata.xml | 13 --
dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild | 43 ------
dev-qt/qtphonon/metadata.xml | 15 --
dev-qt/qtphonon/qtphonon-4.8.9999.ebuild | 51 -------
dev-qt/qtscript/qtscript-4.8.9999.ebuild | 37 -----
dev-qt/qtsql/qtsql-4.8.9999.ebuild | 60 --------
dev-qt/qtsvg/qtsvg-4.8.9999.ebuild | 43 ------
dev-qt/qttest/qttest-4.8.9999.ebuild | 33 ----
.../qttranslations/qttranslations-4.8.9999.ebuild | 41 -----
.../qtwebkit/files/4.8.2-javascriptcore-x32.patch | 11 --
dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild | 76 ----------
dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild | 34 -----
sets/qt4-live | 27 ----
48 files changed, 1999 deletions(-)
diff --git a/Documentation/package.keywords/qt4-live
b/Documentation/package.keywords/qt4-live
deleted file mode 100644
index 75cef11..0000000
--- a/Documentation/package.keywords/qt4-live
+++ /dev/null
@@ -1,24 +0,0 @@
-~dev-qt/assistant-4.8.9999 **
-~dev-qt/designer-4.8.9999 **
-~dev-qt/linguist-4.8.9999 **
-~dev-qt/pixeltool-4.8.9999 **
-~dev-qt/qdbusviewer-4.8.9999 **
-~dev-qt/qt3support-4.8.9999 **
-~dev-qt/qtbearer-4.8.9999 **
-~dev-qt/qtcore-4.8.9999 **
-~dev-qt/qtdbus-4.8.9999 **
-~dev-qt/qtdeclarative-4.8.9999 **
-~dev-qt/qtdemo-4.8.9999 **
-~dev-qt/qtgui-4.8.9999 **
-~dev-qt/qthelp-4.8.9999 **
-~dev-qt/qtmultimedia-4.8.9999 **
-~dev-qt/qtopengl-4.8.9999 **
-~dev-qt/qtopenvg-4.8.9999 **
-~dev-qt/qtphonon-4.8.9999 **
-~dev-qt/qtscript-4.8.9999 **
-~dev-qt/qtsql-4.8.9999 **
-~dev-qt/qtsvg-4.8.9999 **
-~dev-qt/qttest-4.8.9999 **
-~dev-qt/qttranslations-4.8.9999 **
-~dev-qt/qtwebkit-4.8.9999 **
-~dev-qt/qtxmlpatterns-4.8.9999 **
diff --git a/dev-qt/assistant/assistant-4.8.9999.ebuild
b/dev-qt/assistant/assistant-4.8.9999.ebuild
deleted file mode 100644
index c2b608e..0000000
--- a/dev-qt/assistant/assistant-4.8.9999.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils qt4-build-multilib
-
-DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-IUSE="webkit"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
-)
-
-QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"
-
-src_prepare() {
- # bug 401173
- use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch")
-
- qt4-build-multilib_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=(
- -system-libpng -system-libjpeg -system-zlib
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2
-no-sql-odbc
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm
-xinput -xkb
- -fontconfig -no-multimedia -no-opengl -no-phonon -no-svg
-no-xmlpatterns
- $(qt_use webkit)
- )
- qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
- qt4_multilib_src_install_all
-
- doicon tools/assistant/tools/assistant/images/assistant.png
- make_desktop_entry assistant Assistant assistant
'Qt;Development;Documentation'
-}
diff --git a/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch
b/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch
deleted file mode 100644
index 1cf7027..0000000
--- a/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- tools/assistant/tools/assistant/mainwindow.cpp 2012-06-27
03:02:37.539564947 +0200
-+++ tools/assistant/tools/assistant/mainwindow.cpp 2012-06-27
03:03:18.843561620 +0200
-@@ -944,8 +944,7 @@ void MainWindow::updateApplicationFont()
- if (helpEngine.usesAppFont())
- font = helpEngine.appFont();
-
-- const QWidgetList &widgets = qApp->allWidgets();
-- foreach (QWidget* widget, widgets)
-+ foreach (QWidget* widget, QApplication::allWidgets())
- widget->setFont(font);
- }
-
diff --git a/dev-qt/assistant/files/disable-webkit.patch
b/dev-qt/assistant/files/disable-webkit.patch
deleted file mode 100644
index 61bca05..0000000
--- a/dev-qt/assistant/files/disable-webkit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index:
qt-everywhere-opensource-src-4.8.9999/tools/assistant/tools/assistant/assistant.pro
-===================================================================
----
qt-everywhere-opensource-src-4.8.9999.orig/tools/assistant/tools/assistant/assistant.pro
-+++
qt-everywhere-opensource-src-4.8.9999/tools/assistant/tools/assistant/assistant.pro
-@@ -2,7 +2,6 @@ include(../../../shared/fontpanel/fontpa
- TEMPLATE = app
- LANGUAGE = C++
- TARGET = assistant
--contains(QT_CONFIG, webkit):QT += webkit
- CONFIG += qt \
- warn_on \
- help
-@@ -81,11 +80,8 @@ SOURCES += aboutdialog.cpp \
- openpageswidget.cpp \
- openpagesmanager.cpp \
- openpagesswitcher.cpp
--contains(QT_CONFIG, webkit) {
-- SOURCES += helpviewer_qwv.cpp
--} else {
-- SOURCES += helpviewer_qtb.cpp
--}
-+
-+SOURCES += helpviewer_qtb.cpp
-
- FORMS += bookmarkdialog.ui \
- bookmarkmanagerwidget.ui \
\ No newline at end of file
diff --git a/dev-qt/designer/designer-4.8.9999.ebuild
b/dev-qt/designer/designer-4.8.9999.ebuild
deleted file mode 100644
index 110f61a..0000000
--- a/dev-qt/designer/designer-4.8.9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils qt4-build-multilib
-
-DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-DESIGNER_PLUGINS="declarative phonon qt3support webkit"
-IUSE="${DESIGNER_PLUGINS} kde"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- declarative? (
~dev-qt/qtdeclarative-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
- phonon? ( !kde? (
~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) )
- qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
)
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="phonon? ( kde? ( media-libs/phonon[designer,qt4] ) )"
-
-QT4_TARGET_DIRECTORIES="tools/designer"
-
-src_prepare() {
- qt4-build-multilib_src_prepare
-
- local plugin
- for plugin in ${DESIGNER_PLUGINS}; do
- if ! use ${plugin} || ( [[ ${plugin} == phonon ]] && use kde );
then
- sed -i -e "/\<${plugin}\>/d" \
- tools/designer/src/plugins/plugins.pro || die
- fi
- done
-}
-
-multilib_src_configure() {
- local myconf=(
- -system-libpng -system-libjpeg -system-zlib
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite
-no-sql-sqlite2 -no-sql-odbc
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm
-xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
- )
- qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
- qt4_multilib_src_install_all
-
- doicon tools/designer/src/designer/images/designer.png
- make_desktop_entry designer Designer designer
'Qt;Development;GUIDesigner'
-}
diff --git a/dev-qt/linguist/linguist-4.8.9999.ebuild
b/dev-qt/linguist/linguist-4.8.9999.ebuild
deleted file mode 100644
index b3d06f1..0000000
--- a/dev-qt/linguist/linguist-4.8.9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils qt4-build-multilib
-
-DESCRIPTION="Graphical tool for translating Qt applications"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="tools/linguist/linguist"
-
-multilib_src_configure() {
- local myconf=(
- -system-libpng -system-libjpeg -system-zlib
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite
-no-sql-sqlite2 -no-sql-odbc
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm
-xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
- )
- qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
- qt4_multilib_src_install_all
-
- newicon tools/linguist/linguist/images/icons/linguist-128-32.png
linguist.png
- make_desktop_entry linguist Linguist linguist
'Qt;Development;Translation'
-}
diff --git a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
deleted file mode 100644
index 43e0a9b..0000000
--- a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="Qt screen magnifier"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- !<dev-qt/qthelp-4.8.5:4
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="tools/pixeltool"
-
-multilib_src_configure() {
- local myconf=(
- -system-libpng -system-libjpeg -system-zlib
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite
-no-sql-sqlite2 -no-sql-odbc
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm
-xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
- )
- qt4_multilib_src_configure
-}
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
deleted file mode 100644
index 77be25a..0000000
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils qt4-build-multilib
-
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and
messages"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
-
-multilib_src_configure() {
- local myconf=(
- -system-libpng -system-libjpeg -system-zlib
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite
-no-sql-sqlite2 -no-sql-odbc
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm
-xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
- )
- qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
- qt4_multilib_src_install_all
-
- newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png
qdbusviewer.png
- make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development'
-}
diff --git a/dev-qt/qt3support/metadata.xml b/dev-qt/qt3support/metadata.xml
deleted file mode 100644
index 258aee1..0000000
--- a/dev-qt/qt3support/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <herd>qt</herd>
- <use>
- <flag name="exceptions">Add support for exceptions - like
catching them
- inside the event loop (recommended by upstream)</flag>
- </use>
- <upstream>
- <bugs-to>https://bugreports.qt.io/</bugs-to>
- <doc>http://doc.qt.io/</doc>
- </upstream>
-</pkgmetadata>
diff --git a/dev-qt/qt3support/qt3support-4.8.9999.ebuild
b/dev-qt/qt3support/qt3support-4.8.9999.ebuild
deleted file mode 100644
index a6035ed..0000000
--- a/dev-qt/qt3support/qt3support-4.8.9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The Qt3Support module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+accessibility"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
-
~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
- src/qt3support
- src/tools/uic3
- tools/porting"
-
-multilib_src_configure() {
- local myconf=(
- -qt3support
- $(qt_use accessibility)
- )
- qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtbearer/metadata.xml b/dev-qt/qtbearer/metadata.xml
deleted file mode 100644
index 258aee1..0000000
--- a/dev-qt/qtbearer/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <herd>qt</herd>
- <use>
- <flag name="exceptions">Add support for exceptions - like
catching them
- inside the event loop (recommended by upstream)</flag>
- </use>
- <upstream>
- <bugs-to>https://bugreports.qt.io/</bugs-to>
- <doc>http://doc.qt.io/</doc>
- </upstream>
-</pkgmetadata>
diff --git a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
deleted file mode 100644
index 1acda2e..0000000
--- a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The network bearer plugins for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="connman networkmanager"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
- networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
)
-"
-RDEPEND="${DEPEND}
- connman? ( net-misc/connman )
- networkmanager? ( net-misc/networkmanager )
-"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/plugins/bearer/generic
- $(use connman && echo src/plugins/bearer/connman)
- $(use networkmanager && echo src/plugins/bearer/networkmanager)"
-}
-
-multilib_src_configure() {
- local myconf=(
- $(use connman || use networkmanager || echo -no-dbus)
- -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-gtkstyle -no-nas-sound -no-opengl
- -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
- )
- qt4_multilib_src_configure
-}
diff --git
a/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch
b/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch
deleted file mode 100644
index 0fcc1fa..0000000
---
a/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 267feb2de49eed0823ca0c29f1cd5238537c7116 Mon Sep 17 00:00:00 2001
-From: Jan-Marek Glogowski <glo...@fbihome.de>
-Date: Thu, 6 Mar 2014 18:44:43 +0100
-Subject: Honor ExcludeSocketNotifiers in glib event loop
-
-Implements QEventLoop::ExcludeSocketNotifiers in the same way
-QEventLoop::X11ExcludeTimers is already implemented for the glib
-event loop.
-
-This prevents crashes when QClipboard checks for clipboard events
-and
- qApp->clipboard()->setProperty( "useEventLoopWhenWaiting", true );
-is set.
-
-Task-number: QTBUG-34614
-Task-number: QTBUG-37380
-
-Change-Id: Id4e2a74c6bdf8c3b439a4e3813d24d11368b607d
----
- src/corelib/kernel/qeventdispatcher_glib.cpp | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp
b/src/corelib/kernel/qeventdispatcher_glib.cpp
-index 0b0e308..ba522fa 100644
---- a/src/corelib/kernel/qeventdispatcher_glib.cpp
-+++ b/src/corelib/kernel/qeventdispatcher_glib.cpp
-@@ -65,6 +65,7 @@ struct GPollFDWithQSocketNotifier
- struct GSocketNotifierSource
- {
- GSource source;
-+ QEventLoop::ProcessEventsFlags processEventsFlags;
- QList<GPollFDWithQSocketNotifier *> pollfds;
- };
-
-@@ -80,6 +81,9 @@ static gboolean socketNotifierSourceCheck(GSource *source)
- GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource
*>(source);
-
- bool pending = false;
-+ if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
-+ return pending;
-+
- for (int i = 0; !pending && i < src->pollfds.count(); ++i) {
- GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
-
-@@ -103,6 +107,9 @@ static gboolean socketNotifierSourceDispatch(GSource
*source, GSourceFunc, gpoin
- QEvent event(QEvent::SockAct);
-
- GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource
*>(source);
-+ if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
-+ return true;
-+
- for (int i = 0; i < src->pollfds.count(); ++i) {
- GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
-
-@@ -331,6 +338,7 @@
QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context)
- reinterpret_cast<GSocketNotifierSource
*>(g_source_new(&socketNotifierSourceFuncs,
-
sizeof(GSocketNotifierSource)));
- (void) new (&socketNotifierSource->pollfds)
QList<GPollFDWithQSocketNotifier *>();
-+ socketNotifierSource->processEventsFlags = QEventLoop::AllEvents;
- g_source_set_can_recurse(&socketNotifierSource->source, true);
- g_source_attach(&socketNotifierSource->source, mainContext);
-
-@@ -416,6 +424,7 @@ bool
QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)
- // tell postEventSourcePrepare() and timerSource about any new flags
- QEventLoop::ProcessEventsFlags savedFlags =
d->timerSource->processEventsFlags;
- d->timerSource->processEventsFlags = flags;
-+ d->socketNotifierSource->processEventsFlags = flags;
-
- if (!(flags & QEventLoop::EventLoopExec)) {
- // force timers to be sent at normal priority
-@@ -427,6 +436,7 @@ bool
QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)
- result = g_main_context_iteration(d->mainContext, canWait);
-
- d->timerSource->processEventsFlags = savedFlags;
-+ d->socketNotifierSource->processEventsFlags = savedFlags;
-
- if (canWait)
- emit awake();
---
-2.0.0
-
diff --git a/dev-qt/qtcore/files/qtcore-4.8.5-moc-boost-lexical-cast.patch
b/dev-qt/qtcore/files/qtcore-4.8.5-moc-boost-lexical-cast.patch
deleted file mode 100644
index b464c92..0000000
--- a/dev-qt/qtcore/files/qtcore-4.8.5-moc-boost-lexical-cast.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: qt-everywhere-opensource-src-4.8.9999/src/tools/moc/main.cpp
-===================================================================
---- qt-everywhere-opensource-src-4.8.9999.orig/src/tools/moc/main.cpp
-+++ qt-everywhere-opensource-src-4.8.9999/src/tools/moc/main.cpp
-@@ -190,6 +190,7 @@ int runMoc(int _argc, char **_argv)
-
- // Workaround a bug while parsing the boost/type_traits/has_operator.hpp
header. See QTBUG-22829
- pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
-+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
-
- QByteArray filename;
- QByteArray output;
diff --git a/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch
b/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch
deleted file mode 100644
index 6d3bf2f..0000000
--- a/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- src/corelib/kernel/qeventdispatcher_glib.cpp.sav 2014-03-28
15:26:37.000000000 +0100
-+++ src/corelib/kernel/qeventdispatcher_glib.cpp 2014-04-24
09:44:09.358659204 +0200
-@@ -255,22 +255,30 @@ struct GPostEventSource
- GSource source;
- QAtomicInt serialNumber;
- int lastSerialNumber;
-+ QEventLoop::ProcessEventsFlags processEventsFlags;
- QEventDispatcherGlibPrivate *d;
- };
-
- static gboolean postEventSourcePrepare(GSource *s, gint *timeout)
- {
-+ GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
- QThreadData *data = QThreadData::current();
- if (!data)
- return false;
-
-+ QEventLoop::ProcessEventsFlags excludeAllFlags
-+ = QEventLoop::ExcludeUserInputEvents
-+ | QEventLoop::ExcludeSocketNotifiers
-+ | QEventLoop::X11ExcludeTimers;
-+ if ((source->processEventsFlags & excludeAllFlags) == excludeAllFlags)
-+ return false;
-+
- gint dummy;
- if (!timeout)
- timeout = &dummy;
- const bool canWait = data->canWaitLocked();
- *timeout = canWait ? -1 : 0;
-
-- GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
- return (!canWait
- || (source->serialNumber != source->lastSerialNumber));
- }
-@@ -284,8 +292,14 @@ static gboolean postEventSourceDispatch(
- {
- GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
- source->lastSerialNumber = source->serialNumber;
-- QCoreApplication::sendPostedEvents();
-- source->d->runTimersOnceWithNormalPriority();
-+ QEventLoop::ProcessEventsFlags excludeAllFlags
-+ = QEventLoop::ExcludeUserInputEvents
-+ | QEventLoop::ExcludeSocketNotifiers
-+ | QEventLoop::X11ExcludeTimers;
-+ if ((source->processEventsFlags & excludeAllFlags) != excludeAllFlags) {
-+ QCoreApplication::sendPostedEvents();
-+ source->d->runTimersOnceWithNormalPriority();
-+ }
- return true; // i dunno, george...
- }
-
-@@ -329,6 +343,7 @@ QEventDispatcherGlibPrivate::QEventDispa
- postEventSource = reinterpret_cast<GPostEventSource
*>(g_source_new(&postEventSourceFuncs,
-
sizeof(GPostEventSource)));
- postEventSource->serialNumber = 1;
-+ postEventSource->processEventsFlags = QEventLoop::AllEvents;
- postEventSource->d = this;
- g_source_set_can_recurse(&postEventSource->source, true);
- g_source_attach(&postEventSource->source, mainContext);
-@@ -423,6 +438,7 @@ bool QEventDispatcherGlib::processEvents
-
- // tell postEventSourcePrepare() and timerSource about any new flags
- QEventLoop::ProcessEventsFlags savedFlags =
d->timerSource->processEventsFlags;
-+ d->postEventSource->processEventsFlags = flags;
- d->timerSource->processEventsFlags = flags;
- d->socketNotifierSource->processEventsFlags = flags;
-
-@@ -435,6 +451,7 @@ bool QEventDispatcherGlib::processEvents
- while (!result && canWait)
- result = g_main_context_iteration(d->mainContext, canWait);
-
-+ d->postEventSource->processEventsFlags = savedFlags;
- d->timerSource->processEventsFlags = savedFlags;
- d->socketNotifierSource->processEventsFlags = savedFlags;
-
---- src/corelib/kernel/qeventdispatcher_unix.cpp.sav 2013-06-07
07:16:52.000000000 +0200
-+++ src/corelib/kernel/qeventdispatcher_unix.cpp 2014-04-24
09:43:06.927589535 +0200
-@@ -905,7 +905,15 @@ bool QEventDispatcherUNIX::processEvents
-
- // we are awake, broadcast it
- emit awake();
-- QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);
-+
-+ QEventLoop::ProcessEventsFlags excludeAllFlags
-+ = QEventLoop::ExcludeUserInputEvents
-+ | QEventLoop::ExcludeSocketNotifiers
-+ | QEventLoop::X11ExcludeTimers;
-+ if ((flags & excludeAllFlags) == excludeAllFlags)
-+ return false;
-+ if(( flags & excludeAllFlags ) != excludeAllFlags )
-+ QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);
-
- int nevents = 0;
- const bool canWait = (d->threadData->canWaitLocked()
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
deleted file mode 100644
index c2d986b..0000000
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+glib iconv icu libressl qt3support ssl"
-
-DEPEND="
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
- iconv? ( >=virtual/libiconv-0-r2[${MULTILIB_USEDEP}] )
- icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}]
)
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
- )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="
- ~dev-qt/qttranslations-${PV}
- qt3support? (
~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] )
-"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/qt4/Qt/qconfig.h
- /usr/include/qt4/QtCore/qconfig.h
-)
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch"
-
"${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch"
# bug 514968
- "${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968
-)
-
-QT4_TARGET_DIRECTORIES="
- src/tools/bootstrap
- src/tools/moc
- src/tools/rcc
- src/tools/uic
- src/corelib
- src/network
- src/xml
- src/plugins/codecs/cn
- src/plugins/codecs/jp
- src/plugins/codecs/kr
- src/plugins/codecs/tw
- tools/linguist/lconvert
- tools/linguist/lrelease
- tools/linguist/lupdate"
-
-QCONFIG_DEFINE="QT_ZLIB"
-
-src_prepare() {
- qt4-build-multilib_src_prepare
-
- # bug 172219
- sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
- -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
- qmake/Makefile.unix || die "sed qmake/Makefile.unix failed"
-
- # bug 427782
- sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
- qmake/Makefile.unix || die "sed CPPFLAGS in qmake/Makefile.unix
failed"
- sed -i -e 's/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set
QMAKE_CFLAGS_RELEASE/' \
- -e 's/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set
QMAKE_CXXFLAGS_RELEASE/' \
- configure || die "sed configure setBootstrapVariable failed"
-}
-
-multilib_src_configure() {
- local myconf=(
- -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-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)
- $(use ssl && echo -openssl-linked || echo -no-openssl)
- $(qt_use qt3support)
- )
- qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtdbus/files/qtdbus-4.7-qdbusintegrator-no-const.patch
b/dev-qt/qtdbus/files/qtdbus-4.7-qdbusintegrator-no-const.patch
deleted file mode 100644
index 086eb47..0000000
--- a/dev-qt/qtdbus/files/qtdbus-4.7-qdbusintegrator-no-const.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dbus/qdbusintegrator.cpp.orig 2011-03-12 02:11:32.313467991 +0100
-+++ src/dbus/qdbusintegrator.cpp 2011-03-12 02:11:03.795809176 +0100
-@@ -71,7 +71,7 @@
- static bool isDebugging;
- #define qDBusDebug if (!::isDebugging); else qDebug
-
--Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString,
(QLatin1String(DBUS_SERVICE_DBUS)))
-+Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString,
(QLatin1String(DBUS_SERVICE_DBUS)))
-
- static inline QString dbusServiceString()
- { return *orgFreedesktopDBusString(); }
diff --git
a/dev-qt/qtdbus/files/qtdbus-4.8.4-qdbusconnection-silence-warning.patch
b/dev-qt/qtdbus/files/qtdbus-4.8.4-qdbusconnection-silence-warning.patch
deleted file mode 100644
index dd3a5a0..0000000
--- a/dev-qt/qtdbus/files/qtdbus-4.8.4-qdbusconnection-silence-warning.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up
qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug.patch
qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp
----
qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug.patch
2012-09-06 02:33:44.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp
2012-09-11 08:55:29.854026815 -0500
-@@ -1109,8 +1109,10 @@ public:
- // make sure this connection is running on the main thread
- QCoreApplication *instance = QCoreApplication::instance();
- if (!instance) {
-+#ifndef QT_NO_DEBUG
- qWarning("QDBusConnection: %s D-Bus connection created before
QCoreApplication. Application may misbehave.",
- type == SessionBus ? "session" : type == SystemBus ?
"system" : "generic");
-+#endif
- } else if (QDBusConnectionPrivate::d(*this)) {
-
QDBusConnectionPrivate::d(*this)->moveToThread(instance->thread());
- }
diff --git a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
deleted file mode 100644
index 1ef3a0b..0000000
--- a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The DBus module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- sys-apps/dbus[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
- "${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch"
-)
-
-QT4_TARGET_DIRECTORIES="
- src/dbus
- tools/qdbus/qdbus
- tools/qdbus/qdbusxml2cpp
- tools/qdbus/qdbuscpp2xml"
-
-QCONFIG_ADD="dbus dbus-linked"
-QCONFIG_DEFINE="QT_DBUS"
-
-multilib_src_configure() {
- local myconf=(
- -dbus-linked
- )
- qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
deleted file mode 100644
index 8079883..0000000
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The Declarative module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+accessibility qt3support webkit"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-
~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
- ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
- ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
- ~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- qt3support? (
~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}] )
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
- src/declarative
- src/imports
- src/plugins/qmltooling
- tools/qml
- tools/qmlplugindump"
-
-QCONFIG_ADD="declarative"
-QCONFIG_DEFINE="QT_DECLARATIVE"
-
-pkg_setup() {
- use webkit && QT4_TARGET_DIRECTORIES+="
- src/3rdparty/webkit/Source/WebKit/qt/declarative"
-}
-
-multilib_src_configure() {
- local myconf=(
- -declarative -no-gtkstyle
- $(qt_use accessibility)
- $(qt_use qt3support)
- $(qt_use webkit)
- )
- qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtdemo/files/qt-demo-4.6-plugandpaint.patch
b/dev-qt/qtdemo/files/qt-demo-4.6-plugandpaint.patch
deleted file mode 100644
index 262996a..0000000
--- a/dev-qt/qtdemo/files/qt-demo-4.6-plugandpaint.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/examples/tools/plugandpaint/plugandpaint.pro
b/examples/tools/plugandpaint/plugandpaint.pro
-index 9616eb8..e188bc1 100644
---- a/examples/tools/plugandpaint/plugandpaint.pro
-+++ b/examples/tools/plugandpaint/plugandpaint.pro
-@@ -10,7 +10,7 @@ SOURCES = main.cpp \
- symbian {
- LIBS = -lpnp_basictools.lib
- } else {
-- LIBS = -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins
-lpnp_basictools
-+ LIBS += -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins
-lpnp_basictools
- }
-
- if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml
deleted file mode 100644
index 669d739..0000000
--- a/dev-qt/qtdemo/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <herd>qt</herd>
- <use>
- <flag name="dbus">Build QtDBus examples and demos</flag>
- <flag name="declarative">Build QtDeclarative examples and
demos</flag>
- <flag name="exceptions">Add support for exceptions - like
catching them
- inside the event loop (recommended by upstream)</flag>
- <flag name="multimedia">Build QtMultimedia examples and
demos</flag>
- <flag name="opengl">Build QtOpenGL examples and demos</flag>
- <flag name="openvg">Build QtOpenVG examples and demos</flag>
- <flag name="phonon">Build Phonon examples and demos</flag>
- <flag name="webkit">Build QtWebKit examples and demos</flag>
- <flag name="xmlpatterns">Build QtXmlPatterns examples and
demos</flag>
- </use>
- <upstream>
- <bugs-to>https://bugreports.qt.io/</bugs-to>
- <doc>http://doc.qt.io/</doc>
- </upstream>
-</pkgmetadata>
diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
deleted file mode 100644
index 631b3bb..0000000
--- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="Demonstration module and examples for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="dbus declarative kde multimedia opengl openvg phonon webkit xmlpatterns"
-
-DEPEND="
- ~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtsvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qttest-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
- declarative? (
~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] )
- multimedia? (
~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
- opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
- openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
- phonon? (
- kde? (
>=media-libs/phonon-4.8.3-r1[aqua=,qt4,${MULTILIB_USEDEP}] )
- !kde? ( || (
- ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-
>=media-libs/phonon-4.8.3-r1[aqua=,qt4,${MULTILIB_USEDEP}]
- ) )
- )
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
- xmlpatterns? (
~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.6-plugandpaint.patch"
-)
-
-QT4_TARGET_DIRECTORIES="
- demos
- examples"
-
-src_prepare() {
- qt4-build-multilib_src_prepare
-
- # Array mapping USE flags to subdirs
- local flags_subdirs_map=(
- 'dbus'
- 'declarative:declarative'
- 'multimedia:spectrum'
- 'opengl:boxes|glhypnotizer'
- 'openvg'
- 'phonon:mediaplayer'
- 'webkit:browser'
- 'xmlpatterns'
- )
-
- # Disable unwanted examples/demos
- for flag in "${flags_subdirs_map[@]}"; do
- if ! use ${flag%:*}; then
- einfo "Disabling ${flag%:*} examples"
- sed -i -e "/SUBDIRS += ${flag%:*}/d" \
- examples/examples.pro || die
-
- if [[ ${flag} == *:* ]]; then
- einfo "Disabling ${flag%:*} demos"
- sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \
- demos/demos.pro || die
- fi
- fi
- done
-
- # Remove bogus dependency on qt3support (bug 510042)
- sed -i -e 's/contains(QT_CONFIG, qt3support)://' \
- examples/graphicsview/graphicsview.pro || die
-}
-
-multilib_src_configure() {
- local myconf=(
- $(qt_use dbus)
- $(qt_use declarative)
- $(qt_use multimedia) -no-audio-backend
- $(qt_use opengl)
- $(qt_use openvg)
- $(qt_use phonon) -no-phonon-backend
- $(qt_use webkit)
- $(qt_use xmlpatterns)
- )
- qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 13c513e..2ace9a1 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,2 +1 @@
DIST qtbase-opensource-src-5.6.0-beta.tar.gz 60743889 SHA256
9d406f1b3e87df6ea5d86643e0cb51e2a255188984b7f22b2f07c596fb96513e SHA512
23cd0e71459e76dc7c4c81ada1dd8bcacb72ccf115813708372b889168b33d3ce9c7e49ab8f6d134e275e982a7fd63ba5333e175167eaf1e7637a0c3aab32e10
WHIRLPOOL
3f89604ec701777fea80c2fb447129276244e435dd6bbac0b6ad9603a7d211befb966e384d7aef6b4098fb50871a6ff2c47444968f46ba607e049819c15bc55d
-DIST qtgui-systemtrayicon-plugin-system.patch 51377 SHA256
e8582ebb2a5db99bf85789585516459ace42fc2b57fc7d5ff6156a2819bda282 SHA512
0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679
WHIRLPOOL
03cc247a2a0e3b77fc541fa0b47abb125c8f7b304037f2067488861f12fdab25d3b3b3a7cf90626c229aa85a2d43ae4319c0f838b6eeb5ecdfe838a365ed8a58
diff --git a/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch
b/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch
deleted file mode 100644
index e0305e1..0000000
--- a/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -ur
qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp
qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp
2010-02-11 16:55:22.000000000 +0100
-+++
qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
2010-02-28 04:34:16.000000000 +0100
-@@ -569,6 +569,32 @@
- void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
- {
- options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
-+
-+ if (cups) {
-+ const ppd_option_t* duplex = cups->ppdOption("Duplex");
-+ if (duplex) {
-+ // copy default ppd duplex to qt dialog
-+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+ options.duplexShort->setChecked(true);
-+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+ options.duplexLong->setChecked(true);
-+ else
-+ options.noDuplex->setChecked(true);
-+ }
-+
-+ if (cups->currentPPD()) {
-+ // set default color
-+ if (cups->currentPPD()->color_device)
-+ options.color->setChecked(true);
-+ else
-+ options.grayscale->setChecked(true);
-+ }
-+
-+ // set collation
-+ const ppd_option_t *collate = cups->ppdOption("Collate");
-+ if (collate)
-+ options.collate->setChecked(qstrcmp(collate->defchoice,
"True")==0);
-+ }
- }
- #endif
-
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp
qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp
2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
2010-02-28 04:55:15.000000000 +0100
-@@ -627,6 +627,44 @@
- && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
- setOutputFormat(QPrinter::PdfFormat);
- }
-+
-+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
-+ // fill in defaults from ppd file
-+ QCUPSSupport cups;
-+
-+ int printernum = -1;
-+ for (int i = 0; i < cups.availablePrintersCount(); i++) {
-+ if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
-+ printernum = i;
-+ }
-+ if (printernum >= 0) {
-+ cups.setCurrentPrinter(printernum);
-+
-+ const ppd_option_t* duplex = cups.ppdOption("Duplex");
-+ if (duplex) {
-+ // copy default ppd duplex to qt dialog
-+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+ setDuplex(DuplexShortSide);
-+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+ setDuplex(DuplexLongSide);
-+ else
-+ setDuplex(DuplexNone);
-+ }
-+
-+ if (cups.currentPPD()) {
-+ // set default color
-+ if (cups.currentPPD()->color_device)
-+ setColorMode(Color);
-+ else
-+ setColorMode(GrayScale);
-+ }
-+
-+ // set collation
-+ const ppd_option_t *collate = cups.ppdOption("Collate");
-+ if (collate)
-+ setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
-+ }
-+#endif
- }
-
- /*!
diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch
b/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch
deleted file mode 100644
index 9a9f773..0000000
--- a/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up
qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check
qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp
----
qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check
2013-06-09 16:28:22.938840346 -0500
-+++ qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp
2013-06-09 17:03:01.781125479 -0500
-@@ -503,18 +503,6 @@ void QGtkStylePrivate::initGtkWidgets()
- return;
- }
-
-- static QString themeName;
-- if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) {
-- themeName = getThemeName();
--
-- if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
-- // Due to namespace conflicts with Qt3 and obvious recursion with
Qt4,
-- // we cannot support the GTK_Qt Gtk engine
-- qWarning("QGtkStyle cannot be used together with the GTK_Qt
engine.");
-- return;
-- }
-- }
--
- if (QGtkStylePrivate::gtk_init) {
- // Gtk will set the Qt error handler so we have to reset it afterwards
- x11ErrorHandler qt_x_errhandler = XSetErrorHandler(0);
diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch
b/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch
deleted file mode 100644
index d46f8c5..0000000
--- a/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From a83ddc5212736f89a0b94667c495494fe6861d63 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensing...@gentoo.org>
-Date: Mon, 16 Jun 2014 23:52:24 +1000
-Subject: Fix delay with QClipboard and useEventLoop.
-
-This manifests when using LibreOffice with KDE integration. When KFileDialog is
-open, the clipboard is repeatedly polled causing a visible delay since using
-QClipboard in "useEventLoop" mode adds 50ms delay to every single clipboard
-fetch.
-
-Change-Id: Id30cda7b983ae7c949fa270d04f772fa44fc21cd
-Task-number: QTBUG-38585
----
- src/gui/kernel/qclipboard_x11.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/gui/kernel/qclipboard_x11.cpp
b/src/gui/kernel/qclipboard_x11.cpp
-index 14bf088..5f442b9 100644
---- a/src/gui/kernel/qclipboard_x11.cpp
-+++ b/src/gui/kernel/qclipboard_x11.cpp
-@@ -548,7 +548,8 @@ bool QX11Data::clipboardWaitForEvent(Window win, int type,
XEvent *event, int ti
- return false;
-
- XSync(X11->display, false);
-- usleep(50000);
-+ if (!XPending(X11->display))
-+ usleep(5000);
-
- now.start();
-
---
-2.0.0
-
diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
deleted file mode 100644
index 05ee2a1..0000000
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils qt4-build-multilib
-
-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"
-fi
-
-IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace
xinerama +xv"
-
-REQUIRED_USE="
- gtkstyle? ( glib )
-"
-
-# cairo[-qt4] is needed because of bug 454066
-RDEPEND="
- app-eselect/eselect-qtgraphicssystem
- ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=,${MULTILIB_USEDEP}]
- ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.4.11-r1:2[${MULTILIB_USEDEP}]
- media-libs/libpng:0=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- virtual/jpeg:0[${MULTILIB_USEDEP}]
- !aqua? (
- >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXcursor-1.1.13-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.1-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXfixes-5.0-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXi-1.6.2-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXrandr-1.4.0-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
- xinerama? ( >=x11-libs/libXinerama-1.1.2-r1[${MULTILIB_USEDEP}]
)
- xv? ( >=x11-libs/libXv-1.0.7-r1[${MULTILIB_USEDEP}] )
- )
- cups? ( net-print/cups[${MULTILIB_USEDEP}] )
- egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
- glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
- gtkstyle? (
- >=x11-libs/cairo-1.12[-qt4(-),${MULTILIB_USEDEP}]
- >=x11-libs/gtk+-2.24.23-r1:2[aqua=,${MULTILIB_USEDEP}]
- )
- mng? ( >=media-libs/libmng-1.0.10-r2:=[${MULTILIB_USEDEP}] )
- nas? ( >=media-libs/nas-1.9.3-r1[${MULTILIB_USEDEP}] )
- tiff? ( >=media-libs/tiff-4.0.3-r2:0[${MULTILIB_USEDEP}] )
- !<dev-qt/qthelp-4.8.5:4
-"
-DEPEND="${RDEPEND}
- !aqua? (
- >=x11-proto/inputproto-2.2-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- xinerama? (
>=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
- xv? ( >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] )
- )
-"
-PDEPEND="
- qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
)
-"
-
-PATCHES=(
- "${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880
- "${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257
- "${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226
- "${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968
-)
-
-QT4_TARGET_DIRECTORIES="
- src/gui
- src/scripttools
- src/plugins/imageformats/gif
- src/plugins/imageformats/ico
- src/plugins/imageformats/jpeg
- src/plugins/imageformats/tga
- src/plugins/inputmethods"
-
-pkg_setup() {
- use accessibility && QT4_TARGET_DIRECTORIES+="
src/plugins/accessible/widgets"
- use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng"
- use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff"
- use trace && QT4_TARGET_DIRECTORIES+="
src/plugins/graphicssystems/trace tools/qttracereplay"
-
- [[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
-
- QCONFIG_ADD="
- mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender
xshape xsync
- fontconfig system-freetype gif png system-png jpeg system-jpeg
- $(usev accessibility)
- $(usev cups)
- $(use mng && echo system-mng)
- $(usev nas)
- $(usev nis)
- $(use tiff && echo system-tiff)
- $(usev xinerama)
- $(use xv && echo xvideo)"
- QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui"
- QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
- $(use cups && echo QT_CUPS)
- $(use egl && echo QT_EGL)
- QT_FONTCONFIG QT_FREETYPE
- $(use gtkstyle && echo QT_STYLE_GTK)
- QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
- $(use mng && echo QT_IMAGEFORMAT_MNG)
- $(use nas && echo QT_NAS)
- $(use nis && echo QT_NIS)
- $(use tiff && echo QT_IMAGEFORMAT_TIFF)
- QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR
QT_XFIXES
- $(use xinerama && echo QT_XINERAMA)
- QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
- $(use xv && echo QT_XVIDEO)"
-}
-
-src_prepare() {
- qt4-build-multilib_src_prepare
-
- # Add -xvideo to the list of accepted configure options
- sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die
-}
-
-multilib_src_configure() {
- local myconf=(
- $(qt_use accessibility)
- $(qt_use cups)
- $(qt_use glib)
- $(qt_use mng libmng system)
- $(qt_use nas nas-sound system)
- $(qt_use nis)
- $(qt_use tiff libtiff system)
- $(qt_use egl)
- $(qt_use qt3support)
- $(qt_use gtkstyle)
- $(qt_use xinerama)
- $(qt_use xv xvideo)
- -system-libpng -system-libjpeg -system-zlib
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite
-no-sql-sqlite2 -no-sql-odbc
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm
-xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
- )
- qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
- qt4_multilib_src_install_all
-
- dodir /usr/share/qt4/graphicssystems
- echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
- echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die
-
- if has tools/qtconfig ${QT4_TARGET_DIRECTORIES}; then
- newicon tools/qtconfig/images/appicon.png qtconfig.png
- make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig
'Qt;Settings;DesktopSettings'
- fi
-}
-
-pkg_postinst() {
- qt4-build-multilib_pkg_postinst
-
- # raster is the default graphicssystem, set it on first install
- eselect qtgraphicssystem set raster --use-old
-}
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index fa41fe6..d678bb0 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,3 +1 @@
-DIST qt-assistant-compat-headers-4.7.tar.gz 448 SHA256
73ae604834cc89d6c67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580 SHA512
da14cb9904591f4389862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66c88b94e23df5fc25e33e01f1ed4d3093460bb
WHIRLPOOL
26c42c101aab36a8d0355f1243226f6b8bd5a477c5aafece7e036f18a9fcfe98ae016042befe494fca0c42b825e29539825466c1ddb720102fa6c65e9cbaec61
-DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896
SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d SHA512
a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106
WHIRLPOOL
9c2822ae2f1ee7c4f63236cc95eb0cb025f088e1f13e0a154fabdad5af6209b0e4cdda86d23061bf35fe5919a1909ed162bbc4835da79fdf1b187461aa948a1b
DIST qttools-opensource-src-5.6.0-beta.tar.gz 12430178 SHA256
17fbcdde8cdbfe2ff96661b64bb611c720680d6c0ef30bee232b3ad37db9e577 SHA512
9c69acb23c00c8e9b7a3804b531d228a603c0e05c3045327c7f6943b2134edd396e0291b78732a728f370a549bbca45d772c9c8826929958769dbc063b74c7d9
WHIRLPOOL
84098eeb3109e60e49372be7e1a7568ef676412d7f541c24aed9f210fbb7e4fe7dad6f9798f79d74d7cc533c9567eeb7cea673fb17536efcc73d31b1c86065bb
diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch
b/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch
deleted file mode 100644
index e157381..0000000
--- a/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 89f99089abe0c1369a78a3bb8e2a576c513ec809 Mon Sep 17 00:00:00 2001
-From: Davide Pesavento <p...@gentoo.org>
-Date: Wed, 6 May 2015 23:21:54 +0200
-Subject: [PATCH] Install assistant_adp binary.
-
----
- tools/assistant/compat/compat.pro | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/tools/assistant/compat/compat.pro
b/tools/assistant/compat/compat.pro
-index 171106a..a14e3f8 100755
---- a/tools/assistant/compat/compat.pro
-+++ b/tools/assistant/compat/compat.pro
-@@ -14,6 +14,8 @@ QT += xml network
-
- PROJECTNAME = Assistant
-
-+DESTDIR = ../../../bin
-+
- FORMS += helpdialog.ui \
- mainwindow.ui \
- tabbedbrowser.ui \
-@@ -59,6 +61,9 @@ mac {
- TARGET = Assistant_adp
- }
-
-+target.path = $$[QT_INSTALL_BINS]
-+INSTALLS += target
-+
- TRANSLATIONS = translations/assistant_adp_de.ts \
- translations/assistant_adp_ja.ts \
- translations/assistant_adp_pl.ts \
---
-2.4.0
-
diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch
b/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch
deleted file mode 100644
index 4ba6b6f..0000000
--- a/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 37725ccec4d26148dde377d78c71046e8b6a6de9 Mon Sep 17 00:00:00 2001
-From: Davide Pesavento <p...@gentoo.org>
-Date: Wed, 6 May 2015 22:44:57 +0200
-Subject: [PATCH] Teach syncqt how to handle the QtAssistant compat headers.
-
-See https://bugs.gentoo.org/show_bug.cgi?id=529398#c47
----
- bin/syncqt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/bin/syncqt b/bin/syncqt
-index dd94d4d..cc5a7bf 100755
---- a/bin/syncqt
-+++ b/bin/syncqt
-@@ -81,6 +81,7 @@ my %modules = ( # path to module name map
- "ActiveQt" => "$basedir/src/activeqt",
- "QtTest" => "$basedir/src/testlib",
- "QtHelp" => "$basedir/tools/assistant/lib",
-+ "QtAssistant" => "$basedir/tools/assistant/compat/lib",
- "QtDesigner" => "$basedir/tools/designer/src/lib",
- "QtUiTools" => "$basedir/tools/designer/src/uitools",
- "QtDBus" => "$basedir/src/dbus",
---
-2.4.0
-
diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
deleted file mode 100644
index 4f8849e..0000000
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The Help module for the Qt toolkit"
-SRC_URI+="
- compat? (
-
http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz
-
https://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz
- )"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-IUSE="compat doc"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
- compat? (
- ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- )
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
- tools/assistant/lib/fulltextsearch
- tools/assistant/lib
- tools/assistant/tools/qhelpgenerator
- tools/assistant/tools/qcollectiongenerator
- tools/assistant/tools/qhelpconverter
- tools/qdoc3"
-
-pkg_setup() {
- use compat && QT4_TARGET_DIRECTORIES+="
- tools/assistant/compat
- tools/assistant/compat/lib"
-}
-
-src_unpack() {
- qt4-build-multilib_src_unpack
-
- # compat version
- #
http://blog.qt.io/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
- if use compat; then
- mv
"${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3
"${S}"/tools/assistant/compat || die
- mv "${WORKDIR}"/QtAssistant "${S}"/include || die
- find "${S}"/tools/assistant/compat -type f -execdir chmod a-x
'{}' + || die
- fi
-}
-
-src_prepare() {
- use compat && PATCHES+=(
- "${FILESDIR}/${PN}-4.8.6-compat-install.patch"
- "${FILESDIR}/${PN}-4.8.6-compat-syncqt.patch"
- )
-
- qt4-build-multilib_src_prepare
-
- # prevent rebuild of QtCore and QtXml (bug 348034)
- sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
-}
-
-multilib_src_configure() {
- local myconf=(
- -system-libpng -system-libjpeg -system-zlib
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2
-no-sql-odbc
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm
-xinput -xkb
- -no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg
-no-webkit -no-xmlpatterns
- -no-nas-sound -no-cups -no-nis -fontconfig
- )
- qt4_multilib_src_configure
-}
-
-multilib_src_compile() {
- qt4_multilib_src_compile
-
- # release tarballs are shipped with prebuilt docs
- if [[ ${QT4_BUILD_TYPE} == live ]] && multilib_is_native_abi; then
- # qhelpgenerator needs libQtHelp.so.4
- export LD_LIBRARY_PATH=${BUILD_DIR}/lib
- export
DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework
- emake docs
- fi
-}
-
-multilib_src_install() {
- qt4_multilib_src_install
-
- if multilib_is_native_abi; then
- emake INSTALL_ROOT="${D}" install_qchdocs
- use doc && emake INSTALL_ROOT="${D}" install_htmldocs
-
- # do not compress .qch files
- docompress -x "${QT4_DOCDIR#${EPREFIX}}"/qch
- fi
-}
-
-multilib_src_install_all() {
- qt4_multilib_src_install_all
-
- if use compat; then
- insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features
- doins tools/assistant/compat/features/assistant.prf
- fi
-}
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch
b/dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch
deleted file mode 100644
index 8bd40ed..0000000
--- a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- qt-everywhere-opensource-src-4.8.0.orig/configure 2012-03-13
00:45:02.502205702 +0100
-+++ qt-everywhere-opensource-src-4.8.0/configure 2012-03-13
00:47:40.386231881 +0100
-@@ -1049,7 +1049,7 @@
- VAL=no
- ;;
- #Qt style yes options
--
-incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)
-+
-incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu|-alsa)
- VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
- VAL=yes
- ;;
-@@ -2399,6 +2399,13 @@
- else
- UNKNOWN_OPT=yes
- fi
-+ ;;
-+ alsa)
-+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
-+ CFG_ALSA="$VAL"
-+ else
-+ UNKNOWN_OPT=yes
-+ fi
- ;;
- *)
- UNKNOWN_OPT=yes
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
deleted file mode 100644
index 35169e5..0000000
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The Multimedia module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="alsa"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.8.0-alsa.patch"
-)
-
-QT4_TARGET_DIRECTORIES="src/multimedia"
-
-QCONFIG_ADD="multimedia"
-QCONFIG_DEFINE="QT_MULTIMEDIA"
-
-multilib_src_configure() {
- local myconf=(
- -multimedia -audio-backend
- $(qt_use alsa)
- -no-accessibility -no-qt3support -no-xmlpatterns -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-openssl
- -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
- -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
- )
- qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
deleted file mode 100644
index 8679072..0000000
--- a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The OpenGL module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="egl qt3support"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=,${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
- src/opengl
- src/plugins/graphicssystems/opengl"
-
-QCONFIG_ADD="opengl"
-QCONFIG_DEFINE="QT_OPENGL"
-
-multilib_src_configure() {
- local myconf=(
- -opengl
- $(qt_use qt3support)
- $(qt_use egl)
- )
- qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
- qt4_multilib_src_install_all
-
- dodir /usr/share/qt4/graphicssystems
- echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl ||
die
-}
diff --git a/dev-qt/qtopenvg/metadata.xml b/dev-qt/qtopenvg/metadata.xml
deleted file mode 100644
index ac06367..0000000
--- a/dev-qt/qtopenvg/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <herd>qt</herd>
- <use>
- <flag name="exceptions">Build with support for exceptions</flag>
- <flag name="qt3support">Enable the Qt3Support libraries for
Qt4</flag>
- </use>
- <upstream>
- <bugs-to>https://bugreports.qt.io/</bugs-to>
- <doc>http://doc.qt.io/</doc>
- </upstream>
-</pkgmetadata>
diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
deleted file mode 100644
index f36bacc..0000000
--- a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The OpenVG module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-IUSE="qt3support"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,egl,qt3support=,${MULTILIB_USEDEP}]
- media-libs/mesa[egl,openvg,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
- src/openvg
- src/plugins/graphicssystems/openvg"
-
-QCONFIG_ADD="openvg"
-QCONFIG_DEFINE="QT_OPENVG"
-
-multilib_src_configure() {
- local myconf=(
- -openvg -egl
- $(qt_use qt3support)
- )
- qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
- qt4_multilib_src_install_all
-
- dodir /usr/share/qt4/graphicssystems
- echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg ||
die
-}
diff --git a/dev-qt/qtphonon/metadata.xml b/dev-qt/qtphonon/metadata.xml
deleted file mode 100644
index 81cb7d9..0000000
--- a/dev-qt/qtphonon/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <herd>qt</herd>
- <use>
- <flag name="exceptions">Add support for exceptions - like
catching them
- inside the event loop (recommended by upstream)</flag>
- <flag name="qt3support">Enable the Qt3Support libraries for
Qt4. Note that
- this does not mean you can compile pure Qt3 programs
with Qt4.</flag>
- </use>
- <upstream>
- <bugs-to>https://bugreports.qt.io/</bugs-to>
- <doc>http://doc.qt.io/</doc>
- </upstream>
-</pkgmetadata>
diff --git a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
deleted file mode 100644
index b6a7941..0000000
--- a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The Phonon module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-IUSE="dbus qt3support"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
- aqua? (
~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}] )
- !aqua? (
- >=media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}]
-
>=media-plugins/gst-plugins-meta-0.10-r9:0.10[${MULTILIB_USEDEP}]
- )
- dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
- !kde-apps/phonon-kde
- !media-libs/phonon
- !media-libs/phonon-gstreamer
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
- src/phonon
- src/plugins/phonon"
-
-QCONFIG_ADD="phonon"
-
-pkg_setup() {
- QCONFIG_DEFINE="
- QT_PHONON
- $(use aqua || echo QT_GSTREAMER)"
-}
-
-multilib_src_configure() {
- local myconf=(
- -phonon -phonon-backend
- -no-opengl -no-svg
- $(qt_use dbus qdbus)
- $(qt_use qt3support)
- )
- qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtscript/qtscript-4.8.9999.ebuild
b/dev-qt/qtscript/qtscript-4.8.9999.ebuild
deleted file mode 100644
index fdb0787..0000000
--- a/dev-qt/qtscript/qtscript-4.8.9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The QtScript module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+jit"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/script"
-
-QCONFIG_ADD="script"
-QCONFIG_DEFINE="QT_SCRIPT"
-
-multilib_src_configure() {
- local myconf=(
- $(qt_use jit javascript-jit)
- -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes
-no-xcursor -no-xinerama
- -no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups
-no-nis -no-gif
- -no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib
-no-webkit -no-phonon
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg
- -no-gtkstyle
- )
- qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
deleted file mode 100644
index b91e496..0000000
--- a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit multilib qt4-build-multilib
-
-DESCRIPTION="The SQL module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
-
-REQUIRED_USE="
- || ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
- freetds? ( dev-db/freetds )
- mysql? ( virtual/libmysqlclient:=[${MULTILIB_USEDEP}] )
- oci8? (
>=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
- odbc? ( || (
- >=dev-db/unixODBC-2.3.2-r2[${MULTILIB_USEDEP}]
- >=dev-db/libiodbc-3.52.8-r2[${MULTILIB_USEDEP}]
- ) )
- postgres? ( dev-db/postgresql:* )
- sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
- src/sql
- src/plugins/sqldrivers"
-
-multilib_src_configure() {
- local myconf=(
- $(qt_native_use freetds sql-tds plugin)
- $(qt_use mysql sql-mysql plugin) $(use mysql && echo
"-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
- $(qt_use oci8 sql-oci plugin) $(use oci8 && echo
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
- $(qt_use odbc sql-odbc plugin) $(use odbc && echo
"-I${EPREFIX}/usr/include/iodbc")
- $(qt_native_use postgres sql-psql plugin) $(use postgres &&
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
- $(qt_use sqlite sql-sqlite plugin) $(use sqlite &&
echo -system-sqlite)
- -no-sql-db2
- -no-sql-ibase
- -no-sql-sqlite2
- -no-sql-symsql
- $(qt_use qt3support)
- -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-openssl
- -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
- -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
- -no-glib
- )
- qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
deleted file mode 100644
index 9d323df..0000000
--- a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The SVG module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+accessibility"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
- src/svg
- src/plugins/imageformats/svg
- src/plugins/iconengines/svgiconengine"
-
-QCONFIG_ADD="svg"
-QCONFIG_DEFINE="QT_SVG"
-
-multilib_src_configure() {
- local myconf=(
- -svg
- $(qt_use accessibility)
- -no-xkb -no-xrender
- -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
- -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif
-no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit
-no-phonon
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-fontconfig -no-glib -no-gtkstyle
- )
- qt4_multilib_src_configure
-}
diff --git a/dev-qt/qttest/qttest-4.8.9999.ebuild
b/dev-qt/qttest/qttest-4.8.9999.ebuild
deleted file mode 100644
index 1fbfb15..0000000
--- a/dev-qt/qttest/qttest-4.8.9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The QtTest module for unit testing Qt applications and libraries"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/testlib"
-
-multilib_src_configure() {
- local myconf=(
- -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes
-no-xcursor
- -no-xinerama -no-xshape -no-sm -no-opengl
- -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit
-no-phonon
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-accessibility -no-fontconfig -no-glib -no-svg
- )
- qt4_multilib_src_configure
-}
diff --git a/dev-qt/qttranslations/qttranslations-4.8.9999.ebuild
b/dev-qt/qttranslations/qttranslations-4.8.9999.ebuild
deleted file mode 100644
index 000134f..0000000
--- a/dev-qt/qttranslations/qttranslations-4.8.9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="Translation files for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}
-"
-RDEPEND=""
-
-QT4_TARGET_DIRECTORIES="translations"
-
-multilib_src_configure() {
- if multilib_is_native_abi; then
- qt4_prepare_env
- qt4_symlink_tools_to_build_dir
- qt4_foreach_target_subdir qt4_qmake
- fi
-}
-
-multilib_src_compile() {
- multilib_is_native_abi && qt4_multilib_src_compile
-}
-
-multilib_src_test() {
- :
-}
-
-multilib_src_install() {
- multilib_is_native_abi && qt4_multilib_src_install
-}
diff --git a/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch
b/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch
deleted file mode 100644
index 16f52d9..0000000
--- a/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig
2012-07-17 15:06:26.692276108 +0000
-+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h 2012-07-17
15:06:54.480928701 +0000
-@@ -993,7 +993,7 @@
- #endif
-
- #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64)
--#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
-+#if (CPU(X86_64) && defined(__LP64__) && (OS(UNIX) || OS(WINDOWS))) \
- || (CPU(IA64) && !CPU(IA64_32)) \
- || CPU(ALPHA) \
- || CPU(SPARC64) \
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
deleted file mode 100644
index 53a6f56..0000000
--- a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The WebKit module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd
~x86-fbsd"
-fi
-
-IUSE="+gstreamer icu +jit"
-
-# libxml2[!icu?] is needed for bugs 407315 and 411091
-DEPEND="
- >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}]
- ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl,${MULTILIB_USEDEP}]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
- gstreamer? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}]
-
>=media-libs/gst-plugins-base-0.10.36-r1:0.10[${MULTILIB_USEDEP}]
- )
- icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/4.8.2-javascriptcore-x32.patch"
-)
-
-QT4_TARGET_DIRECTORIES="
- src/3rdparty/webkit/Source/JavaScriptCore
- src/3rdparty/webkit/Source/WebCore
- src/3rdparty/webkit/Source/WebKit/qt"
-
-QCONFIG_ADD="webkit"
-QCONFIG_DEFINE="QT_WEBKIT"
-
-src_prepare() {
- # Remove -Werror from CXXFLAGS
- sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \
- src/3rdparty/webkit/Source/WebKit.pri || die
-
- # Fix version number in generated pkgconfig file (bug 406443)
- sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \
- src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die
-
- # Prevent automagic dependency on qt-mobility (bug 547350)
- sed -i -e 's/contains(MOBILITY_CONFIG,\s*\w\+)/false/' \
- src/3rdparty/webkit/Source/WebCore/features.pri || die
-
- if use icu; then
- sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
-
src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die
- fi
-
- qt4-build-multilib_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=(
- -webkit
- -system-sqlite
- $(qt_use icu)
- $(qt_use jit javascript-jit)
- $(use gstreamer || echo -DENABLE_VIDEO=0)
- )
- qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
deleted file mode 100644
index efb99bc..0000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The XmlPatterns module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
- src/xmlpatterns
- tools/xmlpatterns
- tools/xmlpatternsvalidator"
-
-QCONFIG_ADD="xmlpatterns"
-QCONFIG_DEFINE="QT_XMLPATTERNS"
-
-multilib_src_configure() {
- local myconf=(
- -xmlpatterns
- )
- qt4_multilib_src_configure
-}
diff --git a/sets/qt4-live b/sets/qt4-live
deleted file mode 100644
index ac6b040..0000000
--- a/sets/qt4-live
+++ /dev/null
@@ -1,27 +0,0 @@
-# set for all packages from qt/4.8 branch
-# qtphonon is commented out, as you may want media-libs/phonon instead
-
-~dev-qt/assistant-4.8.9999
-~dev-qt/designer-4.8.9999
-~dev-qt/linguist-4.8.9999
-~dev-qt/pixeltool-4.8.9999
-~dev-qt/qdbusviewer-4.8.9999
-~dev-qt/qt3support-4.8.9999
-~dev-qt/qtbearer-4.8.9999
-~dev-qt/qtcore-4.8.9999
-~dev-qt/qtdbus-4.8.9999
-~dev-qt/qtdeclarative-4.8.9999
-#~dev-qt/qtdemo-4.8.9999
-~dev-qt/qtgui-4.8.9999
-~dev-qt/qthelp-4.8.9999
-~dev-qt/qtmultimedia-4.8.9999
-~dev-qt/qtopengl-4.8.9999
-#~dev-qt/qtopenvg-4.8.9999
-#~dev-qt/qtphonon-4.8.9999
-~dev-qt/qtscript-4.8.9999
-~dev-qt/qtsql-4.8.9999
-~dev-qt/qtsvg-4.8.9999
-~dev-qt/qttest-4.8.9999
-~dev-qt/qttranslations-4.8.9999
-~dev-qt/qtwebkit-4.8.9999
-~dev-qt/qtxmlpatterns-4.8.9999
