gentoo resync : 28.04.2021

3 files changed, 10 insertions, 11 deletions

diff --git a/x11-plugins/wmfishtime/Manifest b/x11-plugins/wmfishtime/Manifest
index 0fec095d37f3..691136009cf5 100644
--- a/x11-plugins/wmfishtime/Manifest
+++ b/x11-plugins/wmfishtime/Manifest
@@ -1,5 +1,5 @@
-AUX wmfishtime-1.24-gtk.patch 1894 BLAKE2B 412589c02e0bd8e2cdfb3b06477637e50f481e6f3cb70ce289757293a87fc00259fa304af5f2293fc80be3f8767a3d27c2e6e0f0f6b5ca669f46fed0121fcd13 SHA512 db68887afee4e4bbce51e2beb82ef5586cb1c7e0acb2b7b84e914c5696cd87110680741ce449634e6034b46c4610f5af3e8018ef1d2614c5821816b03886489b
+AUX wmfishtime-1.24-gtk.patch 1560 BLAKE2B 507ea333ac03f1ee798111d47020c1a472f1fd7b5ba5ef66bb63abcec6fbb967e7e78cfbcc474c2df85765cf10dddcca4d80eb15aa675d1af3427d834bcb4f34 SHA512 88dfb8e6fcef55886fa517146fea58f524f63257d7bca154f03490a86b30f4c5a4a6a677000eedbc2a33aee020473aeb1359fa803aaeb41df67c61b6ee69e42f
 AUX wmfishtime-1.24-no_display.patch 516 BLAKE2B d81cd82250f74a3fda686cc49eb01ac2310470857a56ed950cac94f1b9a747fcbc98ee1b3083afe18f79e80f8db6c5983e480e3f7bfadad1dc55e5b682d38a9e SHA512 413c033262c6cbec6bd2ed8b709ec5d6988bea7ae2f5b26c7fca330e56b297041656e08cfc2d418c0e8d3c561e9ed10b4e672cf40a4779b254b76c7a5ff7151b
 DIST wmfishtime-1.24.tar.gz 21895 BLAKE2B d24d5400635223ffe4dbf7e63e5576083c6b5ab99563a24b9c36fe3e50821615998258f59bf6ec5cc630312c356b40210b0ab9091cb4350eb8fe6a1ca59d9b2c SHA512 7df3c6648b46c6f67cf094f634dc7699c1dd1ee4f4a18dbf63d74ebda74f322524b83d99f10a1c8c8c8a5040d78b071754a40ff162fdb13a5a00d01f1eb5c4e6
-EBUILD wmfishtime-1.24-r3.ebuild 821 BLAKE2B 0e4a95ddcfa71e371dbc854179441d448a60771390830a9daf9ce97aba2c9bebcfcdce6e7a776d2cc85bb7a0fba9fc439534ddb19c47805af162d27c13401119 SHA512 f2b4066f18f18617646145b139840f5beda615a0051e2f05a429db671ba1d24efb8e34d6d9dc73e2225d14e959d6f36bcbfc22ce337db39dfa1fd98b8d2f8e1a
+EBUILD wmfishtime-1.24-r3.ebuild 843 BLAKE2B c41ab6bc7b5e134e6bdc450cb03fb483e409d5d591f239150f52ff4991c050cf07da275e34b2e51e3248d10e6cf1e3526dfe58dfa16669a12f1eb02732246917 SHA512 03761e6e15026d9274d13b177c8515885daa469fa90d2d2f41fa6c27a2d4a8c3616bdc3f4dde277755c5ccbc1b96b958e32ff48bee9b1121295668a8ec9e03fb
 MISC metadata.xml 480 BLAKE2B c72218dce63a37d81c62b21d779a16de91591b4849d8ea7f8292cf4d73f88e3c6e98a64854133cfe6892ef3db464e4461f26b665f63f24e1efa3dd77128abd65 SHA512 3aebfb320d3d4cf32587efdeb26ba4bbf531c94fcf7c6c5a5c68a78939d8cabf40582d88661e490cba8e48f72f0885b426c69b8f55fba91f0ffa788dbc507220
diff --git a/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch b/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch
index 68d4c057c44e..91fb45ae8746 100644
--- a/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch
+++ b/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch
@@ -1,6 +1,5 @@
-diff -ur wmfishtime-1.24.orig/fishmon.c wmfishtime-1.24/fishmon.c
---- wmfishtime-1.24.orig/fishmon.c	2004-05-13 02:55:59.000000000 +0300
-+++ wmfishtime-1.24/fishmon.c	2008-01-12 16:19:34.000000000 +0200
+--- a/fishmon.c
++++ b/fishmon.c
 @@ -648,6 +648,7 @@
  
      /* make a copy for the iconwin - parameters are the same */
@@ -26,9 +25,8 @@ diff -ur wmfishtime-1.24.orig/fishmon.c wmfishtime-1.24/fishmon.c
  #undef MASK
  }				/* make_new_fishmon_dockapp */
  
-diff -ur wmfishtime-1.24.orig/Makefile wmfishtime-1.24/Makefile
---- wmfishtime-1.24.orig/Makefile	2001-05-26 23:49:41.000000000 +0300
-+++ wmfishtime-1.24/Makefile	2008-01-12 16:22:30.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -2,11 +2,11 @@
  DESTDIR =
  
@@ -39,7 +37,7 @@ diff -ur wmfishtime-1.24.orig/Makefile wmfishtime-1.24/Makefile
  # no user serviceable parts below this line
  # optimization cflags
 -CFLAGS = -O3 -Wall `gtk-config --cflags` ${EXTRA}
-+CFLAGS += -Wall `pkg-config gtk+-2.0 --cflags` ${EXTRA}
++CFLAGS += -Wall `${PKG_CONFIG} gtk+-2.0 --cflags` ${EXTRA}
  # profiling cflags
  # CFLAGS=-ansi -pedantic -Wall -pg -O3 `gtk-config --cflags` ${EXTRA} -DPRO
  # test coverage cflags
@@ -48,7 +46,7 @@ diff -ur wmfishtime-1.24.orig/Makefile wmfishtime-1.24/Makefile
  SHELL = sh
  OBJS = fishmon.o
 -LIBS = `gtk-config --libs | sed "s/-lgtk//g"`
-+LIBS = `pkg-config gtk+-2.0 --libs` -lm -lX11
++LIBS = `${PKG_CONFIG} gtk+-2.0 --libs` -lm -lX11
  INSTALL = -m 755
  
  all: wmfishtime
diff --git a/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild b/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild
index d031d7285b63..3b20412197ae 100644
--- a/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild
+++ b/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,6 +28,7 @@ src_prepare() {
 }
 
 src_compile() {
+	tc-export PKG_CONFIG
 	emake CC="$(tc-getCC)"
 }