From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7538F1381FA for ; Mon, 31 Dec 2012 06:27:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02E5EE05EB; Mon, 31 Dec 2012 06:27:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 706F5E05EB for ; Mon, 31 Dec 2012 06:27:42 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 88F0433D73B for ; Mon, 31 Dec 2012 06:27:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E9B53E543D for ; Mon, 31 Dec 2012 06:27:39 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1356935229.9b5308c4f7e8a41a48311d85c4b9e6fc9ff83293.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 9b5308c4f7e8a41a48311d85c4b9e6fc9ff83293 X-VCS-Branch: master Date: Mon, 31 Dec 2012 06:27:39 +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-Archives-Salt: ea2d8a99-a245-4eb9-9592-cc933ef2b8c2 X-Archives-Hash: a8e63e23e20ce23f12e0f23a53512a11 commit: 9b5308c4f7e8a41a48311d85c4b9e6fc9ff83293 Author: Davide Pesavento gmail com> AuthorDate: Mon Dec 31 06:27:09 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon Dec 31 06:27:09 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9b5308c4 [qt4-build.eclass] Remove dead code. --- eclass/qt4-build.eclass | 21 ++++----------------- 1 files changed, 4 insertions(+), 17 deletions(-) diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 27d51a7..1ddca1a 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -36,20 +36,13 @@ case ${QT4_BUILD_TYPE} in EGIT_BRANCH=${PV%.9999} ;; release) - if version_is_at_least 4.8.1; then - SRC_URI="http://releases.qt-project.org/qt4/source/${MY_P}.tar.gz" - else - SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz" - fi + SRC_URI="http://releases.qt-project.org/qt4/source/${MY_P}.tar.gz" ;; esac IUSE="aqua debug pch" [[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && IUSE+=" +exceptions" -if version_is_at_least 4.8; then - [[ ${CATEGORY}/${PN} != x11-libs/qt-webkit ]] && IUSE+=" c++0x" - version_is_at_least 4.8.3 || IUSE+=" qpa" -fi +[[ ${CATEGORY}/${PN} != x11-libs/qt-webkit ]] && IUSE+=" c++0x" DEPEND="virtual/pkgconfig" if [[ ${QT4_BUILD_TYPE} == live ]]; then @@ -279,11 +272,6 @@ qt4-build_src_prepare() { 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \ || die "sed config.tests failed" - if ! version_is_at_least 4.8; then - # Strip predefined CFLAGS from mkspecs (bugs 312689 and 352778) - sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die - fi - # Bug 172219 sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die @@ -411,9 +399,8 @@ qt4-build_src_configure() { # exceptions USE flag conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)" - # disable rpath on Qt >= 4.8 (bug 380415) - # but leave it enabled on prefix (bug 417169) - version_is_at_least 4.8 && use !prefix && conf+=" -no-rpath" + # disable rpath (bug 380415), except on prefix (bug 417169) + use prefix || conf+=" -no-rpath" # precompiled headers don't work on hardened, where the flag is masked conf+=" $(qt_use pch)"