gentoo resync : 28.04.2021

3 files changed, 32 insertions, 29 deletions

diff --git a/x11-plugins/wmclockmon/Manifest b/x11-plugins/wmclockmon/Manifest
index 798b4baaa865..732c40eb13a9 100644
--- a/x11-plugins/wmclockmon/Manifest
+++ b/x11-plugins/wmclockmon/Manifest
@@ -1,5 +1,5 @@
 AUX wmclockmon-0.8.1-gcc-10.patch 7348 BLAKE2B c953c2cf70b2991808d774c2916bef2d894d9bb7f895ae7541844df58a010ef3c0feec79a5445851975537729ff687ebdbe2db4de1a2b41fba777c8a3d5c1173 SHA512 65528c84701055f3e42ff30b32f1b52b9c5fb8e5d7ca49ba47c5fe31a2e78ccb30cf47ae91a40da54619b8bea6ba1f14889baadda5782110076db87e13d5e5da
-AUX wmclockmon-0.8.1-gtk.patch 11386 BLAKE2B f624a1720dc51db5af1298bdf334065e1e707f83a4561f94ad35ed32a057270db1a3a3234132d3d526c8cda50847b976c3ce9393f35c8460c6791b0b7fcec6aa SHA512 60e9cccabe142dae7cc24a3f6a261ed60f1b9c85dabb439fda8fc8657bc082997bd4558cc9e360b5911a6a8e1a46ada42eaccad6729b1e859fa9b81b60f2146c
+AUX wmclockmon-0.8.1-gtk.patch 10130 BLAKE2B 5cb15c22ab9cce779d8ccbb0733f581c8adca858074425ace973a435a5c5ba078ecdaafedd0361827e0ee1048e6d304702bd720123f515c35326915460fd84a0 SHA512 2db3deea64c1f7c6ad8468659601ab89112ac500d152e359e3784c8f5d598439af392e537e71a1b96d14582aaf9fed5284370a3300e7c9bb7daca54f2a4a26de
 DIST wmclockmon_0.8.1-1.tar.gz 139233 BLAKE2B fef6cc69afe54fc966008097c15ebf08db5dc585e3789f610b5f0d5d550312a6e0a00e5ee07d6e86d5efd78358e00a4d0fa44cd3b7ac69ecd9c7374037be61f4 SHA512 6216737b9df3ba2ec453570c477764b89b386bbaf954abcb5a5dc2e8841b08d4a8b0b9a4b7eaea73af59544a004cd685f15ce5a0cf098e4db29208151e5309a4
-EBUILD wmclockmon-0.8.1-r1.ebuild 811 BLAKE2B 2567e68c1cb1781f6edcc6dd5dff06a0a124f8ac35b1a8885ca1c9c003ec3f8710f5c6365d21454ac6b3f87d4c4b3b4ffd3cb1469fff7d4f00c3bb6e81bd6932 SHA512 901d151a214a375615007a4e8b9d6fca0a78b485933b5d43b718c94c124177c4dbd64e89fa0d28fa4679bc5f264803a05b74cf0f8d0617208a7464c58fc57047
+EBUILD wmclockmon-0.8.1-r1.ebuild 898 BLAKE2B ccc376fbcce31694070046613de84fdae8d3696d5e86307f341fad5f7a0459bc004843f60724d69e7d351d3c5ced088da53a25fc608f15c0928576f4ad7f4c91 SHA512 e7caecd8400b4876bda0720d1b85e4d86bfb34a8be76427c6e55fbb0273255708702ed6f4c17b00619b3a70c102fbdcae888d552a7fda77f369d0b659cdc2e8b
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmclockmon/files/wmclockmon-0.8.1-gtk.patch b/x11-plugins/wmclockmon/files/wmclockmon-0.8.1-gtk.patch
index a3b1b1fff9df..6d501934762d 100644
--- a/x11-plugins/wmclockmon/files/wmclockmon-0.8.1-gtk.patch
+++ b/x11-plugins/wmclockmon/files/wmclockmon-0.8.1-gtk.patch
@@ -1,12 +1,11 @@
-diff -ur wmclockmon-0.8.1.orig/wmclockmon-cal/Makefile.in wmclockmon-0.8.1/wmclockmon-cal/Makefile.in
---- wmclockmon-0.8.1.orig/wmclockmon-cal/Makefile.in	2005-06-15 16:55:27.000000000 +0300
-+++ wmclockmon-0.8.1/wmclockmon-cal/Makefile.in	2008-01-13 13:23:11.000000000 +0200
+--- a/wmclockmon-cal/Makefile.in
++++ b/wmclockmon-cal/Makefile.in
 @@ -96,17 +96,17 @@
  
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I..
 -LDFLAGS = @LDFLAGS@ `gtk-config --libs`
