[gentoo-commits] proj/qt:master commit in: eclass/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     6a666f95d25eb75c651033f50c27dbc6da343b53
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 16:17:32 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 16:17:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=6a666f95

[qt4-build-multilib.eclass] Remove sed that does not apply anymore.

This expression doesn't match anything since at least Qt 4.7.0, so
it is effectively dead code. Those platforms that still need such
patching have been broken for years, and apparently nobody cares.

 eclass/qt4-build-multilib.eclass | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index c7e21cd..9a758e4 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -258,14 +258,6 @@ qt4-build-multilib_src_prepare() {
 		fi
 	fi
 
-	# This is needed for all systems with a separate -liconv, except
-	# Darwin, for which the sources already cater for -liconv
-	if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
-		sed -i -e 's|mac:\(LIBS += -liconv\)|\1|g' \
-			config.tests/unix/iconv/iconv.pro \
-			|| die "sed iconv.pro failed"
-	fi
-
 	if [[ ${CHOST} == *-solaris* ]]; then
 		sed -i -e '/^QMAKE_LFLAGS_THREAD/a QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
 			mkspecs/$(qt4_get_mkspec)/qmake.conf || die