gentoo resync : 30.05.2020

3 files changed, 3 insertions, 46 deletions

diff --git a/dev-util/smem/Manifest b/dev-util/smem/Manifest
index fbe4d51e3ebe..0bde1d372d5a 100644
--- a/dev-util/smem/Manifest
+++ b/dev-util/smem/Manifest
@@ -1,5 +1,3 @@
-DIST smem-1.4.tar.gz 15733 BLAKE2B 6c097c10625050a9d3a133144054d9791bb0ae2f498335398889b58c243b4477d38aefd8203a0483016647a6a72b4bcf4b9af23c241c0e87494614ca6cdaeade SHA512 2740b9ebede8e742e3d01f5f2e7a77a4d3ed04bee78585a904d07c299ea5a77be135dd5b6626abfdebcf2742b9004035443d3faeca04ca9b59c603f74708af9b
 DIST smem-1.5.tar.xz 16016 BLAKE2B 7c7e5dae6b047780275eebe2b9ec4fb06b27b8d3d2e70fc50c07136c18d414d7f51203760ab3bca98906c6566633c908dd18a7a8c390339850d80ad1ffe7f188 SHA512 8f3f5447060e6d857c3eb59ccbebbd62f18280f3993b31e55369b31ea74bc0e54109fd6d3f7088a23c48af050ff67eb738efceb0adeaff1dc7466f50efd9bc82
-EBUILD smem-1.4.ebuild 789 BLAKE2B bc6ee383a3445c9e35d9cf4b43e3f1dfab07226cb027b344611fd5ef372608a8419dddcd9a355a981309be13532bbba398f18247060317bf6ed9608112b7063b SHA512 28c2b8cedaf1c6ee66b2cada67f636dd5ad79a6b032ff3523b3a9db53af9900f86af91789f2e6cef82f887af5d7e43f48595178b8965f84df57c44308d498642
-EBUILD smem-1.5.ebuild 761 BLAKE2B df041e8794717f87efea62c92a0486aab60fd34c161aab7f19d997d4e05a2f23be74d7013185a0b30323de24665ec655bef68a84b75936fb72c907b564a26a32 SHA512 ea4ad43a92456f552528ee4553fd183401651a7ffb418428bb12647fe5212930cab28856a298681d884a545fb4e72b9294f563aa6c1127870d1c664e6b758073
+EBUILD smem-1.5.ebuild 764 BLAKE2B 68f9d997322ba69045c9b08fbe0d856b5b15cac3e3e38cfb6e49d25c1efa8de61df85af2bee482e29fd9baa6e2bab1016c01edc71e353efcaa25cc9a5ebeec41 SHA512 1e9d5c09d074c7068970160cc6942ebaed446ffd87def1dbac7ba310d15dd97b27c5fda516057b5d9b2d2c627c459b77fd4d4798dec6b46aab5bcf06c612828c
 MISC metadata.xml 887 BLAKE2B 97eada233bb3bbc6976a34ed5e2ee6b80e0c17e36d7617b2bb109194183878fde46e59a2c38bf84216673850dc21814edf27ba24f189bd03c0240a9c3eed60f1 SHA512 6bb126678342abd8ea5b5c6b4091ffba18d28494db92715d8f2b7dbd363df48d6265579c52340d1b9514b0422b4fcebb0b2f4a9efdfea5e040bf047a1576e478
diff --git a/dev-util/smem/smem-1.4.ebuild b/dev-util/smem/smem-1.4.ebuild
deleted file mode 100644
index d7bae6128dc2..000000000000
--- a/dev-util/smem/smem-1.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A tool that can give numerous reports on memory usage on Linux systems"
-HOMEPAGE="https://www.selenic.com/smem/"
-SRC_URI="https://www.selenic.com/${PN}/download/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-BDEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	python_fix_shebang smem
-}
-
-src_compile() {
-	"$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -o smemcap smemcap.c || die
-}
-
-src_install() {
-	dobin smemcap
-	python_doexe smem
-
-	doman smem.8
-}
-
-pkg_postinst() {
-	optfeature "for chart generation." dev-python/matplotlib
-}
diff --git a/dev-util/smem/smem-1.5.ebuild b/dev-util/smem/smem-1.5.ebuild
index 32239c1bdbf1..80a34b96f8e4 100644
--- a/dev-util/smem/smem-1.5.ebuild
+++ b/dev-util/smem/smem-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}"