commit: 5c41b675d30045c54dd9a66dc99352c5362a8b91 Author: Matthias Dahl <matthias.dahl <AT> binary-island <DOT> eu> AuthorDate: Thu Apr 20 08:06:20 2017 +0000 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> CommitDate: Mon Apr 24 00:59:18 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5c41b675
dev-qt/qtdbus: revert awful hack With the changes to qt5-build.eclass to pass 'dbus-runtime' instead of 'no-dbus' to avoid a general QT_NO_DBUS macro in QtCore/qconfig.h, this hack is no longer needed and qtdbus compiles just fine. dev-qt/qtdbus/qtdbus-5.8.0.ebuild | 30 ------------------------------ dev-qt/qtdbus/qtdbus-5.8.9999.ebuild | 30 ------------------------------ dev-qt/qtdbus/qtdbus-5.9.9999.ebuild | 30 ------------------------------ dev-qt/qtdbus/qtdbus-5.9999.ebuild | 30 ------------------------------ 4 files changed, 120 deletions(-) diff --git a/dev-qt/qtdbus/qtdbus-5.8.0.ebuild b/dev-qt/qtdbus/qtdbus-5.8.0.ebuild index 2c260c29..d7d8945c 100644 --- a/dev-qt/qtdbus/qtdbus-5.8.0.ebuild +++ b/dev-qt/qtdbus/qtdbus-5.8.0.ebuild @@ -20,7 +20,6 @@ DEPEND=" RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( - src/corelib src/dbus src/tools/qdbusxml2cpp src/tools/qdbuscpp2xml @@ -31,38 +30,9 @@ QT5_GENTOO_CONFIG=( :dbus-linked: ) -src_prepare() { - qt5-build_src_prepare - - cat > "${S}/src/corelib/corelib.pro" <<-_EOF_ || die - QT = - TARGET = QtCore - load(qt_module) - _EOF_ -} - src_configure() { local myconf=( -dbus-linked ) qt5-build_src_configure } - -src_compile() { - hack() { - emake - if [[ ${subdir} = "src/corelib" ]]; then - rm "${S}"/lib/libQt5Core* || die - fi - } - qt5_foreach_target_subdir hack -} - -src_install() { - QT5_TARGET_SUBDIRS=( - src/dbus - src/tools/qdbusxml2cpp - src/tools/qdbuscpp2xml - ) - qt5-build_src_install -} diff --git a/dev-qt/qtdbus/qtdbus-5.8.9999.ebuild b/dev-qt/qtdbus/qtdbus-5.8.9999.ebuild index a8861216..d7d8945c 100644 --- a/dev-qt/qtdbus/qtdbus-5.8.9999.ebuild +++ b/dev-qt/qtdbus/qtdbus-5.8.9999.ebuild @@ -20,7 +20,6 @@ DEPEND=" RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( - src/corelib src/dbus src/tools/qdbusxml2cpp src/tools/qdbuscpp2xml @@ -31,38 +30,9 @@ QT5_GENTOO_CONFIG=( :dbus-linked: ) -src_prepare() { - qt5-build_src_prepare - - cat > "${S}/src/corelib/corelib.pro" <<-_EOF_ || die - QT = - TARGET = QtCore - load(qt_module) - _EOF_ -} - src_configure() { local myconf=( -dbus-linked ) qt5-build_src_configure } - -src_compile() { - hack() { - emake - if [[ ${subdir} = "src/corelib" ]]; then - rm "${QT5_BUILD_DIR}"/lib/libQt5Core* || die - fi - } - qt5_foreach_target_subdir hack -} - -src_install() { - QT5_TARGET_SUBDIRS=( - src/dbus - src/tools/qdbusxml2cpp - src/tools/qdbuscpp2xml - ) - qt5-build_src_install -} diff --git a/dev-qt/qtdbus/qtdbus-5.9.9999.ebuild b/dev-qt/qtdbus/qtdbus-5.9.9999.ebuild index a8861216..d7d8945c 100644 --- a/dev-qt/qtdbus/qtdbus-5.9.9999.ebuild +++ b/dev-qt/qtdbus/qtdbus-5.9.9999.ebuild @@ -20,7 +20,6 @@ DEPEND=" RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( - src/corelib src/dbus src/tools/qdbusxml2cpp src/tools/qdbuscpp2xml @@ -31,38 +30,9 @@ QT5_GENTOO_CONFIG=( :dbus-linked: ) -src_prepare() { - qt5-build_src_prepare - - cat > "${S}/src/corelib/corelib.pro" <<-_EOF_ || die - QT = - TARGET = QtCore - load(qt_module) - _EOF_ -} - src_configure() { local myconf=( -dbus-linked ) qt5-build_src_configure } - -src_compile() { - hack() { - emake - if [[ ${subdir} = "src/corelib" ]]; then - rm "${QT5_BUILD_DIR}"/lib/libQt5Core* || die - fi - } - qt5_foreach_target_subdir hack -} - -src_install() { - QT5_TARGET_SUBDIRS=( - src/dbus - src/tools/qdbusxml2cpp - src/tools/qdbuscpp2xml - ) - qt5-build_src_install -} diff --git a/dev-qt/qtdbus/qtdbus-5.9999.ebuild b/dev-qt/qtdbus/qtdbus-5.9999.ebuild index a8861216..d7d8945c 100644 --- a/dev-qt/qtdbus/qtdbus-5.9999.ebuild +++ b/dev-qt/qtdbus/qtdbus-5.9999.ebuild @@ -20,7 +20,6 @@ DEPEND=" RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( - src/corelib src/dbus src/tools/qdbusxml2cpp src/tools/qdbuscpp2xml @@ -31,38 +30,9 @@ QT5_GENTOO_CONFIG=( :dbus-linked: ) -src_prepare() { - qt5-build_src_prepare - - cat > "${S}/src/corelib/corelib.pro" <<-_EOF_ || die - QT = - TARGET = QtCore - load(qt_module) - _EOF_ -} - src_configure() { local myconf=( -dbus-linked ) qt5-build_src_configure } - -src_compile() { - hack() { - emake - if [[ ${subdir} = "src/corelib" ]]; then - rm "${QT5_BUILD_DIR}"/lib/libQt5Core* || die - fi - } - qt5_foreach_target_subdir hack -} - -src_install() { - QT5_TARGET_SUBDIRS=( - src/dbus - src/tools/qdbusxml2cpp - src/tools/qdbuscpp2xml - ) - qt5-build_src_install -}