update git urls and migrate git-2 -> git-r3

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index c84a4cda777797107a041a7576420c1ac9036769..f3beb0857a3170efeca9462e5e88138c7cb59e5d 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1590 2015/04/19 18:22:15 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1591 2015/04/21 11:19:10 perfinion Exp $
+
+  21 Apr 2015; Jason Zaman <perfinion@gentoo.org> selinux-policy-2.eclass:
+  update git urls and migrate git-2 -> git-r3
 
   19 Apr 2015; Michael Palimaka <kensington@gentoo.org> qt5-build.eclass:
   Sync with qt overlay - export AR and OBJDUMP too, use new configure option
@@ -35,7 +38,7 @@
   accidentally enabled in a previous revision). Fixes bug #545174 by Toralf
   Förster.
 
-  04 Apr 2015; <jason@gentoo.org> selinux-policy-2.eclass:
+  04 Apr 2015; Jason Zaman <perfinion@gentoo.org> selinux-policy-2.eclass:
   Drop EAPI<5 from selinux-policy-2.eclass
 
   01 Apr 2015; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass,

diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass
index cc61db8361d4638de47a6cba32cc2b19f7567e7b..57af0097c61711551d707d235c46b41f334ef91a 100644 (file)
--- a/eclass/selinux-policy-2.eclass
+++ b/eclass/selinux-policy-2.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/selinux-policy-2.eclass,v 1.31 2015/04/04 17:11:35 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.32 2015/04/21 11:19:10 perfinion Exp $
 
 # Eclass for installing SELinux policy, and optionally
 # reloading the reference-policy based modules.
@@ -63,7 +63,7 @@
 # using a single variable, rather than having to set the packagename_LIVE_REPO
 # variable for each and every SELinux policy module package they want to install.
 # The default value is Gentoo's hardened-refpolicy repository.
-: ${SELINUX_GIT_REPO:="git://git.overlays.gentoo.org/proj/hardened-refpolicy.git https://git.overlays.gentoo.org/gitroot/proj/hardened-refpolicy.git"};
+: ${SELINUX_GIT_REPO:="git://anongit.gentoo.org/proj/hardened-refpolicy.git https://anongit.gentoo.org/git/proj/hardened-refpolicy.git"};
 
 # @ECLASS-VARIABLE: SELINUX_GIT_BRANCH
 # @DESCRIPTION:
@@ -76,10 +76,10 @@
 
 extra_eclass=""
 case ${BASEPOL} in
-       9999)   extra_eclass="git-2";
+       9999)   extra_eclass="git-r3";
                        EGIT_REPO_URI="${SELINUX_GIT_REPO}";
                        EGIT_BRANCH="${SELINUX_GIT_BRANCH}";
-                       EGIT_SOURCEDIR="${WORKDIR}/refpolicy";;
+                       EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy";;
 esac
 
 inherit eutils ${extra_eclass}
@@ -132,7 +132,7 @@ selinux-policy-2_src_unpack() {
        then
                unpack ${A}
        else
-               git-2_src_unpack
+               git-r3_src_unpack
        fi
 }