gentoo auto-resync : 16:07:2022 - 01:44:25

4 files changed, 7 insertions, 26 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index c83e49bf51fe..44967fd88bce 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/wmhdplop/Manifest b/x11-plugins/wmhdplop/Manifest
index 4a7a8d08ee79..0bb1445f7684 100644
--- a/x11-plugins/wmhdplop/Manifest
+++ b/x11-plugins/wmhdplop/Manifest
@@ -1,5 +1,4 @@
-AUX wmhdplop-0.9.10-cflags.patch 424 BLAKE2B 0831d43756a4cd2ad3a723fbdc027b8348695d57377fad0d9f9ec216d000adb738faa69f5a0424019b02fd029375b11e1974d8d7e85504d468ddb29f2814a467 SHA512 878eb78f4ccddb03b03848089da111c72c2861f9bbb6859eb154c161d4a429194443a87dfcf1ded61cc186017c96286019ab3856a741bda96361ef387ff50f01
-AUX wmhdplop-0.9.11-configure.patch 3289 BLAKE2B 80c93a0689689170ead4742ab0e102d4918dd467bef64b0b7031c142de86f1aeb4fbcd1b15760c83672587cbed1cedb978c53c1a4e88cc7cb7bf92443cfa6d0f SHA512 8e0d322392c572ee45d80ae8f9fa5e91be87773a2da390924ed3e5640ba318901ba1e3e92cf7bb58315dc16230171ff599c8a228ab343e3307c56e8482823262
+AUX wmhdplop-0.9.11-configure.patch 3188 BLAKE2B 2d5e5e2b22485d0004fd7fec7ee47dd247c8cf5e4f34f2350d7f7e14d36f413662877ba56de42db0976ce749024ba08152e85daab2722e2b30e4fa36324255f7 SHA512 1110d4517b4b43bb39a8cca57bd11e8511637e4a7586fa18b5a8363e4bc1702836e0ed9cd46b50e489ba488297eb8c02073a3ba6295d6f32283cb6f5a8debfeb
 AUX wmhdplop-0.9.11-indent.patch 1447 BLAKE2B 4d1359ad2f8408bdf6823d06139f3a89a5c5cc70e2aa237d02274d308979e505ed492fb55097e6090a82a659742d93285a2974dbd2ecd8c54a7864fb4c542919 SHA512 ca393cd833e7760223fa8e92ca3511c4e3631480402cca5addc67304368116da22bfde228066a648897530f47fbb7bed543b83ffab7c9db9efe59bd118a92636
 DIST wmhdplop-0.9.11.tar.gz 163931 BLAKE2B 9a30f0ea11fd9abd5419612a413187299945b415ed9231e878aeea5a395627b21d77b99bbac3bd8d2b0673069c2011974355c9056d2dbe46688ed7606e8f9b8c SHA512 e77802945b0c4213212922307416e8f99f1fe99de4ade6200bdd9cd8687926ddc7e67b437109174fb8544eebd8a6aea22ba685624842b54134bff48ea8aaa540
 EBUILD wmhdplop-0.9.11-r1.ebuild 712 BLAKE2B 3f65491374be554c081bd269f7c8ef75ede01420b6d343f3a16e85c39c7846ea6af36b02d71208c44186f285067c9415f9d904ceeb9d15ec6ef49f5bf3658b28 SHA512 cb7b3b69327a03e39404325ee6ebb9311da9907d433176c5b385ff18b312c9a37a14b384b0fe70fe1369baafaea06d5dab350b4260c5022646ed976f9e8e7324
