gentoo resync : 18.05.2019

8 files changed, 150 insertions, 34 deletions

diff --git a/x11-misc/wbar/Manifest b/x11-misc/wbar/Manifest
index 3cf5ecba4104..2fa47a46e4fa 100644
--- a/x11-misc/wbar/Manifest
+++ b/x11-misc/wbar/Manifest
@@ -1,9 +1,12 @@
-AUX wbar-2.3.3-cfg.patch 291 BLAKE2B 43ac39f4b989398fcdd03cc868905f0c1b1bd90572fe35ed0d02b629a21e2d9232bb3f9973a8bf243afad2898b0f270345a714a492527f30198b950218099bda SHA512 e37e7a192d738defe1d47f5e47dff27761272a1f0dc0866f358777a28dc509d2aba2794b432101bd0a0b3bb198901c09618c2fe251d8e73d3dc79737443fdb7e
-AUX wbar-2.3.3-desktopfile.patch 2416 BLAKE2B 8e57c5abb97e7b160f33657635f4c4b219a7c521fe5a3695b25c9cdb9c009d5d6dccd1400274de25a56b76b44b87f4460ce1a69583a02cb20c1e50542405e995 SHA512 12a1ffc38196fe6bfe32320e42781f1db1ef742cc58474d784033fb9678da91bf00e0c7efbcfe9acedef511c51ca70a2be5746ba7824a652e4b68f731dadde03
-AUX wbar-2.3.3-nowerror.patch 282 BLAKE2B 2384a214b71e5bb76dae52db90fe21b73615a0c26c28f4dde6d6e2ee8da34c00ef323e8c11bb4d53d06098dc98eeab6bcf38eb9afe90b8d4dc7a997330a7609d SHA512 38de89325a8c028e25f91e30e585c04e6be7affbde2c37723c384fc9e1477dc46c1853bf127c94c4c90dd22661b5a9bcf210ea63770e868cb8658faa4fc26946
-AUX wbar-2.3.3-test.patch 247 BLAKE2B 01cee8fa798b961251c233bb2e2c445daf2907fbb44738368a81487240cedb76233c4b3ad8dce18bdc9bf3f6bb6949540e57719d08571ee7a06c6a8d3e057806 SHA512 da5425b8d3a618fae397c453903add62918352a329656610cd4f49b1e8372d79c99f9fb58f715a020fefb23b61cac8108f765a6d58945064a2e91e1a3a50dfd2
+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
 AUX wbar-2.3.4-automake-1.13.patch 238 BLAKE2B 7c8521e72ee19e5e236266608c29942d69fefb35324a62c5f160d11cffd9ab891ce9c95c36a212f645e8e773c7f3aef4ba9864d46b59c076828bbeeb1b69c053 SHA512 62f3c1266a715b3b4368002a4658a2d010b24a6bd2251ab13b8b665370c7e8584a3b10904687d272628cba97785c2bcd0a6bacd643f712cb3e6c9ec940b99f67
+AUX wbar-2.3.4-c++11.patch 1559 BLAKE2B 9b0233ccd33621043504e456307815f2647dc67fbdf20b721bebb5a89777e3cd9b297afba0b7209bce0d432aa19359b0894f3bf5ad4b64b311ed2544c8e6b349 SHA512 cb912821849a04e934832cad49689d3bce544be72c55d96f60da8a59a23a100942414519f1471d8ab68b8a2ec97cd73c48920894aff49afa19bafad477240c12
 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
 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
index 5ffd82869983..5d64909d28b2 100644
--- a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
+++ b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
@@ -1,7 +1,3 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Sep 21 21:45:22 UTC 2012
-Subject: remove wbar-config for -gtk
-
 --- a/etc/wbar.cfg.in
 +++ b/etc/wbar.cfg.in
 @@ -2,8 +2,3 @@
