diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2012-12-31 06:29:42 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2012-12-31 06:29:42 +0000 |
| commit | 6c5ffc3357e50138084ea2cc73e361d2f1232436 (patch) | |
| tree | 248a685601cf94008a0873e426724d259df8015d | |
| parent | Cleanup metadata. (diff) | |
| download | gentoo-2-6c5ffc3357e50138084ea2cc73e361d2f1232436.tar.gz gentoo-2-6c5ffc3357e50138084ea2cc73e361d2f1232436.tar.bz2 gentoo-2-6c5ffc3357e50138084ea2cc73e361d2f1232436.zip | |
Remove dead code.
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qt4-build.eclass | 23 |
2 files changed, 9 insertions, 19 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 0ee386495ad2..25ebb18d7583 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.581 2012/12/30 14:17:29 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.582 2012/12/31 06:29:42 pesa Exp $ + + 31 Dec 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass: + Remove dead code. 30 Dec 2012; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass: Fix installing scripts & modules for Prefix, bug #448786. diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 9dbac1d79368..2b439d666ebc 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.140 2012/12/22 03:57:14 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.141 2012/12/31 06:29:42 pesa Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -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)" |