gentoo resync : 21.06.2020

3 files changed, 5 insertions, 43 deletions

diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
index f65920b37b5d..55fd952b377a 100644
--- a/app-text/nfoview/Manifest
+++ b/app-text/nfoview/Manifest
@@ -1,8 +1,6 @@
-DIST nfoview-1.26.tar.gz 117468 BLAKE2B 7fec761774ee66f1f5845d2d49cf99644d522c6fe402bdfd578e12371b58b3ac5a80b77959c92531ff54362c2234d043fa219b50730158c91310ba67b491f729 SHA512 2e697e3a49aa85fe0865ad9f281ea830e692335682658061f2aaaa1c5ed6ccb3dbd822dab244190ae0521ce237fbc3d91480da4c1229548f0fd5a74df712e336
 DIST nfoview-1.27.1.tar.gz 60211 BLAKE2B 777d9f42a08a17d3790996ff76819a0b74c6e1f01625019259524e6e5cee9afc72ae463085071e4a23cefeebaf5b14f1bbeae949446356ed1aaebebaaf53e230 SHA512 7066995954997a20aec27ff820c0f0a067835e219f9029f696b2885a85c4714b32fc8d474291433f64d9b28e81e5f4c24989a6447affc7b206cef453342a05d2
-DIST nfoview-1.27.tar.gz 60094 BLAKE2B 3186de6d04b50aa4388f606a49f8c2f13a0fe3494d49a1dbbd2ffc84cc039f03f47223e3aed469c32c3fbb01d277cba7f53290056dbcc7fec8e0eeec7ebcb596 SHA512 157257f9f289bdeac140054320ad43893c73995e11e6ccc91ebd2ca53878f00d45945c4e3ac3c11ec2f589a0349598f96dfecad3b0e3cfbe06e5a036bcedc3b5
-EBUILD nfoview-1.26.ebuild 817 BLAKE2B 47ada35bd06c2a1c43d78f598de8858e6a7bafcd9dc79987515155bbccdb4922288fb8374db2b3413c545bf7f2055f70a1eeda8b2f35009f6314424dec48b276 SHA512 56111d9d3a08543a698ef7319ca3ed2312955f0b611ce7069f24d6ce3957d30cc884b4ea9ec37f8749d31956b76c17786221c5829a9cce6e1dd0dbce640d1386
+DIST nfoview-1.28.tar.gz 61164 BLAKE2B 7fb1f150d343d5133e411486f3bff7315765187920dc5821de7d717f3381b6126263585a23fdb7847403ae992ee98b7503f7313a312adb0e6b2fb992e69da4a8 SHA512 652ed3a5dd3cad547c6c0f93a0c686c42e9fc58e2f90a682432cbcb865a1b6ab6cb55424ed68128718c0c867ad353d170ecf54619f7006445cb9761bced2bbd3
 EBUILD nfoview-1.27.1.ebuild 872 BLAKE2B 7b70a94c6144642e519476ccf2f44d1a07168493ff23b460237bbe9d62569f98fc0d812a46bc45674198ff0cbee091275fb63bf98369d42915c257f9b41f85dc SHA512 1b0b399f1ef009998b47d46f0d45f2130ef1cc6d62d50c993eb2be95f118e4d1afce962868763d4c177a74744a8b968312c2910c92a4723a29409f0741544f61
-EBUILD nfoview-1.27.ebuild 842 BLAKE2B 0b41463fa89d8dde1235c8609d728e9c696246fd1e6e252aad937ae238240127c832ab27e2592c93ba86a2c7150409501a70c918b584581dcfd51854a4abf717 SHA512 f14d92ccde72f6c5f72feb3b6b7f068f9fe26f3ddf86b0fff3a588fcb6ab829d1a042366fdf074b7876bf74f7786a3ed3e3cf487508d2dc3582f9c6d1d7d485a
+EBUILD nfoview-1.28.ebuild 872 BLAKE2B 0e0ea4b94556b7221137cbf1d4bde727854a8318b0d0e32f60951acf3df9f9945986ff1d31b2b41d6328d073bc1ea5aed073ed4a575711a7b694cc4003c67393 SHA512 3595e083ab06bcc9fdd85e6035e4ad380416e6484534e142b1e15b416ed98ce0627af3ab6093bff01bf467a8bf4c6267c2bdb47d649c664719fb6cf043586ae7
 EBUILD nfoview-9999.ebuild 817 BLAKE2B 47ada35bd06c2a1c43d78f598de8858e6a7bafcd9dc79987515155bbccdb4922288fb8374db2b3413c545bf7f2055f70a1eeda8b2f35009f6314424dec48b276 SHA512 56111d9d3a08543a698ef7319ca3ed2312955f0b611ce7069f24d6ce3957d30cc884b4ea9ec37f8749d31956b76c17786221c5829a9cce6e1dd0dbce640d1386
 MISC metadata.xml 457 BLAKE2B fc1b77e74af5461b5ff1e772f60ef2c222f95860b1afb21828aa39d26342c241658e731d80bb937e694ff1195b0a079fb4134e60207539fa799ffdb6cd601c52 SHA512 65cd8b6021811a13d3a319b930afd8a090c5d15fe232e10d403c3ca8258685f6e118a224bdda7e6cbcff17bf72a409f5213a919554d20525c75efca06b1fcfc1
diff --git a/app-text/nfoview/nfoview-1.26.ebuild b/app-text/nfoview/nfoview-1.26.ebuild
deleted file mode 100644
index a6e9e5a10d68..000000000000
--- a/app-text/nfoview/nfoview-1.26.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/otsaloma/nfoview/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Simple viewer for NFO files, which are ASCII art in the CP437 codepage"
-HOMEPAGE="https://otsaloma.io/nfoview/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	media-fonts/terminus-font"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/nfoview/nfoview-1.27.ebuild b/app-text/nfoview/nfoview-1.28.ebuild
index 568e5c1e57bd..ac3f5a722095 100644
--- a/app-text/nfoview/nfoview-1.27.ebuild
+++ b/app-text/nfoview/nfoview-1.28.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 xdg-utils
 
@@ -26,7 +27,7 @@ BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext"
 DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-	media-fonts/terminus-font"
+	media-fonts/cascadia-code"
 
 pkg_postinst() {
 	xdg_icon_cache_update