From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 570EC138359 for ; Thu, 13 Aug 2020 14:50:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36A05E0815; Thu, 13 Aug 2020 14:50:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11E1AE0815 for ; Thu, 13 Aug 2020 14:50:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6FD434F28C for ; Thu, 13 Aug 2020 14:50:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D7A9031A for ; Thu, 13 Aug 2020 14:50:19 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1597330062.3962316389a3fad321922fa8238fbf51cee7bddb.asturm@gentoo> Subject: [gentoo-commits] proj/kde-sunset:master commit in: eclass/ X-VCS-Repository: proj/kde-sunset X-VCS-Files: eclass/qt4-build-multilib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 3962316389a3fad321922fa8238fbf51cee7bddb X-VCS-Branch: master Date: Thu, 13 Aug 2020 14:50:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: db5220c2-563c-4f29-8499-e6c47fe4d82f X-Archives-Hash: ffbe96b3370a7c682dae60649ff48249 commit: 3962316389a3fad321922fa8238fbf51cee7bddb Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Aug 13 12:34:06 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Aug 13 14:47:42 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=39623163 qt4-build-multilib.eclass: Drop all traces of IUSE=aqua Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt4-build-multilib.eclass | 91 +++------------------------------------- 1 file changed, 5 insertions(+), 86 deletions(-) diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index b044a7d6..3cf33cf9 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -45,7 +45,7 @@ EGIT_REPO_URI=( [[ ${QT4_BUILD_TYPE} == live ]] && inherit git-r3 if [[ ${PN} != qttranslations ]]; then - IUSE="aqua debug pch" + IUSE="debug pch" [[ ${PN} != qtxmlpatterns ]] && IUSE+=" +exceptions" fi @@ -231,20 +231,6 @@ qt4-build-multilib_src_prepare() { mkspecs/$(qt4_get_mkspec)/qmake.conf \ || die "sed QMAKE_(LIB|INC)DIR failed" - if use_if_iuse aqua; then - sed -i \ - -e '/^CONFIG/s:app_bundle::' \ - -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \ - mkspecs/$(qt4_get_mkspec)/qmake.conf \ - || die "sed failed (aqua)" - - # we are crazy and build cocoa + qt3support - if { ! in_iuse qt3support || use qt3support; } && [[ ${CHOST##*-darwin} -ge 9 ]]; then - sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \ - configure || die "sed failed (cocoa + qt3support)" - fi - fi - if [[ ${CHOST} == *-darwin* ]]; then # Set FLAGS and remove -arch, since our gcc-apple is multilib crippled (by design) sed -i \ @@ -400,19 +386,6 @@ qt4_multilib_src_configure() { $([[ ${CHOST} != *-solaris* ]] && echo -reduce-relocations) ) - if use_if_iuse aqua; then - if [[ ${CHOST##*-darwin} -ge 9 ]]; then - conf+=( - # on (snow) leopard use the new (frameworked) cocoa code - -cocoa -framework - # add hint for the framework location - -F"${QT4_LIBDIR}" - ) - else - conf+=(-no-framework) - fi - fi - conf+=( # module-specific options "${myconf[@]}" @@ -483,23 +456,14 @@ qt4_multilib_src_install() { fi qt4_install_module_qconfigs - qt4_symlink_framework_headers } qt4_multilib_src_install_all() { if [[ ${PN} == qtcore ]]; then # include gentoo-qconfig.h at the beginning of Qt{,Core}/qconfig.h - if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then - sed -i -e '1i #include \n' \ - "${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \ - || die "sed failed (qconfig.h)" - dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo \ - "${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo - else - sed -i -e '1i #include \n' \ - "${D}${QT4_HEADERDIR}"/Qt{,Core}/qconfig.h \ - || die "sed failed (qconfig.h)" - fi + sed -i -e '1i #include \n' \ + "${D}${QT4_HEADERDIR}"/Qt{,Core}/qconfig.h \ + || die "sed failed (qconfig.h)" dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die @@ -736,49 +700,6 @@ qt4_regenerate_global_qconfigs() { fi } -# @FUNCTION: qt4_symlink_framework_headers -# @DESCRIPTION: -# On OS X we need to add some symlinks when frameworks are being -# used, to avoid complications with some more or less stupid packages. -qt4_symlink_framework_headers() { - if use_if_iuse aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then - local frw dest f h rdir - # Some packages tend to include - dodir "${QT4_HEADERDIR#${EPREFIX}}"/Qt - - # Fake normal headers when frameworks are installed... eases life later - # on, make sure we use relative links though, as some ebuilds assume - # these dirs exist in src_install to add additional files - f=${QT4_HEADERDIR} - h=${QT4_LIBDIR} - while [[ -n ${f} && ${f%%/*} == ${h%%/*} ]] ; do - f=${f#*/} - h=${h#*/} - done - rdir=${h} - f="../" - while [[ ${h} == */* ]] ; do - f="${f}../" - h=${h#*/} - done - rdir="${f}${rdir}" - - for frw in "${D}${QT4_LIBDIR}"/*.framework; do - [[ -e "${frw}"/Headers ]] || continue - f=$(basename ${frw}) - dest="${QT4_HEADERDIR#${EPREFIX}}"/${f%.framework} - dosym "${rdir}"/${f}/Headers "${dest}" - - # Link normal headers as well. - for hdr in "${D}${QT4_LIBDIR}/${f}"/Headers/*; do - h=$(basename ${hdr}) - dosym "../${rdir}"/${f}/Headers/${h} \ - "${QT4_HEADERDIR#${EPREFIX}}"/Qt/${h} - done - done - fi -} - # @FUNCTION: qt4_get_mkspec # @INTERNAL # @DESCRIPTION: @@ -790,9 +711,7 @@ qt4_get_mkspec() { *-linux*) spec=linux ;; *-darwin*) - use_if_iuse aqua && - spec=macx || # mac with carbon/cocoa - spec=darwin ;; # darwin/mac with X11 + spec=darwin ;; # darwin/mac with X11 *-freebsd*|*-dragonfly*) spec=freebsd ;; *-netbsd*)