| 1 |
commit: bf60ab922b7e43493ea72a47a2f1095e24f86440 |
| 2 |
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> |
| 3 |
AuthorDate: Fri Apr 27 17:38:46 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 27 22:11:15 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf60ab92 |
| 7 |
|
| 8 |
sys-libs/uclibc: git-2->git-r3, explicit EAPI=0 |
| 9 |
|
| 10 |
Also unified the live vs versioned ebuild logic. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
| 13 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 14 |
|
| 15 |
sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild | 27 +++++++++++++++------------ |
| 16 |
sys-libs/uclibc/uclibc-0.9.33.9999.ebuild | 26 ++++++++++++++------------ |
| 17 |
sys-libs/uclibc/uclibc-9999.ebuild | 26 ++++++++++++++------------ |
| 18 |
3 files changed, 43 insertions(+), 36 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild |
| 21 |
index 32bb5418085..4c712c8a69a 100644 |
| 22 |
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild |
| 23 |
+++ b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild |
| 24 |
@@ -1,10 +1,20 @@ |
| 25 |
# Copyright 1999-2018 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
+EAPI=0 |
| 29 |
+ |
| 30 |
inherit eutils flag-o-matic multilib toolchain-funcs savedconfig |
| 31 |
-if [[ ${PV} == "9999" ]] ; then |
| 32 |
- EGIT_REPO_URI="git://git.busybox.net/uClibc" |
| 33 |
- inherit git-2 |
| 34 |
+ |
| 35 |
+MY_P=uClibc-${PV} |
| 36 |
+if [[ ${PV} == *9999* ]] ; then |
| 37 |
+ EGIT_REPO_URI="https://git.busybox.net/uClibc" |
| 38 |
+ EGIT_BRANCH="0.9.33" |
| 39 |
+ inherit git-r3 |
| 40 |
+else |
| 41 |
+ PATCH_VER="17" |
| 42 |
+ SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2 |
| 43 |
+ ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}" |
| 44 |
+ KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86" |
| 45 |
fi |
| 46 |
|
| 47 |
export CBUILD=${CBUILD:-${CHOST}} |
| 48 |
@@ -15,15 +25,8 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then |
| 49 |
fi |
| 50 |
fi |
| 51 |
|
| 52 |
-MY_P=uClibc-${PV} |
| 53 |
DESCRIPTION="C library for developing embedded Linux systems" |
| 54 |
HOMEPAGE="https://www.uclibc.org/" |
| 55 |
-if [[ ${PV} != "9999" ]] ; then |
| 56 |
- PATCH_VER="17" |
| 57 |
- SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2 |
| 58 |
- ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}" |
| 59 |
- KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86" |
| 60 |
-fi |
| 61 |
|
| 62 |
LICENSE="LGPL-2" |
| 63 |
SLOT="0" |
| 64 |
@@ -232,8 +235,8 @@ src_config() { |
| 65 |
} |
| 66 |
|
| 67 |
src_unpack() { |
| 68 |
- if [[ ${PV} == "9999" ]] ; then |
| 69 |
- git-2_src_unpack |
| 70 |
+ if [[ ${PV} == *9999* ]] ; then |
| 71 |
+ git-r3_src_unpack |
| 72 |
else |
| 73 |
unpack ${A} |
| 74 |
fi |
| 75 |
|
| 76 |
diff --git a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild |
| 77 |
index fbc8a60a1fc..d55f0afff6d 100644 |
| 78 |
--- a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild |
| 79 |
+++ b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild |
| 80 |
@@ -1,11 +1,20 @@ |
| 81 |
# Copyright 1999-2018 Gentoo Foundation |
| 82 |
# Distributed under the terms of the GNU General Public License v2 |
| 83 |
|
| 84 |
+EAPI=0 |
| 85 |
+ |
| 86 |
inherit eutils flag-o-matic multilib toolchain-funcs savedconfig |
| 87 |
-if [[ ${PV} == *9999 ]] ; then |
| 88 |
+ |
| 89 |
+MY_P=uClibc-${PV} |
| 90 |
+if [[ ${PV} == *9999* ]] ; then |
| 91 |
+ EGIT_REPO_URI="https://git.busybox.net/uClibc" |
| 92 |
EGIT_BRANCH="0.9.33" |
| 93 |
- EGIT_REPO_URI="git://git.busybox.net/uClibc" |
| 94 |
- inherit git-2 |
| 95 |
+ inherit git-r3 |
| 96 |
+else |
| 97 |
+ PATCH_VER="" |
| 98 |
+ SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2 |
| 99 |
+ ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}" |
| 100 |
+ KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86" |
| 101 |
fi |
| 102 |
|
| 103 |
export CBUILD=${CBUILD:-${CHOST}} |
| 104 |
@@ -16,15 +25,8 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then |
| 105 |
fi |
| 106 |
fi |
| 107 |
|
| 108 |
-MY_P=uClibc-${PV} |
| 109 |
DESCRIPTION="C library for developing embedded Linux systems" |
| 110 |
HOMEPAGE="https://www.uclibc.org/" |
| 111 |
-if [[ ${PV} != *9999 ]] ; then |
| 112 |
- PATCH_VER="" |
| 113 |
- SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2 |
| 114 |
- ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}" |
| 115 |
- KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86" |
| 116 |
-fi |
| 117 |
|
| 118 |
LICENSE="LGPL-2" |
| 119 |
SLOT="0" |
| 120 |
@@ -231,8 +233,8 @@ src_config() { |
| 121 |
} |
| 122 |
|
| 123 |
src_unpack() { |
| 124 |
- if [[ ${PV} == *9999 ]] ; then |
| 125 |
- git-2_src_unpack |
| 126 |
+ if [[ ${PV} == *9999* ]] ; then |
| 127 |
+ git-r3_src_unpack |
| 128 |
else |
| 129 |
unpack ${A} |
| 130 |
fi |
| 131 |
|
| 132 |
diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild |
| 133 |
index f5cec3749e7..3e096317bab 100644 |
| 134 |
--- a/sys-libs/uclibc/uclibc-9999.ebuild |
| 135 |
+++ b/sys-libs/uclibc/uclibc-9999.ebuild |
| 136 |
@@ -1,10 +1,19 @@ |
| 137 |
# Copyright 1999-2018 Gentoo Foundation |
| 138 |
# Distributed under the terms of the GNU General Public License v2 |
| 139 |
|
| 140 |
+EAPI=0 |
| 141 |
+ |
| 142 |
inherit eutils flag-o-matic multilib toolchain-funcs savedconfig |
| 143 |
-if [[ ${PV} == "9999" ]] ; then |
| 144 |
- EGIT_REPO_URI="git://git.busybox.net/uClibc" |
| 145 |
- inherit git-2 |
| 146 |
+ |
| 147 |
+MY_P=uClibc-${PV} |
| 148 |
+if [[ ${PV} == *9999* ]] ; then |
| 149 |
+ EGIT_REPO_URI="https://git.busybox.net/uClibc" |
| 150 |
+ inherit git-r3 |
| 151 |
+else |
| 152 |
+ PATCH_VER="" |
| 153 |
+ SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2 |
| 154 |
+ ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}" |
| 155 |
+ KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86" |
| 156 |
fi |
| 157 |
|
| 158 |
export CBUILD=${CBUILD:-${CHOST}} |
| 159 |
@@ -15,15 +24,8 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then |
| 160 |
fi |
| 161 |
fi |
| 162 |
|
| 163 |
-MY_P=uClibc-${PV} |
| 164 |
DESCRIPTION="C library for developing embedded Linux systems" |
| 165 |
HOMEPAGE="https://www.uclibc.org/" |
| 166 |
-if [[ ${PV} != "9999" ]] ; then |
| 167 |
- PATCH_VER="" |
| 168 |
- SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2 |
| 169 |
- ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}" |
| 170 |
- KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86" |
| 171 |
-fi |
| 172 |
|
| 173 |
LICENSE="LGPL-2" |
| 174 |
SLOT="0" |
| 175 |
@@ -230,8 +232,8 @@ src_config() { |
| 176 |
} |
| 177 |
|
| 178 |
src_unpack() { |
| 179 |
- if [[ ${PV} == "9999" ]] ; then |
| 180 |
- git-2_src_unpack |
| 181 |
+ if [[ ${PV} == *9999* ]] ; then |
| 182 |
+ git-r3_src_unpack |
| 183 |
else |
| 184 |
unpack ${A} |
| 185 |
fi |
Archives