gentoo auto-resync : 09:07:2022 - 19:15:57

14 files changed, 72 insertions, 23 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index f5be6a0eb592..37b5e9236476 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/wmbio/Manifest b/x11-plugins/wmbio/Manifest
index 658c52e97709..bc05fb0d44fc 100644
--- a/x11-plugins/wmbio/Manifest
+++ b/x11-plugins/wmbio/Manifest
@@ -1,4 +1,4 @@
 AUX wmbio-1.02-fno-common.patch 740 BLAKE2B d53e54a24ee0a7271746632cffed02475406ce5048bf8c37d3b1b7ee0932e8c8927db8cd22aa32e7d509dbcac0e1438c2aa44cd62e48822edffe28802aef05c6 SHA512 38881970a52f20ec721ab944c43c80586a65c35f704e4103f996d6276897850754a5f912386e01c6f4c32ee48f03ca4ccef504a8c8c7fc367c4c982cab9061a7
 DIST wmbio-1.02.tar.gz 21799 BLAKE2B f3736ad83e4441f027b8091d398f7f819de79d29d9d48dff0f1ab3c159e1da2fc367f8faa92addedb770d7137e7a93f8e91a29935264a6505d16c9598daad64b SHA512 bebe8de364f782c38164fdd3910c3f63ff8313fa46fce1215218a4d14b9be0c793ee1d234fdb694798c1ab49b17eca90957d22c076920bf50ecf24b563a07d5b
-EBUILD wmbio-1.02.ebuild 768 BLAKE2B 67390e3a14265a6e0215fe4ea704e21cf2c347c7cf80c6acb9f9178f44b61d7888e73d0da986d92cbfe6ad6780e855444f71409c7bde0a2154937785752d7e11 SHA512 e0b3ded12d598815617f09f5a97a3aedf29b326e8bf1f83075fcdb509226e9c9805c91b1778d65144148a29e3a5272fe6f64eb879b5243d3368431dc68491378
+EBUILD wmbio-1.02.ebuild 834 BLAKE2B ea312ddbd8105bb454a40ee025e4f730e32c2f9047a4da3f519ba9663f30a8d6998ca44e0266fd84644c38cdfeb971728281eb7475dc726810afaa15daca3a18 SHA512 62289c981e8fa9c1876af7205b64bb7b5046bc40eafc963c5f497cd12309ab5b91e6e3978fcb9c8bcf32b9122527d4b4c69e7dfc34db5b90ca5cdc51281441e2
 MISC metadata.xml 604 BLAKE2B bfc37c2cedb9d900bd0e2846248b572f362c786018c7e5a67879d587510ba791804db5d04af7bd3ae87be8bc4f09764d84ff9ca7b66ba69c49dfef1ca555a18e SHA512 cefa27b984a5959d8f13454f4376c5cbdd8c2bcc6900689d64cc12e1bb0ff262bcca0bbda0c6a23b5064671b98747ecf040ec3bca105bb9df3106f2ad843b8e4
diff --git a/x11-plugins/wmbio/wmbio-1.02.ebuild b/x11-plugins/wmbio/wmbio-1.02.ebuild
index d2d2e7ccc5fb..4c7d53c862ea 100644
--- a/x11-plugins/wmbio/wmbio-1.02.ebuild
+++ b/x11-plugins/wmbio/wmbio-1.02.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="A Window Maker applet that shows your biorhythm"
 HOMEPAGE="http://wmbio.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wmbio/${P}.tar.gz"
