gentoo (valentine's day) resync : 14.02.2021

4 files changed, 3 insertions, 71 deletions

diff --git a/x11-misc/wbar/Manifest b/x11-misc/wbar/Manifest
index 2fa47a46e4fa..96922b1f5982 100644
--- a/x11-misc/wbar/Manifest
+++ b/x11-misc/wbar/Manifest
@@ -1,4 +1,3 @@
-AUX wbar-2.3.3-cfg.patch 176 BLAKE2B ce95f2eb9787e5f342cbdf7a943612cc066ba09038efd15f7c60258c59dfafd5377c9706c5db8690af69dda555333d54ae176368934062787dd1114d00a1ce5c SHA512 2c5035c41130eade51e90b36588915ea46201678f46ef580f61a33cde2aaadc640cd1626ef3aba4695f43f13f304e5d2e9fedee1c69f07d2bb49655edecd4c71
 AUX wbar-2.3.3-desktopfile.patch 1797 BLAKE2B bf87427e36821aadce543fef960ed235530bbd92ebfc12e1e158102ea3b7a76d7acc2bb20d9d6433babcda3ca15aa8dfca2b7cbfc15b45b5e956550374c3a18e SHA512 16689b27fd2d810d67afca43552822b1a4a70b75b1703e983f767bb7f3a4acb1a4782cb44d56c5ce128fce15589da721083f254732ba702fe5ed4ed813bbbfbf
 AUX wbar-2.3.3-nowerror.patch 181 BLAKE2B b014234207a378f516e738ed14808860b8b2fd426a86e466fd06383ca3e5e1ab8b538864929204fa8d5cc4b525539a018a31cf392075bbe4afb911ba7de023a5 SHA512 6dc28969c9e7be4f9e5e72362f4312882d3aecf2a878a9b1c45f018f1f7707d7b714a5e5b9c1199123fe9295e7c4780068570489b5d3185c8374d8c3b6b0ad28
 AUX wbar-2.3.3-test.patch 145 BLAKE2B 8fd715fabb88ae0e2295d4c38d7e8803cae1631df0838a0e06be82293c1b9cbf4e38360036dd33fec7217658d938cd2a35afcbc535ddabe267b68646ac67af94 SHA512 507b47f25fb13658b677572ebcc995be36a510a7e380d73d6a4ae4f3b74a3564b510b79edf9cedb21a4206053f9f212740fdaf4152ccd4adcf6750620cb21c39
@@ -7,6 +6,5 @@ AUX wbar-2.3.4-c++11.patch 1559 BLAKE2B 9b0233ccd33621043504e456307815f2647dc67f
 AUX wbar-2.3.4-completion.patch 283 BLAKE2B aecc682099788283e42208edd5b4860c8e4be06d9a5776d39086ef7802532d3c77adaf65dbb2eb597d9e9deffb40a41bf8ca2e406973d2316810394b0bd34605 SHA512 dadc31f136b2e85efd19a25698499810de0d6e9dde873d89c50a18e84f4b158f3570c63885270b09541eb89574375ed2c6e630b28b627b5383f23bab5f94d1eb
 AUX wbar-2.3.4-gtk.patch 677 BLAKE2B 6ed51fda1f98b07f5f86acd8a10ce00d4f330210e7ac4aaf1ac5e388dcc1213bfb8f5be6d78eb0d85115ba05dc125f34f1992b46a69ea755dd803c5ae4ab1136 SHA512 f8a0c29e9e4536d9fe60ff350fff73f362e109e04f205cf33383ef4c461102f844c5e43b336fef7631e727c286321c6130d297b40af85b79ea1229286463ed25
 DIST wbar-2.3.4.tgz 189999 BLAKE2B 6c06ae634f276efea336568f38220e40073f6525eb942f9825629fcccf763e119955507e7fb6f12f5501e9072e6b2bf3ba8ac58505ecf8fceb0ef6c4095c6ec2 SHA512 07f3484bd071761d57ef1172c56b30980eef9ce2ee65d1fc21ea20c631a1da1d88c1b8a9e1a1fca0e5f18e7bf1c5697c349a543d72966ce71ff53d7e921147b3
-EBUILD wbar-2.3.4-r2.ebuild 1248 BLAKE2B 9c9eecdb315184d1ffb1e528cac20d24f04c5b8f87ec53c7abe2e6bdfab4166d68e45982d547555491dfabb336b659c5c75475e608999a75bfcc3a7c5af91ac2 SHA512 2bbf0e8c6233e724da9820ad2b4ce8f86f7431b5ca25a8dba4f47ec9bfb5c7b49a0de483901f37fcc4f5e0d30ec365cd03cdcf61da68a0a0031f8a7d7b3b2137
-EBUILD wbar-2.3.4-r3.ebuild 1133 BLAKE2B d9aef4b0947c12d7390ef7cd0a17830771cc054b01ab724e28d6561745c22f35093d413fcdb9ea48ed36d379b8a0aaca6f9be28953d403df916053ff14a8faff SHA512 8a5b2811b68acab0de6293beaf0fe150fe2aa83cb4c18f911502d814b2b835c5ad0971a20027e10208e523bccfff0aa13aa3b94d4f33a61a13668610c0a5b730
+EBUILD wbar-2.3.4-r3.ebuild 1131 BLAKE2B 18a0f55ec512f4604bc6705f083213a3ecf13f52ed1f52e60a9ca20635d94cdca7e04e744cf7ca0a0c06142cd80a239438fd53ab661dbd1a7be2300894cc77af SHA512 b587126294ce184a627a202d0ac6e5187f34aa240fa33f0eb512c075cd75c3e632e5e3a8aaaf062d5dd446a9a97a113750331134087898b6bcb9c35774e799ea
 MISC metadata.xml 481 BLAKE2B 6161d8af7bc35f0e741236c79cc71813e7a308d71db65022a1dd35e69f32b70627eee0a2c61f43cbcada132bf19202d299d8a31d9300a02713f40375aa6b7932 SHA512 05a8903618ab4022768e4eec18f1e89a64a99049b135565bfe921d376ba24c1b6081e6afc50cca90109050364c79e09050372a478c2ac1e200fce0c8216b357b
diff --git a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
deleted file mode 100644
index 5d64909d28b2..000000000000
--- a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/etc/wbar.cfg.in
-+++ b/etc/wbar.cfg.in
-@@ -2,8 +2,3 @@
- c: @PACKAGE_NAME@ @DEFAULT_ARGV@
- t: none
- 
--i: @PIXMAPDIR@/@PACKAGE_NAME@/wbar.png
--c: wbar-config
--t: Config
--
--
diff --git a/x11-misc/wbar/wbar-2.3.4-r2.ebuild b/x11-misc/wbar/wbar-2.3.4-r2.ebuild
deleted file mode 100644
index d5e6928b2a88..000000000000
--- a/x11-misc/wbar/wbar-2.3.4-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools bash-completion-r1 eutils
-
-DESCRIPTION="A fast, lightweight quick launch bar"
-HOMEPAGE="https://github.com/rodolf0/wbar"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="media-libs/imlib2[X]
-	x11-libs/libX11
-	gtk? ( gnome-base/libglade
-		media-libs/freetype:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	use gtk || epatch "${FILESDIR}"/${PN}-2.3.3-cfg.patch
-
-	epatch \
-		"${FILESDIR}"/${PN}-2.3.3-desktopfile.patch \
-		"${FILESDIR}"/${PN}-2.3.3-nowerror.patch \
-		"${FILESDIR}"/${PN}-2.3.3-test.patch \
-		"${FILESDIR}"/${P}-automake-1.13.patch \
-		"${FILESDIR}"/${P}-completion.patch
-
-	sed -i \
-		-e "/^bashcompletiondir/s:=.*$:=$(get_bashcompdir):" \
-		etc/Makefile.am || die #482358
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable gtk wbar-config)
-}
-
-pkg_postinst() {
-	einfo
-	elog "media-libs/imlib2 needs to be compiled with the appropriate useflags"
-	elog "depending on your choice of image files (such as png, jpeg...)"
-	einfo
-}
diff --git a/x11-misc/wbar/wbar-2.3.4-r3.ebuild b/x11-misc/wbar/wbar-2.3.4-r3.ebuild
index f46e060720dc..a8f753750939 100644
--- a/x11-misc/wbar/wbar-2.3.4-r3.ebuild
+++ b/x11-misc/wbar/wbar-2.3.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="gtk"
 RDEPEND="