Remove all references to qt-project.org and switch EGIT_REPO_URI from gitorious to...

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 56eef1c1194ea43add47107514e0808d03d379a2..6e17187e43649011460de38b41bf7ecf2d66f818 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1580 2015/03/31 18:43:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1581 2015/04/01 18:45:04 pesa Exp $
+
+  01 Apr 2015; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass,
+  qt4-build-multilib.eclass, qt5-build.eclass:
+  Remove all references to qt-project.org and switch EGIT_REPO_URI from
+  gitorious to code.qt.io.
 
   31 Mar 2015; Ulrich Müller <ulm@gentoo.org> java-vm-2.eclass,
   vdr-plugin-2.eclass, gnat.eclass, gnatbuild.eclass, myspell.eclass,

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 48ad42dc4984b2a4048249cbff73340c7354321f..9b3480ea37aa31d96b9a40ad70a7b8ed04fdaf38 100644 (file)
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.8 2015/03/23 02:15:14 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.9 2015/04/01 18:45:04 pesa Exp $
 
 # @ECLASS: qt4-build-multilib.eclass
 # @MAINTAINER:
@@ -19,7 +19,7 @@ esac
 
 inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
 
-HOMEPAGE="https://www.qt.io/ https://qt-project.org/"
+HOMEPAGE="https://www.qt.io/"
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="4"
 
@@ -27,8 +27,9 @@ case ${PV} in
        4.?.9999)
                QT4_BUILD_TYPE="live"
                EGIT_REPO_URI=(
-                       "git://gitorious.org/qt/qt.git"
-                       "https://git.gitorious.org/qt/qt.git"
+                       "git://code.qt.io/qt/qt.git"
+                       "https://code.qt.io/git/qt/qt.git"
+                       "https://github.com/qtproject/qt.git"
                )
                EGIT_BRANCH=${PV%.9999}
                inherit git-r3

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 4d20a6572acf9f4719b3179922ae025fb2b40416..5ed6d3895af1d56dffc6dfbff5a95a3f381a7866 100644 (file)
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.162 2015/03/23 02:15:14 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.163 2015/04/01 18:45:04 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -16,7 +16,7 @@ esac
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
-HOMEPAGE="https://www.qt.io/ https://qt-project.org/"
+HOMEPAGE="https://www.qt.io/"
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="4"
 
@@ -24,8 +24,9 @@ case ${PV} in
        4.?.9999)
                QT4_BUILD_TYPE="live"
                EGIT_REPO_URI=(
-                       "git://gitorious.org/qt/qt.git"
-                       "https://git.gitorious.org/qt/qt.git"
+                       "git://code.qt.io/qt/qt.git"
+                       "https://code.qt.io/git/qt/qt.git"
+                       "https://github.com/qtproject/qt.git"
                )
                EGIT_BRANCH=${PV%.9999}
                inherit git-r3

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 3cb42ac4ff1822c7a2b238b1344b15a12ceef09b..32263637d60421a756728a72993c8f705b931f93 100644 (file)
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.14 2015/02/18 14:15:37 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.15 2015/04/01 18:45:04 pesa Exp $
 
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
@@ -22,7 +22,7 @@ inherit eutils flag-o-matic multilib toolchain-funcs virtualx
 QT5_MINOR_VERSION=${PV#*.}
 QT5_MINOR_VERSION=${QT5_MINOR_VERSION%%.*}
 
-HOMEPAGE="https://www.qt.io/ https://qt-project.org/"
+HOMEPAGE="https://www.qt.io/"
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
 
@@ -60,8 +60,9 @@ case ${PV} in
 esac
 
 EGIT_REPO_URI=(
-       "git://gitorious.org/qt/${QT5_MODULE}.git"
-       "https://git.gitorious.org/qt/${QT5_MODULE}.git"
+       "git://code.qt.io/qt/${QT5_MODULE}.git"
+       "https://code.qt.io/git/qt/${QT5_MODULE}.git"
+       "https://github.com/qtproject/${QT5_MODULE}.git"
 )
 [[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3