Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/linux-firmware/
Date: Thu, 23 Nov 2017 15:34:23
Message-Id: 1511451205.8e2b9da48f56ff91cef3f794f6c5787856dbad37.floppym@gentoo
1 commit: 8e2b9da48f56ff91cef3f794f6c5787856dbad37
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 23 15:33:25 2017 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 23 15:33:25 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e2b9da4
7
8 sys-kernel/linux-firmware: convert live ebuild to EAPI 6 and git-r3
9
10 Package-Manager: Portage-2.3.15, Repoman-2.3.6_p7
11
12 sys-kernel/linux-firmware/linux-firmware-99999999.ebuild | 12 +++++++-----
13 1 file changed, 7 insertions(+), 5 deletions(-)
14
15 diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
16 index 0b15091c69b..1056574b806 100644
17 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
18 +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
19 @@ -1,16 +1,17 @@
20 # Copyright 1999-2017 Gentoo Foundation
21 # Distributed under the terms of the GNU General Public License v2
22
23 -EAPI=5
24 +EAPI=6
25 inherit savedconfig
26
27 if [[ ${PV} == 99999999* ]]; then
28 - inherit git-2
29 + inherit git-r3
30 SRC_URI=""
31 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
32 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
33 KEYWORDS=""
34 else
35 - SRC_URI="mirror://gentoo/${P}.tar.xz"
36 + GIT_COMMIT=""
37 + SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
38 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
39 fi
40
41 @@ -67,7 +68,7 @@ QA_PREBUILT="lib/firmware/*"
42
43 src_unpack() {
44 if [[ ${PV} == 99999999* ]]; then
45 - git-2_src_unpack
46 + git-r3_src_unpack
47 else
48 default
49 # rename directory from git snapshot tarball
50 @@ -76,6 +77,7 @@ src_unpack() {
51 }
52
53 src_prepare() {
54 + default
55 echo "# Remove files that shall not be installed from this list." > ${PN}.conf
56 find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf