gentoo resync : 03.03.2021

4 files changed, 37 insertions, 47 deletions

diff --git a/x11-misc/devilspie/Manifest b/x11-misc/devilspie/Manifest
index 566bb9375eda..98865ad00a6d 100644
--- a/x11-misc/devilspie/Manifest
+++ b/x11-misc/devilspie/Manifest
@@ -1,4 +1,4 @@
 DIST devilspie-0.23.tar.xz 130984 BLAKE2B 86b1b472d23ba49fdcc27c1d5a48ef95e3edd1c236569a3d25e23c8947ed41d91ce35969939cefc8ee1b74eb65594f91617172d35350e873977f4e8856e71ce4 SHA512 6ea6c79d317b0f35d943ecafa010e8c6011870796d83ff0a24a4853ad0ebad93608173dd1c4b645254d53c5c182c667e6eba42a20f764f258c211ee2bcd19174
-EBUILD devilspie-0.23-r1.ebuild 1028 BLAKE2B df241aeff50c518c512954e6ef83aac0a7ee9a8bd1b2bc01989ad92ab2de613d9ecde62f4649e3f8d92f319123a050414b35c594608de29b0fedf32f79d142a6 SHA512 69e3078752ee90f39ae4d220d002e9b5330ccae8b2feeb73e76ad7b19f5310483da989ed6e3e8f238782c8deb53fdd3d7398705572638b90e65a4a17dbc7a06c
+EBUILD devilspie-0.23-r2.ebuild 661 BLAKE2B 71800ca4f4c9f8fc06b9cfa844c2bf50a71ce9cd7f00846e77b36bfcf2f5c8451a0fee642de7f56dadf853cedf3e122c72639cdefce5745d8cb9a4738cfede9c SHA512 4c2d3f2e705fc14205ae471cacc1f7630f7daf09ebcaad25019a2d95579e004e280fd16c5c0ba4335d80392c139d33745e8ec4b9f2b92fd59f93b817d80ee463
 EBUILD devilspie-0.23.ebuild 966 BLAKE2B 2aff3525074fff8cc2cf32360b776072e24567f35a6529a97418ab27102c718b000fdf9b49b30ca5a94c30ac33520ddad808e96d4980e4bb14e76d37b8d893d8 SHA512 399161cbecec1da3d68ec0ec9981558569d0425431b96418b4764307557354c96965c15fd16a8df49e13d8d06681c3cef3ddb801d73988824350cecb91056395
-MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
+MISC metadata.xml 364 BLAKE2B 780ff95eef4ae562c2c3919a6df525aedb055b94ad2faa57957b91010c9051b6503a9dd9d3d52c7dfe501a815b560bb76955af2d7f8ce96ca67467d9c1b67735 SHA512 aae50c8a6e6080b64b08ccf066821ac3beb51495bb727e9e4dbadfe60f5a9c1b73b575553dc35a0f696e70210799caa77ce6492f002fee9cd9b8afb08d18942f
diff --git a/x11-misc/devilspie/devilspie-0.23-r1.ebuild b/x11-misc/devilspie/devilspie-0.23-r1.ebuild
deleted file mode 100644
index 5711466aa402..000000000000
--- a/x11-misc/devilspie/devilspie-0.23-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A Window Matching utility similar to Sawfish's Matched Windows feature"
-HOMEPAGE="http://www.burtonini.com/blog/tag/devilspie.html"
-SRC_URI="http://www.burtonini.com/computing/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.10
-	x11-libs/gtk+:3[X]
-	x11-libs/libwnck:3
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext
-	gnome-base/gnome-common" # Required by eautoreconf
-
-src_prepare() {
-	default
-	sed -i -e "s:\(/usr/share/doc/devilspie\):\1-${PVR}:" devilspie.1 || die
-	sed -i -e '/-DG.*_DISABLE_DEPRECATED/d' src/Makefile.am || die
-	mv configure.{in,ac} || die
-	eautoreconf
-	LIBS="$($(tc-getPKG_CONFIG) --libs x11)"
-}
-
-src_configure() {
-	econf --disable-compile-warnings
-}
-
-src_install() {
-	default
-	keepdir /etc/devilspie
-}
diff --git a/x11-misc/devilspie/devilspie-0.23-r2.ebuild b/x11-misc/devilspie/devilspie-0.23-r2.ebuild
new file mode 100644
index 000000000000..e515002c9246
--- /dev/null
+++ b/x11-misc/devilspie/devilspie-0.23-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Window matching utility similar to Sawfish's Matched Windows"
+HOMEPAGE="http://www.burtonini.com/blog/tag/devilspie.html"
+SRC_URI="http://www.burtonini.com/computing/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	x11-libs/libwnck:3"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	sed -i "/doc\//s@devilspie..@${PF}/@" devilspie.1 || die
+}
diff --git a/x11-misc/devilspie/metadata.xml b/x11-misc/devilspie/metadata.xml
index 2ba8e9e851e4..d91810780a67 100644
--- a/x11-misc/devilspie/metadata.xml
+++ b/x11-misc/devilspie/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>sudinave@gmail.com</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>