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

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/dev-embedded/openocd/openocd-0.10.0.ebuild b/dev-embedded/openocd/openocd-0.10.0.ebuild
index 2fee2af1d4430ab0a1c612660ee1cc6a76bd9d77..57ba7a8c69e965ed46c5be9ad8bd14f0cfde77b3 100644 (file)
--- 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 5704e4db3efa8487fc5d884cbc3fd353db20099e..aae09088d933ce51a175eb8802d2eb45ed7c17a4 100644 (file)
--- 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 f53195d0c7d50b2ea1690c5e87b1324695f6a64b..d065bac6e8d9738303afb46c20dc0123dc1d23f4 100644 (file)
--- 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 cbe0594cec56f4b037a9486b4be594356fd072d9..6ea9209b57f8aa92c8113e3802e003ab7e45e666 100644 (file)
--- 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 362bf3eecd2445d1dccb5077952c0c6a0a66ca04..637aac7abd108c450b467bfdac06872376f7fb52 100644 (file)
--- 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 39ee7af6b85711bcd8eeaf5be50552e97aa355b0..7a694fd3a84d4b8d41dd1b0832ddac4595060f17 100644 (file)
--- 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 2fee2af1d4430ab0a1c612660ee1cc6a76bd9d77..57ba7a8c69e965ed46c5be9ad8bd14f0cfde77b3 100644 (file)
--- 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}"