-+LIBS = @LIBS@ `pkg-config gtk+-2.0 --libs`
++LIBS = @LIBS@ `${PKG_CONFIG} gtk+-2.0 --libs`
  X_CFLAGS = @X_CFLAGS@
  X_LIBS = @X_LIBS@
  X_PRE_LIBS = @X_PRE_LIBS@
@@ -14,7 +13,7 @@ diff -ur wmclockmon-0.8.1.orig/wmclockmon-cal/Makefile.in wmclockmon-0.8.1/wmclo
  wmclockmon_DEPENDENCIES = 
  wmclockmon_LDFLAGS = 
 -CFLAGS = @CFLAGS@ `gtk-config --cflags`
-+CFLAGS = @CFLAGS@ `pkg-config gtk+-2.0 --cflags`
++CFLAGS = @CFLAGS@ `${PKG_CONFIG} gtk+-2.0 --cflags`
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
 -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
@@ -22,9 +21,8 @@ diff -ur wmclockmon-0.8.1.orig/wmclockmon-cal/Makefile.in wmclockmon-0.8.1/wmclo
  DIST_COMMON =  Makefile.am Makefile.in
  
  
-diff -ur wmclockmon-0.8.1.orig/wmclockmon-cal/mainwindow.c wmclockmon-0.8.1/wmclockmon-cal/mainwindow.c
---- wmclockmon-0.8.1.orig/wmclockmon-cal/mainwindow.c	2005-06-15 17:03:21.000000000 +0300
-+++ wmclockmon-0.8.1/wmclockmon-cal/mainwindow.c	2008-01-13 13:04:53.000000000 +0200
+--- a/wmclockmon-cal/mainwindow.c
++++ b/wmclockmon-cal/mainwindow.c
 @@ -51,7 +51,6 @@
      gtk_widget_hide(calendar);
      gtk_widget_hide(closewindow);
@@ -170,15 +168,14 @@ diff -ur wmclockmon-0.8.1.orig/wmclockmon-cal/mainwindow.c wmclockmon-0.8.1/wmcl
      gtk_widget_show(closewindow);
  
  
-diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/Makefile.in wmclockmon-0.8.1/wmclockmon-config/Makefile.in
---- wmclockmon-0.8.1.orig/wmclockmon-config/Makefile.in	2005-06-15 16:55:27.000000000 +0300
-+++ wmclockmon-0.8.1/wmclockmon-config/Makefile.in	2008-01-13 13:23:44.000000000 +0200
+--- a/wmclockmon-config/Makefile.in
++++ b/wmclockmon-config/Makefile.in
 @@ -96,17 +96,17 @@
  
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I..
 -LDFLAGS = @LDFLAGS@ `gtk-config --libs`
-+LIBS = @LIBS@ `pkg-config gtk+-2.0 --libs`
++LIBS = @LIBS@ `${PKG_CONFIG} gtk+-2.0 --libs`
  X_CFLAGS = @X_CFLAGS@
  X_LIBS = @X_LIBS@
  X_PRE_LIBS = @X_PRE_LIBS@
