summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2013-11-11 19:47:39 +0000
committerDavide Pesavento <pesa@gentoo.org>2013-11-11 19:47:39 +0000
commit6e7da05f84409c7bd122f883f8f67700b8fa4b09 (patch)
tree5d1794bec02c643c2dadc1d9be43a1fbf6c99d1c /eclass/qt4-build.eclass
parentAdded attribution to ChangeLog. (diff)
downloadgentoo-2-6e7da05f84409c7bd122f883f8f67700b8fa4b09.tar.gz
gentoo-2-6e7da05f84409c7bd122f883f8f67700b8fa4b09.tar.bz2
gentoo-2-6e7da05f84409c7bd122f883f8f67700b8fa4b09.zip
Sync with qt overlay. Changes should affect only live ebuilds.
Diffstat (limited to 'eclass/qt4-build.eclass')
-rw-r--r--eclass/qt4-build.eclass9
1 files changed, 3 insertions, 6 deletions
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index f34b0ccc9c9c..d5e236f078be 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.153 2013/10/20 21:45:31 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.154 2013/11/11 19:47:39 pesa Exp $
# @ECLASS: qt4-build.eclass
# @MAINTAINER:
@@ -26,9 +26,6 @@ fi
HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
LICENSE="|| ( LGPL-2.1 GPL-3 )"
-MY_PV=${PV/_/-}
-MY_P=qt-everywhere-opensource-src-${MY_PV}
-
case ${QT4_BUILD_TYPE} in
live)
EGIT_REPO_URI=(
@@ -38,7 +35,9 @@ case ${QT4_BUILD_TYPE} in
EGIT_BRANCH=${PV%.9999}
;;
release)
+ MY_P=qt-everywhere-opensource-src-${PV/_/-}
SRC_URI="http://download.qt-project.org/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
+ S=${WORKDIR}/${MY_P}
;;
esac
@@ -53,8 +52,6 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
DEPEND+=" dev-lang/perl"
fi
-S=${WORKDIR}/${MY_P}
-
# @FUNCTION: qt4-build_pkg_setup
# @DESCRIPTION:
# Sets up PATH and LD_LIBRARY_PATH.