gentoo resync : 21.07.2018

4 files changed, 58 insertions, 26 deletions

diff --git a/app-misc/screenfetch/Manifest b/app-misc/screenfetch/Manifest
index d5318c297931..51ce9824000b 100644
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@@ -1,4 +1,5 @@
 DIST screenfetch-3.8.0.tar.gz 71970 BLAKE2B 783d14bb30f5858f2f2f8ac81c6c8bca2fa4c1e7c9225d9ba13a7ace05c365459e277bea625b680fc3e3fedd0303507a583190d866627cedcb33e042aa8fdca7 SHA512 903f42e3bfcd719c4d6b91d10e5678063e223c2baa58214c7e8dae9ea925852f9e2c07ad90148e02d87ce5f9af7b989e80e93c2f569cd579e6f4f7d5c49c62f2
+EBUILD screenfetch-3.8.0-r1.ebuild 645 BLAKE2B da3565843558442dcfb92af2f56da8dbfddb25d88ea21492dd716377e6de0975b25e5ff25d25014c9342c0ee6abd7a1e479386bae10b5e5f505c1b109aee9efb SHA512 230977a4b296c7536799ebe36812bcbd1d311568cd5e243e96e6fdd6582dab322163dc767c796984e2fe7d16b904f3732d457b0fe59d206fcafc3a6cc3a55a6a
 EBUILD screenfetch-3.8.0.ebuild 693 BLAKE2B ad0cb380e1a3cd16f21e695e178abb984c76d6d696ef36dcd518b683c84ff82ebdbec02c9dd94f28c4b6b77a59f559614b07ef4cdd22a5a13104c9460a14da95 SHA512 99082dbdb51ba4ef62e0acdc41fddc59544644e8bb94dfbabe33bc3cd171e6416d5525c90770fdae8f86792ceb154e0be74373542668675cfff89c2d15074f9f
-EBUILD screenfetch-9999.ebuild 695 BLAKE2B aba8d3df8fcf9c7de4f83eee0fd1823160d1b7099dd22b20a3dd53b187472fb9bbabf0177a39473776fb2c2dc74056057250042188e43ac907aed246c944ecfe SHA512 bac3af4d7023f27284ec87186021d7e55d274675a719ce1785ba10ae6bbf5d52ddc97152f2c6096e6fca4e785c232016ff579ccb9f1eb44704872b7f694dfc24
-MISC metadata.xml 565 BLAKE2B 765d7d26e0e26fa7fc38808d02d8c9f49af990cacb9c22e670a53dd968dea368411beee7c3c4f9df2b877c8337944bf513edfd086f147dff54e6ac50e77df1a4 SHA512 a6032e340f2ebc2eb69673cdf61fd9c6da9a141e59aea3ff60bdb47120b86147ed6b971cc16df936a7391f8ab8fe8258e10444ffe11e79a7118620f883de45fa
+EBUILD screenfetch-9999.ebuild 645 BLAKE2B da3565843558442dcfb92af2f56da8dbfddb25d88ea21492dd716377e6de0975b25e5ff25d25014c9342c0ee6abd7a1e479386bae10b5e5f505c1b109aee9efb SHA512 230977a4b296c7536799ebe36812bcbd1d311568cd5e243e96e6fdd6582dab322163dc767c796984e2fe7d16b904f3732d457b0fe59d206fcafc3a6cc3a55a6a
+MISC metadata.xml 433 BLAKE2B 50f5c928a8db5e71033fd780bd2ea13af87d8d14d83b694ff6765fc65ca3f7313c53de0a22ee5cdc0ed4ad88c754a0ccd750e59e46cfd1456b4ea185162ae1df SHA512 d07492a28cab27bba43976cc18148cde296f7e3a5ec76f06f066812b085c8b1a2b7ba9ed0a5eeea7aa838b052f177a2fde0a99ff5ff5ef9a46c4c0553cf012e0
diff --git a/app-misc/screenfetch/metadata.xml b/app-misc/screenfetch/metadata.xml
index a91c788aff05..d142f85f16c8 100644
--- a/app-misc/screenfetch/metadata.xml
+++ b/app-misc/screenfetch/metadata.xml
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hwoarang@gentoo.org</email>
-    <name>Markos Chandras</name>
-  </maintainer>
-   <maintainer type="person">
-    <email>johu@gentoo.org</email>
-    <name>Johannes Huber</name>
-  </maintainer>
-  <use>
-    <flag name="X">Use the <pkg>media-gfx/scrot</pkg> package to take screenshots</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">KittyKatt/screenFetch</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
+	<use>
+		<flag name="X">Use the <pkg>media-gfx/scrot</pkg> package to take screenshots</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">KittyKatt/screenFetch</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild b/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
new file mode 100644
index 000000000000..f2c6bb16d7d5
--- /dev/null
+++ b/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+
+DEPEND=""
+RDEPEND="
+	curl? ( net-misc/curl )
+	X? (
+		media-gfx/scrot
+		x11-apps/xdpyinfo
+	)"
+
+src_install() {
+	newbin ${PN}-dev ${PN}
+	einstalldocs
+}
diff --git a/app-misc/screenfetch/screenfetch-9999.ebuild b/app-misc/screenfetch/screenfetch-9999.ebuild
index 0c17327b86ac..f2c6bb16d7d5 100644
--- 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