@@ -186,7 +183,7 @@ diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/Makefile.in wmclockmon-0.8.1/wm
  wmclockmon_DEPENDENCIES = 
  wmclockmon_LDFLAGS = 
 -CFLAGS = @CFLAGS@ `gtk-config --cflags`
-+CFLAGS = @CFLAGS@ `pkg-config gtk+-2.0 --cflags`
++CFLAGS = @CFLAGS@ `${PKG_CONFIG} gtk+-2.0 --cflags`
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
 -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
@@ -194,9 +191,8 @@ diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/Makefile.in wmclockmon-0.8.1/wm
  DIST_COMMON =  Makefile.am Makefile.in
  
  
-diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/dialogs.c wmclockmon-0.8.1/wmclockmon-config/dialogs.c
---- wmclockmon-0.8.1.orig/wmclockmon-config/dialogs.c	2005-06-15 16:55:27.000000000 +0300
-+++ wmclockmon-0.8.1/wmclockmon-config/dialogs.c	2008-01-13 13:04:53.000000000 +0200
+--- a/wmclockmon-config/dialogs.c
++++ b/wmclockmon-config/dialogs.c
 @@ -38,7 +38,6 @@
                         bouton, TRUE, TRUE, 0);
      GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
@@ -213,9 +209,8 @@ diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/dialogs.c wmclockmon-0.8.1/wmcl
      gtk_widget_show(bouton);
  
      gtk_container_set_border_width(GTK_CONTAINER
-diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/edit.c wmclockmon-0.8.1/wmclockmon-config/edit.c
---- wmclockmon-0.8.1.orig/wmclockmon-config/edit.c	2005-06-15 16:55:27.000000000 +0300
-+++ wmclockmon-0.8.1/wmclockmon-config/edit.c	2008-01-13 13:04:53.000000000 +0200
+--- a/wmclockmon-config/edit.c
++++ b/wmclockmon-config/edit.c
 @@ -76,7 +76,6 @@
                         bouton, TRUE, TRUE, 0);
      GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
@@ -224,9 +219,8 @@ diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/edit.c wmclockmon-0.8.1/wmclock
      gtk_widget_show(bouton);
  
      bouton = gtk_button_new_with_label("Cancel");
-diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/mainwindow.c wmclockmon-0.8.1/wmclockmon-config/mainwindow.c
---- wmclockmon-0.8.1.orig/wmclockmon-config/mainwindow.c	2005-06-15 16:55:27.000000000 +0300
-+++ wmclockmon-0.8.1/wmclockmon-config/mainwindow.c	2008-01-13 13:04:53.000000000 +0200
+--- a/wmclockmon-config/mainwindow.c
++++ b/wmclockmon-config/mainwindow.c
 @@ -10,9 +10,9 @@
  #include "actions.h"
  
diff --git a/x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild b/x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild
index 830ad8041b50..6f42f7bf0fab 100644
--- a/x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild
+++ b/x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DESCRIPTION="a nice digital clock with 7 different styles either in LCD or LED style"
+inherit toolchain-funcs
+
+DESCRIPTION="A nice digital clock with 7 different styles either in LCD or LED style"
 HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
 SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}-1.tar.gz"
 
@@ -17,16 +19,23 @@ RDEPEND="x11-libs/gtk+:2
 	x11-libs/libXpm
 	x11-libs/libICE"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	x11-base/xorg-proto
 	x11-libs/libXt"
+BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${P}-gtk.patch
-	"${FILESDIR}"/${P}-gcc-10.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gtk.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
+)
 
 DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO \
 	doc/sample2.wmclockmonrc doc/sample1.wmclockmonrc )
 
+src_configure() {
+	tc-export PKG_CONFIG
+	default
+}
+
 src_install() {
 	default
 	newdoc debian/changelog ChangeLog.debian