[gentoo-commits] repo/gentoo:master commit in: sys-apps/superiotool/

[David Seifert]

commit:     87d2eb716c31062361cf158a49a6be5c37d0f292
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  2 15:11:14 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec  2 16:14:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d2eb71

sys-apps/superiotool: Port to EAPI 6

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 sys-apps/superiotool/Manifest                    |  2 +-
 sys-apps/superiotool/superiotool-6637.ebuild     | 16 ++++++----------
 sys-apps/superiotool/superiotool-99999999.ebuild | 16 ++++++----------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/sys-apps/superiotool/Manifest b/sys-apps/superiotool/Manifest
index f29ac538666..81eb3d41623 100644
--- a/sys-apps/superiotool/Manifest
+++ b/sys-apps/superiotool/Manifest
@@ -1 +1 @@
-DIST superiotool-6637.tar.xz 27364 SHA256 
e21e091c7679c2eeac66aa49499c02587d64a41b3b36449f4ec06dafc8f0ba21 SHA512 
dafb732b33205d1bdd368c1f752c7ba78cfb9f6174fc72075b9e8dcae962ab9ef10eb0860052a5925167b91e5b056f6b8a4a316799661d3950a630020f4330fd
 WHIRLPOOL 
70ee5da7946cd93d978db2094dee1466a91239db96f640e5e2b7aa6d9487ccc43229e570bd084dcd6ef27353752059dfaa6fdf5b414d4eadf657549d0998bf39
+DIST superiotool-6637.tar.xz 27364 BLAKE2B 
be0fd054f1385c20ca1d3da04052f7155da77211c1a4253c58c0ee272944e4134b1df6213934ea0ab6c297da9ab09ceab1cc00dcd775633d7ba50f46cba8ffb8
 SHA512 
dafb732b33205d1bdd368c1f752c7ba78cfb9f6174fc72075b9e8dcae962ab9ef10eb0860052a5925167b91e5b056f6b8a4a316799661d3950a630020f4330fd

diff --git a/sys-apps/superiotool/superiotool-6637.ebuild 
b/sys-apps/superiotool/superiotool-6637.ebuild
index 9cd57fadcfc..83db272b25a 100644
--- a/sys-apps/superiotool/superiotool-6637.ebuild
+++ b/sys-apps/superiotool/superiotool-6637.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
-if [[ ${PV} == "99999999" ]] ; then
+if [[ ${PV} == *99999999 ]] ; then
        ESVN_REPO_URI="svn://coreboot.org/coreboot/trunk/util/${PN}"
        inherit subversion
-       SRC_URI=""
 else
        SRC_URI="mirror://gentoo/${P}.tar.xz"
        KEYWORDS="~amd64 ~x86"
@@ -26,6 +25,8 @@ DEPEND="${RDEPEND}
        app-arch/xz-utils"
 
 src_prepare() {
+       default
+
        sed -i \
                -e 's:-Werror ::' \
                -e 's:-O2 ::' \
@@ -40,8 +41,3 @@ src_compile() {
                CC="$(tc-getCC)" \
                SVNDEF="-D'SUPERIOTOOL_VERSION=\"${ESVN_WC_REVISION}\"'"
 }
-
-src_install() {
-       emake install DESTDIR="${D}"
-       dodoc README
-}

diff --git a/sys-apps/superiotool/superiotool-99999999.ebuild 
b/sys-apps/superiotool/superiotool-99999999.ebuild
index 9cd57fadcfc..83db272b25a 100644
--- a/sys-apps/superiotool/superiotool-99999999.ebuild
+++ b/sys-apps/superiotool/superiotool-99999999.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
-if [[ ${PV} == "99999999" ]] ; then
+if [[ ${PV} == *99999999 ]] ; then
        ESVN_REPO_URI="svn://coreboot.org/coreboot/trunk/util/${PN}"
        inherit subversion
-       SRC_URI=""
 else
        SRC_URI="mirror://gentoo/${P}.tar.xz"
        KEYWORDS="~amd64 ~x86"
@@ -26,6 +25,8 @@ DEPEND="${RDEPEND}
        app-arch/xz-utils"
 
 src_prepare() {
+       default
+
        sed -i \
                -e 's:-Werror ::' \
                -e 's:-O2 ::' \
@@ -40,8 +41,3 @@ src_compile() {
                CC="$(tc-getCC)" \
                SVNDEF="-D'SUPERIOTOOL_VERSION=\"${ESVN_WC_REVISION}\"'"
 }
-
-src_install() {
-       emake install DESTDIR="${D}"
-       dodoc README
-}