diff --git a/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch b/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch
index 79a5de15629d..d2032dfa79f6 100644
--- a/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch
+++ b/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch
@@ -1,10 +1,3 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date:   Fri Sep 21 17:08:32 2012 +0200
-
-	fix desktop file destination and QA issues
-
-diff --git a/configure.ac b/configure.ac
-index 00ad0b6..48fe73d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -83,6 +83,7 @@ AC_DEFINE_UNQUOTED(PIDOF_BIN, "$PIDOF_BIN ", [ program to retreive wbar pid ])
@@ -15,8 +8,6 @@ index 00ad0b6..48fe73d 100644
  etc/Makefile \
  etc/wbar.cfg \
  etc/wbar.desktop.in \
-diff --git a/etc/Makefile.am b/etc/Makefile.am
-index ec41c76..d78525e 100644
 --- a/etc/Makefile.am
 +++ b/etc/Makefile.am
 @@ -3,7 +3,7 @@ CLEANFILES = *~ $(wbardesktop:.desktop.in.in=.desktop)
@@ -28,8 +19,6 @@ index ec41c76..d78525e 100644
  autostart_DATA = $(wbardesktop:.desktop.in.in=.desktop)
  
  bashcompletiondir = /etc/bash_completion.d
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index ddf920c..16ee6dd 100644
 --- a/po/POTFILES.in
 +++ b/po/POTFILES.in
 @@ -1,3 +1,4 @@
@@ -37,16 +26,12 @@ index ddf920c..16ee6dd 100644
  share/wbar.glade
  src/config/Functions.cc
  src/config/Functions.h
-diff --git a/po/POTFILES.skip b/po/POTFILES.skip
-index 327f139..27a8f48 100644
 --- a/po/POTFILES.skip
 +++ b/po/POTFILES.skip
 @@ -1,2 +1,3 @@
  etc/wbar.desktop.in.in
 +share/wbar.desktop.in.in
  
-diff --git a/share/Makefile.am b/share/Makefile.am
-index 87c736b..66027d4 100644
 --- a/share/Makefile.am
 +++ b/share/Makefile.am
 @@ -1,8 +1,17 @@
@@ -69,9 +54,6 @@ index 87c736b..66027d4 100644
 +$(wbardesktop) \
 +$(wbardesktop:.desktop.in.in=.desktop.in)
  
-diff --git a/share/wbar.desktop.in.in b/share/wbar.desktop.in.in
-new file mode 100644
-index 0000000..48fc33c
 --- /dev/null
 +++ b/share/wbar.desktop.in.in
 @@ -0,0 +1,12 @@
diff --git a/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch b/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch
index 2cf163bc4642..32c341b26e0f 100644
--- a/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch
+++ b/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch
@@ -1,7 +1,3 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Aug 26 17:18:37 UTC 2012
-Subject: remove Werror
-
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -8,7 +8,6 @@
diff --git a/x11-misc/wbar/files/wbar-2.3.3-test.patch b/x11-misc/wbar/files/wbar-2.3.3-test.patch
index 4468791a4202..fc2cb7c5498c 100644
--- a/x11-misc/wbar/files/wbar-2.3.3-test.patch
+++ b/x11-misc/wbar/files/wbar-2.3.3-test.patch
@@ -1,7 +1,3 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Sep 21 21:50:34 UTC 2012
-Subject: fix test phase
-
 --- a/po/POTFILES.in
 +++ b/po/POTFILES.in
 @@ -1,3 +1,4 @@
