commit: 9e0663d66b2878e295170852722b2dbfb112cb26
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 8 19:08:05 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul 8 19:08:05 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9e0663d6
[Qt4] Refactor phase functions so that ebuilds can override multilib_src_*
---
dev-qt/assistant/assistant-4.8.6.ebuild | 14 ++---
dev-qt/assistant/assistant-4.8.9999.ebuild | 14 ++---
dev-qt/designer/designer-4.8.6.ebuild | 14 ++---
dev-qt/designer/designer-4.8.9999.ebuild | 14 ++---
dev-qt/linguist/linguist-4.8.6.ebuild | 14 ++---
dev-qt/linguist/linguist-4.8.9999.ebuild | 14 ++---
dev-qt/pixeltool/pixeltool-4.8.6.ebuild | 10 ++--
dev-qt/pixeltool/pixeltool-4.8.9999.ebuild | 10 ++--
dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild | 14 ++---
dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild | 14 ++---
dev-qt/qt3support/qt3support-4.8.6.ebuild | 10 ++--
dev-qt/qt3support/qt3support-4.8.9999.ebuild | 10 ++--
dev-qt/qtbearer/qtbearer-4.8.6.ebuild | 10 ++--
dev-qt/qtbearer/qtbearer-4.8.9999.ebuild | 10 ++--
dev-qt/qtcore/qtcore-4.8.6.ebuild | 14 ++---
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 14 ++---
dev-qt/qtdbus/qtdbus-4.8.6.ebuild | 9 ++--
dev-qt/qtdbus/qtdbus-4.8.9999.ebuild | 9 ++--
dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild | 9 ++--
dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild | 9 ++--
dev-qt/qtdemo/qtdemo-4.8.6.ebuild | 16 +++---
dev-qt/qtdemo/qtdemo-4.8.9999.ebuild | 16 +++---
dev-qt/qtgui/qtgui-4.8.6.ebuild | 19 +++----
dev-qt/qtgui/qtgui-4.8.9999.ebuild | 19 +++----
dev-qt/qthelp/qthelp-4.8.6.ebuild | 22 ++++----
dev-qt/qthelp/qthelp-4.8.9999.ebuild | 22 ++++----
dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild | 10 ++--
dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild | 10 ++--
dev-qt/qtopengl/qtopengl-4.8.6.ebuild | 15 +++---
dev-qt/qtopengl/qtopengl-4.8.9999.ebuild | 15 +++---
dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild | 15 +++---
dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild | 15 +++---
dev-qt/qtphonon/qtphonon-4.8.6.ebuild | 13 ++---
dev-qt/qtphonon/qtphonon-4.8.9999.ebuild | 13 ++---
dev-qt/qtscript/qtscript-4.8.6.ebuild | 10 ++--
dev-qt/qtscript/qtscript-4.8.9999.ebuild | 10 ++--
dev-qt/qtsql/qtsql-4.8.6.ebuild | 10 ++--
dev-qt/qtsql/qtsql-4.8.9999.ebuild | 10 ++--
dev-qt/qtsvg/qtsvg-4.8.6.ebuild | 10 ++--
dev-qt/qtsvg/qtsvg-4.8.9999.ebuild | 10 ++--
dev-qt/qttest/qttest-4.8.6.ebuild | 10 ++--
dev-qt/qttest/qttest-4.8.9999.ebuild | 10 ++--
dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild | 10 ++--
dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild | 10 ++--
dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild | 9 ++--
dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild | 9 ++--
eclass/qt4-build-multilib.eclass | 63 +++++++---------------
47 files changed, 305 insertions(+), 332 deletions(-)
diff --git a/dev-qt/assistant/assistant-4.8.6.ebuild
b/dev-qt/assistant/assistant-4.8.6.ebuild
index 60846fa..0c9c6a2 100644
--- a/dev-qt/assistant/assistant-4.8.6.ebuild
+++ b/dev-qt/assistant/assistant-4.8.6.ebuild
@@ -38,19 +38,19 @@ src_prepare() {
qt4-build-multilib_src_prepare
}
-src_configure() {
- myconf+="
+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-build-multilib_src_configure
+ $(qt_use webkit)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+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/assistant-4.8.9999.ebuild
b/dev-qt/assistant/assistant-4.8.9999.ebuild
index 60846fa..0c9c6a2 100644
--- a/dev-qt/assistant/assistant-4.8.9999.ebuild
+++ b/dev-qt/assistant/assistant-4.8.9999.ebuild
@@ -38,19 +38,19 @@ src_prepare() {
qt4-build-multilib_src_prepare
}
-src_configure() {
- myconf+="
+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-build-multilib_src_configure
+ $(qt_use webkit)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+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/designer/designer-4.8.6.ebuild
b/dev-qt/designer/designer-4.8.6.ebuild
index 0b0d858..0915f41 100644
--- a/dev-qt/designer/designer-4.8.6.ebuild
+++ b/dev-qt/designer/designer-4.8.6.ebuild
@@ -40,18 +40,18 @@ src_prepare() {
done
}
-src_configure() {
- myconf+="
+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-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install() {
+ qt4_multilib_src_install
# qt-creator
# some qt-creator headers are located
diff --git a/dev-qt/designer/designer-4.8.9999.ebuild
b/dev-qt/designer/designer-4.8.9999.ebuild
index 0b0d858..0915f41 100644
--- a/dev-qt/designer/designer-4.8.9999.ebuild
+++ b/dev-qt/designer/designer-4.8.9999.ebuild
@@ -40,18 +40,18 @@ src_prepare() {
done
}
-src_configure() {
- myconf+="
+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-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install() {
+ qt4_multilib_src_install
# qt-creator
# some qt-creator headers are located
diff --git a/dev-qt/linguist/linguist-4.8.6.ebuild
b/dev-qt/linguist/linguist-4.8.6.ebuild
index 62bfacf..8307f56 100644
--- a/dev-qt/linguist/linguist-4.8.6.ebuild
+++ b/dev-qt/linguist/linguist-4.8.6.ebuild
@@ -25,18 +25,18 @@ RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="tools/linguist/linguist"
-src_configure() {
- myconf+="
+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-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+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/linguist/linguist-4.8.9999.ebuild
b/dev-qt/linguist/linguist-4.8.9999.ebuild
index 62bfacf..8307f56 100644
--- a/dev-qt/linguist/linguist-4.8.9999.ebuild
+++ b/dev-qt/linguist/linguist-4.8.9999.ebuild
@@ -25,18 +25,18 @@ RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="tools/linguist/linguist"
-src_configure() {
- myconf+="
+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-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+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.6.ebuild
b/dev-qt/pixeltool/pixeltool-4.8.6.ebuild
index 07cf48b..d2254ef 100644
--- a/dev-qt/pixeltool/pixeltool-4.8.6.ebuild
+++ b/dev-qt/pixeltool/pixeltool-4.8.6.ebuild
@@ -25,12 +25,12 @@ RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="tools/pixeltool"
-src_configure() {
- myconf+="
+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-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
index 07cf48b..d2254ef 100644
--- a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
+++ b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
@@ -25,12 +25,12 @@ RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="tools/pixeltool"
-src_configure() {
- myconf+="
+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-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild
b/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild
index fe83d4c..74f27ba 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild
@@ -25,18 +25,18 @@ RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
-src_configure() {
- myconf+="
+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-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+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/qdbusviewer/qdbusviewer-4.8.9999.ebuild
b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
index fe83d4c..74f27ba 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
@@ -25,18 +25,18 @@ RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
-src_configure() {
- myconf+="
+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-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+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/qt3support-4.8.6.ebuild
b/dev-qt/qt3support/qt3support-4.8.6.ebuild
index ab38a26..b5d12f9 100644
--- a/dev-qt/qt3support/qt3support-4.8.6.ebuild
+++ b/dev-qt/qt3support/qt3support-4.8.6.ebuild
@@ -28,10 +28,10 @@ QT4_TARGET_DIRECTORIES="
src/tools/uic3
tools/porting"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-qt3support
- $(qt_use accessibility)"
-
- qt4-build-multilib_src_configure
+ $(qt_use accessibility)
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qt3support/qt3support-4.8.9999.ebuild
b/dev-qt/qt3support/qt3support-4.8.9999.ebuild
index ab38a26..b5d12f9 100644
--- a/dev-qt/qt3support/qt3support-4.8.9999.ebuild
+++ b/dev-qt/qt3support/qt3support-4.8.9999.ebuild
@@ -28,10 +28,10 @@ QT4_TARGET_DIRECTORIES="
src/tools/uic3
tools/porting"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-qt3support
- $(qt_use accessibility)"
-
- qt4-build-multilib_src_configure
+ $(qt_use accessibility)
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
b/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
index bb01c0a..5d2b47b 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
@@ -33,15 +33,15 @@ pkg_setup() {
$(use networkmanager && echo src/plugins/bearer/networkmanager)"
}
-src_configure() {
- myconf+="
+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-build-multilib_src_configure
+ -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype
-no-xinput -no-xkb
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
index bb01c0a..5d2b47b 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
@@ -33,15 +33,15 @@ pkg_setup() {
$(use networkmanager && echo src/plugins/bearer/networkmanager)"
}
-src_configure() {
- myconf+="
+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-build-multilib_src_configure
+ -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype
-no-xinput -no-xkb
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild
b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index b7e20b6..4ceb304 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -68,8 +68,8 @@ src_prepare() {
configure || die "sed configure setBootstrapVariable failed"
}
-src_configure() {
- myconf+="
+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
@@ -80,13 +80,13 @@ src_configure() {
$(qt_use iconv)
$(qt_use icu)
$(use ssl && echo -openssl-linked || echo -no-openssl)
- $(qt_use qt3support)"
-
- qt4-build-multilib_src_configure
+ $(qt_use qt3support)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
# List all the multilib libdirs
local libdirs=
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index b7e20b6..4ceb304 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -68,8 +68,8 @@ src_prepare() {
configure || die "sed configure setBootstrapVariable failed"
}
-src_configure() {
- myconf+="
+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
@@ -80,13 +80,13 @@ src_configure() {
$(qt_use iconv)
$(qt_use icu)
$(use ssl && echo -openssl-linked || echo -no-openssl)
- $(qt_use qt3support)"
-
- qt4-build-multilib_src_configure
+ $(qt_use qt3support)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
# List all the multilib libdirs
local libdirs=
diff --git a/dev-qt/qtdbus/qtdbus-4.8.6.ebuild
b/dev-qt/qtdbus/qtdbus-4.8.6.ebuild
index df916b8..3127e24 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.6.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.6.ebuild
@@ -36,8 +36,9 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="dbus dbus-linked"
QCONFIG_DEFINE="QT_DBUS"
-src_configure() {
- myconf+=" -dbus-linked"
-
- qt4-build-multilib_src_configure
+multilib_src_configure() {
+ local myconf=(
+ -dbus-linked
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
index df916b8..3127e24 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
@@ -36,8 +36,9 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="dbus dbus-linked"
QCONFIG_DEFINE="QT_DBUS"
-src_configure() {
- myconf+=" -dbus-linked"
-
- qt4-build-multilib_src_configure
+multilib_src_configure() {
+ local myconf=(
+ -dbus-linked
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
index 5a5c974..4750e3e 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
@@ -44,11 +44,12 @@ pkg_setup() {
src/3rdparty/webkit/Source/WebKit/qt/declarative"
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-declarative -no-gtkstyle
$(qt_use accessibility)
$(qt_use qt3support)
- $(qt_use webkit)"
- qt4-build-multilib_src_configure
+ $(qt_use webkit)
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
index 5a5c974..4750e3e 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
@@ -44,11 +44,12 @@ pkg_setup() {
src/3rdparty/webkit/Source/WebKit/qt/declarative"
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-declarative -no-gtkstyle
$(qt_use accessibility)
$(qt_use qt3support)
- $(qt_use webkit)"
- qt4-build-multilib_src_configure
+ $(qt_use webkit)
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
b/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
index e74659d..6128e3d 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
@@ -82,8 +82,8 @@ src_prepare() {
examples/graphicsview/graphicsview.pro || die
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
$(qt_use dbus)
$(qt_use declarative)
$(qt_use multimedia) -no-audio-backend
@@ -91,14 +91,14 @@ src_configure() {
$(qt_use openvg)
$(qt_use phonon) -no-phonon-backend
$(qt_use webkit)
- $(qt_use xmlpatterns)"
-
- qt4-build-multilib_src_configure
+ $(qt_use xmlpatterns)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
+
insinto "${QT4_DOCDIR#${EPREFIX}}"/src
doins -r doc/src/images
-
- qt4-build-multilib_src_install
}
diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
index e74659d..6128e3d 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
@@ -82,8 +82,8 @@ src_prepare() {
examples/graphicsview/graphicsview.pro || die
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
$(qt_use dbus)
$(qt_use declarative)
$(qt_use multimedia) -no-audio-backend
@@ -91,14 +91,14 @@ src_configure() {
$(qt_use openvg)
$(qt_use phonon) -no-phonon-backend
$(qt_use webkit)
- $(qt_use xmlpatterns)"
-
- qt4-build-multilib_src_configure
+ $(qt_use xmlpatterns)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
+
insinto "${QT4_DOCDIR#${EPREFIX}}"/src
doins -r doc/src/images
-
- qt4-build-multilib_src_install
}
diff --git a/dev-qt/qtgui/qtgui-4.8.6.ebuild b/dev-qt/qtgui/qtgui-4.8.6.ebuild
index 2adb6dc..ed74f5d 100644
--- a/dev-qt/qtgui/qtgui-4.8.6.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.6.ebuild
@@ -129,8 +129,8 @@ src_prepare() {
sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
$(qt_use accessibility)
$(qt_use cups)
$(qt_use glib)
@@ -146,18 +146,15 @@ src_configure() {
-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"
-
- # bug 367045
- [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3"
-
- qt4-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ $([[ ${CHOST} == *86*-apple-darwin* ]] && echo -no-ssse3) # bug
367045
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
- # touch the available graphics systems
dodir /usr/share/qt4/graphicssystems
echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die
diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
index 6a3641e..e4f0746 100644
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
@@ -126,8 +126,8 @@ src_prepare() {
sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
$(qt_use accessibility)
$(qt_use cups)
$(qt_use glib)
@@ -143,18 +143,15 @@ src_configure() {
-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"
-
- # bug 367045
- [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3"
-
- qt4-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ $([[ ${CHOST} == *86*-apple-darwin* ]] && echo -no-ssse3) # bug
367045
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
- # touch the available graphics systems
dodir /usr/share/qt4/graphicssystems
echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die
diff --git a/dev-qt/qthelp/qthelp-4.8.6.ebuild
b/dev-qt/qthelp/qthelp-4.8.6.ebuild
index 70ac632..9b7a09c 100644
--- a/dev-qt/qthelp/qthelp-4.8.6.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.6.ebuild
@@ -69,23 +69,23 @@ src_prepare() {
sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
}
-src_configure() {
- myconf+="
+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-build-multilib_src_configure
+ -no-nas-sound -no-cups -no-nis -fontconfig
+ )
+ qt4_multilib_src_configure
}
-src_compile() {
- qt4-build-multilib_src_compile
+multilib_src_compile() {
+ qt4_multilib_src_compile
# qhelpgenerator needs libQtHelp.so.4
- export LD_LIBRARY_PATH=${S}/lib
- export DYLD_LIBRARY_PATH=${S}/lib:${S}/lib/QtHelp.framework
+ export LD_LIBRARY_PATH=${BUILD_DIR}/lib
+ export
DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework
if use doc; then
emake docs
@@ -95,8 +95,8 @@ src_compile() {
fi
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install() {
+ qt4_multilib_src_install
emake INSTALL_ROOT="${D}" install_qchdocs
diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 70ac632..9b7a09c 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -69,23 +69,23 @@ src_prepare() {
sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
}
-src_configure() {
- myconf+="
+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-build-multilib_src_configure
+ -no-nas-sound -no-cups -no-nis -fontconfig
+ )
+ qt4_multilib_src_configure
}
-src_compile() {
- qt4-build-multilib_src_compile
+multilib_src_compile() {
+ qt4_multilib_src_compile
# qhelpgenerator needs libQtHelp.so.4
- export LD_LIBRARY_PATH=${S}/lib
- export DYLD_LIBRARY_PATH=${S}/lib:${S}/lib/QtHelp.framework
+ export LD_LIBRARY_PATH=${BUILD_DIR}/lib
+ export
DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework
if use doc; then
emake docs
@@ -95,8 +95,8 @@ src_compile() {
fi
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install() {
+ qt4_multilib_src_install
emake INSTALL_ROOT="${D}" install_qchdocs
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild
index 32318e3..5f20ad2 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild
@@ -32,8 +32,8 @@ QT4_TARGET_DIRECTORIES="src/multimedia"
QCONFIG_ADD="multimedia"
QCONFIG_DEFINE="QT_MULTIMEDIA"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-multimedia -audio-backend
$(qt_use alsa)
-no-accessibility -no-qt3support -no-xmlpatterns -no-phonon
-no-phonon-backend
@@ -41,7 +41,7 @@ src_configure() {
-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-build-multilib_src_configure
+ -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype
-no-xinput -no-xkb
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
index 32318e3..5f20ad2 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
@@ -32,8 +32,8 @@ QT4_TARGET_DIRECTORIES="src/multimedia"
QCONFIG_ADD="multimedia"
QCONFIG_DEFINE="QT_MULTIMEDIA"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-multimedia -audio-backend
$(qt_use alsa)
-no-accessibility -no-qt3support -no-xmlpatterns -no-phonon
-no-phonon-backend
@@ -41,7 +41,7 @@ src_configure() {
-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-build-multilib_src_configure
+ -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.6.ebuild
b/dev-qt/qtopengl/qtopengl-4.8.6.ebuild
index 8c08988..77e064e 100644
--- a/dev-qt/qtopengl/qtopengl-4.8.6.ebuild
+++ b/dev-qt/qtopengl/qtopengl-4.8.6.ebuild
@@ -32,19 +32,18 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="opengl"
QCONFIG_DEFINE="QT_OPENGL"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-opengl
$(qt_use qt3support)
- $(qt_use egl)"
-
- qt4-build-multilib_src_configure
+ $(qt_use egl)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
- # touch the available graphics systems
dodir /usr/share/qt4/graphicssystems
echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl ||
die
}
diff --git a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
index 8c08988..77e064e 100644
--- a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
+++ b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
@@ -32,19 +32,18 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="opengl"
QCONFIG_DEFINE="QT_OPENGL"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-opengl
$(qt_use qt3support)
- $(qt_use egl)"
-
- qt4-build-multilib_src_configure
+ $(qt_use egl)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
- # touch the available graphics systems
dodir /usr/share/qt4/graphicssystems
echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl ||
die
}
diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild
b/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild
index 84799f5..23bf1dc 100644
--- a/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild
+++ b/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild
@@ -30,18 +30,17 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="openvg"
QCONFIG_DEFINE="QT_OPENVG"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-openvg -egl
- $(qt_use qt3support)"
-
- qt4-build-multilib_src_configure
+ $(qt_use qt3support)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install() {
+ qt4_multilib_src_install
- # touch the available graphics systems
dodir /usr/share/qt4/graphicssystems
echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg ||
die
}
diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
index 84799f5..23bf1dc 100644
--- a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
+++ b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
@@ -30,18 +30,17 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="openvg"
QCONFIG_DEFINE="QT_OPENVG"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-openvg -egl
- $(qt_use qt3support)"
-
- qt4-build-multilib_src_configure
+ $(qt_use qt3support)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install() {
+ qt4_multilib_src_install
- # touch the available graphics systems
dodir /usr/share/qt4/graphicssystems
echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg ||
die
}
diff --git a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
index be7dca9..5f2a9df 100644
--- a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
+++ b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
@@ -39,16 +39,17 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="phonon"
pkg_setup() {
- QCONFIG_DEFINE="QT_PHONON
+ QCONFIG_DEFINE="
+ QT_PHONON
$(use aqua || echo QT_GSTREAMER)"
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-phonon -phonon-backend
-no-opengl -no-svg
$(qt_use dbus qdbus)
- $(qt_use qt3support)"
-
- qt4-build-multilib_src_configure
+ $(qt_use qt3support)
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
index be7dca9..5f2a9df 100644
--- a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
+++ b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
@@ -39,16 +39,17 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="phonon"
pkg_setup() {
- QCONFIG_DEFINE="QT_PHONON
+ QCONFIG_DEFINE="
+ QT_PHONON
$(use aqua || echo QT_GSTREAMER)"
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-phonon -phonon-backend
-no-opengl -no-svg
$(qt_use dbus qdbus)
- $(qt_use qt3support)"
-
- qt4-build-multilib_src_configure
+ $(qt_use qt3support)
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtscript/qtscript-4.8.6.ebuild
b/dev-qt/qtscript/qtscript-4.8.6.ebuild
index e00c21e..d45f75c 100644
--- a/dev-qt/qtscript/qtscript-4.8.6.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.6.ebuild
@@ -26,8 +26,8 @@ QT4_TARGET_DIRECTORIES="src/script"
QCONFIG_ADD="script"
QCONFIG_DEFINE="QT_SCRIPT"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
$(qt_use iconv)
$(qt_use jit javascript-jit)
-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes
-no-xcursor -no-xinerama
@@ -35,7 +35,7 @@ src_configure() {
-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-build-multilib_src_configure
+ -no-gtkstyle
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtscript/qtscript-4.8.9999.ebuild
b/dev-qt/qtscript/qtscript-4.8.9999.ebuild
index e00c21e..d45f75c 100644
--- a/dev-qt/qtscript/qtscript-4.8.9999.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.9999.ebuild
@@ -26,8 +26,8 @@ QT4_TARGET_DIRECTORIES="src/script"
QCONFIG_ADD="script"
QCONFIG_DEFINE="QT_SCRIPT"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
$(qt_use iconv)
$(qt_use jit javascript-jit)
-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes
-no-xcursor -no-xinerama
@@ -35,7 +35,7 @@ src_configure() {
-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-build-multilib_src_configure
+ -no-gtkstyle
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index 803a39a..cd5918f 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -35,8 +35,8 @@ QT4_TARGET_DIRECTORIES="
src/sql
src/plugins/sqldrivers"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
$(qt_native_use freetds sql-tds plugin)
$(qt_native_use mysql sql-mysql plugin) $(use mysql &&
multilib_is_native_abi && 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)")
@@ -54,7 +54,7 @@ src_configure() {
-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-build-multilib_src_configure
+ -no-glib
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
index 803a39a..cd5918f 100644
--- a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
@@ -35,8 +35,8 @@ QT4_TARGET_DIRECTORIES="
src/sql
src/plugins/sqldrivers"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
$(qt_native_use freetds sql-tds plugin)
$(qt_native_use mysql sql-mysql plugin) $(use mysql &&
multilib_is_native_abi && 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)")
@@ -54,7 +54,7 @@ src_configure() {
-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-build-multilib_src_configure
+ -no-glib
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtsvg/qtsvg-4.8.6.ebuild b/dev-qt/qtsvg/qtsvg-4.8.6.ebuild
index 8813c14..b61bbe5 100644
--- a/dev-qt/qtsvg/qtsvg-4.8.6.ebuild
+++ b/dev-qt/qtsvg/qtsvg-4.8.6.ebuild
@@ -31,8 +31,8 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="svg"
QCONFIG_DEFINE="QT_SVG"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-svg
$(qt_use accessibility)
-no-xkb -no-xrender
@@ -40,7 +40,7 @@ src_configure() {
-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-build-multilib_src_configure
+ -no-fontconfig -no-glib -no-gtkstyle
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
index 8813c14..b61bbe5 100644
--- a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
+++ b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
@@ -31,8 +31,8 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="svg"
QCONFIG_DEFINE="QT_SVG"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-svg
$(qt_use accessibility)
-no-xkb -no-xrender
@@ -40,7 +40,7 @@ src_configure() {
-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-build-multilib_src_configure
+ -no-fontconfig -no-glib -no-gtkstyle
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qttest/qttest-4.8.6.ebuild
b/dev-qt/qttest/qttest-4.8.6.ebuild
index d151b5f..2eb2656 100644
--- a/dev-qt/qttest/qttest-4.8.6.ebuild
+++ b/dev-qt/qttest/qttest-4.8.6.ebuild
@@ -23,14 +23,14 @@ RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="src/testlib"
-src_configure() {
- myconf+="
+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-build-multilib_src_configure
+ -no-accessibility -no-fontconfig -no-glib -no-svg
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qttest/qttest-4.8.9999.ebuild
b/dev-qt/qttest/qttest-4.8.9999.ebuild
index d151b5f..2eb2656 100644
--- a/dev-qt/qttest/qttest-4.8.9999.ebuild
+++ b/dev-qt/qttest/qttest-4.8.9999.ebuild
@@ -23,14 +23,14 @@ RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="src/testlib"
-src_configure() {
- myconf+="
+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-build-multilib_src_configure
+ -no-accessibility -no-fontconfig -no-glib -no-svg
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
index d3719f0..bc6ee6b 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
@@ -63,13 +63,13 @@ src_prepare() {
qt4-build-multilib_src_prepare
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-webkit
-system-sqlite
$(qt_use icu)
$(qt_use jit javascript-jit)
- $(use gstreamer || echo -DENABLE_VIDEO=0)"
-
- qt4-build-multilib_src_configure
+ $(use gstreamer || echo -DENABLE_VIDEO=0)
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
index d3719f0..bc6ee6b 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
@@ -63,13 +63,13 @@ src_prepare() {
qt4-build-multilib_src_prepare
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-webkit
-system-sqlite
$(qt_use icu)
$(qt_use jit javascript-jit)
- $(use gstreamer || echo -DENABLE_VIDEO=0)"
-
- qt4-build-multilib_src_configure
+ $(use gstreamer || echo -DENABLE_VIDEO=0)
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild
b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild
index e2941e9..2234419 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild
@@ -29,8 +29,9 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="xmlpatterns"
QCONFIG_DEFINE="QT_XMLPATTERNS"
-src_configure() {
- myconf+=" -xmlpatterns"
-
- qt4-build-multilib_src_configure
+multilib_src_configure() {
+ local myconf=(
+ -xmlpatterns
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
index e2941e9..2234419 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
@@ -29,8 +29,9 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="xmlpatterns"
QCONFIG_DEFINE="QT_XMLPATTERNS"
-src_configure() {
- myconf+=" -xmlpatterns"
-
- qt4-build-multilib_src_configure
+multilib_src_configure() {
+ local myconf=(
+ -xmlpatterns
+ )
+ qt4_multilib_src_configure
}
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index c685334..7693930 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -54,7 +54,16 @@ RDEPEND="
dev-qt/qtchooser
"
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test
src_install pkg_postinst pkg_postrm
+
+# src_{configure,compile,test,install} are inherited from multilib-minimal
+EXPORT_FUNCTIONS src_unpack src_prepare pkg_postinst pkg_postrm
+
+multilib_src_configure() { qt4_multilib_src_configure; }
+multilib_src_compile() { qt4_multilib_src_compile; }
+multilib_src_test() { qt4_multilib_src_test; }
+multilib_src_install() { qt4_multilib_src_install; }
+multilib_src_install_all() { qt4_multilib_src_install_all; }
+
# @ECLASS-VARIABLE: PATCHES
# @DEFAULT_UNSET
@@ -257,14 +266,7 @@ qt4-build-multilib_src_prepare() {
epatch_user
}
-# @FUNCTION: qt4-build-multilib_src_configure
-# @DESCRIPTION:
-# Runs configure and generates Makefiles for all QT4_TARGET_DIRECTORIES.
-qt4-build-multilib_src_configure() {
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
+qt4_multilib_src_configure() {
qt4_prepare_env
if [[ ${PN} != qtcore ]]; then
@@ -373,8 +375,10 @@ multilib_src_configure() {
fi
fi
- # append module-specific arguments
- conf+=(${myconf})
+ conf+=(
+ # module-specific options
+ "${myconf[@]}"
+ )
einfo "Configuring with: ${conf[@]}"
"${S}"/configure "${conf[@]}" || die "configure failed"
@@ -389,41 +393,19 @@ multilib_src_configure() {
qt4_foreach_target_subdir qt4_qmake
}
-# @FUNCTION: qt4-build-multilib_src_compile
-# @DESCRIPTION:
-# Compiles the code in QT4_TARGET_DIRECTORIES.
-qt4-build-multilib_src_compile() {
- multilib-minimal_src_compile
-}
-
-multilib_src_compile() {
+qt4_multilib_src_compile() {
qt4_prepare_env
qt4_foreach_target_subdir emake
}
-# @FUNCTION: qt4-build-multilib_src_test
-# @DESCRIPTION:
-# Runs unit tests in all QT4_TARGET_DIRECTORIES.
-qt4-build-multilib_src_test() {
- multilib-minimal_src_test
-}
-
-multilib_src_test() {
+qt4_multilib_src_test() {
qt4_prepare_env
qt4_foreach_target_subdir emake -j1 check
}
-# @FUNCTION: qt4-build-multilib_src_install
-# @DESCRIPTION:
-# Performs the actual installation, running 'emake install'
-# in all QT4_TARGET_DIRECTORIES, and installing qconfigs.
-qt4-build-multilib_src_install() {
- multilib-minimal_src_install
-}
-
-multilib_src_install() {
+qt4_multilib_src_install() {
qt4_prepare_env
qt4_foreach_target_subdir emake INSTALL_ROOT="${D}" install
@@ -438,14 +420,7 @@ multilib_src_install() {
fix_includes
}
-multilib_src_install_all() {
- qt4-build-multilib_src_install_all
-}
-
-# @FUNCTION: qt4-build-multilib_src_install_all
-# @DESCRIPTION:
-# Common install phase for all multilib ABIs.
-qt4-build-multilib_src_install_all() {
+qt4_multilib_src_install_all() {
# install private headers of a few modules
if has ${PN} qtcore qtdeclarative qtgui qtscript; then
local moduledir=${PN#qt}
