gentoo auto-resync : 15:07:2022 - 19:43:32

8 files changed, 158 insertions, 151 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index d122b46215ed..c83e49bf51fe 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/wmhdplop/Manifest b/x11-plugins/wmhdplop/Manifest
index 61542dd3b947..4a7a8d08ee79 100644
--- a/x11-plugins/wmhdplop/Manifest
+++ b/x11-plugins/wmhdplop/Manifest
@@ -1,8 +1,6 @@
 AUX wmhdplop-0.9.10-cflags.patch 424 BLAKE2B 0831d43756a4cd2ad3a723fbdc027b8348695d57377fad0d9f9ec216d000adb738faa69f5a0424019b02fd029375b11e1974d8d7e85504d468ddb29f2814a467 SHA512 878eb78f4ccddb03b03848089da111c72c2861f9bbb6859eb154c161d4a429194443a87dfcf1ded61cc186017c96286019ab3856a741bda96361ef387ff50f01
-AUX wmhdplop-0.9.10-sysmacros.patch 388 BLAKE2B bea15277921cfe403e6960771821db22e01455d1092534e76a1f988b99adb75537552e42e28bbbaafba9531d15f4dbb6f14434d384defc4cd56bab938ec1a01a SHA512 b914f815c65196221f88d75b0346063be3f283f8f55921e454529d7a3089121edbac6ba8e75bd759f2b4f0fcc5d1295a1084f751901c275a6aa501271e0831f3
-AUX wmhdplop-0.9.9-64bit.patch 3955 BLAKE2B 138a449cdc015e7763166b061232a6bcecceba4d2e60f503ec84d27aa330918dde7f589cbb9dc3c76b9afc9fe8e4f90d8c34e420707fcb99fd5bedf0a87b4b61 SHA512 11ad797cce7d04e389f7252cac2617aada7da68b412f3678eda2b7503d104ec2a66d4e297cec80501626b67c2ee0fee4799646f8421c450a0ffb70d68ebb9d94
-DIST wmhdplop-0.9.10.tar.gz 163491 BLAKE2B dd05bcddd4be666e403e7d0ccdbdba9048af6eb15dd72657b657bc4eb8eea1a6a7a78da820f143f6f377949bd9d8df89c5ae129f40374586633f8cdb174b9146 SHA512 9bd79ab5c271e2fbd7d415a1ea20eda5412d7657d9ccfd4781a6d42b834107b65e110231718ad686355e76590cd39f556ebfc9b14e7a4048a68d62503df94f46
+AUX wmhdplop-0.9.11-configure.patch 3289 BLAKE2B 80c93a0689689170ead4742ab0e102d4918dd467bef64b0b7031c142de86f1aeb4fbcd1b15760c83672587cbed1cedb978c53c1a4e88cc7cb7bf92443cfa6d0f SHA512 8e0d322392c572ee45d80ae8f9fa5e91be87773a2da390924ed3e5640ba318901ba1e3e92cf7bb58315dc16230171ff599c8a228ab343e3307c56e8482823262
+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.10.ebuild 754 BLAKE2B 145df35ceb4727355e628533e96f9eb6fb9b3f12ce04e74068b8da479639cf2e4487dd4eea5a746e9fe92204ce6c23e8eda417d29278999a31bad61c2823bddb SHA512 600af3552d4292d5ac60e410f8324774b11bfd9b9a79b71fecd930551b0e35960a2d368297069cc53f70fb7f50f96163ff16f460b9c46f92c595d8a643b29494
-EBUILD wmhdplop-0.9.11.ebuild 684 BLAKE2B c84e836d0316b5776c325399126ac12ac0c1b20ab6db5125127eb087d91fc9684e0fd3e6f579a922d3a8e8dc43f69180f98b3fcc92c877654fae13d5b7596391 SHA512 3fe7b2eae8c2c36216b7ab800901bc956cabfb0380b6c4e172b6f0cf95cd9ff366c1c8d3a13658edbdf6940f05b671b99f23c58d603977f7d81f318505401c18
+EBUILD wmhdplop-0.9.11-r1.ebuild 712 BLAKE2B 3f65491374be554c081bd269f7c8ef75ede01420b6d343f3a16e85c39c7846ea6af36b02d71208c44186f285067c9415f9d904ceeb9d15ec6ef49f5bf3658b28 SHA512 cb7b3b69327a03e39404325ee6ebb9311da9907d433176c5b385ff18b312c9a37a14b384b0fe70fe1369baafaea06d5dab350b4260c5022646ed976f9e8e7324
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-plugins/wmhdplop/files/wmhdplop-0.9.10-sysmacros.patch b/x11-plugins/wmhdplop/files/wmhdplop-0.9.10-sysmacros.patch
deleted file mode 100644
index 1346cd2e3641..000000000000
--- a/x11-plugins/wmhdplop/files/wmhdplop-0.9.10-sysmacros.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur wmhdplop-0.9.10.orig/devnames.c wmhdplop-0.9.10/devnames.c
---- wmhdplop-0.9.10.orig/devnames.c	2016-11-24 15:49:55.000000000 +0100
-+++ wmhdplop-0.9.10/devnames.c	2017-02-16 15:03:08.946447885 +0100
-@@ -4,6 +4,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <unistd.h>
- #include <linux/major.h>
- #include <ctype.h>
diff --git a/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-configure.patch b/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-configure.patch
new file mode 100644
index 000000000000..3eabe853f62a
--- /dev/null
+++ b/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-configure.patch
@@ -0,0 +1,112 @@
+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
+@@ -1,12 +1,14 @@
+-AC_INIT(wmhdplop, 0.9.11)
++AC_INIT([wmhdplop], [0.9.11], [https://www.dockapps.net/wmhdplop])
+ AC_CONFIG_SRCDIR(wmhdplop.c)
+ AM_INIT_AUTOMAKE
++LT_INIT
++AC_CONFIG_MACRO_DIRS([m4])
+ AM_CONFIG_HEADER(config.h)
+ 
+ AC_SUBST(VERSION)
+ 
+ ISODATE=`date +%Y-%m-%d`
+-AC_SUBST(ISODATE)
++AC_SUBST([ISODATE])
+ 
+ AC_CANONICAL_HOST
+ 
+@@ -19,39 +21,42 @@
+ 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
+-if test x$no_x = xyes; then
+-  echo "You need to supply the path to the X headers and libraries with --x-includes=dir and --x-libraries=dir";
+-  exit 1;
+-fi;
++AS_IF(
++  [test "x${no_x}" = "xyes"],
++  [AC_MSG_ERROR([You need to supply the path to the X headers and libraries with --x-includes=dir and --x-libraries=dir])]
++)
+ 
+ LIBS="${X_PRE_LIBS} ${X_LIBS} -lX11 -lXext ${LIBS} ${X_EXTRA_LIBS}"
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ 
+ dnl Checks for library functions.
+-AC_CHECK_HEADERS(linux/hdreg.h)
++AC_CHECK_HEADERS([linux/hdreg.h])
+ 
+-AC_CHECK_PROG([IMLIB2_CONFIG_IN_PATH],[imlib2-config],[yes],[no])
+-if test "x$IMLIB2_CONFIG_IN_PATH" = "xno"; then
+-  AC_ERROR([imlib2-config not found in PATH.. You need to install Imlib2 (and its developpement package)])
+-fi
+-IMLIB2_CFLAGS=$(imlib2-config --cflags)
+-IMLIB2_LIBS=$(imlib2-config --libs)
+-AC_SUBST(IMLIB2_CFLAGS)
+-AC_SUBST(IMLIB2_LIBS)
++AC_CHECK_PROG([PKG_CONFIG_IN_PATH],[pkg-config],[yes],[no])
++AS_IF(
++  [test "x$PKG_CONFIG_IN_PATH" = "xno"],
++  [AC_ERROR([pkg-config not found in PATH.. You need to install pkgconf])]
++)
++
++IMLIB2_CFLAGS=$(pkg-config imlib2 --cflags)
++IMLIB2_LIBS=$(pkg-config imlib2 --libs)
++AC_SUBST([IMLIB2_CFLAGS])
++AC_SUBST([IMLIB2_LIBS])
+ 
+ YELLOW="\\033\\1331;33m"
+ RESET="\\033\\1330m"
+ 
+ dnl Checks for the gkrellm plugin
+ build_gkhdplop="yes"
+-AC_ARG_ENABLE(gkrellm,
++AC_ARG_ENABLE([gkrellm],
+  [  --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 @@
+   PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+   GTK2_CFLAGS=$PACKAGE_CFLAGS;
+   GTK2_LIBS=$PACKAGE_LIBS;
+-  AC_SUBST(GTK2_CFLAGS)
+-  AC_SUBST(GTK2_LIBS)
++  AC_SUBST([GTK2_CFLAGS])
++  AC_SUBST([GTK2_LIBS])
+   SAVECPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CFLAGS $GTK2_CFLAGS"
+   AC_CHECK_HEADERS([gkrellm2/gkrellm.h], [ok=1], [ok=0])
+@@ -82,7 +87,7 @@
+   fi
+   CPPFLAGS="$SAVECPPFLAGS"
+ fi
+-AC_SUBST(GKHDPLOP)
++AC_SUBST([GKHDPLOP])
+ 
+ 
+ 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
+@@ -8,6 +8,8 @@
+ 
+ EXTRA_DIST=autogen.sh gkrellm_hdplop.c
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ IMLIB2_LIBS=@IMLIB2_LIBS@
+ IMLIB2_CFLAGS=@IMLIB2_CFLAGS@
+ 
diff --git a/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-indent.patch b/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-indent.patch
new file mode 100644
index 000000000000..30e44715ea2a
--- /dev/null
+++ b/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-indent.patch
@@ -0,0 +1,38 @@
+From f597fc7288f57d1dfddd5bb559cc7b0f598d15e5 Mon Sep 17 00:00:00 2001
+From: "Torrance, Douglas" <dtorrance@piedmont.edu>
+Date: Sun, 10 Oct 2021 10:01:04 +0000
+Subject: [PATCH] wmhdplop: Fix "misleadingly indented" compiler warnings.
+
+---
+ wmhdplop/wmhdplop.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/wmhdplop.c b/wmhdplop.c
+index 16b9a4f..bbbe971 100644
+--- a/wmhdplop.c
++++ b/wmhdplop.c
+@@ -421,7 +421,9 @@ static void draw_hdlist(App *app) {
+     //printf("update : first displayed(%d) = %p\n", cnt, dl);
+ 
+     for (dl = first_dev_in_list(), dev_cnt=hd_cnt=-1; dl; dl = dl->next) {
+-      if (dl->part_id == 0) ++hd_cnt; if (!is_displayed(dl->hd_id, dl->part_id)) continue; ++dev_cnt;
++      if (dl->part_id == 0) ++hd_cnt;
++      if (!is_displayed(dl->hd_id, dl->part_id)) continue;
++      ++dev_cnt;
+       imlib_get_text_size(shorten_name(dl),&w,&h);
+       lw = MAX(w,lw);
+       lh += h;
+@@ -440,7 +442,9 @@ static void draw_hdlist(App *app) {
+   imlib_image_draw_rectangle(lx-1,ly-1,lw+2,lh+2);
+ 
+   for (dl = first_dev_in_list(), dev_cnt=hd_cnt=-1; dl; dl = dl->next) {
+-    if (dl->part_id==0) ++hd_cnt; if (!is_displayed(dl->hd_id, dl->part_id)) continue; ++dev_cnt;
++    if (dl->part_id==0) ++hd_cnt;
++    if (!is_displayed(dl->hd_id, dl->part_id)) continue;
++    ++dev_cnt;
+     int x = lx, y = ly + lh - dev_cnt * h;
+     if (!Prefs.disable_hd_leds) {
+       if (dl->touched_r) {
+-- 
+2.11.4.GIT
+
diff --git a/x11-plugins/wmhdplop/files/wmhdplop-0.9.9-64bit.patch b/x11-plugins/wmhdplop/files/wmhdplop-0.9.9-64bit.patch
deleted file mode 100644
index 13650e9bb7d9..000000000000
--- a/x11-plugins/wmhdplop/files/wmhdplop-0.9.9-64bit.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -pudr wmhdplop-0.9.9/devnames.h wmhdplop-0.9.9-fixed/devnames.h
---- wmhdplop-0.9.9/devnames.h	2004-04-07 01:14:01.000000000 +0200
-+++ wmhdplop-0.9.9-fixed/devnames.h	2010-06-25 21:56:10.662190796 +0200
-@@ -9,7 +9,7 @@ typedef struct DiskList {
-   unsigned major, minor;
-   int hd_id, part_id; /* part_id = 0 for disks */
-   int enable_hddtemp;
--  int nr, nw, touched_r, touched_w;
-+  long nr, nw, touched_r, touched_w;
-   struct DiskList *next;
- } DiskList;
- 
-diff -pudr wmhdplop-0.9.9/procstat.c wmhdplop-0.9.9-fixed/procstat.c
---- wmhdplop-0.9.9/procstat.c	2007-04-20 11:12:16.000000000 +0200
-+++ wmhdplop-0.9.9-fixed/procstat.c	2010-06-25 21:55:37.086191145 +0200
-@@ -8,7 +8,7 @@
- static ProcStats ps;
- int use_proc_diskstats;
- 
--void pstat_init(struct pstat *pst, int nslice, float update_interval) {
-+void pstat_init(struct pstat *pst, long nslice, float update_interval) {
-   pst->nslice = nslice;
-   ALLOC_VEC(pst->slices, nslice);
-   pst->cur_slice = 0;
-@@ -17,7 +17,7 @@ void pstat_init(struct pstat *pst, int n
- }
- 
- float pstat_current(struct pstat *pst) {
--  int idx = pst->cur_slice ? pst->cur_slice-1 : pst->nslice-1;
-+  long idx = pst->cur_slice ? pst->cur_slice-1 : pst->nslice-1;
-   return pst->slices[idx]/pst->update_interval;
- }
- 
-@@ -101,13 +101,13 @@ void update_stats() {
-             if (!Prefs.debug_disk_rd) {
-               pstat_add(&ps.disk_read, nr);
-             } else {
--              static int cntr = 0; cntr+=(rand()%30) == 0 ? Prefs.debug_disk_rd : 0;
-+              static long cntr = 0; cntr+=(rand()%30) == 0 ? Prefs.debug_disk_rd : 0;
-               pstat_add(&ps.disk_read, nr + cntr);
-             }
-             if (!Prefs.debug_disk_wr) {
-               pstat_add(&ps.disk_write, nw);
-             } else {
--              static int cntw = 0; cntw+=(rand()%30) == 0 ? Prefs.debug_disk_wr : 0;
-+              static long cntw = 0; cntw+=(rand()%30) == 0 ? Prefs.debug_disk_wr : 0;
-               pstat_add(&ps.disk_write, nw + cntw);
-             }
-             readok = 2;
-@@ -121,7 +121,7 @@ void update_stats() {
-               pstat_add(&ps.swap_in, nr);
-               pstat_add(&ps.swap_out, nw);
-             } else {
--              static int cnt = 0; cnt+=Prefs.debug_swapio;
-+              static long cnt = 0; cnt+=Prefs.debug_swapio;
-               pstat_add(&ps.swap_in, nr + cnt);
-               pstat_add(&ps.swap_out, nw + cnt);
-             }
-@@ -144,10 +144,10 @@ void init_stats(float update_interval) {
-   char s[512];
-   FILE *f;
- 
--  pstat_init(&ps.swap_in, (int)(0.5/update_interval)+1, update_interval);
--  pstat_init(&ps.swap_out, (int)(0.5/update_interval)+1, update_interval);
--  pstat_init(&ps.disk_read, (int)(0.5/update_interval)+1, update_interval);
--  pstat_init(&ps.disk_write, (int)(0.5/update_interval)+1, update_interval);
-+  pstat_init(&ps.swap_in, (long)(0.5/update_interval)+1, update_interval);
-+  pstat_init(&ps.swap_out, (long)(0.5/update_interval)+1, update_interval);
-+  pstat_init(&ps.disk_read, (long)(0.5/update_interval)+1, update_interval);
-+  pstat_init(&ps.disk_write, (long)(0.5/update_interval)+1, update_interval);
-   f = fopen("/proc/swaps","r");
-   //if (!f) { perror("/proc/swaps"); exit(1); }
-   if (f) {
-diff -pudr wmhdplop-0.9.9/procstat.h wmhdplop-0.9.9-fixed/procstat.h
---- wmhdplop-0.9.9/procstat.h	2004-03-14 12:07:15.000000000 +0100
-+++ wmhdplop-0.9.9-fixed/procstat.h	2010-06-25 21:45:52.146334994 +0200
-@@ -4,7 +4,7 @@
- 
- struct pstat {
-   unsigned long total;
--  int nslice, cur_slice;
-+  long nslice, cur_slice;
-   unsigned long *slices;
-   float update_interval;
- };
-@@ -15,7 +15,7 @@ typedef struct {
-   struct pstat disk_read, disk_write;
- } ProcStats;
- 
--void pstat_init(struct pstat *pst, int nslice, float update_interval);
-+void pstat_init(struct pstat *pst, long nslice, float update_interval);
- float pstat_current(struct pstat *pst);
- void pstat_add(struct pstat *pst, unsigned long v);
- void pstat_advance(struct pstat *pst);
diff --git a/x11-plugins/wmhdplop/wmhdplop-0.9.10.ebuild b/x11-plugins/wmhdplop/wmhdplop-0.9.10.ebuild
deleted file mode 100644
index d8f6755165d8..000000000000
--- a/x11-plugins/wmhdplop/wmhdplop-0.9.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="a dockapp for monitoring disk activities with fancy visuals"
-HOMEPAGE="https://www.dockapps.net/wmhdplop"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="media-libs/imlib2[X]
-	x11-libs/libX11
-	x11-libs/libXext
-	media-fonts/corefonts
-	>=media-libs/freetype-2"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.9-64bit.patch
-	"${FILESDIR}"/${P}-cflags.patch
-	"${FILESDIR}"/${P}-sysmacros.patch
-	)
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-src_configure() {
-	econf --disable-gkrellm
-}
diff --git a/x11-plugins/wmhdplop/wmhdplop-0.9.11.ebuild b/x11-plugins/wmhdplop/wmhdplop-0.9.11-r1.ebuild
index 2806056295d9..2f766c788980 100644
--- a/x11-plugins/wmhdplop/wmhdplop-0.9.11.ebuild
+++ b/x11-plugins/wmhdplop/wmhdplop-0.9.11-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 inherit autotools
 
 DESCRIPTION="a dockapp for monitoring disk activities with fancy visuals"
@@ -21,14 +21,15 @@ RDEPEND="media-libs/imlib2[X]
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.10-cflags.patch
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-indent.patch
 )
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
 src_prepare() {
-	eautoreconf
 	default
+	eautoreconf
 }
 
 src_configure() {