diff --git a/x11-plugins/wmhdplop/files/wmhdplop-0.9.10-cflags.patch b/x11-plugins/wmhdplop/files/wmhdplop-0.9.10-cflags.patch
deleted file mode 100644
index 999379988317..000000000000
--- a/x11-plugins/wmhdplop/files/wmhdplop-0.9.10-cflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur wmhdplop-0.9.10.orig/configure.ac wmhdplop-0.9.10/configure.ac
---- wmhdplop-0.9.10.orig/configure.ac	2016-11-24 16:18:21.000000000 +0100
-+++ wmhdplop-0.9.10/configure.ac	2016-12-02 11:58:28.276017676 +0100
-@@ -19,10 +19,6 @@
- AC_DEFINE(_GNU_SOURCE,[],[uses GNU extensions])
- 
- 
--if test x$GCC = xyes; then
--  CFLAGS="-O3 -fomit-frame-pointer -ffast-math -Wall -W";
--fi
--
- dnl check for X
- AC_PATH_X
- AC_PATH_XTRA
diff --git a/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-configure.patch b/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-configure.patch
index 3eabe853f62a..1bbe3ad2f388 100644
--- a/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-configure.patch
+++ b/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-configure.patch
@@ -1,6 +1,6 @@
 diff -Naur wmhdplop-0.9.11.orig/configure.ac wmhdplop-0.9.11/configure.ac
 --- wmhdplop-0.9.11.orig/configure.ac	2018-12-11 02:45:33.000000000 +0100
-+++ wmhdplop-0.9.11/configure.ac	2022-07-15 14:17:50.244012667 +0200
++++ wmhdplop-0.9.11/configure.ac	2022-07-15 19:42:42.504309025 +0200
 @@ -1,12 +1,14 @@
 -AC_INIT(wmhdplop, 0.9.11)
 +AC_INIT([wmhdplop], [0.9.11], [https://www.dockapps.net/wmhdplop])
@@ -18,18 +18,14 @@ diff -Naur wmhdplop-0.9.11.orig/configure.ac wmhdplop-0.9.11/configure.ac
  
  AC_CANONICAL_HOST
  
-@@ -19,39 +21,42 @@
+@@ -19,39 +21,37 @@
  AC_DEFINE(_GNU_SOURCE,[],[uses GNU extensions])
  
  
 -if test x$GCC = xyes; then
 -  CFLAGS="-O3 -fomit-frame-pointer -ffast-math -Wall -W";
 -fi
-+AS_IF(
-+  [test "x${GCC}" = "xyes"],
-+  [CFLAGS="-O3 -fomit-frame-pointer -ffast-math -Wall -W"]
-+)
- 
+-
  dnl check for X
  AC_PATH_X
  AC_PATH_XTRA
@@ -78,7 +74,7 @@ diff -Naur wmhdplop-0.9.11.orig/configure.ac wmhdplop-0.9.11/configure.ac
   [  --enable-gkrellm        build the gkrellm plugin (requires gtk2 and gkrellm developpement files) (Default is yes)
    --disable-gkrellm       do not build the gkrellm plugin],
   [ if   test "x$enableval" = "xno" ; then
-@@ -69,8 +74,8 @@
+@@ -69,8 +69,8 @@
    PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
    GTK2_CFLAGS=$PACKAGE_CFLAGS;
    GTK2_LIBS=$PACKAGE_LIBS;
@@ -89,7 +85,7 @@ diff -Naur wmhdplop-0.9.11.orig/configure.ac wmhdplop-0.9.11/configure.ac
    SAVECPPFLAGS="$CPPFLAGS"
    CPPFLAGS="$CFLAGS $GTK2_CFLAGS"
    AC_CHECK_HEADERS([gkrellm2/gkrellm.h], [ok=1], [ok=0])
-@@ -82,7 +87,7 @@
+@@ -82,7 +82,7 @@
    fi
    CPPFLAGS="$SAVECPPFLAGS"
  fi
@@ -100,7 +96,7 @@ diff -Naur wmhdplop-0.9.11.orig/configure.ac wmhdplop-0.9.11/configure.ac
  AC_OUTPUT(Makefile)
 diff -Naur wmhdplop-0.9.11.orig/Makefile.am wmhdplop-0.9.11/Makefile.am
 --- wmhdplop-0.9.11.orig/Makefile.am	2018-12-08 22:48:27.000000000 +0100
-+++ wmhdplop-0.9.11/Makefile.am	2022-07-15 14:11:07.842722348 +0200
++++ wmhdplop-0.9.11/Makefile.am	2022-07-15 19:42:17.107279593 +0200
 @@ -8,6 +8,8 @@
  
  EXTRA_DIST=autogen.sh gkrellm_hdplop.c