diff --git a/x11-misc/wbar/files/wbar-2.3.4-c++11.patch b/x11-misc/wbar/files/wbar-2.3.4-c++11.patch
new file mode 100644
index 000000000000..fead9e9b4cb3
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.4-c++11.patch
@@ -0,0 +1,54 @@
+--- a/src/config/Functions.cc
++++ b/src/config/Functions.cc
+@@ -11,7 +11,7 @@
+ #include "Run.h"
+ #include "OptParser.h"
+ 
+-#define ICON_DEFAULT PIXMAPDIR"/"PACKAGE_NAME".png"
++#define ICON_DEFAULT PIXMAPDIR "/" PACKAGE_NAME ".png"
+ 
+ static const gchar *authors[] =
+ {
+@@ -304,7 +304,7 @@
+         
+         if (command.empty())
+         {
+-            command = PACKAGE_NAME" "DEFAULT_ARGV;
++            command = PACKAGE_NAME " " DEFAULT_ARGV;
+         }
+ 
+         if (argc <= 1 || tmpoptparser.isSet( OptParser::CONFIG ))
+--- a/src/config/Run.cc
++++ b/src/config/Run.cc
+@@ -125,9 +125,9 @@
+ 
+ bool Run::start(std::string command)
+ {
+-    if (system ((PACKAGE_NAME" " + command + " &").c_str()) != 0)
++    if (system ((PACKAGE_NAME " " + command + " &").c_str()) != 0)
+     {
+-        std::cout << _("Error run program: ") << PACKAGE_NAME" " + command << std::endl;
++        std::cout << _("Error run program: ") << PACKAGE_NAME " " + command << std::endl;
+     }
+     return Run::getPID() > 0;
+ }
+@@ -136,7 +136,7 @@
+ {
+     if (Run::getPID() > 0)
+     {
+-        if (system ("killall "PACKAGE_NAME) != 0)
++        if (system ("killall " PACKAGE_NAME) != 0)
+         {
+             std::cout << _("Error kill program: ") << PACKAGE_NAME << std::endl;
+         }
+--- a/src/core/Main.cc
++++ b/src/core/Main.cc
+@@ -81,7 +81,7 @@
+ 
+         if (command.empty())
+         {
+-            command = PACKAGE_NAME" "DEFAULT_ARGV;
++            command = PACKAGE_NAME " " DEFAULT_ARGV;
+         }
+ 
+         if (argc <= 1 || tmpoptparser.isSet( OptParser::CONFIG ))
diff --git a/x11-misc/wbar/files/wbar-2.3.4-gtk.patch b/x11-misc/wbar/files/wbar-2.3.4-gtk.patch
new file mode 100644
index 000000000000..76f2b902759f
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.4-gtk.patch
@@ -0,0 +1,32 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,7 +59,6 @@
+ AC_DEFINE_UNQUOTED(DEFAULT_ARGV, "$DEFAULT_ARGV" , [ The default argv ])
+ 
+ AC_PROG_INTLTOOL()
+-AM_GLIB_GNU_GETTEXT
+ PKG_PROG_PKG_CONFIG
+ 
+ PKG_CHECK_MODULES(modules, [imlib2 x11])
+--- 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
+-
+-
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -51,7 +51,7 @@
+ $(top_srcdir)/src/utils/i18n.h
+ 
+ wbar_CXXFLAGS = @modules_CFLAGS@
+-wbar_LDADD = @modules_LIBS@ @INTLLIBS@
++wbar_LDADD = @modules_LIBS@ 
+ 
+ if WBAR_CONFIG
+ wbar_config_CXXFLAGS = @gui_modules_CFLAGS@
diff --git a/x11-misc/wbar/wbar-2.3.4-r3.ebuild b/x11-misc/wbar/wbar-2.3.4-r3.ebuild
new file mode 100644
index 000000000000..f46e060720dc
--- /dev/null
+++ b/x11-misc/wbar/wbar-2.3.4-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools bash-completion-r1
+
+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? (
+		dev-libs/glib
+		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
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.3-desktopfile.patch
+	"${FILESDIR}"/${PN}-2.3.3-nowerror.patch
+	"${FILESDIR}"/${PN}-2.3.3-test.patch
+	"${FILESDIR}"/${PN}-2.3.4-automake-1.13.patch
+	"${FILESDIR}"/${PN}-2.3.4-c++11.patch
+	"${FILESDIR}"/${PN}-2.3.4-completion.patch
+)
+
+src_prepare() {
+	default
+
+	use gtk || eapply "${FILESDIR}"/${PN}-2.3.4-gtk.patch
+
+	sed -i \
+		-e "/^bashcompletiondir/s:=.*$:=$(get_bashcompdir):" \
+		etc/Makefile.am || die #482358
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable gtk wbar-config)
+}