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

[Dominik Kapusta (ayoy)]

ayoy        09/10/02 15:04:23

  Modified:             qt4-build.eclass
  Log:
  Switching to gzip packages like Nokia does starting from 4.5.3

Revision  Changes    Path
1.45                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.44&r2=1.45

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- qt4-build.eclass	11 Aug 2009 14:44:16 -0000	1.44
+++ qt4-build.eclass	2 Oct 2009 15:04:23 -0000	1.45
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.44 2009/08/11 14:44:16 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.45 2009/10/02 15:04:23 ayoy Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -58,7 +58,10 @@
 S=${WORKDIR}/${MY_P}
 
 HOMEPAGE="http://qt.nokia.com/"
-SRC_URI="http://download.qt.nokia.com/qt/source/${MY_P}.tar.bz2"
+SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.bz2"
+if version_is_at_least 4.5.3 ${PV} ; then
+	SRC_URI="${SRC_URI/bz2/gz}"
+fi
 
 case "${PV}" in
 	4.4.?) SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-headers.tar.bz2" ;;
@@ -110,7 +113,7 @@
 # Unpacks the sources
 qt4-build_src_unpack() {
 	setqtenv
-	local target targets licenses
+	local target targets licenses tar_pkg tar_args
 	if version_is_at_least 4.5 ${PV} ; then
 		licenses="LICENSE.GPL3 LICENSE.LGPL"
 	else
@@ -122,8 +125,15 @@
 			targets="${targets} ${MY_P}/${target}"
 	done
 
-	echo tar xjpf "${DISTDIR}"/${MY_P}.tar.bz2 ${targets}
-	tar xjpf "${DISTDIR}"/${MY_P}.tar.bz2 ${targets}
+	tar_pkg=${MY_P}.tar.bz2
+	tar_args="xjpf"
+	if version_is_at_least 4.5.3 ${PV} ; then
+		tar_pkg=${tar_pkg/bz2/gz}
+		tar_args="xzpf"
+	fi
+
+	echo tar ${tar_args} "${DISTDIR}"/${tar_pkg} ${targets}
+	tar ${tar_args} "${DISTDIR}"/${tar_pkg} ${targets}
 
 	case "${PV}" in
 		4.4.?)