Gentoo Archives: gentoo-dev

From: "Marty E. Plummer" <hanetzer@×××××××××.com>
To: gentoo-dev@l.g.o
Cc: "Marty E. Plummer" <hanetzer@×××××××××.com>
Subject: [gentoo-dev] [PATCH 2/2] toolchain-glibc.eclass: remove git logic
Date: Sun, 03 Jun 2018 01:49:02
Message-Id: 20180603014716.17459-3-hanetzer@startmail.com
In Reply to: [gentoo-dev] [PATCH 0/2] drop git logic from toolchain eclasses by "Marty E. Plummer"
1 The git logic is handled in the live ebuild directly, and the only use
2 of this eclass is in non-live ebuilds. In fact, the two newest non-live
3 ebuilds do not make use of this eclass at all, and as far as I can see
4 nowhere in the history of this file does it inherit git-2 at all.
5 ---
6 eclass/toolchain-glibc.eclass | 11 +----------
7 1 file changed, 1 insertion(+), 10 deletions(-)
8
9 diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass
10 index d75ca2eefdf..5f0e0cfd5cd 100644
11 --- a/eclass/toolchain-glibc.eclass
12 +++ b/eclass/toolchain-glibc.eclass
13 @@ -667,16 +667,7 @@ toolchain-glibc_do_src_unpack() {
14 # Check NPTL support _before_ we unpack things to save some time
15 want_nptl && check_nptl_support
16
17 - if [[ -n ${EGIT_REPO_URIS} ]] ; then
18 - local i d
19 - for ((i=0; i<${#EGIT_REPO_URIS[@]}; ++i)) ; do
20 - EGIT_REPO_URI=${EGIT_REPO_URIS[$i]}
21 - EGIT_SOURCEDIR=${EGIT_SOURCEDIRS[$i]}
22 - git-2_src_unpack
23 - done
24 - else
25 - unpack_pkg
26 - fi
27 + unpack_pkg
28
29 cd "${S}"
30 touch locale/C-translit.h #185476 #218003
31 --
32 2.17.1