[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass

[Davide Pesavento (pesa)]

pesa        12/12/31 06:29:42

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Remove dead code.

Revision  Changes    Path
1.582                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.582&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.582&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.581&r2=1.582

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.581
retrieving revision 1.582
diff -u -r1.581 -r1.582
--- ChangeLog	30 Dec 2012 14:17:29 -0000	1.581
+++ ChangeLog	31 Dec 2012 06:29:42 -0000	1.582
@@ -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@g.o> qt4-build.eclass:
+  Remove dead code.
 
   30 Dec 2012; Michał Górny <mgorny@g.o> python-utils-r1.eclass:
   Fix installing scripts & modules for Prefix, bug #448786.



1.141                eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.141&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.141&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.140&r2=1.141

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- qt4-build.eclass	22 Dec 2012 03:57:14 -0000	1.140
+++ qt4-build.eclass	31 Dec 2012 06:29:42 -0000	1.141
@@ -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 @@
 		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 @@
 			'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 @@
 	# 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)"