gentoo resync : 31.05.2021

4 files changed, 49 insertions, 15 deletions

diff --git a/app-misc/screenfetch/Manifest b/app-misc/screenfetch/Manifest
index 5c30eb0f0598..a142eda1baef 100644
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@@ -1,4 +1,5 @@
 DIST screenfetch-3.9.1.tar.gz 77350 BLAKE2B 10852e63c9ad615cea9a5e53374f16e2f3ac40074bc247c144c91b5e96e0040c6b6623d2a79300e859cef0d8eeb2e935aad585c73d668676dda388d5af6693b3 SHA512 e186901480dcad57b765052b1b156b7706a196ce0e08b6b88264912a5d2a1250e5014923312353a82ccabd8129d4d2421891f13fd34f0ed76c50ce9633207df0
-EBUILD screenfetch-3.9.1.ebuild 698 BLAKE2B 19c4dc1b59b17d0857be792b7b4e853fb1a9e8c16740336a21c0d08dbe42d3aff0c3bb992b3fcb0fa03e6bf0476ccc0409cef440e74ec5faaccd99e4ea303774 SHA512 c446d204d054e4cb78aa0f2e6927b0bad2ed83304f825b37e433f22c0ec3f6f4dc0281048b99244cfe5a0b3310bddf10cc5adac54a166e2e2377be2d5b052bbe
-EBUILD screenfetch-9999.ebuild 700 BLAKE2B 13008f0c79a4b427033b78d372455448d45bba1dc422ae3e1169e7aec4b50c67a58885d0242581f21b9bf6b0473758417b12f5cdc41e4c52adfec00c556ab6ae SHA512 d14d09879a624d86ba79dbae445210d1226c9c780a3406b44386eaa92bed24650048caa034d0e96e0e5d483aa569828f56459eeb5269f5deaec37ced133e414c
+EBUILD screenfetch-3.9.1-r1.ebuild 783 BLAKE2B 6cc07a31e3a1f6f2bde2cf8fed3f3d487d6d8775b51dec38f1b29dbb3aaa6b5fe3fc5708acaf382739d252da5f05f6ee7ecbc6abf5b5b25a2b38a210838673c1 SHA512 073eac6b7f4108e02408eb91c97ca3ce2e1fe9b50dc8960eabc93117cb3a87b5bc4f0925145f62a7ef6dd47add325b3bb4e4a78b6c821ae0183d85dab46b68c1
+EBUILD screenfetch-3.9.1.ebuild 699 BLAKE2B f70b0de1eb3d79064a25e74315b1e9bea733c310d6c236c26b345f5ca460cfedef4cf85a854247e1fdb47918be5ed1fbdec82f6a0468d926dd516dd78fafdfad SHA512 4e1729290cc836d02578db0b6b2065cbdae13f2a55f14febf512aa12a064f6818c63cc8b25b91d9b0b4f24e2c431b16947ba229cafeb74d5865259402e8f5980
+EBUILD screenfetch-9999.ebuild 783 BLAKE2B 6cc07a31e3a1f6f2bde2cf8fed3f3d487d6d8775b51dec38f1b29dbb3aaa6b5fe3fc5708acaf382739d252da5f05f6ee7ecbc6abf5b5b25a2b38a210838673c1 SHA512 073eac6b7f4108e02408eb91c97ca3ce2e1fe9b50dc8960eabc93117cb3a87b5bc4f0925145f62a7ef6dd47add325b3bb4e4a78b6c821ae0183d85dab46b68c1
 MISC metadata.xml 433 BLAKE2B 50f5c928a8db5e71033fd780bd2ea13af87d8d14d83b694ff6765fc65ca3f7313c53de0a22ee5cdc0ed4ad88c754a0ccd750e59e46cfd1456b4ea185162ae1df SHA512 d07492a28cab27bba43976cc18148cde296f7e3a5ec76f06f066812b085c8b1a2b7ba9ed0a5eeea7aa838b052f177a2fde0a99ff5ff5ef9a46c4c0553cf012e0
diff --git a/app-misc/screenfetch/screenfetch-3.9.1-r1.ebuild b/app-misc/screenfetch/screenfetch-3.9.1-r1.ebuild
new file mode 100644
index 000000000000..8bb13a276cb6
--- /dev/null
+++ b/app-misc/screenfetch/screenfetch-3.9.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature
+
+MY_PN="${PN/f/F}"
+
+DESCRIPTION="Bash Screenshot Information Tool"
+HOMEPAGE="https://github.com/KittyKatt/screenFetch"
+
+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/screenFetch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+src_install() {
+	newbin ${PN}-dev ${PN}
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "screenshot taking" media-gfx/scrot
+	optfeature "screenshot uploading" net-misc/curl
+	optfeature "resolution detection" x11-apps/xdpyinfo
+}
diff --git a/app-misc/screenfetch/screenfetch-3.9.1.ebuild b/app-misc/screenfetch/screenfetch-3.9.1.ebuild
index 5a74091728ce..b60b0c410fdb 100644
--- a/app-misc/screenfetch/screenfetch-3.9.1.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ else
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 IUSE="curl X"
 
diff --git a/app-misc/screenfetch/screenfetch-9999.ebuild b/app-misc/screenfetch/screenfetch-9999.ebuild
index 552e3a0655c6..8bb13a276cb6 100644
--- a/app-misc/screenfetch/screenfetch-9999.ebuild
+++ b/app-misc/screenfetch/screenfetch-9999.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit optfeature
+
 MY_PN="${PN/f/F}"
 
 DESCRIPTION="Bash Screenshot Information Tool"
@@ -17,19 +19,16 @@ else
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
-LICENSE="GPL-3"
+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
 }
+
+pkg_postinst() {
+	optfeature "screenshot taking" media-gfx/scrot
+	optfeature "screenshot uploading" net-misc/curl
+	optfeature "resolution detection" x11-apps/xdpyinfo
+}