dev-embedded/openocd: [QA] Port to git-r3

Package-Manager: Portage-2.3.19, Repoman-2.3.6

7 files changed, 26 insertions, 34 deletions

diff --git a/dev-embedded/openocd/openocd-0.10.0.ebuild b/dev-embedded/openocd/openocd-0.10.0.ebuild
index 2fee2af1d443..57ba7a8c69e9 100644
--- a/dev-embedded/openocd/openocd-0.10.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.10.0.ebuild
@@ -6,10 +6,9 @@ EAPI="5"
 inherit eutils multilib flag-o-matic toolchain-funcs udev user
 
 # One ebuild to rule them all
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-2
-	EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
-	EGIT_PROJECT="${PN}"
+if [[ ${PV} == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
 else
 	MY_PV="${PV/_/-}"
 	MY_P="${PN}-${MY_PV}"
diff --git a/dev-embedded/openocd/openocd-0.5.0.ebuild b/dev-embedded/openocd/openocd-0.5.0.ebuild
index 5704e4db3efa..aae09088d933 100644
--- a/dev-embedded/openocd/openocd-0.5.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.5.0.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
 
 inherit eutils multilib
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-2
-	KEYWORDS=""
-	EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
-	EGIT_PROJECT="${PN}"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
diff --git a/dev-embedded/openocd/openocd-0.6.1.ebuild b/dev-embedded/openocd/openocd-0.6.1.ebuild
index f53195d0c7d5..d065bac6e8d9 100644
--- a/dev-embedded/openocd/openocd-0.6.1.ebuild
+++ b/dev-embedded/openocd/openocd-0.6.1.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
 
 inherit eutils multilib flag-o-matic toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-2
-	KEYWORDS=""
-	EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
-	EGIT_PROJECT="${PN}"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
diff --git a/dev-embedded/openocd/openocd-0.7.0-r1.ebuild b/dev-embedded/openocd/openocd-0.7.0-r1.ebuild
index cbe0594cec56..6ea9209b57f8 100644
--- a/dev-embedded/openocd/openocd-0.7.0-r1.ebuild
+++ b/dev-embedded/openocd/openocd-0.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,11 +6,9 @@ EAPI="5"
 inherit eutils multilib flag-o-matic toolchain-funcs
 
 # One ebuild to rule them all
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-2
-	KEYWORDS=""
-	EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
-	EGIT_PROJECT="${PN}"
+if [[ ${PV} == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
diff --git a/dev-embedded/openocd/openocd-0.8.0.ebuild b/dev-embedded/openocd/openocd-0.8.0.ebuild
index 362bf3eecd24..637aac7abd10 100644
--- a/dev-embedded/openocd/openocd-0.8.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.8.0.ebuild
@@ -6,10 +6,9 @@ EAPI="5"
 inherit eutils multilib flag-o-matic toolchain-funcs udev user
 
 # One ebuild to rule them all
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-2
-	EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
-	EGIT_PROJECT="${PN}"
+if [[ ${PV} == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
 else
 	MY_PV="${PV/_/-}"
 	MY_P="${PN}-${MY_PV}"
diff --git a/dev-embedded/openocd/openocd-0.9.0.ebuild b/dev-embedded/openocd/openocd-0.9.0.ebuild
index 39ee7af6b857..7a694fd3a84d 100644
--- a/dev-embedded/openocd/openocd-0.9.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.9.0.ebuild
@@ -6,10 +6,9 @@ EAPI="5"
 inherit eutils multilib flag-o-matic toolchain-funcs udev user
 
 # One ebuild to rule them all
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-2
-	EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
-	EGIT_PROJECT="${PN}"
+if [[ ${PV} == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
 else
 	MY_PV="${PV/_/-}"
 	MY_P="${PN}-${MY_PV}"
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index 2fee2af1d443..57ba7a8c69e9 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -6,10 +6,9 @@ EAPI="5"
 inherit eutils multilib flag-o-matic toolchain-funcs udev user
 
 # One ebuild to rule them all
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-2
-	EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
-	EGIT_PROJECT="${PN}"
+if [[ ${PV} == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
 else
 	MY_PV="${PV/_/-}"
 	MY_P="${PN}-${MY_PV}"