sys-devel/gnuconfig: git-2->git-r3

Package-Manager: Portage-2.3.31, Repoman-2.3.9

diff --git a/sys-devel/gnuconfig/gnuconfig-20161104.ebuild b/sys-devel/gnuconfig/gnuconfig-20161104.ebuild
index 60b5697dc48179f446470679f8fde0b9be9ded3e..bd734c724372eaa1212db5703c19cde74baab761 100644 (file)
--- a/sys-devel/gnuconfig/gnuconfig-20161104.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20161104.ebuild
@@ -8,10 +8,11 @@ if [[ ${PV} == "99999999" ]] ; then
        EGIT_REPO_URI="git://git.savannah.gnu.org/config.git
                http://git.savannah.gnu.org/r/config.git"
 
-       inherit git-2
+       inherit git-r3
 else
        SRC_URI="mirror://gentoo/${P}.tar.bz2"
        KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+       S="${WORKDIR}"
 fi
 
 DESCRIPTION="Updated config.sub and config.guess file from GNU"
@@ -21,8 +22,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-S=${WORKDIR}
-
 maint_pkg_create() {
        cd "${S}"
 
@@ -39,7 +38,7 @@ maint_pkg_create() {
 
 src_unpack() {
        if [[ ${PV} == "99999999" ]] ; then
-               git-2_src_unpack
+               git-r3_src_unpack
                maint_pkg_create
        else
                unpack ${A}
@@ -47,7 +46,7 @@ src_unpack() {
 }
 
 src_prepare() {
-       epatch "${WORKDIR}"/*.patch
+       epatch "${S}"/*.patch
        use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
 }
 

diff --git a/sys-devel/gnuconfig/gnuconfig-20170101.ebuild b/sys-devel/gnuconfig/gnuconfig-20170101.ebuild
index 92d06ef82ca8f209047831b50a851d8cf6560bac..0b3c4010d8f472f43311ffe7b8ed12d888ef2fc3 100644 (file)
--- a/sys-devel/gnuconfig/gnuconfig-20170101.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20170101.ebuild
@@ -8,10 +8,11 @@ if [[ ${PV} == "99999999" ]] ; then
        EGIT_REPO_URI="git://git.savannah.gnu.org/config.git
                http://git.savannah.gnu.org/r/config.git"
 
-       inherit git-2
+       inherit git-r3
 else
        SRC_URI="mirror://gentoo/${P}.tar.bz2"
        KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+       S="${WORKDIR}"
 fi
 
 DESCRIPTION="Updated config.sub and config.guess file from GNU"
@@ -21,8 +22,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-S=${WORKDIR}
-
 maint_pkg_create() {
        cd "${S}"
 
@@ -39,7 +38,7 @@ maint_pkg_create() {
 
 src_unpack() {
        if [[ ${PV} == "99999999" ]] ; then
-               git-2_src_unpack
+               git-r3_src_unpack
                maint_pkg_create
        else
                unpack ${A}
@@ -47,7 +46,7 @@ src_unpack() {
 }
 
 src_prepare() {
-       epatch "${WORKDIR}"/*.patch
+       epatch "${S}"/*.patch
        use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
 }
 

diff --git a/sys-devel/gnuconfig/gnuconfig-20180101.ebuild b/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
index 2629a1d763f8c089ec99b25f71a852846087b246..c4ccaeecd38cd45e0aace33591bcbce266d2f27e 100644 (file)
--- a/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
@@ -8,10 +8,11 @@ if [[ ${PV} == "99999999" ]] ; then
        EGIT_REPO_URI="git://git.savannah.gnu.org/config.git
                http://git.savannah.gnu.org/r/config.git"
 
-       inherit git-2
+       inherit git-r3
 else
        SRC_URI="mirror://gentoo/${P}.tar.bz2"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+       S="${WORKDIR}"
 fi
 
 DESCRIPTION="Updated config.sub and config.guess file from GNU"
@@ -21,8 +22,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-S=${WORKDIR}
-
 maint_pkg_create() {
        cd "${S}"
 
@@ -39,7 +38,7 @@ maint_pkg_create() {
 
 src_unpack() {
        if [[ ${PV} == "99999999" ]] ; then
-               git-2_src_unpack
+               git-r3_src_unpack
                maint_pkg_create
        else
                unpack ${A}
@@ -47,7 +46,7 @@ src_unpack() {
 }
 
 src_prepare() {
-       epatch "${WORKDIR}"/*.patch
+       epatch "${S}"/*.patch
        use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
 }
 

diff --git a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
index 2629a1d763f8c089ec99b25f71a852846087b246..c4ccaeecd38cd45e0aace33591bcbce266d2f27e 100644 (file)
--- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -8,10 +8,11 @@ if [[ ${PV} == "99999999" ]] ; then
        EGIT_REPO_URI="git://git.savannah.gnu.org/config.git
                http://git.savannah.gnu.org/r/config.git"
 
-       inherit git-2
+       inherit git-r3
 else
        SRC_URI="mirror://gentoo/${P}.tar.bz2"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+       S="${WORKDIR}"
 fi
 
 DESCRIPTION="Updated config.sub and config.guess file from GNU"
@@ -21,8 +22,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-S=${WORKDIR}
-
 maint_pkg_create() {
        cd "${S}"
 
@@ -39,7 +38,7 @@ maint_pkg_create() {
 
 src_unpack() {
        if [[ ${PV} == "99999999" ]] ; then
-               git-2_src_unpack
+               git-r3_src_unpack
                maint_pkg_create
        else
                unpack ${A}
@@ -47,7 +46,7 @@ src_unpack() {
 }
 
 src_prepare() {
-       epatch "${WORKDIR}"/*.patch
+       epatch "${S}"/*.patch
        use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
 }