gentoo resync : 20.10.2021

4 files changed, 5 insertions, 41 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 61ad46315c21..6de98be53da1 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/wmfsm/Manifest b/x11-plugins/wmfsm/Manifest
index 58f1b1057b56..a3a5fa3e3d5c 100644
--- a/x11-plugins/wmfsm/Manifest
+++ b/x11-plugins/wmfsm/Manifest
@@ -1,4 +1,3 @@
 DIST wmfsm-0.36.tar.gz 20456 BLAKE2B a9832bb4d6ae45b451c564d45ab2af085a17b3089b2f62411b70dab8f78e9c8725f6e1abfed75aa9334969dcea8258b6746c07e5a1e43cc021ab2083ae897de3 SHA512 d5d148f67f226e38a8b3c2475cdae9d93cb545ca79afe93060137b36f09a328db82b4561a6dd76abe7f5d59e944e8c8ed0f85ab1ff1727c659195c88d1d7406b
-EBUILD wmfsm-0.36-r1.ebuild 622 BLAKE2B 5dafc37253324f78b590861808654ee41210ef7dd0cb839d3170b885675b2007a305b93e46208ca98fa85979b35de154fe2212e21ee77f0533ba80fb815b6ab1 SHA512 1ed911d5dbbda65894bcb0c6544b8c45ec59757cdfc2fe1b1c6543d6f76db3bf97197e1102cc7b5d5483de994a194e33535947a07a5cb00a7bddf27cc0451d9d
-EBUILD wmfsm-0.36.ebuild 692 BLAKE2B a5f2759160ab9f22612fedcf2363bd037ff8f2164657a0161476196780a26b409a2b974aebb8d1efc5ac395d1420b1ebac703c14c408a184974b0a88a4fcdd5d SHA512 e5f7656ec36fd2a6a8b75c1f8cab2fbcc51ec86e9b5742fb238f6867c62b48cc33c32d7846ab8e2820a4b0e01c3a7447f09f0483435edf19584d21c5725f9f1c
+EBUILD wmfsm-0.36-r1.ebuild 545 BLAKE2B 74a0c3894e346d4426c3370eccc69feda719f325d89a5f0c378c2791a83b26d7e20a5714354dc2d4db0a95b162e0346b85728c5756316a5cf925906ecddadc9e SHA512 bfaf5096c0788a65f0231acb5975a9703cb5d191ed4628f52813bb90635e3cfef73be4dea8069581368e5919043641f2ff1bd18d81f46c1e4cf2aff791737e07
 MISC metadata.xml 424 BLAKE2B 38ae9b3e2e16efd2184ddfde2c9e5be3891c6b466c4e7297714082743b3e783b6a541ae96aba7f37e04492c08acb4f01dc61363450d908174e4a032a68a06c94 SHA512 791f08163435ea0180a8d698ab6ce6be109e35772a0c9386a27e3efcd20b4ceb70e6da8ba9e0b937e39aef6dcaa6e5cd69c8c0716d5ab650ea94443feabd6c6f
diff --git a/x11-plugins/wmfsm/wmfsm-0.36-r1.ebuild b/x11-plugins/wmfsm/wmfsm-0.36-r1.ebuild
index c350aba89612..9edd1516785a 100644
--- a/x11-plugins/wmfsm/wmfsm-0.36-r1.ebuild
+++ b/x11-plugins/wmfsm/wmfsm-0.36-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit autotools
 
@@ -13,7 +13,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-RDEPEND=">=x11-libs/libdockapp-0.7:=
+RDEPEND="
+	>=x11-libs/libdockapp-0.7:=
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXt
@@ -23,7 +24,5 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	default
-	sed -e "/^X11LIBS/s/-I$x_includes //" -i configure.ac || die "sed failed"
-
 	eautoreconf
 }
diff --git a/x11-plugins/wmfsm/wmfsm-0.36.ebuild b/x11-plugins/wmfsm/wmfsm-0.36.ebuild
deleted file mode 100644
index 43937a34e436..000000000000
--- a/x11-plugins/wmfsm/wmfsm-0.36.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-IUSE=""
-DESCRIPTION="dockapp for monitoring filesystem usage"
-HOMEPAGE="https://www.dockapps.net/wmfsm"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-RDEPEND=">=x11-libs/libdockapp-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	sed -e "/^X11LIBS/s/-I$x_includes //" -i configure.ac || die "sed failed"
-
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog
-}