commit: 3d84d817b714b4862665cdef9a265334f0e82bb8
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri May 23 00:09:04 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri May 23 00:09:04 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3d84d817
[Qt4] Migrate all live ebuilds to EAPI=5 and qt4-build-multilib.eclass
---
dev-qt/assistant/assistant-4.8.9999.ebuild | 24 ++---
dev-qt/designer/designer-4.8.9999.ebuild | 28 +++---
dev-qt/linguist/linguist-4.8.9999.ebuild | 22 ++---
dev-qt/pixeltool/pixeltool-4.8.9999.ebuild | 22 ++---
dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild | 22 ++---
dev-qt/qt3support/qt3support-4.8.9999.ebuild | 29 +++---
dev-qt/qtbearer/qtbearer-4.8.9999.ebuild | 31 +++---
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 106 ++++++++++-----------
dev-qt/qtdbus/qtdbus-4.8.9999.ebuild | 41 ++++----
dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild | 52 +++++-----
dev-qt/qtdemo/qtdemo-4.8.9999.ebuild | 36 ++++---
dev-qt/qtgui/qtgui-4.8.9999.ebuild | 51 +++++-----
dev-qt/qthelp/qthelp-4.8.9999.ebuild | 56 +++++------
dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild | 37 ++++---
dev-qt/qtopengl/qtopengl-4.8.9999.ebuild | 46 ++++-----
dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild | 49 +++++-----
dev-qt/qtphonon/qtphonon-4.8.9999.ebuild | 40 ++++----
dev-qt/qtscript/qtscript-4.8.9999.ebuild | 39 ++++----
dev-qt/qtsql/qtsql-4.8.9999.ebuild | 35 ++++---
dev-qt/qtsvg/qtsvg-4.8.9999.ebuild | 51 +++++-----
dev-qt/qttest/qttest-4.8.9999.ebuild | 25 +++--
dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild | 31 +++---
dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild | 45 ++++-----
23 files changed, 430 insertions(+), 488 deletions(-)
diff --git a/dev-qt/assistant/assistant-4.8.9999.ebuild
b/dev-qt/assistant/assistant-4.8.9999.ebuild
index 64b67e3..8508bf8 100644
--- a/dev-qt/assistant/assistant-4.8.9999.ebuild
+++ b/dev-qt/assistant/assistant-4.8.9999.ebuild
@@ -4,10 +4,10 @@
EAPI=5
-inherit eutils qt4-build
+inherit eutils qt4-build-multilib
DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
@@ -29,21 +29,17 @@ PATCHES=(
"${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
)
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"
+QT4_EXTRACT_DIRECTORIES="
+ include
+ src
+ tools"
src_prepare() {
# bug 401173
use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch")
- qt4-build_src_prepare
+ qt4-build-multilib_src_prepare
}
src_configure() {
@@ -54,11 +50,11 @@ src_configure() {
-fontconfig -no-multimedia -no-opengl -no-phonon -no-svg
-no-xmlpatterns
$(qt_use webkit)"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_install() {
- qt4-build_src_install
+ qt4-build-multilib_src_install
doicon tools/assistant/tools/assistant/images/assistant.png
make_desktop_entry assistant Assistant assistant
'Qt;Development;Documentation'
diff --git a/dev-qt/designer/designer-4.8.9999.ebuild
b/dev-qt/designer/designer-4.8.9999.ebuild
index 17368dd..0b75a86 100644
--- a/dev-qt/designer/designer-4.8.9999.ebuild
+++ b/dev-qt/designer/designer-4.8.9999.ebuild
@@ -4,10 +4,10 @@
EAPI=5
-inherit eutils qt4-build
+inherit eutils qt4-build-multilib
DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
@@ -28,18 +28,14 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="tools/designer"
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="tools/designer"
+QT4_EXTRACT_DIRECTORIES="
+ include
+ src
+ tools"
src_prepare() {
- qt4-build_src_prepare
+ qt4-build-multilib_src_prepare
local plugin
for plugin in ${DESIGNER_PLUGINS}; do
@@ -55,11 +51,11 @@ src_configure() {
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm
-xinput -xkb
-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_install() {
- qt4-build_src_install
+ qt4-build-multilib_src_install
# qt-creator
# some qt-creator headers are located
@@ -69,9 +65,9 @@ src_install() {
# So instead of installing both, we create the private folder
# and drop tools/designer/src/lib/* headers in it.
if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- insinto
"${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
+ insinto
"${QT4_LIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/
+ insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtDesigner/private/
fi
doins "${S}"/tools/designer/src/lib/shared/*
doins "${S}"/tools/designer/src/lib/sdk/*
diff --git a/dev-qt/linguist/linguist-4.8.9999.ebuild
b/dev-qt/linguist/linguist-4.8.9999.ebuild
index a0a367a..eec9dc2 100644
--- a/dev-qt/linguist/linguist-4.8.9999.ebuild
+++ b/dev-qt/linguist/linguist-4.8.9999.ebuild
@@ -4,10 +4,10 @@
EAPI=5
-inherit eutils qt4-build
+inherit eutils qt4-build-multilib
DESCRIPTION="Graphical tool for translating Qt applications"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
@@ -23,15 +23,11 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="tools/linguist/linguist"
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="tools/linguist/linguist"
+QT4_EXTRACT_DIRECTORIES="
+ include
+ src
+ tools"
src_configure() {
myconf+="
@@ -40,11 +36,11 @@ src_configure() {
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm
-xinput -xkb
-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_install() {
- qt4-build_src_install
+ qt4-build-multilib_src_install
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
index 2f5a6fe..9086ea0 100644
--- a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
+++ b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
@@ -4,10 +4,10 @@
EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="Qt screen magnifier"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
@@ -23,16 +23,12 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="tools/pixeltool"
- QT4_EXTRACT_DIRECTORIES="
- include
- src/corelib
- src/gui
- tools/pixeltool"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="tools/pixeltool"
+QT4_EXTRACT_DIRECTORIES="
+ include
+ src/corelib
+ src/gui
+ tools/pixeltool"
src_configure() {
myconf+="
@@ -41,5 +37,5 @@ src_configure() {
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm
-xinput -xkb
-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
index a87515a..09d4d01 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
@@ -4,10 +4,10 @@
EAPI=5
-inherit eutils qt4-build
+inherit eutils qt4-build-multilib
DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and
messages"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
@@ -23,15 +23,11 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools/qdbus"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
+QT4_EXTRACT_DIRECTORIES="
+ include
+ src
+ tools/qdbus"
src_configure() {
myconf+="
@@ -40,11 +36,11 @@ src_configure() {
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm
-xinput -xkb
-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_install() {
- qt4-build_src_install
+ qt4-build-multilib_src_install
newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png
qdbusviewer.png
make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development'
diff --git a/dev-qt/qt3support/qt3support-4.8.9999.ebuild
b/dev-qt/qt3support/qt3support-4.8.9999.ebuild
index 0bc8273..4b4927c 100644
--- a/dev-qt/qt3support/qt3support-4.8.9999.ebuild
+++ b/dev-qt/qt3support/qt3support-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The Qt3Support module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE="+accessibility"
DEPEND="
@@ -22,24 +23,20 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/qt3support
- src/tools/uic3
- tools/porting"
+QT4_TARGET_DIRECTORIES="
+ src/qt3support
+ src/tools/uic3
+ tools/porting"
- QT4_EXTRACT_DIRECTORIES="
- src
- include
- tools"
-
- qt4-build_pkg_setup
-}
+QT4_EXTRACT_DIRECTORIES="
+ src
+ include
+ tools"
src_configure() {
myconf+="
-qt3support
$(qt_use accessibility)"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
index a0d6807..b941bbc 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The network bearer plugins for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd"
fi
+
IUSE="connman networkmanager"
DEPEND="
@@ -25,23 +26,23 @@ RDEPEND="${DEPEND}
networkmanager? ( net-misc/networkmanager )
"
-pkg_setup() {
- QT4_EXTRACT_DIRECTORIES="
- include/QtCore
- include/QtDBus
- include/QtNetwork
- src/corelib
- src/dbus
- src/network
- src/plugins/bearer
- src/plugins/qpluginbase.pri"
+QT4_EXTRACT_DIRECTORIES="
+ include/QtCore
+ include/QtDBus
+ include/QtNetwork
+ src/corelib
+ src/dbus
+ src/network
+ src/plugins/bearer
+ src/plugins/qpluginbase.pri"
+pkg_setup() {
QT4_TARGET_DIRECTORIES="
src/plugins/bearer/generic
$(use connman && echo src/plugins/bearer/connman)
$(use networkmanager && echo src/plugins/bearer/networkmanager)"
- qt4-build_pkg_setup
+ qt4-build-multilib_pkg_setup
}
src_configure() {
@@ -54,5 +55,5 @@ src_configure() {
-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-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index 2ac14dd..4c4f5a3 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -4,23 +4,23 @@
EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="Cross-platform application development framework"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE="+glib iconv icu qt3support ssl"
DEPEND="
sys-libs/zlib
glib? ( dev-libs/glib:2 )
icu? ( >=dev-libs/icu-49:= )
- ssl? ( dev-libs/openssl )
- !<x11-libs/cairo-1.10.2-r2
+ ssl? ( dev-libs/openssl:0 )
"
RDEPEND="${DEPEND}"
PDEPEND="
@@ -31,41 +31,39 @@ PATCHES=(
"${FILESDIR}/moc-boost-lexical-cast.patch"
)
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/tools/bootstrap
- src/tools/moc
- src/tools/rcc
- src/tools/uic
- src/corelib
- src/xml
- src/network
- src/plugins/codecs
- tools/linguist/lconvert
- tools/linguist/lrelease
- tools/linguist/lupdate"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include
- src/plugins/plugins.pro
- src/plugins/qpluginbase.pri
- src/src.pro
- src/3rdparty/des
- src/3rdparty/harfbuzz
- src/3rdparty/md4
- src/3rdparty/md5
- src/3rdparty/sha1
- src/3rdparty/easing
- src/3rdparty/zlib_dependency.pri
- src/declarative
- src/gui
- src/script
- tools/shared
- tools/linguist/shared
- translations"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="
+ src/tools/bootstrap
+ src/tools/moc
+ src/tools/rcc
+ src/tools/uic
+ src/corelib
+ src/xml
+ src/network
+ src/plugins/codecs
+ tools/linguist/lconvert
+ tools/linguist/lrelease
+ tools/linguist/lupdate"
+
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include
+ src/plugins/plugins.pro
+ src/plugins/qpluginbase.pri
+ src/src.pro
+ src/3rdparty/des
+ src/3rdparty/harfbuzz
+ src/3rdparty/md4
+ src/3rdparty/md5
+ src/3rdparty/sha1
+ src/3rdparty/easing
+ src/3rdparty/zlib_dependency.pri
+ src/declarative
+ src/gui
+ src/script
+ tools/shared
+ tools/linguist/shared
+ translations"
+
+QCONFIG_DEFINE="QT_ZLIB"
src_prepare() {
# Don't pre-strip, bug 235026
@@ -73,7 +71,7 @@ src_prepare() {
echo "CONFIG+=nostrip" >>
"${S}"/src/plugins/codecs/${i}/${i}.pro
done
- qt4-build_src_prepare
+ qt4-build-multilib_src_prepare
# bug 172219
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
@@ -103,7 +101,7 @@ src_configure() {
$(use ssl && echo -openssl-linked || echo -no-openssl)
$(qt_use qt3support)"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_install() {
@@ -114,8 +112,8 @@ src_install() {
emake INSTALL_ROOT="${D}" install_mkspecs
# install private headers
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
- find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} +
+ insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtCore/private
+ find "${S}"/src/corelib -type f -name "*_p.h" -exec doins '{}' +
# use freshly built libraries
local DYLD_FPATH=
@@ -125,7 +123,7 @@ src_install() {
LD_LIBRARY_PATH="${S}/lib" \
"${S}"/bin/lrelease translations/*.ts \
|| die "generating translations failed"
- insinto "${QTTRANSDIR#${EPREFIX}}"
+ insinto "${QT4_TRANSLATIONDIR#${EPREFIX}}"
doins translations/*.qm
setqtenv
@@ -142,32 +140,30 @@ src_install() {
EOF
doenvd "${T}"/44qt4
- dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo
- mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri
"${D}${QTDATADIR}"/mkspecs/gentoo \
- || die "failed to move qconfig.pri"
+ dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
+ mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
# Framework hacking
if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
# TODO: do this better
sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
-
"${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
+
"${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \
|| die "sed for qconfig.h failed."
- dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo
"${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
+ dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo
"${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
else
sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QTHEADERDIR}"/QtCore/qconfig.h \
- "${D}${QTHEADERDIR}"/Qt/qconfig.h \
+ "${D}${QT4_HEADERDIR}"/QtCore/qconfig.h \
+ "${D}${QT4_HEADERDIR}"/Qt/qconfig.h \
|| die "sed for qconfig.h failed"
fi
- QCONFIG_DEFINE="QT_ZLIB"
install_qconfigs
# remove .la files
prune_libtool_files
- keepdir "${QTSYSCONFDIR#${EPREFIX}}"
-
- # Framework magic
+ # framework magic
fix_includes
+
+ keepdir "${QT4_SYSCONFDIR#${EPREFIX}}"
}
diff --git a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
index f2fc13b..cf203e4 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
@@ -2,22 +2,23 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The DBus module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE=""
DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=]
- >=sys-apps/dbus-1.2
+ sys-apps/dbus
"
RDEPEND="${DEPEND}"
@@ -26,28 +27,24 @@ PATCHES=(
"${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch"
)
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/dbus
- tools/qdbus/qdbus
- tools/qdbus/qdbusxml2cpp
- tools/qdbus/qdbuscpp2xml"
+QT4_TARGET_DIRECTORIES="
+ src/dbus
+ tools/qdbus/qdbus
+ tools/qdbus/qdbusxml2cpp
+ tools/qdbus/qdbuscpp2xml"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtCore
- include/QtDBus
- include/QtXml
- src/corelib
- src/xml"
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/QtCore
+ include/QtDBus
+ include/QtXml
+ src/corelib
+ src/xml"
- QCONFIG_ADD="dbus dbus-linked"
- QCONFIG_DEFINE="QT_DBUS"
-
- qt4-build_pkg_setup
-}
+QCONFIG_ADD="dbus dbus-linked"
+QCONFIG_DEFINE="QT_DBUS"
src_configure() {
myconf+=" -dbus-linked"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
index 063b4a7..8b1c7b1 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The Declarative module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
fi
+
IUSE="+accessibility qt3support webkit"
DEPEND="
@@ -28,28 +29,27 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/declarative
- src/imports
- src/plugins/qmltooling
- tools/qml
- tools/qmlplugindump"
+QT4_TARGET_DIRECTORIES="
+ src/declarative
+ src/imports
+ src/plugins/qmltooling
+ tools/qml
+ tools/qmlplugindump"
- if use webkit; then
- QT4_TARGET_DIRECTORIES+="
src/3rdparty/webkit/Source/WebKit/qt/declarative"
- fi
+QT4_EXTRACT_DIRECTORIES="
+ include
+ src
+ tools
+ translations"
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools
- translations"
+QCONFIG_ADD="declarative"
+QCONFIG_DEFINE="QT_DECLARATIVE"
- QCONFIG_ADD="declarative"
- QCONFIG_DEFINE="QT_DECLARATIVE"
+pkg_setup() {
+ use webkit && QT4_TARGET_DIRECTORIES+="
+ src/3rdparty/webkit/Source/WebKit/qt/declarative"
- qt4-build_pkg_setup
+ qt4-build-multilib_pkg_setup
}
src_configure() {
@@ -58,19 +58,19 @@ src_configure() {
$(qt_use accessibility)
$(qt_use qt3support)
$(qt_use webkit)"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_install() {
- qt4-build_src_install
+ qt4-build-multilib_src_install
# install private headers
if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- insinto
"${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private
+ insinto
"${QT4_LIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private
# ran for the 2nd time, need it for the updated headers
fix_includes
else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private
+ insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtDeclarative/private
fi
- find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} +
+ find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins '{}' +
}
diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
index 20344e4..7a57ed4 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="Demonstration module and examples for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
fi
+
IUSE="dbus declarative kde multimedia opengl openvg phonon qt3support webkit
xmlpatterns"
DEPEND="
@@ -43,21 +44,18 @@ PATCHES=(
"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
)
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- demos
- examples"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- doc/src/images
- include
- src
- tools"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="
+ demos
+ examples"
+
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ doc/src/images
+ include
+ src
+ tools"
src_prepare() {
- qt4-build_src_prepare
+ qt4-build-multilib_src_prepare
# Array mapping USE flags to subdirs
local flags_subdirs_map=(
@@ -105,12 +103,12 @@ src_configure() {
$(qt_use webkit)
$(qt_use xmlpatterns)"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_install() {
- insinto "${QTDOCDIR#${EPREFIX}}"/src
+ insinto "${QT4_DOCDIR#${EPREFIX}}"/src
doins -r doc/src/images
- qt4-build_src_install
+ qt4-build-multilib_src_install
}
diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
index 25e758b..2f90936 100644
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
@@ -4,10 +4,10 @@
EAPI=5
-inherit eutils qt4-build
+inherit eutils qt4-build-multilib
DESCRIPTION="The GUI module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
@@ -69,20 +69,16 @@ PATCHES=(
"${FILESDIR}/${PN}-4.7.3-cups.patch"
)
-pkg_setup() {
- 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"
-
- QT4_EXTRACT_DIRECTORIES="
- include
- src"
+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"
@@ -91,13 +87,15 @@ pkg_setup() {
# mac version does not contain qtconfig?
[[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
${QT4_EXTRACT_DIRECTORIES}"
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include
+ src"
- qt4-build_pkg_setup
+ qt4-build-multilib_pkg_setup
}
src_prepare() {
- qt4-build_src_prepare
+ qt4-build-multilib_src_prepare
# Add -xvideo to the list of accepted configure options
sed -i -e 's:|-xinerama|:&-xvideo|:' configure
@@ -123,9 +121,10 @@ src_configure() {
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm
-xinput -xkb
-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
- [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" #367045
+ # bug 367045
+ [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
if use gtkstyle; then
sed -i -e 's:-I/usr/include/qt4 ::' src/gui/Makefile || die
"sed failed"
@@ -162,15 +161,15 @@ src_install() {
QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
$(use xv && echo QT_XVIDEO)"
- qt4-build_src_install
+ qt4-build-multilib_src_install
# install private headers
if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- insinto
"${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
+ insinto
"${QT4_LIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
+ insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtGui/private
fi
- find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} +
+ find "${S}"/src/gui -type f -name '*_p.h' -exec doins '{}' +
if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
# rerun to get links to headers right
@@ -187,7 +186,7 @@ src_install() {
# bug 388551
if use gtkstyle; then
- local tempfile=${T}/${PN}${SLOT}.sh
+ local tempfile=${T}/${PN}4.sh
cat <<-EOF > "${tempfile}"
export GTK2_RC_FILES=\${HOME}/.gtkrc-2.0
EOF
@@ -197,7 +196,7 @@ src_install() {
}
pkg_postinst() {
- qt4-build_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/qthelp-4.8.9999.ebuild
b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 5eebfea..3e4ec00 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit eutils qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The Help module for the Qt toolkit"
SRC_URI+="
@@ -13,7 +13,6 @@ SRC_URI+="
http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz
)"
-SLOT="4"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
@@ -33,31 +32,32 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- tools/assistant/lib/fulltextsearch
- tools/assistant/lib
- tools/assistant/tools/qhelpgenerator
- tools/assistant/tools/qcollectiongenerator
- tools/assistant/tools/qhelpconverter
- tools/qdoc3"
- QT4_EXTRACT_DIRECTORIES="
- demos
- doc
- examples
- include
- src
- tools"
+QT4_TARGET_DIRECTORIES="
+ tools/assistant/lib/fulltextsearch
+ tools/assistant/lib
+ tools/assistant/tools/qhelpgenerator
+ tools/assistant/tools/qcollectiongenerator
+ tools/assistant/tools/qhelpconverter
+ tools/qdoc3"
+
+QT4_EXTRACT_DIRECTORIES="
+ demos
+ doc
+ examples
+ include
+ src
+ tools"
+pkg_setup() {
use compat && QT4_TARGET_DIRECTORIES+="
tools/assistant/compat
tools/assistant/compat/lib"
- qt4-build_pkg_setup
+ qt4-build-multilib_pkg_setup
}
src_unpack() {
- qt4-build_src_unpack
+ qt4-build-multilib_src_unpack
# compat version
#
http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
@@ -71,9 +71,9 @@ src_unpack() {
}
src_prepare() {
- qt4-build_src_prepare
+ use compat && PATCHES+=("${FILESDIR}/${PN}-4.8.5-fix-compat.patch")
- use compat && epatch "${FILESDIR}"/${PN}-4.8.5-fix-compat.patch
+ qt4-build-multilib_src_prepare
# bug 348034
sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
@@ -87,18 +87,18 @@ src_configure() {
-no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg
-no-webkit -no-xmlpatterns
-no-nas-sound -no-cups -no-nis -fontconfig"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_compile() {
# help libQtHelp find freshly built libQtCLucene (bug #289811)
- export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
+ export LD_LIBRARY_PATH="${S}/lib:${QT4_LIBDIR}"
export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
- qt4-build_src_compile
+ qt4-build-multilib_src_compile
# ugly hack to build docs
- "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die
+ "${S}"/bin/qmake "LIBS+=-L${QT4_LIBDIR}" "CONFIG+=nostrip" || die
if use doc; then
emake docs
@@ -109,19 +109,19 @@ src_compile() {
}
src_install() {
- qt4-build_src_install
+ qt4-build-multilib_src_install
emake INSTALL_ROOT="${D}" install_qchdocs
# do not compress .qch files
- docompress -x "${QTDOCDIR}"/qch
+ docompress -x "${QT4_DOCDIR}"/qch
if use doc; then
emake INSTALL_ROOT="${D}" install_htmldocs
fi
if use compat; then
- insinto "${QTDATADIR#${EPREFIX}}"/mkspecs/features
+ insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features
doins tools/assistant/compat/features/assistant.prf
fi
}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
index ad39ced..4e74b56 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The Multimedia module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
~ppc-macos ~x86-macos"
fi
+
IUSE="alsa"
DEPEND="
@@ -26,24 +27,20 @@ PATCHES=(
"${FILESDIR}/${PN}-4.8.0-alsa.patch"
)
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/multimedia"
+QT4_TARGET_DIRECTORIES="
+ src/multimedia"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt
- include/QtCore
- include/QtGui
- include/QtMultimedia
- src/src.pro
- src/corelib
- src/gui"
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/Qt
+ include/QtCore
+ include/QtGui
+ include/QtMultimedia
+ src/src.pro
+ src/corelib
+ src/gui"
- QCONFIG_ADD="multimedia"
- QCONFIG_DEFINE="QT_MULTIMEDIA"
-
- qt4-build_pkg_setup
-}
+QCONFIG_ADD="multimedia"
+QCONFIG_DEFINE="QT_MULTIMEDIA"
src_configure() {
myconf+="
@@ -56,5 +53,5 @@ src_configure() {
-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-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
index a33d904..11b887b 100644
--- a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
+++ b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The OpenGL module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~x64-solaris ~x86-solaris"
fi
+
IUSE="egl qt3support"
DEPEND="
@@ -24,26 +25,22 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/opengl
- src/plugins/graphicssystems/opengl"
+QT4_TARGET_DIRECTORIES="
+ src/opengl
+ src/plugins/graphicssystems/opengl"
- QT4_EXTRACT_DIRECTORIES="
- include/QtCore
- include/QtGui
- include/QtOpenGL
- src/corelib
- src/gui
- src/opengl
- src/plugins
- src/3rdparty"
+QT4_EXTRACT_DIRECTORIES="
+ include/QtCore
+ include/QtGui
+ include/QtOpenGL
+ src/corelib
+ src/gui
+ src/opengl
+ src/plugins
+ src/3rdparty"
- QCONFIG_ADD="opengl"
- QCONFIG_DEFINE="QT_OPENGL"
-
- qt4-build_pkg_setup
-}
+QCONFIG_ADD="opengl"
+QCONFIG_DEFINE="QT_OPENGL"
src_configure() {
myconf+="
@@ -51,14 +48,11 @@ src_configure() {
$(qt_use qt3support)
$(qt_use egl)"
- qt4-build_src_configure
-
- # Not building tools/designer/src/plugins/tools/view3d as it's
- # commented out of the build in the source
+ qt4-build-multilib_src_configure
}
src_install() {
- qt4-build_src_install
+ qt4-build-multilib_src_install
# touch the available graphics systems
dodir /usr/share/qt4/graphicssystems
diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
index 2e54c08..e11f3af 100644
--- a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
+++ b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The OpenVG module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE="qt3support"
DEPEND="
@@ -22,39 +23,33 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/openvg
- src/plugins/graphicssystems/openvg"
-
- QT4_EXTRACT_DIRECTORIES="
- include/QtCore
- include/QtGui
- include/QtOpenVG
- src/corelib
- src/gui
- src/openvg
- src/plugins
- src/3rdparty"
-
- QCONFIG_ADD="openvg"
- QCONFIG_DEFINE="QT_OPENVG"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="
+ src/openvg
+ src/plugins/graphicssystems/openvg"
-src_configure() {
- gltype="desktop"
+QT4_EXTRACT_DIRECTORIES="
+ include/QtCore
+ include/QtGui
+ include/QtOpenVG
+ src/corelib
+ src/gui
+ src/openvg
+ src/plugins
+ src/3rdparty"
+
+QCONFIG_ADD="openvg"
+QCONFIG_DEFINE="QT_OPENVG"
+src_configure() {
myconf+="
-openvg -egl
$(qt_use qt3support)"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_install() {
- qt4-build_src_install
+ qt4-build-multilib_src_install
# touch the available graphics systems
dodir /usr/share/qt4/graphicssystems
diff --git a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
index c155f65..55db6be 100644
--- a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
+++ b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
@@ -2,53 +2,59 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The Phonon module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~x64-solaris ~x86-solaris"
fi
+
IUSE="dbus qt3support"
DEPEND="
+ ~dev-qt/qtcore-${PV}[aqua=,debug=]
~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=]
!kde-base/phonon-kde
!kde-base/phonon-xine
!media-libs/phonon
!media-sound/phonon
- !aqua? ( media-libs/gstreamer:0.10
- media-plugins/gst-plugins-meta:0.10 )
aqua? ( ~dev-qt/qtopengl-${PV}[aqua,debug=,qt3support=] )
+ !aqua? (
+ media-libs/gstreamer:0.10
+ media-plugins/gst-plugins-meta:0.10
+ )
dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/phonon
- src/plugins/phonon"
+QT4_TARGET_DIRECTORIES="
+ src/phonon
+ src/plugins/phonon"
- QT4_EXTRACT_DIRECTORIES="
- include
- src"
+QT4_EXTRACT_DIRECTORIES="
+ include
+ src"
- QCONFIG_ADD="phonon"
+QCONFIG_ADD="phonon"
+
+pkg_setup() {
QCONFIG_DEFINE="QT_PHONON
- $(use !aqua && echo QT_GSTREAMER)"
+ $(use aqua || echo QT_GSTREAMER)"
- qt4-build_pkg_setup
+ qt4-build-multilib_pkg_setup
}
src_configure() {
myconf+="
- -phonon -phonon-backend -no-opengl -no-svg
+ -phonon -phonon-backend
+ -no-opengl -no-svg
$(qt_use dbus qdbus)
$(qt_use qt3support)"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qtscript/qtscript-4.8.9999.ebuild
b/dev-qt/qtscript/qtscript-4.8.9999.ebuild
index bb97692..f6796ce 100644
--- a/dev-qt/qtscript/qtscript-4.8.9999.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The QtScript module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE="iconv +jit"
DEPEND="
@@ -20,22 +21,18 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/script"
+QT4_TARGET_DIRECTORIES="
+ src/script"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt
- include/QtCore
- include/QtScript
- src/3rdparty/javascriptcore
- src/corelib"
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/Qt
+ include/QtCore
+ include/QtScript
+ src/3rdparty/javascriptcore
+ src/corelib"
- QCONFIG_ADD="script"
- QCONFIG_DEFINE="QT_SCRIPT"
-
- qt4-build_pkg_setup
-}
+QCONFIG_ADD="script"
+QCONFIG_DEFINE="QT_SCRIPT"
src_configure() {
myconf+="
@@ -48,13 +45,13 @@ src_configure() {
-no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg
-no-gtkstyle"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_install() {
- qt4-build_src_install
+ qt4-build-multilib_src_install
# install private headers
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private
- find "${S}"/src/script -type f -name "*_p.h" -exec doins {} +
+ insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtScript/private
+ find "${S}"/src/script -type f -name "*_p.h" -exec doins '{}' +
}
diff --git a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
index af6cd63..e3fe7c7 100644
--- a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit multilib qt4-build
+inherit multilib qt4-build-multilib
DESCRIPTION="The SQL module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
REQUIRED_USE="
@@ -31,22 +32,18 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/sql
- src/plugins/sqldrivers"
+QT4_TARGET_DIRECTORIES="
+ src/sql
+ src/plugins/sqldrivers"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt
- include/QtCore
- include/QtSql
- src/src.pro
- src/corelib
- src/plugins
- src/tools/tools.pro"
-
- qt4-build_pkg_setup
-}
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/Qt
+ include/QtCore
+ include/QtSql
+ src/src.pro
+ src/corelib
+ src/plugins
+ src/tools/tools.pro"
src_configure() {
myconf+="
@@ -69,5 +66,5 @@ src_configure() {
-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype
-no-xinput -no-xkb
-no-glib"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
index ab4668e..6e4baef 100644
--- a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
+++ b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The SVG module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~x64-solaris ~x86-solaris"
fi
+
IUSE="+accessibility"
DEPEND="
@@ -22,29 +23,25 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/svg
- src/plugins/imageformats/svg
- src/plugins/iconengines/svgiconengine"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtSvg
- include/Qt
- include/QtGui
- include/QtCore
- include/QtXml
- src/corelib
- src/gui
- src/plugins
- src/xml
- src/3rdparty"
-
- QCONFIG_ADD="svg"
- QCONFIG_DEFINE="QT_SVG"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="
+ src/svg
+ src/plugins/imageformats/svg
+ src/plugins/iconengines/svgiconengine"
+
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/QtSvg
+ include/Qt
+ include/QtGui
+ include/QtCore
+ include/QtXml
+ src/corelib
+ src/gui
+ src/plugins
+ src/xml
+ src/3rdparty"
+
+QCONFIG_ADD="svg"
+QCONFIG_DEFINE="QT_SVG"
src_configure() {
myconf+="
@@ -57,5 +54,5 @@ src_configure() {
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
-no-fontconfig -no-glib -no-gtkstyle"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qttest/qttest-4.8.9999.ebuild
b/dev-qt/qttest/qttest-4.8.9999.ebuild
index 7256324..a0292cb 100644
--- a/dev-qt/qttest/qttest-4.8.9999.ebuild
+++ b/dev-qt/qttest/qttest-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The QtTest module for unit testing Qt applications and libraries"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~x64-solaris ~x86-solaris"
fi
+
IUSE=""
DEPEND="
@@ -20,17 +21,13 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/testlib"
+QT4_TARGET_DIRECTORIES="
+ src/testlib"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtTest
- include/QtCore
- src/corelib"
-
- qt4-build_pkg_setup
-}
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/QtTest
+ include/QtCore
+ src/corelib"
src_configure() {
myconf+="
@@ -41,5 +38,5 @@ src_configure() {
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
-no-accessibility -no-fontconfig -no-glib -no-svg"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
index a87fc07..eb66856 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
@@ -4,15 +4,16 @@
EAPI=5
-inherit qt4-build flag-o-matic
+inherit qt4-build-multilib
DESCRIPTION="The WebKit module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd
~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
~x64-solaris ~x86-solaris"
fi
+
IUSE="+gstreamer icu +jit"
# libxml2[!icu?] is needed for bugs 407315 and 411091
@@ -38,21 +39,17 @@ PATCHES=(
"${FILESDIR}/4.8.2-javascriptcore-x32.patch"
)
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/3rdparty/webkit/Source/JavaScriptCore
- src/3rdparty/webkit/Source/WebCore
- src/3rdparty/webkit/Source/WebKit/qt"
+QT4_TARGET_DIRECTORIES="
+ src/3rdparty/webkit/Source/JavaScriptCore
+ src/3rdparty/webkit/Source/WebCore
+ src/3rdparty/webkit/Source/WebKit/qt"
- QT4_EXTRACT_DIRECTORIES="
- include
- src"
+QT4_EXTRACT_DIRECTORIES="
+ include
+ src"
- QCONFIG_ADD="webkit"
- QCONFIG_DEFINE="QT_WEBKIT"
-
- qt4-build_pkg_setup
-}
+QCONFIG_ADD="webkit"
+QCONFIG_DEFINE="QT_WEBKIT"
src_prepare() {
# Fix version number in generated pkgconfig file, bug 406443
@@ -68,7 +65,7 @@ src_prepare() {
src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die
fi
- qt4-build_src_prepare
+ qt4-build-multilib_src_prepare
}
src_configure() {
@@ -79,5 +76,5 @@ src_configure() {
$(qt_use jit javascript-jit)
$(use gstreamer || echo -DENABLE_VIDEO=0)"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
index 575c99f..9f6a15b 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The XmlPatterns module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE=""
DEPEND="
@@ -20,29 +21,25 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/xmlpatterns
- tools/xmlpatterns
- tools/xmlpatternsvalidator"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtCore
- include/QtNetwork
- include/QtXml
- include/QtXmlPatterns
- src/network
- src/xml
- src/corelib"
-
- QCONFIG_ADD="xmlpatterns"
- QCONFIG_DEFINE="QT_XMLPATTERNS"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="
+ src/xmlpatterns
+ tools/xmlpatterns
+ tools/xmlpatternsvalidator"
+
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/QtCore
+ include/QtNetwork
+ include/QtXml
+ include/QtXmlPatterns
+ src/network
+ src/xml
+ src/corelib"
+
+QCONFIG_ADD="xmlpatterns"
+QCONFIG_DEFINE="QT_XMLPATTERNS"
src_configure() {
myconf+=" -xmlpatterns"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
