commit: 8881a1b7b068f78aeca09c3b53ed268ed898056b
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 17 12:32:19 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Aug 17 12:32:19 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8881a1b7
[qt5-build.eclass] Stop defining/exporting pkg_setup.
---
dev-qt/qtgui/qtgui-5.3.1-r1.ebuild | 2 --
dev-qt/qtgui/qtgui-5.3.9999.ebuild | 2 --
dev-qt/qtgui/qtgui-5.4.9999.ebuild | 2 --
dev-qt/qtgui/qtgui-5.9999.ebuild | 2 --
dev-qt/qtnetwork/qtnetwork-5.3.1-r1.ebuild | 2 --
dev-qt/qtnetwork/qtnetwork-5.3.9999.ebuild | 2 --
dev-qt/qtnetwork/qtnetwork-5.4.9999.ebuild | 2 --
dev-qt/qtnetwork/qtnetwork-5.9999.ebuild | 2 --
dev-qt/qtwebkit/qtwebkit-5.3.1.ebuild | 5 -----
dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild | 5 -----
dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild | 5 -----
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 5 -----
eclass/qt5-build.eclass | 19 ++++++-------------
13 files changed, 6 insertions(+), 49 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
b/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
index b76db5c..0688654 100644
--- a/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
@@ -117,8 +117,6 @@ pkg_setup() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
-
- qt5-build_pkg_setup
}
src_configure() {
diff --git a/dev-qt/qtgui/qtgui-5.3.9999.ebuild
b/dev-qt/qtgui/qtgui-5.3.9999.ebuild
index b76db5c..0688654 100644
--- a/dev-qt/qtgui/qtgui-5.3.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.9999.ebuild
@@ -117,8 +117,6 @@ pkg_setup() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
-
- qt5-build_pkg_setup
}
src_configure() {
diff --git a/dev-qt/qtgui/qtgui-5.4.9999.ebuild
b/dev-qt/qtgui/qtgui-5.4.9999.ebuild
index 1a468bb..a5647d9 100644
--- a/dev-qt/qtgui/qtgui-5.4.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.4.9999.ebuild
@@ -118,8 +118,6 @@ pkg_setup() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
-
- qt5-build_pkg_setup
}
src_configure() {
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index 1a468bb..a5647d9 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -118,8 +118,6 @@ pkg_setup() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
-
- qt5-build_pkg_setup
}
src_configure() {
diff --git a/dev-qt/qtnetwork/qtnetwork-5.3.1-r1.ebuild
b/dev-qt/qtnetwork/qtnetwork-5.3.1-r1.ebuild
index 6c2cfa1..79b546e 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.3.1-r1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.3.1-r1.ebuild
@@ -42,8 +42,6 @@ QT5_GENTOO_CONFIG=(
)
pkg_setup() {
- qt5-build_pkg_setup
-
use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
use networkmanager &&
QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
}
diff --git a/dev-qt/qtnetwork/qtnetwork-5.3.9999.ebuild
b/dev-qt/qtnetwork/qtnetwork-5.3.9999.ebuild
index 6c2cfa1..79b546e 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.3.9999.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.3.9999.ebuild
@@ -42,8 +42,6 @@ QT5_GENTOO_CONFIG=(
)
pkg_setup() {
- qt5-build_pkg_setup
-
use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
use networkmanager &&
QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
}
diff --git a/dev-qt/qtnetwork/qtnetwork-5.4.9999.ebuild
b/dev-qt/qtnetwork/qtnetwork-5.4.9999.ebuild
index 6c2cfa1..79b546e 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.4.9999.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.4.9999.ebuild
@@ -42,8 +42,6 @@ QT5_GENTOO_CONFIG=(
)
pkg_setup() {
- qt5-build_pkg_setup
-
use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
use networkmanager &&
QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
}
diff --git a/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild
b/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild
index 6c2cfa1..79b546e 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild
@@ -42,8 +42,6 @@ QT5_GENTOO_CONFIG=(
)
pkg_setup() {
- qt5-build_pkg_setup
-
use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
use networkmanager &&
QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
}
diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.1.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.3.1.ebuild
index a031505..49d482e 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3.1.ebuild
@@ -60,11 +60,6 @@ DEPEND="${RDEPEND}
sys-devel/flex
"
-pkg_setup() {
- python-any-r1_pkg_setup
- qt5-build_pkg_setup
-}
-
src_prepare() {
use gstreamer || epatch
"${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
use libxml2 || sed -i -e '/config_libxml2: WEBKIT_CONFIG +=
use_libxml2/d' \
diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
index a031505..49d482e 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
@@ -60,11 +60,6 @@ DEPEND="${RDEPEND}
sys-devel/flex
"
-pkg_setup() {
- python-any-r1_pkg_setup
- qt5-build_pkg_setup
-}
-
src_prepare() {
use gstreamer || epatch
"${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
use libxml2 || sed -i -e '/config_libxml2: WEBKIT_CONFIG +=
use_libxml2/d' \
diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
index a031505..49d482e 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
@@ -60,11 +60,6 @@ DEPEND="${RDEPEND}
sys-devel/flex
"
-pkg_setup() {
- python-any-r1_pkg_setup
- qt5-build_pkg_setup
-}
-
src_prepare() {
use gstreamer || epatch
"${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
use libxml2 || sed -i -e '/config_libxml2: WEBKIT_CONFIG +=
use_libxml2/d' \
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index a031505..49d482e 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -60,11 +60,6 @@ DEPEND="${RDEPEND}
sys-devel/flex
"
-pkg_setup() {
- python-any-r1_pkg_setup
- qt5-build_pkg_setup
-}
-
src_prepare() {
use gstreamer || epatch
"${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
use libxml2 || sed -i -e '/config_libxml2: WEBKIT_CONFIG +=
use_libxml2/d' \
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 9c2799c..a4ae5af 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -76,7 +76,7 @@ if [[ ${PN} != qttest ]]; then
fi
fi
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile
src_install src_test pkg_postinst pkg_postrm
+EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
src_test pkg_postinst pkg_postrm
# @ECLASS-VARIABLE: PATCHES
# @DEFAULT_UNSET
@@ -122,18 +122,8 @@ esac
# for tests you should proceed with setting VIRTUALX_REQUIRED=test.
: ${VIRTUALX_REQUIRED:=manual}
-# @FUNCTION: qt5-build_pkg_setup
-# @DESCRIPTION:
-# Warns and/or dies if the user is trying to downgrade Qt.
-qt5-build_pkg_setup() {
- # Warn users of possible breakage when downgrading to a previous
release.
- # Downgrading revisions within the same release is safe.
- if has_version ">${CATEGORY}/${P}-r9999:5"; then
- ewarn
- ewarn "Downgrading Qt is completely unsupported and can break
your system!"
- ewarn
- fi
-}
+
+###### Phase functions ######
# @FUNCTION: qt5-build_src_unpack
# @DESCRIPTION:
@@ -299,6 +289,9 @@ qt5-build_pkg_postrm() {
fi
}
+
+###### Public helpers ######
+
# @FUNCTION: qt_use
# @USAGE: <flag> [feature] [enableopt]
# @DESCRIPTION:
