app-misc/screenfetch: EAPI 7

Package-Manager: Portage-2.3.43, Repoman-2.3.10

diff --git a/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild b/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
index 673c98a4a09f45ddf289af673f8b6482598e2ed3..f2c6bb16d7d57a5ce35359e156aa32c928469487 100644 (file)
--- a/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
@@ -1,13 +1,22 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="${PN/f/F}"
 
 DESCRIPTION="Bash Screenshot Information Tool"
 HOMEPAGE="https://github.com/KittyKatt/screenFetch"
 
+if [[ ${PV} == *9999 ]] ; then
+       EGIT_REPO_URI="${HOMEPAGE}.git"
+       inherit git-r3
+else
+       KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+       SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+       S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="curl X"
@@ -20,15 +29,6 @@ RDEPEND="
                x11-apps/xdpyinfo
        )"
 
-if [[ ${PV} == *9999 ]] ; then
-       EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
-       inherit git-r3
-else
-       KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-       SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-       S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
 src_install() {
        newbin ${PN}-dev ${PN}
        einstalldocs

diff --git a/app-misc/screenfetch/screenfetch-9999.ebuild b/app-misc/screenfetch/screenfetch-9999.ebuild
index 0c17327b86ac06d436495e828a63b2d10f4b7e4e..f2c6bb16d7d57a5ce35359e156aa32c928469487 100644 (file)
--- a/app-misc/screenfetch/screenfetch-9999.ebuild
+++ b/app-misc/screenfetch/screenfetch-9999.ebuild
@@ -1,13 +1,22 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="${PN/f/F}"
 
 DESCRIPTION="Bash Screenshot Information Tool"
 HOMEPAGE="https://github.com/KittyKatt/screenFetch"
 
+if [[ ${PV} == *9999 ]] ; then
+       EGIT_REPO_URI="${HOMEPAGE}.git"
+       inherit git-r3
+else
+       KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+       SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+       S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="curl X"
@@ -20,15 +29,6 @@ RDEPEND="
                x11-apps/xdpyinfo
        )"
 
-if [[ ${PV} == *9999 ]] ; then
-       EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
-       inherit git-r3
-else
-       KEYWORDS="~amd64 ~x86 ~x64-macos"
-       SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-       S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
 src_install() {
        newbin ${PN}-dev ${PN}
        einstalldocs