| 1 |
commit: 9b5308c4f7e8a41a48311d85c4b9e6fc9ff83293 |
| 2 |
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Dec 31 06:27:09 2012 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 31 06:27:09 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9b5308c4 |
| 7 |
|
| 8 |
[qt4-build.eclass] Remove dead code. |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/qt4-build.eclass | 21 ++++----------------- |
| 12 |
1 files changed, 4 insertions(+), 17 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass |
| 15 |
index 27d51a7..1ddca1a 100644 |
| 16 |
--- a/eclass/qt4-build.eclass |
| 17 |
+++ b/eclass/qt4-build.eclass |
| 18 |
@@ -36,20 +36,13 @@ case ${QT4_BUILD_TYPE} in |
| 19 |
EGIT_BRANCH=${PV%.9999} |
| 20 |
;; |
| 21 |
release) |
| 22 |
- if version_is_at_least 4.8.1; then |
| 23 |
- SRC_URI="http://releases.qt-project.org/qt4/source/${MY_P}.tar.gz" |
| 24 |
- else |
| 25 |
- SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz" |
| 26 |
- fi |
| 27 |
+ SRC_URI="http://releases.qt-project.org/qt4/source/${MY_P}.tar.gz" |
| 28 |
;; |
| 29 |
esac |
| 30 |
|
| 31 |
IUSE="aqua debug pch" |
| 32 |
[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && IUSE+=" +exceptions" |
| 33 |
-if version_is_at_least 4.8; then |
| 34 |
- [[ ${CATEGORY}/${PN} != x11-libs/qt-webkit ]] && IUSE+=" c++0x" |
| 35 |
- version_is_at_least 4.8.3 || IUSE+=" qpa" |
| 36 |
-fi |
| 37 |
+[[ ${CATEGORY}/${PN} != x11-libs/qt-webkit ]] && IUSE+=" c++0x" |
| 38 |
|
| 39 |
DEPEND="virtual/pkgconfig" |
| 40 |
if [[ ${QT4_BUILD_TYPE} == live ]]; then |
| 41 |
@@ -279,11 +272,6 @@ qt4-build_src_prepare() { |
| 42 |
'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \ |
| 43 |
|| die "sed config.tests failed" |
| 44 |
|
| 45 |
- if ! version_is_at_least 4.8; then |
| 46 |
- # Strip predefined CFLAGS from mkspecs (bugs 312689 and 352778) |
| 47 |
- sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die |
| 48 |
- fi |
| 49 |
- |
| 50 |
# Bug 172219 |
| 51 |
sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die |
| 52 |
|
| 53 |
@@ -411,9 +399,8 @@ qt4-build_src_configure() { |
| 54 |
# exceptions USE flag |
| 55 |
conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)" |
| 56 |
|
| 57 |
- # disable rpath on Qt >= 4.8 (bug 380415) |
| 58 |
- # but leave it enabled on prefix (bug 417169) |
| 59 |
- version_is_at_least 4.8 && use !prefix && conf+=" -no-rpath" |
| 60 |
+ # disable rpath (bug 380415), except on prefix (bug 417169) |
| 61 |
+ use prefix || conf+=" -no-rpath" |
| 62 |
|
| 63 |
# precompiled headers don't work on hardened, where the flag is masked |
| 64 |
conf+=" $(qt_use pch)" |
Archives