sys-libs/uclibc: Revert "git-2->git-r3, explicit EAPI=0"

This change blocks prior patch removing EAPI=0 support from git-r3.
If you really want to keep this live ebuild, please update it to use
newer EAPI.  Otherwise, removing it would be a better solution.

diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
index 4c712c8a69a84f580d13973903309852a93cf5be..32bb541808547dee5a5b64fbfc98dc6c6caaec4d 100644 (file)
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
@@ -1,20 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-
-MY_P=uClibc-${PV}
-if [[ ${PV} == *9999* ]] ; then
-       EGIT_REPO_URI="https://git.busybox.net/uClibc"
-       EGIT_BRANCH="0.9.33"
-       inherit git-r3
-else
-       PATCH_VER="17"
-       SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-               ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-       KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
+if [[ ${PV} == "9999" ]] ; then
+       EGIT_REPO_URI="git://git.busybox.net/uClibc"
+       inherit git-2
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -25,8 +15,15 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
        fi
 fi
 
+MY_P=uClibc-${PV}
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="https://www.uclibc.org/"
+if [[ ${PV} != "9999" ]] ; then
+       PATCH_VER="17"
+       SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
+               ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
+       KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
+fi
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -235,8 +232,8 @@ src_config() {
 }
 
 src_unpack() {
-       if [[ ${PV} == *9999* ]] ; then
-               git-r3_src_unpack
+       if [[ ${PV} == "9999" ]] ; then
+               git-2_src_unpack
        else
                unpack ${A}
        fi

diff --git a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
index d55f0afff6dab9a1b6a0ca0ed24d486946a44bb6..fbc8a60a1fc9373454ff0f14a9f531d71a3e92ff 100644 (file)
--- a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
@@ -1,20 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-
-MY_P=uClibc-${PV}
-if [[ ${PV} == *9999* ]] ; then
-       EGIT_REPO_URI="https://git.busybox.net/uClibc"
+if [[ ${PV} == *9999 ]] ; then
        EGIT_BRANCH="0.9.33"
-       inherit git-r3
-else
-       PATCH_VER=""
-       SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-               ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-       KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
+       EGIT_REPO_URI="git://git.busybox.net/uClibc"
+       inherit git-2
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -25,8 +16,15 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
        fi
 fi
 
+MY_P=uClibc-${PV}
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="https://www.uclibc.org/"
+if [[ ${PV} != *9999 ]] ; then
+       PATCH_VER=""
+       SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
+               ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
+       KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
+fi
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -233,8 +231,8 @@ src_config() {
 }
 
 src_unpack() {
-       if [[ ${PV} == *9999* ]] ; then
-               git-r3_src_unpack
+       if [[ ${PV} == *9999 ]] ; then
+               git-2_src_unpack
        else
                unpack ${A}
        fi

diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild
index 3e096317babc2f315b6fc1ac83be857859ea057b..f5cec3749e759f637b10753f11804e2b025b68f9 100644 (file)
--- a/sys-libs/uclibc/uclibc-9999.ebuild
+++ b/sys-libs/uclibc/uclibc-9999.ebuild
@@ -1,19 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-
-MY_P=uClibc-${PV}
-if [[ ${PV} == *9999* ]] ; then
-       EGIT_REPO_URI="https://git.busybox.net/uClibc"
-       inherit git-r3
-else
-       PATCH_VER=""
-       SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-               ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-       KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
+if [[ ${PV} == "9999" ]] ; then
+       EGIT_REPO_URI="git://git.busybox.net/uClibc"
+       inherit git-2
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -24,8 +15,15 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
        fi
 fi
 
+MY_P=uClibc-${PV}
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="https://www.uclibc.org/"
+if [[ ${PV} != "9999" ]] ; then
+       PATCH_VER=""
+       SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
+               ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
+       KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
+fi
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -232,8 +230,8 @@ src_config() {
 }
 
 src_unpack() {
-       if [[ ${PV} == *9999* ]] ; then
-               git-r3_src_unpack
+       if [[ ${PV} == "9999" ]] ; then
+               git-2_src_unpack
        else
                unpack ${A}
        fi