@@ -23,10 +25,14 @@ S=${WORKDIR}/${P}/src
 
 src_prepare() {
 	default
-	# Honour Gentoo CFLAGS
-	sed -i "s/-g -O2/\$(CFLAGS)/" Makefile || die
-	# Honour Gentoo LDFLAGS
-	sed -i "s/-o wmbio/\$(LDFLAGS) -o wmbio/" Makefile || die
+	# Honour Gentoo CFLAGS, LDFLAGS, CC
+	sed -i -e "s/-g -O2/\$(CFLAGS)/" \
+		-e "s/-o wmbio/\$(LDFLAGS) -o wmbio/" \
+		-e "s/cc /\$(CC) /" Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/x11-plugins/wmcdplay/Manifest b/x11-plugins/wmcdplay/Manifest
index e5c504e9cc49..4273df1d1ee6 100644
--- a/x11-plugins/wmcdplay/Manifest
+++ b/x11-plugins/wmcdplay/Manifest
@@ -1,4 +1,5 @@
+AUX wmcdplay-1.1-cpp11.patch 1315 BLAKE2B 5ca7792045a6c64be012a1b1474bfe5722f9365e2e3c0b3ed956b30e0afd7cea99cc4a672fd0e236c5cc4d76bb4f948699e699fccb959f37dcf0cf94ca955fdb SHA512 4774a3de25ecb5de09ccf32318f6e19d98560c05a438d39bf4bbdd47b38e1a5eeea13a2f615c969eb3efd48fdc83b013d830b8b3f11518f9c12c90b0993a5437
 AUX wmcdplay.desktop 178 BLAKE2B 74f1f10064d6e3e1738bb21b135ba479ce2bec97e084d4d3b402b823abbeb6db9b0590c2e12c427661518f099c478f7de35b161d788d01359053bed88224d69c SHA512 54e48ca979d5348e58b7b7057665dab9ff1429be534ea2dee970900c14b853ba9616487ff27500bf4a28145ca2b8809b4d6fffebbc99ac684238fa708a946293
 DIST wmcdplay-1.1.tar.gz 32082 BLAKE2B 5fd8f57aca1d3d53d34a31f9814c132a98241b848ac04e69c367065ea291add5f025598b7b03c44033024d20e24271690cdb38830e56d3795f6232b02f1d81c6 SHA512 db657ee2cf0a1a7e323e1a6fbf2ec70251005b84fb18808661cd44a50b4203786e56e90329d81957d2496a6e79d76e9d87620680186c85e476b7f94d8f234133
-EBUILD wmcdplay-1.1-r1.ebuild 598 BLAKE2B 21ab0b04f3d40cc8c58c1dc706abc3a3a4d6a29c5c6698e0f34e7f2634e0dc4a42e47019623eb3b2a42ecb8afae2680560c9693c5a8fcba0b8884b210d24c961 SHA512 d1c542bfa8931ae139aa92463e03cce12c6c5d813bd7e76a57cc0c91cb821f1dce88e98e8a1dd00655422ee7d5f42e977550936e64104aae763b03629d9e1761
+EBUILD wmcdplay-1.1-r1.ebuild 639 BLAKE2B eaf576cb722ad44210fda5bf6c71bb63a158fba3ae0b40e552c1fc0876fc3fc2dee511c4ac4af6e09a476fc275280952e3032deedef450f442618eed6a20348e SHA512 bc255c8689916b6a7ef6b7853919e2891814d5ca504da37aa62dd13908807d5b4c62f777d98f907846934aa8f510fcb4a14c5db5c5dcfd81896d9cccf68fbe9d
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-plugins/wmcdplay/files/wmcdplay-1.1-cpp11.patch b/x11-plugins/wmcdplay/files/wmcdplay-1.1-cpp11.patch
new file mode 100644
index 000000000000..7fdd1021dab3
--- /dev/null
+++ b/x11-plugins/wmcdplay/files/wmcdplay-1.1-cpp11.patch
@@ -0,0 +1,30 @@
+From bd69f80f597ca589683d6f606e979b8f77e9e0a4 Mon Sep 17 00:00:00 2001
+From: Doug Torrance <dtorrance@piedmont.edu>
+Date: Wed, 29 Apr 2020 11:01:30 -0400
+Subject: [PATCH] wmcdplay: Add spaces between macro and string literals for
+ C++11
+
+We may get compile errors (e.g., [1]) otherwise.
+
+[1] https://clang.debian.net/logs/2020-02-24-9.0.1/
+    wmcdplay_1.1-2_unstable_clang9.0.1.log
+---
+ wmcdplay.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wmcdplay.cc b/wmcdplay.cc
+index 46ae03a..675b5dc 100644
+--- a/wmcdplay.cc
++++ b/wmcdplay.cc
+@@ -353,7 +353,7 @@ unsigned long mixColor(char *colorname1, int prop1, char *colorname2, int prop2)
+ void scanArgs(int argc, char **argv){
+    for(int i=1;i<argc;i++){
+       if(strcmp(argv[i], "-h")==0 || strcmp(argv[i], "-help")==0 || strcmp(argv[i], "--help")==0){
+-         fprintf(stderr, "wmcdplay - A cd player designed for WindowMaker\nRelease "VERSION"\n");
++         fprintf(stderr, "wmcdplay - A cd player designed for WindowMaker\nRelease " VERSION "\n");
+          fprintf(stderr, "Copyright (C) 1998  Sam Hawker <shawkie@geocities.com>\n");
+          fprintf(stderr, "This software comes with ABSOLUTELY NO WARRANTY\n");
+          fprintf(stderr, "This software is free software, and you are welcome to redistribute it\n");
+-- 
+2.11.4.GIT
+
diff --git a/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild b/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
index 4751907aadbf..47fa6c9faf43 100644
--- a/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
+++ b/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/dockapps"
 
+PATCHES=( ${FILESDIR}/${P}-cpp11.patch )
 DOCS=( ARTWORK README )
 
 src_prepare() {
diff --git a/x11-plugins/wmcms/Manifest b/x11-plugins/wmcms/Manifest
index e90e975e8e11..8f9a881747e8 100644
--- a/x11-plugins/wmcms/Manifest
+++ b/x11-plugins/wmcms/Manifest
@@ -1,4 +1,4 @@
 AUX wmcms-0.3.5-s4t4n.patch 8562 BLAKE2B d1b99dc03a8dd0fd2f1e5d387ee8b763a0b1633199c20ab231fa8496a253f9124ad7508bd66cf742660b7aa9ddca16b5eaa887f08ddb4e8de0dd10b7cf490370 SHA512 ad25dead5271907845ae96efec52844de1005f31ddbf4d2e43996633ef8c54c89f9137421b019079462227a16052df950c7f589d112815c8b02b435f863e8b09
 DIST wmcms-0.3.5.tar.gz 19855 BLAKE2B ac97dc403e6adeebc85b386ae7c78a8537c33858950f41059aadb750909b22fabef5bed3114e9552b381d3fb9d603e90236c88a614ee168a46214f64b9ca50f5 SHA512 ef57e6b278c14163de0792e6af8be40ef721020594fb2871aad34543471869ecf468210c173861a93b4f22e1dfca8f1e4254aec6508adfdf143f3a0f1a49f549
-EBUILD wmcms-0.3.5-r4.ebuild 710 BLAKE2B dc90bba96a414e8d91bd704f86b847b782fde93b8385e4b9557f730f365691f98c4921bf1cc54e102143a656ffd283524c3dc20f1b815b56dc5e2e2214b5ac34 SHA512 ea7f7584dbf73efd20cde1315124f0a328f3f83d2918403a203552e4bdf32114b7e64340d7a2f28d2a5f5b8189adafdbe74648af595529208fbc31079025a9b0
+EBUILD wmcms-0.3.5-r4.ebuild 752 BLAKE2B 8f13e3eaf86f6ff5ee644ff152b5d6abea58f8c2d34256b35505ea59f0632ffafb994640b3b1cf8602f9e04856cd08c1859f218981441c58d76962dc2056c168 SHA512 0790ae9be3951f636fceddb50dce8a5023ca580f6371122d159819d50f47e808eb24685e52f6df63859cf9ba4988a7155c5907674ff7f305d98e169fb2a78421
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild b/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild
index 70c2fcf3f058..af360d3fe27e 100644
--- a/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild
+++ b/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="WindowMaker CPU and Memory Usage Monitor Dock App"
 HOMEPAGE="https://www.geocities.ws/neofpo/wmcms.html"
 SRC_URI="https://www.geocities.ws/neofpo/files/${P}.tar.gz"
@@ -27,7 +29,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}"
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/x11-plugins/wmdrawer/Manifest b/x11-plugins/wmdrawer/Manifest
index e31c00a69084..24384fe6b503 100644
--- a/x11-plugins/wmdrawer/Manifest
+++ b/x11-plugins/wmdrawer/Manifest
@@ -1,4 +1,4 @@
 AUX wmdrawer-0.10.5-gtk+-2.patch 370 BLAKE2B f308ef901a7d609bd257253ed092b2bf8a53e8b87afc973024b4249f56c4ae0a9b757a203ce5df180a31feb512bf6dff559a93081c0ae5314d6b3afe3785fa84 SHA512 4ee57e974cb4828a20fe5313746a0c646f793793a89ce70fb3bbdf28cf397fb4112121eb7f4274a67601f5e18487cbabf2b655161d575b8a58740eaa6aec87e6
 DIST wmdrawer-0.10.5.tar.gz 49413 BLAKE2B df77a7e7fedc1a648fccb6efc4315f1f7c4d316a475b3d0044578df0cc0ef5f5d481eec11a23a33682fd8f8bb5faeedb66e82916becb668546cbc5b9e5a61dd7 SHA512 f1e7cb7dc16841a7176e628f42ba5834200707dc162838e62fc7233e383d0aab6ce7fe22017286d26ce6ddc2e3cb6f1d0d21acd176fd36a0cdcd7ab04a2dbae1
-EBUILD wmdrawer-0.10.5-r3.ebuild 1182 BLAKE2B c9c0af7bfd790d38fb15b0b64042bbf6ffb93ba91646752d77b6aa3bdca73032ee1ae97dd7f2a7305e5beb9cdcafabbf81e70f7795d90ab2322e8b85f286f045 SHA512 a3e32a02315339ef851d6e58f3ccd883d678be30a55f1a907cba2fadb2178a35778195194afaece381425862c6be6202245acce37f3685c6fea1f2a91e9ac6de
+EBUILD wmdrawer-0.10.5-r3.ebuild 1228 BLAKE2B 217e4d49d5925e100040814368e505641ba330a0c5958b29004cc3c8bc9126abfd783827ec313aa914e5a159a4c9c5f32396ad589c13dfa3aebb5ff303b6efe6 SHA512 85b04baf700cf55e72f464caf804e06cfffda66163b8bc20608e110db69513830ea01131eb3b2fe981a89e68ec1e81f1461b4476c4825a598c3a8faa5c427dbd
 MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
diff --git a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
index 8ed75478b444..d72e2c0e4a88 100644
--- a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
+++ b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="dockapp which provides a drawer (retractable button bar) to launch applications"
 HOMEPAGE="http://people.easter-eggs.org/~valos/wmdrawer/"
 SRC_URI="http://people.easter-eggs.org/~valos/wmdrawer/${P}.tar.gz"
@@ -33,11 +35,11 @@ src_prepare() {
 	# Do not auto-strip binaries
 	sed -i -e 's/	strip $@//' Makefile || die
 	# Honour Gentoo LDFLAGS
-	sed -i -e 's/$(CC) -o/$(CC) $(REAL_LDFLAGS) -o/' Makefile || die
+	sed -i -e 's/$(CC) -o/$(CC) $(GENTOO_LDFLAGS) -o/' Makefile || die
 }
 
 src_compile() {
-	emake REAL_LDFLAGS="${LDFLAGS}"
+	emake CC="$(tc-getCC)" GENTOO_LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/x11-plugins/wmgrabimage/Manifest b/x11-plugins/wmgrabimage/Manifest
index 08d095f9f8e9..61d7b2f822b1 100644
--- a/x11-plugins/wmgrabimage/Manifest
+++ b/x11-plugins/wmgrabimage/Manifest
@@ -2,5 +2,5 @@ AUX wmgrabimage-0.72-gcc-10.patch 1009 BLAKE2B aa7be547c75400ec11afada57b8466eec
 AUX wmgrabimage-noman.patch 295 BLAKE2B cb10ee8ea0e98a2c77fe51fb333ce722efa8d0ce7b4296cdae925deae9a4ac946cc88d97e5da6805ba3385381fbd4651fd4a4b75eedac0678b6d52b6b9d59496 SHA512 adaace112266f179c120fac600d5b4eb016806ac7075f69663880c5f518e09ee213f899318b74feb2777e5504c06fdc72f4d54e733fc9f2ba9bd533490c42307
 AUX wmgrabimage.desktop 165 BLAKE2B 8faac723c7263861d7c348c33310882b39e4ca864e275d139a970d1377f4531c939dfffb569e29dcb952468e0d0dac61477125b77c4b6adb0ed3c1e76aaf227e SHA512 3d08f5a93d1ff356adb86b8636f092bf89fee18e238b8cbd2f7739239e996dd524f5fddc3821bf24f8c7271f1d9c7cd67300d58e31814a117697cfd9f3fd1458
 DIST wmGrabImage-0.72.tgz 19902 BLAKE2B d9000c03e4f9a3584f356c18fd4e4767ccc235708e0d3554fd6a0defa6108de3f52a90825b4ed7d334b545340ec9e463e67aae89062f5b0e2622c9e6d851a796 SHA512 64909db71d141ccf849eacbb100072a53770601fdf23949f76a45d1d25f5015ebb8f3a3da99e8f311977967d44a6db6596c2bcbe961fb8e313e41cad4960c92e
-EBUILD wmgrabimage-0.72-r2.ebuild 1108 BLAKE2B b8ba771cb7d67ebe95d82a667b8319d501de210edcbfff1a9b1d1dd2f9607013ba69253f00eac2298c3b793951624f16dbd3364863190733825749a9b67d9416 SHA512 976065532662b03bb110d6479d55bca9dc6b7d6aadb90bde747b66842fcda762ce1916fda4cb3078edbe9e2ef70cef7dd79ad1c89714da73006ffa66c842fc35
+EBUILD wmgrabimage-0.72-r2.ebuild 1141 BLAKE2B 33a876c94272ca777049c36d46be69b39cec3df2f86a6f71831a84651f14c082a74215e6d55560f964375a68388f7d478edfc1c767a9768054f12cb116b47638 SHA512 7520b3315ea5b298c4435664ce0b7116a241f699fd865270e97c3e98b1a15bd05e0b66e214cc351b2e55bb73aff09217f96ca14a401cce528e558065f8ab627f
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
index b1d7ff43dabc..126ad0294ba9 100644
--- a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
+++ b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop
+inherit desktop toolchain-funcs
 
 MY_PN=${PN/grabi/GrabI}
 
@@ -39,7 +39,7 @@ src_prepare() {
 
 src_compile() {
 	emake clean
-	emake CFLAGS="${CFLAGS} -Wall" SYSTEM="${LDFLAGS}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" SYSTEM="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/x11-plugins/wmpager/Manifest b/x11-plugins/wmpager/Manifest
index 203aef76ada2..5e6018366eb6 100644
--- a/x11-plugins/wmpager/Manifest
+++ b/x11-plugins/wmpager/Manifest
@@ -1,3 +1,3 @@
 DIST wmpager-1.2.tar.gz 24255 BLAKE2B 7ca18094ad1cb51793249072e530366cd4b4c02d8d5a2a8f49bae4e4742fbfdb6dad9a20d79142cd6776a17dfa078c6e6a7dbf84e98611f6024166f1bdf0a977 SHA512 6abd4ea28bba9bb809a8e0ce96df2b4491f32eaa39a16fa57727581c63ad6f96515e761392564af1515b92a6c463f7efee5fd84b96ae730fa0ff19094f5fec3e
-EBUILD wmpager-1.2-r2.ebuild 813 BLAKE2B 8a239d3ac459b2a89f3e5c9fcc725b47643f28f9b44260350f9cdee5f47f44776044c80017f2aa1438340d8721d7da7e783f0a445c984f7592de47eb03a0207f SHA512 67ddca8fc38f75f4b47c814af45fefbf8e039089b16a9e69e480a06b7e55b24f672747808fc517d595384cfe51f9278f5c9830dfbc6f90c87287a58e9964d231
+EBUILD wmpager-1.2-r2.ebuild 918 BLAKE2B bfcd82e73f0c5272f86cc48c5c50f39a53657fabdfc80cee3218e95978ddbe05f642a10a9610be4b840ce353e8786b0d0a7ad8273630c60972e4f644d7d8d8a0 SHA512 1a3003dd2aaacc6d5a2d6e5932afe04320b47a12019f1466bd5cd59755612179d970401afd09dc6528b97988cda3afa2ccdd98daa4b49173a58054df91e7ff55
 MISC metadata.xml 335 BLAKE2B 84ea6f161a5cf64fc1e9e42acb9f07936feab59f93f718fea55648446d52ed31a392e499729635894777433e1727d679da7761be79fd8adfe4abc4aba7a1257e SHA512 64fd9abf4714f12fee918ed90e7a6b67660a1ce73b15f341217892465ed655b2c0ada154a26f1fff87df7748d974d5f1a50846daf16f60e93ef7612fb2a247c3
diff --git a/x11-plugins/wmpager/wmpager-1.2-r2.ebuild b/x11-plugins/wmpager/wmpager-1.2-r2.ebuild
index 920a6e876ac9..541b6e136aad 100644
--- a/x11-plugins/wmpager/wmpager-1.2-r2.ebuild
+++ b/x11-plugins/wmpager/wmpager-1.2-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="A simple pager docklet for the WindowMaker window manager"
 HOMEPAGE="http://wmpager.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wmpager/${P}.tar.gz"
@@ -21,12 +23,17 @@ src_prepare() {
 	sed -i "s:\(WMPAGER_DEFAULT_INSTALL_DIR \).*:\1\"/usr/share/wmpager\":" \
 		src/wmpager.c || die
 
-	#Honour Gentoo CFLAGS and LDFLAGS, see bug #337604
-	sed -i -e "s/-g/${CFLAGS}/" \
+	#Honour Gentoo CC, CFLAGS and LDFLAGS, see bug #337604 and #726286
+	sed -i -e "s/-g/\${CFLAGS}/" \
 		-e "s/\${LIBS}/\${LIBS} \${LDFLAGS}/" \
+		-e "s/gcc/\$(CC)/" \
 		src/Makefile || die
 }
 
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
 src_install() {
 	emake INSTALLDIR="${ED}/usr" install
 	rm -rf "${ED}"/usr/man || die