gentoo resync : 20.03.2022

4 files changed, 2 insertions, 66 deletions

diff --git a/x11-misc/devilspie2/Manifest b/x11-misc/devilspie2/Manifest
index 5257acadc0b6..8e0fa151d1d0 100644
--- a/x11-misc/devilspie2/Manifest
+++ b/x11-misc/devilspie2/Manifest
@@ -1,6 +1,3 @@
-AUX devilspie2-0.43-lua-pkgconfig.patch 551 BLAKE2B 915dc2939517efa56bafce78c748ab061885eb320b1b902642fe3bc42125c1c94b81bc085ca0a5763550ed3a87f8aef2c67e2e6b80b40c870da0bdc50a7dd57f SHA512 82b2acc0d858daf70ed44f6f8acdf69c54926ac0aa9f350b656f06a7d22e5bdff4b20293bff3fcf95149c96a63c68bfbc6f739f48bbf2c28810f6e8964166148
 DIST devilspie2-0.44.tar.xz 46028 BLAKE2B e9ec3115781575c331d91e982fd1c71361ea57004a1b7ff234957998d3d44fd4e9a0ca1fde9d133e9e4c2d01b6e8d192921554eae8b83acfb0e3fa44b0c9fd23 SHA512 f01f2d044a670dd9b1b97e896a3e8ebcac3e67daea9f08a14bce26fe8084b85f7fdaa0ed147aba91626200f882eddeba7e0ec18f0f565cb7557ffb2ac74a4a64
-DIST devilspie2_0.43-src.tar.gz 48666 BLAKE2B 3657693547f1dbdfe8542f123601f228086261855dc8e99997cea76ef586b744aacb260222000300dbe34d3030646044fc046e94c2285e6386995853ceaaffda SHA512 0f44f3991e31f68a2d38eac32ea6fe4275a56e8b5e9439490d1e819fd69b5455ede565aa2b09b70c20ac852c465ac2c05c339ae1e5c1b7824685c46a28871abd
-EBUILD devilspie2-0.43-r100.ebuild 1050 BLAKE2B c530c3ce2d1cb7a930ce6ea6b0e9b1caefc540b5702c5030001408e6b1758763ad0fbc9700336ffe41779e2db8d3931ef0166544c772a5c1f82ca34ba6a382eb SHA512 72fcb6ea1af22aaa1029eaf349ef4bcb524022b34597f3378930bd8a66d667150d5d8b88202e33f1790f8946e70bab866df7af0916e234df06309c8ae099b5b2
-EBUILD devilspie2-0.44.ebuild 966 BLAKE2B ed2148f064ed59c20d57bdd75f3a3b8420b8db5425aa795517f318877827e730db33c5e11c7e24c410b7476b59222e8a34e694c996b3a29b11071e3d0d51efc4 SHA512 d9632765b7a4d4071616869be5caef850121c835420806287a3a4e99e7ca22372ca249655a0f75a9cfe12058977ee62394fee3195c0482d71c0a184759032d00
+EBUILD devilspie2-0.44.ebuild 964 BLAKE2B 7c726bccf0a07f9086b92bc7985d77feb2cbb678c52fed1eb49ac3ac0f47d87889b8ddb3fb1c3ed3d5713f4dfec636870c144c58b699f0ea1aedb04f40cab40e SHA512 055406394a977a59267779bb166294eec14b46ed2b2592be9029666065bf3bf35df3ccdbc81d4e2bc104cc5b38b37b2564a42d132af2991a27f8a6f4e40d47e3
 MISC metadata.xml 327 BLAKE2B deb8a111c8827befa1e4637d81d1605f10de1dfedbf2693a47361a5de9a01392934957906a48419acd421704db1c01029411a0f71d42c26525d5294e66a73e35 SHA512 d876e887ddd0c79605cedbad6aa23026c12a3a44a690fc5fcf84ae804fd22dffff76c1487d1a529af52db3594899f79d986aadf6fd44593a90d53db21d1c3f61
diff --git a/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild b/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild
deleted file mode 100644
index abeaa7126aa3..000000000000
--- a/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} luajit )
-PLOCALES="fi fr it ja nl pt_BR ru sv"
-
-inherit lua-single plocale toolchain-funcs
-
-DESCRIPTION="Devilspie like window matching utility, using LUA for scripting"
-HOMEPAGE="https://www.nongnu.org/devilspie2/"
-SRC_URI="https://download.savannah.gnu.org/releases/devilspie2/devilspie2_${PV}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
-	${LUA_DEPS}
-	>=dev-libs/glib-2.32.4:2
-	>=x11-libs/gtk+-3.4.4:3
-	>=x11-libs/libwnck-3.4.4:3
-	x11-libs/libX11
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.43-lua-pkgconfig.patch"
-)
-
-src_compile() {
-	tc-export PKG_CONFIG
-	emake CC="$(tc-getCC)" PREFIX="/usr" LANGUAGES="$(plocale_get_locales)"
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${ED}" LANGUAGES="$(plocale_get_locales)" install
-	einstalldocs
-	doman devilspie2.1
-}
diff --git a/x11-misc/devilspie2/devilspie2-0.44.ebuild b/x11-misc/devilspie2/devilspie2-0.44.ebuild
index 46b7dd07d740..b919988753f7 100644
--- a/x11-misc/devilspie2/devilspie2-0.44.ebuild
+++ b/x11-misc/devilspie2/devilspie2-0.44.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/x11-misc/devilspie2/files/devilspie2-0.43-lua-pkgconfig.patch b/x11-misc/devilspie2/files/devilspie2-0.43-lua-pkgconfig.patch
deleted file mode 100644
index 4b832e6a7fcc..000000000000
--- a/x11-misc/devilspie2/files/devilspie2-0.43-lua-pkgconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -60,7 +60,7 @@
- endif
- 
--LIB_CFLAGS=$(shell pkg-config --cflags --silence-errors $(PKG_GTK) $(PKG_WNCK) lua5.1 || pkg-config --cflags $(PKG_GTK) $(PKG_WNCK) lua)
-+LIB_CFLAGS=$(shell ${PKG_CONFIG} --cflags $(PKG_GTK) $(PKG_WNCK) lua)
- STD_LDFLAGS=
--LIBS=-lX11 $(shell pkg-config --libs --silence-errors $(PKG_GTK) $(PKG_WNCK) lua5.1 || pkg-config --libs $(PKG_GTK) $(PKG_WNCK) lua)
-+LIBS=-lX11 $(shell ${PKG_CONFIG} --libs $(PKG_GTK) $(PKG_WNCK) lua)
- 
- LOCAL_CFLAGS=$(STD_CFLAGS) $(DEPRECATED) $(CFLAGS) $(LIB_CFLAGS)