commit: 1cd844487d67bdf5bfe24c8c15aadce4bd6ae2fc
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat May 31 00:55:42 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 1 02:39:56 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1cd84448
[qt4-build-multilib.eclass] Stop exporting pkg_setup.
---
dev-qt/qtbearer/qtbearer-4.8.6.ebuild | 2 --
dev-qt/qtbearer/qtbearer-4.8.9999.ebuild | 2 --
dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild | 2 --
dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild | 2 --
dev-qt/qtgui/qtgui-4.8.6.ebuild | 2 --
dev-qt/qtgui/qtgui-4.8.9999.ebuild | 2 --
dev-qt/qthelp/qthelp-4.8.6.ebuild | 2 --
dev-qt/qthelp/qthelp-4.8.9999.ebuild | 2 --
dev-qt/qtphonon/qtphonon-4.8.6.ebuild | 2 --
dev-qt/qtphonon/qtphonon-4.8.9999.ebuild | 2 --
eclass/qt4-build-multilib.eclass | 15 +--------------
11 files changed, 1 insertion(+), 34 deletions(-)
diff --git a/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
b/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
index 8d2117e..c99bbab 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
@@ -40,8 +40,6 @@ pkg_setup() {
src/plugins/bearer/generic
$(use connman && echo src/plugins/bearer/connman)
$(use networkmanager && echo src/plugins/bearer/networkmanager)"
-
- qt4-build-multilib_pkg_setup
}
src_configure() {
diff --git a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
index 8d2117e..c99bbab 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
@@ -40,8 +40,6 @@ pkg_setup() {
src/plugins/bearer/generic
$(use connman && echo src/plugins/bearer/connman)
$(use networkmanager && echo src/plugins/bearer/networkmanager)"
-
- qt4-build-multilib_pkg_setup
}
src_configure() {
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
index 38e3027..a0b8602 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
@@ -48,8 +48,6 @@ QCONFIG_DEFINE="QT_DECLARATIVE"
pkg_setup() {
use webkit && QT4_TARGET_DIRECTORIES+="
src/3rdparty/webkit/Source/WebKit/qt/declarative"
-
- qt4-build-multilib_pkg_setup
}
src_configure() {
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
index 38e3027..a0b8602 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
@@ -48,8 +48,6 @@ QCONFIG_DEFINE="QT_DECLARATIVE"
pkg_setup() {
use webkit && QT4_TARGET_DIRECTORIES+="
src/3rdparty/webkit/Source/WebKit/qt/declarative"
-
- qt4-build-multilib_pkg_setup
}
src_configure() {
diff --git a/dev-qt/qtgui/qtgui-4.8.6.ebuild b/dev-qt/qtgui/qtgui-4.8.6.ebuild
index bf01a8c..e652ddf 100644
--- a/dev-qt/qtgui/qtgui-4.8.6.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.6.ebuild
@@ -118,8 +118,6 @@ pkg_setup() {
$(use xinerama && echo QT_XINERAMA)
QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
$(use xv && echo QT_XVIDEO)"
-
- qt4-build-multilib_pkg_setup
}
src_prepare() {
diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
index bb6bb86..2e49b9d 100644
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
@@ -117,8 +117,6 @@ pkg_setup() {
$(use xinerama && echo QT_XINERAMA)
QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
$(use xv && echo QT_XVIDEO)"
-
- qt4-build-multilib_pkg_setup
}
src_prepare() {
diff --git a/dev-qt/qthelp/qthelp-4.8.6.ebuild
b/dev-qt/qthelp/qthelp-4.8.6.ebuild
index 2525195..4ee3aa3 100644
--- a/dev-qt/qthelp/qthelp-4.8.6.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.6.ebuild
@@ -52,8 +52,6 @@ pkg_setup() {
use compat && QT4_TARGET_DIRECTORIES+="
tools/assistant/compat
tools/assistant/compat/lib"
-
- qt4-build-multilib_pkg_setup
}
src_unpack() {
diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 2525195..4ee3aa3 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -52,8 +52,6 @@ pkg_setup() {
use compat && QT4_TARGET_DIRECTORIES+="
tools/assistant/compat
tools/assistant/compat/lib"
-
- qt4-build-multilib_pkg_setup
}
src_unpack() {
diff --git a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
index 55db6be..d684e9f 100644
--- a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
+++ b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
@@ -45,8 +45,6 @@ QCONFIG_ADD="phonon"
pkg_setup() {
QCONFIG_DEFINE="QT_PHONON
$(use aqua || echo QT_GSTREAMER)"
-
- qt4-build-multilib_pkg_setup
}
src_configure() {
diff --git a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
index 55db6be..d684e9f 100644
--- a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
+++ b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
@@ -45,8 +45,6 @@ QCONFIG_ADD="phonon"
pkg_setup() {
QCONFIG_DEFINE="QT_PHONON
$(use aqua || echo QT_GSTREAMER)"
-
- qt4-build-multilib_pkg_setup
}
src_configure() {
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 4771381..84aa4b4 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -51,20 +51,7 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
DEPEND+=" dev-lang/perl"
fi
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile
src_install src_test pkg_postinst pkg_postrm
-
-# @FUNCTION: qt4-build-multilib_pkg_setup
-# @DESCRIPTION:
-# Sets up PATH and LD_LIBRARY_PATH.
-qt4-build-multilib_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:4"; then
- ewarn
- ewarn "Downgrading Qt is completely unsupported and can break
your system!"
- ewarn
- fi
-}
+EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test
src_install pkg_postinst pkg_postrm
# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
# @DEFAULT_UNSET
