Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/superiotool/
Date: Sat, 02 Dec 2017 16:15:28
Message-Id: 1512231284.87d2eb716c31062361cf158a49a6be5c37d0f292.soap@gentoo
1 commit: 87d2eb716c31062361cf158a49a6be5c37d0f292
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 2 15:11:14 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 2 16:14:44 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d2eb71
7
8 sys-apps/superiotool: Port to EAPI 6
9
10 Package-Manager: Portage-2.3.16, Repoman-2.3.6
11
12 sys-apps/superiotool/Manifest | 2 +-
13 sys-apps/superiotool/superiotool-6637.ebuild | 16 ++++++----------
14 sys-apps/superiotool/superiotool-99999999.ebuild | 16 ++++++----------
15 3 files changed, 13 insertions(+), 21 deletions(-)
16
17 diff --git a/sys-apps/superiotool/Manifest b/sys-apps/superiotool/Manifest
18 index f29ac538666..81eb3d41623 100644
19 --- a/sys-apps/superiotool/Manifest
20 +++ b/sys-apps/superiotool/Manifest
21 @@ -1 +1 @@
22 -DIST superiotool-6637.tar.xz 27364 SHA256 e21e091c7679c2eeac66aa49499c02587d64a41b3b36449f4ec06dafc8f0ba21 SHA512 dafb732b33205d1bdd368c1f752c7ba78cfb9f6174fc72075b9e8dcae962ab9ef10eb0860052a5925167b91e5b056f6b8a4a316799661d3950a630020f4330fd WHIRLPOOL 70ee5da7946cd93d978db2094dee1466a91239db96f640e5e2b7aa6d9487ccc43229e570bd084dcd6ef27353752059dfaa6fdf5b414d4eadf657549d0998bf39
23 +DIST superiotool-6637.tar.xz 27364 BLAKE2B be0fd054f1385c20ca1d3da04052f7155da77211c1a4253c58c0ee272944e4134b1df6213934ea0ab6c297da9ab09ceab1cc00dcd775633d7ba50f46cba8ffb8 SHA512 dafb732b33205d1bdd368c1f752c7ba78cfb9f6174fc72075b9e8dcae962ab9ef10eb0860052a5925167b91e5b056f6b8a4a316799661d3950a630020f4330fd
24
25 diff --git a/sys-apps/superiotool/superiotool-6637.ebuild b/sys-apps/superiotool/superiotool-6637.ebuild
26 index 9cd57fadcfc..83db272b25a 100644
27 --- a/sys-apps/superiotool/superiotool-6637.ebuild
28 +++ b/sys-apps/superiotool/superiotool-6637.ebuild
29 @@ -1,14 +1,13 @@
30 -# Copyright 1999-2011 Gentoo Foundation
31 +# Copyright 1999-2017 Gentoo Foundation
32 # Distributed under the terms of the GNU General Public License v2
33
34 -EAPI="4"
35 +EAPI=6
36
37 -inherit toolchain-funcs eutils
38 +inherit toolchain-funcs
39
40 -if [[ ${PV} == "99999999" ]] ; then
41 +if [[ ${PV} == *99999999 ]] ; then
42 ESVN_REPO_URI="svn://coreboot.org/coreboot/trunk/util/${PN}"
43 inherit subversion
44 - SRC_URI=""
45 else
46 SRC_URI="mirror://gentoo/${P}.tar.xz"
47 KEYWORDS="~amd64 ~x86"
48 @@ -26,6 +25,8 @@ DEPEND="${RDEPEND}
49 app-arch/xz-utils"
50
51 src_prepare() {
52 + default
53 +
54 sed -i \
55 -e 's:-Werror ::' \
56 -e 's:-O2 ::' \
57 @@ -40,8 +41,3 @@ src_compile() {
58 CC="$(tc-getCC)" \
59 SVNDEF="-D'SUPERIOTOOL_VERSION=\"${ESVN_WC_REVISION}\"'"
60 }
61 -
62 -src_install() {
63 - emake install DESTDIR="${D}"
64 - dodoc README
65 -}
66
67 diff --git a/sys-apps/superiotool/superiotool-99999999.ebuild b/sys-apps/superiotool/superiotool-99999999.ebuild
68 index 9cd57fadcfc..83db272b25a 100644
69 --- a/sys-apps/superiotool/superiotool-99999999.ebuild
70 +++ b/sys-apps/superiotool/superiotool-99999999.ebuild
71 @@ -1,14 +1,13 @@
72 -# Copyright 1999-2011 Gentoo Foundation
73 +# Copyright 1999-2017 Gentoo Foundation
74 # Distributed under the terms of the GNU General Public License v2
75
76 -EAPI="4"
77 +EAPI=6
78
79 -inherit toolchain-funcs eutils
80 +inherit toolchain-funcs
81
82 -if [[ ${PV} == "99999999" ]] ; then
83 +if [[ ${PV} == *99999999 ]] ; then
84 ESVN_REPO_URI="svn://coreboot.org/coreboot/trunk/util/${PN}"
85 inherit subversion
86 - SRC_URI=""
87 else
88 SRC_URI="mirror://gentoo/${P}.tar.xz"
89 KEYWORDS="~amd64 ~x86"
90 @@ -26,6 +25,8 @@ DEPEND="${RDEPEND}
91 app-arch/xz-utils"
92
93 src_prepare() {
94 + default
95 +
96 sed -i \
97 -e 's:-Werror ::' \
98 -e 's:-O2 ::' \
99 @@ -40,8 +41,3 @@ src_compile() {
100 CC="$(tc-getCC)" \
101 SVNDEF="-D'SUPERIOTOOL_VERSION=\"${ESVN_WC_REVISION}\"'"
102 }
103 -
104 -src_install() {
105 - emake install DESTDIR="${D}"
106 - dodoc README
107 -}