summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-plugins')
-rw-r--r--x11-plugins/asmem/asmem-1.12-r2.ebuild (renamed from x11-plugins/asmem/asmem-1.12-r1.ebuild)26
-rw-r--r--x11-plugins/asmem/files/configure-implicit-func-decls.patch14
-rw-r--r--x11-plugins/e16-epplets/Manifest1
-rw-r--r--x11-plugins/e16-epplets/e16-epplets-0.17.ebuild51
-rw-r--r--x11-plugins/e16-epplets/files/e16-epplets-0.17-musl.patch60
-rw-r--r--x11-plugins/enigmail/Manifest1
-rw-r--r--x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild84
-rw-r--r--x11-plugins/enigmail/enigmail-2.2.4.ebuild4
-rw-r--r--x11-plugins/enigmail/enigmail-9999.ebuild78
-rw-r--r--x11-plugins/enigmail/files/enigmail-2.0.12-enable_seamonkey_support.patch20
-rw-r--r--x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild2
-rw-r--r--x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild36
-rw-r--r--x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild32
-rw-r--r--x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild25
-rw-r--r--x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild4
-rw-r--r--x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r1.ebuild39
-rw-r--r--x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild30
-rw-r--r--x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r2.ebuild2
-rw-r--r--x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild30
-rw-r--r--x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r2.ebuild2
-rw-r--r--x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r2.ebuild34
-rw-r--r--x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild2
-rw-r--r--x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild33
-rw-r--r--x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r1.ebuild29
-rw-r--r--x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r2.ebuild2
-rw-r--r--x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild35
-rw-r--r--x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r3.ebuild2
-rw-r--r--x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild36
-rw-r--r--x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r3.ebuild2
-rw-r--r--x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild29
-rw-r--r--x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild2
-rw-r--r--x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5-r1.ebuild2
-rw-r--r--x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild24
-rw-r--r--x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild31
-rw-r--r--x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild2
-rw-r--r--x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild38
-rw-r--r--x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild8
-rw-r--r--x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild28
-rw-r--r--x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild2
-rw-r--r--x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r3.ebuild26
-rw-r--r--x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild2
-rw-r--r--x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild34
-rw-r--r--x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild2
-rw-r--r--x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild44
-rw-r--r--x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild2
-rw-r--r--x11-plugins/gkrellweather/gkrellweather-2.0.8-r1.ebuild46
-rw-r--r--x11-plugins/gkrellweather/gkrellweather-2.0.8-r2.ebuild2
-rw-r--r--x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild34
-rw-r--r--x11-plugins/gkwebmon/gkwebmon-0.2-r3.ebuild2
-rw-r--r--x11-plugins/i8krellm/i8krellm-2.5-r2.ebuild22
-rw-r--r--x11-plugins/i8krellm/i8krellm-2.5-r3.ebuild2
-rw-r--r--x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild4
-rw-r--r--x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild28
-rw-r--r--x11-plugins/wmbio/wmbio-1.02.ebuild16
-rw-r--r--x11-plugins/wmcdplay/files/wmcdplay-1.1-cpp11.patch30
-rw-r--r--x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild3
-rw-r--r--x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild6
-rw-r--r--x11-plugins/wmcp/wmcp-1.2.8-r2.ebuild43
-rw-r--r--x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild8
-rw-r--r--x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild6
-rw-r--r--x11-plugins/wmhdplop/Manifest2
-rw-r--r--x11-plugins/wmhdplop/files/wmhdplop-0.9.10-cflags.patch14
-rw-r--r--x11-plugins/wmhdplop/files/wmhdplop-0.9.10-sysmacros.patch11
-rw-r--r--x11-plugins/wmhdplop/files/wmhdplop-0.9.11-configure.patch108
-rw-r--r--x11-plugins/wmhdplop/files/wmhdplop-0.9.11-indent.patch38
-rw-r--r--x11-plugins/wmhdplop/files/wmhdplop-0.9.12-configure.patch14
-rw-r--r--x11-plugins/wmhdplop/files/wmhdplop-0.9.9-64bit.patch94
-rw-r--r--x11-plugins/wmhdplop/wmhdplop-0.9.11-r1.ebuild (renamed from x11-plugins/wmhdplop/wmhdplop-0.9.10.ebuild)14
-rw-r--r--x11-plugins/wmhdplop/wmhdplop-0.9.12.ebuild (renamed from x11-plugins/wmhdplop/wmhdplop-0.9.11.ebuild)8
-rw-r--r--x11-plugins/wmix/wmix-3.5.ebuild7
-rw-r--r--x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch13
-rw-r--r--x11-plugins/wmmixer/Manifest1
-rw-r--r--x11-plugins/wmmixer/wmmixer-1.9-r1.ebuild (renamed from x11-plugins/wmmixer/wmmixer-1.8.ebuild)11
-rw-r--r--x11-plugins/wmmixer/wmmixer-1.9.ebuild19
-rw-r--r--x11-plugins/wmmoonclock/Manifest1
-rw-r--r--x11-plugins/wmmoonclock/files/wmmoonclock-1.29-gcc-10.patch37
-rw-r--r--x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild21
-rw-r--r--x11-plugins/wmmoonclock/wmmoonclock-1.30.ebuild4
-rw-r--r--x11-plugins/wmpager/wmpager-1.2-r2.ebuild13
-rw-r--r--x11-plugins/wmrack/wmrack-1.4-r1.ebuild4
-rw-r--r--x11-plugins/wmsysmon/Manifest2
-rw-r--r--x11-plugins/wmsysmon/files/wmsysmon-0.7.8-gcc-10.patch23
-rw-r--r--x11-plugins/wmsysmon/wmsysmon-0.8.0.ebuild (renamed from x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild)8
-rw-r--r--x11-plugins/wmweather+/Manifest1
-rw-r--r--x11-plugins/wmweather+/files/wmweather+-2.17-gcc-10.patch23
-rw-r--r--x11-plugins/wmweather+/wmweather+-2.17.ebuild23
-rw-r--r--x11-plugins/wmweather+/wmweather+-2.18.ebuild4
-rw-r--r--x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild4
88 files changed, 486 insertions, 1280 deletions
diff --git a/x11-plugins/asmem/asmem-1.12-r1.ebuild b/x11-plugins/asmem/asmem-1.12-r2.ebuild
index b8aeeafc015..47c255eede9 100644
--- a/x11-plugins/asmem/asmem-1.12-r1.ebuild
+++ b/x11-plugins/asmem/asmem-1.12-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit toolchain-funcs
@@ -14,16 +14,23 @@ SLOT="0"
KEYWORDS="amd64 ppc ppc64 sparc x86"
IUSE="jpeg"
-RDEPEND="x11-libs/libX11
+RDEPEND="
+ x11-libs/libX11
x11-libs/libICE
x11-libs/libSM
x11-libs/libXpm
x11-libs/libXext
- jpeg? ( virtual/jpeg:0 )"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}/respect-ldflags.patch" )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+
+PATCHES=(
+ "${FILESDIR}"/respect-ldflags.patch
+ "${FILESDIR}"/configure-implicit-func-decls.patch
+)
src_configure() {
econf $(use_enable jpeg)
@@ -34,7 +41,8 @@ src_compile() {
}
src_install() {
- dobin "${PN}"
- newman "${PN}.man" "${PN}.1"
einstalldocs
+
+ dobin ${PN}
+ newman ${PN}.man ${PN}.1
}
diff --git a/x11-plugins/asmem/files/configure-implicit-func-decls.patch b/x11-plugins/asmem/files/configure-implicit-func-decls.patch
new file mode 100644
index 00000000000..0361c3e6e9b
--- /dev/null
+++ b/x11-plugins/asmem/files/configure-implicit-func-decls.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/870679
+
+Generated file and configure.in is written for autoconf 2.13.
+--- a/configure
++++ b/configure
+@@ -751,7 +751,7 @@ cat > conftest.$ac_ext << EOF
+ #line 752 "configure"
+ #include "confdefs.h"
+
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ ac_cv_prog_cc_works=yes
diff --git a/x11-plugins/e16-epplets/Manifest b/x11-plugins/e16-epplets/Manifest
index 5fbf1f3995b..d97bb22a35c 100644
--- a/x11-plugins/e16-epplets/Manifest
+++ b/x11-plugins/e16-epplets/Manifest
@@ -1 +1,2 @@
DIST e16-epplets-0.16.tar.xz 800796 BLAKE2B 70785fce2949bb5e3b0f950436e63246b576dc2dc13ac392e2d884f913e0f22e68b428b416e20807adfb47ca7a148bb3242efff6dbeac8c734ed645ff3f1c705 SHA512 2cc90dee741a50f54665078db6197d7736d5423419439e640d5170057b80111458dbf4b7c9a92898e96654b1af4a986e5cedb88a565616e70ed0fba6ec82cd9b
+DIST e16-epplets-0.17.tar.xz 797728 BLAKE2B 17d1bcd885c2da1192e1ac249cc57b2b0316f10f163b4dbefd4bf10315142ec89c64e8ff0e6b8a6e86a2f393720b41324978117026150a05fd349783f3eecdff SHA512 26731b5da902f2afb7aaaa80513c2eef5a476c4156396390e08f406746e20e5cfa4ac3309b97f1104f7f53bd824be333b7a791e34480c3aaaa64856eeecf0f2a
diff --git a/x11-plugins/e16-epplets/e16-epplets-0.17.ebuild b/x11-plugins/e16-epplets/e16-epplets-0.17.ebuild
new file mode 100644
index 00000000000..643433afff8
--- /dev/null
+++ b/x11-plugins/e16-epplets/e16-epplets-0.17.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Enlightenment DR16 epplets"
+HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/"
+SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2+ BSD public-domain"
+SLOT="0"
+IUSE="cdaudio libgtop opengl"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+CDEPEND="
+ cdaudio? ( media-libs/libcdaudio )
+ libgtop? ( gnome-base/libgtop )
+ opengl? ( media-libs/glu media-libs/mesa[X(+)] )
+ >=media-libs/imlib2-1.2.0
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-wm/e16
+"
+RDEPEND="${CDEPEND}
+ !x11-plugins/epplets
+"
+DEPEND="${CDEPEND}
+ x11-base/xorg-proto
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.17-musl.patch" )
+
+src_configure() {
+ local myconf=(
+ $(use_enable cdaudio)
+ $(use_enable opengl glx)
+ $(use_with libgtop)
+ --disable-esd
+ --disable-static
+ --disable-werror
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ find "${ED}"/usr -name '*.la' -delete || die
+}
diff --git a/x11-plugins/e16-epplets/files/e16-epplets-0.17-musl.patch b/x11-plugins/e16-epplets/files/e16-epplets-0.17-musl.patch
new file mode 100644
index 00000000000..d6c2a6bbd3a
--- /dev/null
+++ b/x11-plugins/e16-epplets/files/e16-epplets-0.17-musl.patch
@@ -0,0 +1,60 @@
+commit c3dcab92ff903422814573d6315ed2a1417080f6
+Author: Andrew Savchenko <bircoph@gentoo.org>
+Date: Mon Aug 1 12:03:51 2022 +0300
+
+ Include <sys/select.h> for fd_set
+
+ When fd_set is used <sys/select.h> should be included.
+ On glibc it is done implicitly via other headers,
+ on musl it must be explicitly provided.
+
+ Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
+
+diff --git a/api/epplet.c b/api/epplet.c
+index b6a7907..b74a4bc 100644
+--- a/api/epplet.c
++++ b/api/epplet.c
+@@ -3,6 +3,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <sys/resource.h>
++#include <sys/select.h>
+ #include <sys/utsname.h>
+ #include <signal.h>
+ #include <sys/time.h>
+diff --git a/epplets/E-Pinger.c b/epplets/E-Pinger.c
+index 7187315..d397063 100644
+--- a/epplets/E-Pinger.c
++++ b/epplets/E-Pinger.c
+@@ -32,6 +32,7 @@
+
+ #include <errno.h>
+ #include <signal.h>
++#include <sys/select.h>
+ #include <sys/wait.h>
+
+ #include "config.h"
+diff --git a/epplets/E-SD.c b/epplets/E-SD.c
+index cd92fa3..d3b6b93 100644
+--- a/epplets/E-SD.c
++++ b/epplets/E-SD.c
+@@ -19,6 +19,7 @@
+ */
+ #include <esd.h>
+ #include <fcntl.h>
++#include <sys/select.h>
+
+ #include "config.h"
+ #include "epplet.h"
+diff --git a/epplets/E-ScreenShoot_ftp.c b/epplets/E-ScreenShoot_ftp.c
+index 377e7ee..ae40ca7 100644
+--- a/epplets/E-ScreenShoot_ftp.c
++++ b/epplets/E-ScreenShoot_ftp.c
+@@ -5,6 +5,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stdarg.h>
++#include <sys/select.h>
+
+ #include "E-ScreenShoot_ftp.h"
+
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index b9b811817e9..bcd0c9596dd 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,2 +1 @@
-DIST enigmail-2.0.12.tar.gz 2614589 BLAKE2B 3db6f595c14e02cfdc71bebc763d05926dc6e0abf4668d132fd0ce43204e681de5fce45db752c4f49b231bd7e217b75c0f23d4a7e204fa9a3a51f1c8097fb63d SHA512 f9f4f1ed4c7244280be2fade0ccb2f4b5e7075dd60f53953478ffb84012e687b7ac7bad489c0b0cb2d8937916c783fe9e1841174bf1e5bdb9ab8cb58b415db74
DIST enigmail-2.2.4.tar.gz 432157 BLAKE2B e6d5eab4cba2cd66669ddf38f8152511606c48ce995be331551a7b403ecbd06967c22702a06e06aa89219b5c905e835ddb4d146c0fc2cb11e1a647e46854dd1f SHA512 bf23f52ed61002b05e2e432a0abd1f576fe6eb97d94ab2241e17be86138cee153d668747f5759b967d9a4977be3dc901ee78ddb168347bdbbfed9229d27f786d
diff --git a/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild b/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
deleted file mode 100644
index be2ff9a0c6a..00000000000
--- a/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="https://www.enigmail.net/"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-3"
-IUSE=""
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
- S="${WORKDIR}/${P}"
-else
- if [[ ${PV} = *_beta* ]] ; then
- SRC_URI="https://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
- else
- SRC_URI="https://www.enigmail.net/download/source/${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
- fi
- S="${WORKDIR}/${PN}"
-fi
-
-RDEPEND="
- ( >=app-crypt/gnupg-2.0
- || (
- app-crypt/pinentry[gtk(-)]
- app-crypt/pinentry[qt5(-)]
- )
- )
- !<mail-client/thunderbird-52.5.0
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- app-arch/zip
- dev-lang/perl
- "
-
-PATCHES=(
- "${FILESDIR}"/enigmail-no_pEp_auto_download.patch
- "${FILESDIR}/${PN}-2.0.12-enable_seamonkey_support.patch"
-)
-
-src_compile() {
- emake ipc public ui package lang stdlib
- emake xpi
-
-}
-
-src_install() {
- local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf)
- [[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
-
- mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
-
- # thunderbird
- insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
- doins build/"${emid}.xpi"
-
- # seamonkey
- insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
- doins build/"${emid}.xpi"
-}
-
-pkg_postinst() {
- local peimpl=$(eselect --brief --colour=no pinentry show)
- case "${peimpl}" in
- *gtk*|*qt*) ;;
- *) ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
- ewarn "You may be prompted for your password in an inaccessible shell!!"
- ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
- ;;
- esac
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- elog
- elog "Please restart thunderbird and/or seamonkey in order for them to use"
- elog "the newly installed version of enigmail."
- fi
-}
diff --git a/x11-plugins/enigmail/enigmail-2.2.4.ebuild b/x11-plugins/enigmail/enigmail-2.2.4.ebuild
index 016d8fd4ed1..e8f165edec4 100644
--- a/x11-plugins/enigmail/enigmail-2.2.4.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.2.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit python-any-r1
diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild
deleted file mode 100644
index b312a52459c..00000000000
--- a/x11-plugins/enigmail/enigmail-9999.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-any-r1
-
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="https://www.enigmail.net/"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-3"
-IUSE=""
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
- S="${WORKDIR}/${P}"
-else
- if [[ ${PV} = *_beta* ]] ; then
- SRC_URI="https://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
- else
- SRC_URI="https://www.enigmail.net/download/source/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
- fi
- S="${WORKDIR}/${PN}"
-fi
-
-RDEPEND="
- ( >=app-crypt/gnupg-2.0
- || (
- app-crypt/pinentry[gtk(-)]
- app-crypt/pinentry[qt5(-)]
- )
- )
- !<mail-client/thunderbird-78
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- app-arch/zip
- dev-lang/perl
- "
-
-PATCHES=( "${FILESDIR}/enigmail-no_pEp_auto_download.patch" )
-
-src_prepare() {
- default
-
- export MAKEOPTS=-j1
-}
-
-src_install() {
- local build_dir=build-tb
- local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' ${build_dir}/dist/manifest.json)
- [[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
-
- mv ${build_dir}/enigmail*.xpi ${build_dir}/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
-
- # thunderbird
- insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
- doins ${build_dir}/"${emid}.xpi"
-}
-
-pkg_postinst() {
- local peimpl=$(eselect --brief --colour=no pinentry show)
- case "${peimpl}" in
- *gtk*|*qt*) ;;
- *) ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
- ewarn "You may be prompted for your password in an inaccessible shell!!"
- ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
- ;;
- esac
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- elog
- elog "Please restart thunderbird in order for them to use"
- elog "the newly installed version of enigmail."
- fi
-}
diff --git a/x11-plugins/enigmail/files/enigmail-2.0.12-enable_seamonkey_support.patch b/x11-plugins/enigmail/files/enigmail-2.0.12-enable_seamonkey_support.patch
deleted file mode 100644
index 11d9702eb97..00000000000
--- a/x11-plugins/enigmail/files/enigmail-2.0.12-enable_seamonkey_support.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- enigmail/package/install.rdf
-+++ enigmail/package/install.rdf
-@@ -19,14 +19,14 @@
- <em:maxVersion>60.*</em:maxVersion>
- </Description>
- </em:targetApplication>
-- <!--em:targetApplication>
-- < ! - - Seamonkey is no longer supported - - >
-+ <em:targetApplication>
-+ <!-- Seamonkey -->
- <Description>
- <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
- <em:minVersion>2.49</em:minVersion>
- <em:maxVersion>2.57</em:maxVersion>
- </Description>
-- </em:targetApplication -->
-+ </em:targetApplication>
-
- <!-- Front End MetaData -->
- <em:name>Enigmail</em:name>
diff --git a/x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild b/x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild
index 951eb481803..df6c139e400 100644
--- a/x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild
+++ b/x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gkrellkam/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc sparc x86"
RDEPEND="
app-admin/gkrellm:2[X]
diff --git a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
deleted file mode 100644
index 3831e4e1f7f..00000000000
--- a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-MY_P=${P/-/_}
-
-DESCRIPTION="an Image-Watcher-Plugin for GKrellM2"
-SRC_URI="mirror://sourceforge/gkrellkam/${MY_P}.tar.gz"
-HOMEPAGE="http://gkrellkam.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="
- app-admin/gkrellm:2[X]
- net-misc/wget"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_compile() {
- emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- local PLUGIN_SO=( ${PN}2$(get_modname) )
- local PLUGIN_DOCS=( example.list )
-
- gkrellm-plugin_src_install
- doman gkrellkam-list.5
-}
diff --git a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild
deleted file mode 100644
index fb9bd912a80..00000000000
--- a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-MY_PN="gkrellmbgchg2"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Plugin for GKrellM2 to change your desktop background"
-HOMEPAGE="http://www.bender-suhl.de/stefan/english/comp/gkrellmbgchg.html"
-SRC_URI="http://www.bender-suhl.de/stefan/comp/sources/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.1.11-fix-build-system.patch )
-
-PLUGIN_DOCS=( bgchg_info.sh kdewallpaper.sh )
-
-src_configure() {
- tc-export CC
-
- PLUGIN_SO=( gkrellmbgchg$(get_modname) )
-}
diff --git a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild
deleted file mode 100644
index 965055c8df4..00000000000
--- a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A simple countdown clock for GKrellM2"
-SRC_URI="http://oss.pugsplace.net/${P}.tar.gz"
-HOMEPAGE="http://freshmeat.sourceforge.net/projects/gkrellm-countdown"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
-
-src_compile() {
- emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
diff --git a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild
index 29c9fb53247..5dfcb6a4155 100644
--- a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild
+++ b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild
@@ -12,11 +12,11 @@ S="${WORKDIR}/${PN}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
RDEPEND="app-admin/gkrellm:2[X]"
DEPEND="${RDEPEND}"
-BDPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-makefile.patch
diff --git a/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r1.ebuild b/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r1.ebuild
deleted file mode 100644
index dcf420b9572..00000000000
--- a/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin
-
-MY_P="${P/gkrellm/gkrellm2}"
-
-DESCRIPTION="A Gkrellm2 plugin for displaying and manipulating CPU frequency"
-HOMEPAGE="https://github.com/sainsaar/gkrellm2-cpupower/"
-SRC_URI="https://github.com/sainsaar/gkrellm2-cpupower/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-admin/gkrellm:2[X]"
-RDEPEND="
- ${DEPEND}
- app-admin/sudo
- sys-power/cpupower"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
- local PLUGIN_SO=( cpupower$(get_modname) )
- gkrellm-plugin_src_install
- emake DESTDIR="${D}" install-sudo
-}
-
-pkg_postinst() {
- einfo
- einfo "For changing the governor and CPU frequencies as a user, create the \"trusted\""
- einfo "group, and add those users to that group who should be allowed to perform"
- einfo "these changes."
- einfo
-}
diff --git a/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild
deleted file mode 100644
index 42c94a2c151..00000000000
--- a/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A GKrellM2 plugin to control a fli4l router"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.bz2"
-HOMEPAGE="http://gkrellm-imonc.sourceforge.net/"
-
-# The COPYING file contains the GPLv2, but the file headers say GPLv2+.
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
-
-src_compile() {
- emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
diff --git a/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r2.ebuild b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r2.ebuild
index a06fa4d4fd6..4805ff89832 100644
--- a/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r2.ebuild
+++ b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-src-${PV}"
# The COPYING file contains the GPLv2, but the file headers say GPLv2+.
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
RDEPEND="app-admin/gkrellm:2[X]"
DEPEND="
diff --git a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
deleted file mode 100644
index ee631d42e27..00000000000
--- a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin
-
-MY_P="${P/rellm-/}"
-
-DESCRIPTION="GKrellM2 plugin for monitoring keyboard LEDs"
-HOMEPAGE="http://heim.ifi.uio.no/~oyvinha/gkleds/"
-SRC_URI="http://heim.ifi.uio.no/~oyvinha/e107_files/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="
- app-admin/gkrellm:2[X]
- x11-libs/libXtst"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- PLUGIN_SO=( src/.libs/gkleds$(get_modname) )
- default
-}
diff --git a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r2.ebuild b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r2.ebuild
index 6cb881e555a..06896ed09df 100644
--- a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r2.ebuild
+++ b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
RDEPEND="
app-admin/gkrellm:2[X]
diff --git a/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r2.ebuild b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r2.ebuild
deleted file mode 100644
index e02392547a6..00000000000
--- a/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A GKrellM2 plugin that shows the status of additional mail boxes"
-SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
-HOMEPAGE="http://gkrellm.luon.net/mailwatch.php"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-PATCHES=(
- "${FILESDIR}"/2.4.3-0001-Respect-LDFLAGS.patch
- "${FILESDIR}"/2.4.3-0002-Use-gkrellm_gkd_string_width.patch
- "${FILESDIR}"/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch
- "${FILESDIR}"/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch
-)
-
-src_configure() {
- tc-export CC
-
- PLUGIN_SO=( mailwatch$(get_modname) )
-
- default
-}
diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild
index d5fcf32c4c2..f46b39d00e7 100644
--- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild
+++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
IUSE="lirc"
RDEPEND="
diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild
deleted file mode 100644
index 37e9b9d77ff..00000000000
--- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A minimalistic GKrellM2 plugin to control radio tuners"
-SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
-HOMEPAGE="http://gkrellm.luon.net/gkrellm-radio.php"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc sparc x86"
-IUSE="lirc"
-
-RDEPEND="
- app-admin/gkrellm:2[X]
- lirc? ( app-misc/lirc )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_configure() {
- PLUGIN_SO=( radio$(get_modname) )
- default
-}
-
-src_compile() {
- use lirc && myconf="${myconf} WITH_LIRC=1"
- emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf}
-}
diff --git a/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r1.ebuild b/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r1.ebuild
deleted file mode 100644
index 7dfa3d5636f..00000000000
--- a/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="Configurable Tray Icons for GKrellM"
-HOMEPAGE="http://gkrellm.srcbox.net/Plugins.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
-
-src_configure() {
- PLUGIN_SO=( trayicons$(get_modname) )
- default
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
diff --git a/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r2.ebuild b/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r2.ebuild
index 7cd6220fe5a..80ea1b4a86d 100644
--- a/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r2.ebuild
+++ b/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
RDEPEND="app-admin/gkrellm:2[X]"
DEPEND="${RDEPEND}"
diff --git a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild
deleted file mode 100644
index 878c46863e6..00000000000
--- a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-MY_P=${P/gkrellm-/}
-
-DESCRIPTION="Superslim VAIO LCD Brightness Control Plugin for Gkrellm"
-SRC_URI="http://nerv-un.net/~dragorn/code/${MY_P}.tar.gz"
-HOMEPAGE="http://nerv-un.net/~dragorn/"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 x86"
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-textrel.patch
- "${FILESDIR}"/${P}-fixinfo.patch
-)
-
-src_configure() {
- tc-export CC PKG_CONFIG
-
- PLUGIN_SO=( vaiobright$(get_modname) )
- default
-}
diff --git a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r3.ebuild b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r3.ebuild
index 8593c387410..e3118369b6b 100644
--- a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r3.ebuild
+++ b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
RDEPEND="app-admin/gkrellm:2[X]"
DEPEND="${RDEPEND}"
diff --git a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild
deleted file mode 100644
index e330327d324..00000000000
--- a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A mixer control plugin for gkrellm"
-HOMEPAGE="http://gkrellm.luon.net/volume.php"
-SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-IUSE="alsa"
-
-RDEPEND="
- app-admin/gkrellm:2[X]
- alsa? ( media-libs/alsa-lib )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-PATCHES=(
- "${FILESDIR}/${P}-reenable.patch"
- "${FILESDIR}/${P}-makefile.patch"
-)
-
-src_configure() {
- PLUGIN_SO=( volume$(get_modname) )
- default
-}
-
-src_compile() {
- use alsa && local myconf="enable_alsa=1"
- emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf}
-}
diff --git a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r3.ebuild b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r3.ebuild
index b3affa03f88..13e56eab4fa 100644
--- a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r3.ebuild
+++ b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r3.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${PN}"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
IUSE="alsa"
RDEPEND="
diff --git a/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild
deleted file mode 100644
index eb076714e07..00000000000
--- a/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="XKB keyboard switcher for gkrellm2"
-HOMEPAGE="http://tripie.sweb.cz/gkrellm/xkb/"
-SRC_URI="http://tripie.sweb.cz/gkrellm/xkb/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
-
-src_configure() {
- PLUGIN_SO=( xkb$(get_modname) )
- default
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
diff --git a/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild
index c148d04e190..310f806b149 100644
--- a/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild
+++ b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tripie.sweb.cz/gkrellm/xkb/dist/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="app-admin/gkrellm:2[X]"
DEPEND="${RDEPEND}"
diff --git a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5-r1.ebuild b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5-r1.ebuild
index a3f3ab6d277..63baf176087 100644
--- a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5-r1.ebuild
+++ b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://gkrellmlaunch.sourceforge.net/"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc sparc x86"
RDEPEND="app-admin/gkrellm:2[X]"
DEPEND="${RDEPEND}"
diff --git a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
deleted file mode 100644
index 410946fe33d..00000000000
--- a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A Program-Launcher Plugin for GKrellM2"
-SRC_URI="mirror://sourceforge/gkrellmlaunch/${P}.tar.gz"
-HOMEPAGE="http://gkrellmlaunch.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_compile() {
- emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
diff --git a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild
deleted file mode 100644
index 15a6d866c2d..00000000000
--- a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A GKrellM2 plugin of the famous wmMoonClock dockapp"
-SRC_URI="mirror://sourceforge/gkrellmoon/${P}.tar.gz"
-HOMEPAGE="http://gkrellmoon.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="
- app-admin/gkrellm:2[X]
- media-libs/imlib2"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_prepare() {
- default
- sed -i -e '/^#include <stdio.h>/a#include <string.h>' CalcEphem.h || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
diff --git a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
index 35005ac0c50..fc0bc240769 100644
--- a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
+++ b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gkrellmoon/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc sparc x86"
RDEPEND="
app-admin/gkrellm:2[X]
diff --git a/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild b/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild
deleted file mode 100644
index cfd3b71cfb0..00000000000
--- a/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin
-
-DESCRIPTION="A plugin for GKrellM2 that has a VU meter and a sound chart"
-HOMEPAGE="http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html"
-SRC_URI="http://web.wt.net/~billw/gkrellmss/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-IUSE="nls"
-
-RDEPEND="
- app-admin/gkrellm:2[X]
- media-libs/alsa-lib
- sci-libs/fftw:3.0="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-Respect-LDFLAGS.patch
- "${FILESDIR}"/${P}-fno-common.patch
-)
-
-PLUGIN_DOCS=( Themes )
-
-src_configure() {
- PLUGIN_SO=( src/gkrellmss$(get_modname) )
- default
-}
-
-src_compile() {
- addpredict /dev/snd
- emake enable_nls=$(usex nls 1 0)
-}
diff --git a/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild b/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild
index 33ca3455e91..44913edd1d6 100644
--- a/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild
+++ b/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild
@@ -11,15 +11,15 @@ SRC_URI="http://web.wt.net/~billw/gkrellmss/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
IUSE="nls"
-RDEPEND="
- app-admin/gkrellm:2[X]
+RDEPEND="app-admin/gkrellm:2[X]
media-libs/alsa-lib
sci-libs/fftw:3.0="
DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="sys-devel/gettext
+ virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-Respect-LDFLAGS.patch
diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild
deleted file mode 100644
index 1edfe399983..00000000000
--- a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A plugin for GKrellM that monitors your wireless network card"
-SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
-HOMEPAGE="http://gkrellm.luon.net/gkrellmwireless.php"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}"/${PN}-2.0.3-fix-build-system.patch )
-
-src_configure() {
- tc-export CC
-
- PLUGIN_SO=( wireless$(get_modname) )
- default
-}
diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild
index 45819d00691..e20fd3092da 100644
--- a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild
+++ b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
RDEPEND="app-admin/gkrellm:2[X]"
DEPEND="${RDEPEND}"
diff --git a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r3.ebuild b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r3.ebuild
deleted file mode 100644
index e6674a3e30d..00000000000
--- a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin
-
-DESCRIPTION="GKrellm2 plugin to take screen shots and lock screen"
-HOMEPAGE="http://gkrellshoot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gkrellshoot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~ppc sparc x86"
-IUSE=""
-
-DEPEND="app-admin/gkrellm:2[X]"
-RDEPEND="
- ${DEPEND}
- virtual/imagemagick-tools"
-
-S=${WORKDIR}/${P/s/S}
-
-PATCHES=(
- "${FILESDIR}"/makefile-respect-flags.patch
-)
diff --git a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild
index d5bff5dbad4..dff19004a2c 100644
--- a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild
+++ b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/s/S}"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc sparc x86"
DEPEND="app-admin/gkrellm:2[X]"
RDEPEND="
diff --git a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild
deleted file mode 100644
index 3e9401aa303..00000000000
--- a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin
-
-DESCRIPTION="A GKrellM plugin that shows sunrise and sunset times"
-HOMEPAGE="http://gkrellsun.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gkrellsun/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc sparc x86"
-IUSE="nls"
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-reenable.patch
- "${FILESDIR}"/${P}-Respect-LDFLAGS.patch
-)
-
-src_configure() {
- PLUGIN_SO=( src20/gkrellsun$(get_modname) )
- default
-}
-
-src_compile() {
- use nls && local myconf="enable_nls=1"
- emake ${myconf}
-}
diff --git a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild
index 4d5e865d0b7..17262d6e999 100644
--- a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild
+++ b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gkrellsun/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc sparc x86"
IUSE="nls"
RDEPEND="app-admin/gkrellm:2[X]"
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild
deleted file mode 100644
index 337fb6a341b..00000000000
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
-HOMEPAGE="https://sourceforge.net/projects/gkrelltop"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="X"
-
-RDEPEND="
- app-admin/gkrellm:2[X]
- dev-libs/glib:2
- x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}.orig
-PATCHES=( "${FILESDIR}"/${PN}-2.2.13-fix-build-system.patch )
-
-src_configure() {
- tc-export CC
-
- PLUGIN_SERVER_SO=( gkrelltopd$(get_modname) )
- PLUGIN_SO=( gkrelltop$(get_modname) )
-
- default
-}
-
-src_compile() {
- use X || local target="server"
- emake ${target}
-}
-
-pkg_postinst() {
- einfo "To enable the gkrelltopd server plugin, you must add the following"
- einfo "line to /etc/gkrellmd.conf:"
- einfo "\tplugin-enable gkrelltopd"
-}
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild
index c9faf926665..20a5fe01ba0 100644
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${P}.orig"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="X"
RDEPEND="
diff --git a/x11-plugins/gkrellweather/gkrellweather-2.0.8-r1.ebuild b/x11-plugins/gkrellweather/gkrellweather-2.0.8-r1.ebuild
deleted file mode 100644
index 4e0e596730f..00000000000
--- a/x11-plugins/gkrellweather/gkrellweather-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="GKrellM2 Plugin that monitors a METAR station and displays weatherinfo"
-HOMEPAGE="https://sites.google.com/site/makovick/gkrellm-plugins"
-SRC_URI="https://sites.google.com/site/makovick/projects/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="
- app-admin/gkrellm:2[X]
- dev-lang/perl
- net-misc/wget
- x11-libs/gtk+:2"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-Respect-LDFLAGS.patch
- "${FILESDIR}"/${P}-Move-GrabWeather.patch
- "${FILESDIR}"/${P}-update-locations.patch
-)
-
-src_configure() {
- append-cflags $($(tc-getPKG_CONFIG) --cflags gtk+-2.0)
- append-flags -fPIC
-}
-
-src_compile() {
- emake PREFIX="${EPREFIX}"/usr CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
- gkrellm-plugin_src_install
-
- exeinto /usr/libexec/gkrellweather
- doexe GrabWeather
-}
diff --git a/x11-plugins/gkrellweather/gkrellweather-2.0.8-r2.ebuild b/x11-plugins/gkrellweather/gkrellweather-2.0.8-r2.ebuild
index 1a70885d8d3..eb3d8f00ee1 100644
--- a/x11-plugins/gkrellweather/gkrellweather-2.0.8-r2.ebuild
+++ b/x11-plugins/gkrellweather/gkrellweather-2.0.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sites.google.com/site/makovick/projects/${P}.tgz"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
RDEPEND="
app-admin/gkrellm:2[X]
diff --git a/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild b/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
deleted file mode 100644
index b915fe94113..00000000000
--- a/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A web monitor plugin for GKrellM2"
-HOMEPAGE="http://gkwebmon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
-
-# The Makefile links with -lssl.
-RDEPEND="
- app-admin/gkrellm:2[X]
- dev-libs/openssl:0="
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-cc-cflags-ldflags.patch
- "${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_compile() {
- tc-export PKG_CONFIG
-
- emake CC="$(tc-getCC)"
-}
diff --git a/x11-plugins/gkwebmon/gkwebmon-0.2-r3.ebuild b/x11-plugins/gkwebmon/gkwebmon-0.2-r3.ebuild
index ed50957c741..47a6c69f522 100644
--- a/x11-plugins/gkwebmon/gkwebmon-0.2-r3.ebuild
+++ b/x11-plugins/gkwebmon/gkwebmon-0.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
# The Makefile links with -lssl.
RDEPEND="app-admin/gkrellm:2[X]
diff --git a/x11-plugins/i8krellm/i8krellm-2.5-r2.ebuild b/x11-plugins/i8krellm/i8krellm-2.5-r2.ebuild
deleted file mode 100644
index 3940327a3c5..00000000000
--- a/x11-plugins/i8krellm/i8krellm-2.5-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin
-
-DESCRIPTION="GKrellM2 Plugin for the Dell Inspiron and Latitude notebooks"
-SRC_URI="http://www.coding-zone.com/${P}.tar.gz"
-HOMEPAGE="http://www.coding-zone.com/?page=i8krellm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- app-admin/gkrellm:2[X]
- >=app-laptop/i8kutils-1.5"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-Respect-LDFLAGS.patch )
diff --git a/x11-plugins/i8krellm/i8krellm-2.5-r3.ebuild b/x11-plugins/i8krellm/i8krellm-2.5-r3.ebuild
index 5bdff0ee496..480e35751f2 100644
--- a/x11-plugins/i8krellm/i8krellm-2.5-r3.ebuild
+++ b/x11-plugins/i8krellm/i8krellm-2.5-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.coding-zone.com/?page=i8krellm"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
app-admin/gkrellm:2[X]
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
index 05c5ee785de..887bab550ed 100644
--- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://wmacpiload.tuxfamily.org/download/${MY_P}.tar.bz2"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="debug"
RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
deleted file mode 100644
index 5dd7b611652..00000000000
--- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${P/-ac}
-
-DESCRIPTION="WMACPILoad based dockapp to monitor CPU temp and battery time on ACPI kernels"
-HOMEPAGE="http://wmacpiload.tuxfamily.org/"
-SRC_URI="http://wmacpiload.tuxfamily.org/download/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE="debug"
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXt
- x11-libs/libXext
- x11-libs/libXpm"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- econf $(use_enable debug)
-}
diff --git a/x11-plugins/wmbio/wmbio-1.02.ebuild b/x11-plugins/wmbio/wmbio-1.02.ebuild
index d2d2e7ccc5f..4c7d53c862e 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/files/wmcdplay-1.1-cpp11.patch b/x11-plugins/wmcdplay/files/wmcdplay-1.1-cpp11.patch
new file mode 100644
index 00000000000..7fdd1021dab
--- /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 4751907aadb..89cc7d94fed 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/wmcms-0.3.5-r4.ebuild b/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild
index 70c2fcf3f05..af360d3fe27 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/wmcp/wmcp-1.2.8-r2.ebuild b/x11-plugins/wmcp/wmcp-1.2.8-r2.ebuild
new file mode 100644
index 00000000000..ead6e103b83
--- /dev/null
+++ b/x11-plugins/wmcp/wmcp-1.2.8-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A pager dockapp"
+HOMEPAGE="https://www.dockapps.net/wmcp"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXpm"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc33.patch
+ "${FILESDIR}"/${P}-stdlibh.patch
+ )
+src_prepare() {
+ default
+ sed -i \
+ -e "s:gcc -g -c:$(tc-getCC) -c:" \
+ -e "s:gcc -g -o:$(tc-getCC) ${LDFLAGS} -o:" \
+ Makefile || die
+}
+
+src_compile() {
+ emake INCLUDES="-I/usr/include/X11" \
+ LIBINC="-L/usr/$(get_libdir)" \
+ FLAGS="${CFLAGS}"
+}
+
+src_install() {
+ dobin wmcp
+ dodoc README
+}
diff --git a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
index 8ed75478b44..d72e2c0e4a8 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/wmgrabimage-0.72-r2.ebuild b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
index b1d7ff43dab..126ad0294ba 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/wmhdplop/Manifest b/x11-plugins/wmhdplop/Manifest
index ff0775b3fe8..78fb53a7de1 100644
--- a/x11-plugins/wmhdplop/Manifest
+++ b/x11-plugins/wmhdplop/Manifest
@@ -1,2 +1,2 @@
-DIST wmhdplop-0.9.10.tar.gz 163491 BLAKE2B dd05bcddd4be666e403e7d0ccdbdba9048af6eb15dd72657b657bc4eb8eea1a6a7a78da820f143f6f377949bd9d8df89c5ae129f40374586633f8cdb174b9146 SHA512 9bd79ab5c271e2fbd7d415a1ea20eda5412d7657d9ccfd4781a6d42b834107b65e110231718ad686355e76590cd39f556ebfc9b14e7a4048a68d62503df94f46
DIST wmhdplop-0.9.11.tar.gz 163931 BLAKE2B 9a30f0ea11fd9abd5419612a413187299945b415ed9231e878aeea5a395627b21d77b99bbac3bd8d2b0673069c2011974355c9056d2dbe46688ed7606e8f9b8c SHA512 e77802945b0c4213212922307416e8f99f1fe99de4ade6200bdd9cd8687926ddc7e67b437109174fb8544eebd8a6aea22ba685624842b54134bff48ea8aaa540
+DIST wmhdplop-0.9.12.tar.gz 168047 BLAKE2B b0c675f3a32e94407e0fb7d4cd724907e57b04057705819f3892f8c35ca0651e98303b51203bc663814894533a1ac84295b8763a5ee16eada130eab62d8939d3 SHA512 d86ebfcc96669cd743c25c4513c00bff8208442e088b141ac3a5313948d928c5fb29644ef7cd4880a438e7b713382c5a009769b7bddfcabf28fd6799c14c298c
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 99937998831..00000000000
--- 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.10-sysmacros.patch b/x11-plugins/wmhdplop/files/wmhdplop-0.9.10-sysmacros.patch
deleted file mode 100644
index 1346cd2e364..00000000000
--- 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 00000000000..1bbe3ad2f38
--- /dev/null
+++ b/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-configure.patch
@@ -0,0 +1,108 @@
+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 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])
+ 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,37 @@
+ 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
+-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 +69,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 +82,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 19:42:17.107279593 +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 00000000000..30e44715ea2
--- /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.12-configure.patch b/x11-plugins/wmhdplop/files/wmhdplop-0.9.12-configure.patch
new file mode 100644
index 00000000000..89718de3481
--- /dev/null
+++ b/x11-plugins/wmhdplop/files/wmhdplop-0.9.12-configure.patch
@@ -0,0 +1,14 @@
+diff -Naur wmhdplop-0.9.12.orig/configure.ac wmhdplop-0.9.12/configure.ac
+--- wmhdplop-0.9.12.orig/configure.ac 2022-08-26 11:38:06.000000000 +0200
++++ wmhdplop-0.9.12/configure.ac 2022-09-14 13:47:56.531041828 +0200
+@@ -18,10 +18,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.9-64bit.patch b/x11-plugins/wmhdplop/files/wmhdplop-0.9.9-64bit.patch
deleted file mode 100644
index 13650e9bb7d..00000000000
--- 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.11-r1.ebuild
index d8f6755165d..2f766c78898 100644
--- a/x11-plugins/wmhdplop/wmhdplop-0.9.10.ebuild
+++ b/x11-plugins/wmhdplop/wmhdplop-0.9.11-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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,15 +21,15 @@ RDEPEND="media-libs/imlib2[X]
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}"/${PN}-0.9.9-64bit.patch
- "${FILESDIR}"/${P}-cflags.patch
- "${FILESDIR}"/${P}-sysmacros.patch
- )
+ "${FILESDIR}"/${P}-configure.patch
+ "${FILESDIR}"/${P}-indent.patch
+)
+
DOCS=( AUTHORS ChangeLog NEWS README )
src_prepare() {
- eautoreconf
default
+ eautoreconf
}
src_configure() {
diff --git a/x11-plugins/wmhdplop/wmhdplop-0.9.11.ebuild b/x11-plugins/wmhdplop/wmhdplop-0.9.12.ebuild
index 2806056295d..2bb21046188 100644
--- a/x11-plugins/wmhdplop/wmhdplop-0.9.11.ebuild
+++ b/x11-plugins/wmhdplop/wmhdplop-0.9.12.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,14 @@ RDEPEND="media-libs/imlib2[X]
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}"/${PN}-0.9.10-cflags.patch
+ "${FILESDIR}"/${P}-configure.patch
)
DOCS=( AUTHORS ChangeLog NEWS README )
src_prepare() {
- eautoreconf
default
+ eautoreconf
}
src_configure() {
diff --git a/x11-plugins/wmix/wmix-3.5.ebuild b/x11-plugins/wmix/wmix-3.5.ebuild
index c0b6a38e180..c2eab904e70 100644
--- a/x11-plugins/wmix/wmix-3.5.ebuild
+++ b/x11-plugins/wmix/wmix-3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,3 +19,8 @@ RDEPEND="media-libs/alsa-lib
x11-libs/libXrandr"
DEPEND="${RDEPEND}
x11-base/xorg-proto"
+
+src_prepare() {
+ default
+ sed -e "s/Audio;/\0AudioVideo;/" -i wmix.desktop || die
+}
diff --git a/x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch b/x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch
index bbf18433480..7e41b40d2f0 100644
--- a/x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch
+++ b/x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch
@@ -1,7 +1,12 @@
---- a/Makefile 2015-04-17 13:43:08.122972280 +0200
-+++ b/Makefile 2015-04-17 13:43:11.569975854 +0200
-@@ -14,12 +14,12 @@
- PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile 2015-04-17 13:36:16.000000000 +0200
++++ b/Makefile 2022-07-10 16:02:05.686255330 +0200
+@@ -11,15 +11,15 @@
+ PIXBUF_CFG = pkg-config gdk-pixbuf-xlib-2.0
+ PIXBUF_DEF = -DWITH_GDKPIXBUF
+ PIXBUF_INC := $(shell $(PIXBUF_CFG) --cflags)
+-PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0
++PIXBUF_LIB := -rdynamic -lgdk_pixbuf_xlib-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0
endif
-CC = gcc #-g
diff --git a/x11-plugins/wmmixer/Manifest b/x11-plugins/wmmixer/Manifest
index 40867577585..3f78ac23e57 100644
--- a/x11-plugins/wmmixer/Manifest
+++ b/x11-plugins/wmmixer/Manifest
@@ -1,2 +1 @@
-DIST wmmixer-1.8.tar.gz 102723 BLAKE2B 2e64b7c81e97d288e2c48cad01fdee5e4a85effc4e831ca4b0391e4df67faa11f5556c07129740b3d07607251ac8fbb98ffbcc573c888f367e288c338600de93 SHA512 3b5c7f27da6ed2cbf8d06c431584186799d17e72db663db6ffc488f777c31de0b13fcc3f665099925efab036a14e70da4bbbabaff6ffc12280698e91f555e276
DIST wmmixer-1.9.tar.gz 103603 BLAKE2B 82191d3cb019786fa23ca13d6060f4d1d3860651c009d1a78752602eab40091a36ce167ac1ebd92fb664905cd24138f19b72ab722ad58e6bd7a1192b5556c73b SHA512 3e1ac2185daad89f8e51ca45c8b96aa3d9791cf9889484fc9873d1111534cf457cfd598296b01a0fa67b2e2c4f4ecea2b9ed3890ef416548342187a1f5dad44d
diff --git a/x11-plugins/wmmixer/wmmixer-1.8.ebuild b/x11-plugins/wmmixer/wmmixer-1.9-r1.ebuild
index e557c839133..f79fafdda1a 100644
--- a/x11-plugins/wmmixer/wmmixer-1.8.ebuild
+++ b/x11-plugins/wmmixer/wmmixer-1.9-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="A mixer designed for WindowMaker"
-HOMEPAGE="https://www.dockapps.net/wmmon"
+HOMEPAGE="https://www.dockapps.net/wmmixer"
SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
LICENSE="GPL-2"
@@ -17,3 +17,8 @@ RDEPEND="x11-libs/libX11
x11-libs/libXpm"
DEPEND="${RDEPEND}
x11-base/xorg-proto"
+
+src_prepare() {
+ default
+ sed -e "s/Audio;/\0AudioVideo;/" -i ${PN}.desktop || die
+}
diff --git a/x11-plugins/wmmixer/wmmixer-1.9.ebuild b/x11-plugins/wmmixer/wmmixer-1.9.ebuild
deleted file mode 100644
index 0c06dab6747..00000000000
--- a/x11-plugins/wmmixer/wmmixer-1.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A mixer designed for WindowMaker"
-HOMEPAGE="https://www.dockapps.net/wmmon"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~sparc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXpm"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
diff --git a/x11-plugins/wmmoonclock/Manifest b/x11-plugins/wmmoonclock/Manifest
index d5aa8989c55..b5594aff13f 100644
--- a/x11-plugins/wmmoonclock/Manifest
+++ b/x11-plugins/wmmoonclock/Manifest
@@ -1,2 +1 @@
-DIST wmmoonclock-1.29.tar.gz 234991 BLAKE2B 7d38b4758d6bd4b78d069ae7d872c60f1a43a25fc424a51615ff0506d249bc0ee416cec9dc389ea27281f0b1eafa299bb126f0ea177334508ebb2b3542162162 SHA512 c36850034a0f3b7863ecfd03f73f91f9b935f645362cebeb33186873f700585d682dc5c35f3b5d67932afd3c5699fca56bf012e8f8a06615ff52c44a47ba552e
DIST wmmoonclock-1.30.tar.gz 238171 BLAKE2B 05246845f95a24f4b0e1b2ce1fb790c170da2b2023337fca5517a27afccaa7a9e42efa497151059897fe87f25b2e32390f441a820afc3eaf353333faa1760d57 SHA512 2173586ef8dd53eae0a05368440dffe8438e57f8158df05fd0de2d4525a5726e48b62ef8e8a81403cb7707d836936957e2238f543946beb557623bd9fbd54175
diff --git a/x11-plugins/wmmoonclock/files/wmmoonclock-1.29-gcc-10.patch b/x11-plugins/wmmoonclock/files/wmmoonclock-1.29-gcc-10.patch
deleted file mode 100644
index 9554254e623..00000000000
--- a/x11-plugins/wmmoonclock/files/wmmoonclock-1.29-gcc-10.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur wmmoonclock-1.29.orig/src/xutils.c wmmoonclock-1.29/src/xutils.c
---- wmmoonclock-1.29.orig/src/xutils.c 2017-08-15 00:32:44.000000000 +0200
-+++ wmmoonclock-1.29/src/xutils.c 2020-02-27 11:42:33.266076617 +0100
-@@ -52,6 +52,13 @@
- XpmIcon wmgen;
- Pixmap pixmask;
-
-+Display *display;
-+Window Root;
-+Window iconwin, win;
-+int screen;
-+int DisplayDepth;
-+
-+
-
-
-
-diff -Naur wmmoonclock-1.29.orig/src/xutils.h wmmoonclock-1.29/src/xutils.h
---- wmmoonclock-1.29.orig/src/xutils.h 2017-08-15 00:31:51.000000000 +0200
-+++ wmmoonclock-1.29/src/xutils.h 2020-02-27 11:41:58.180058348 +0100
-@@ -20,11 +20,11 @@
- /*
- * Global variable
- */
--Display *display;
--Window Root;
--Window iconwin, win;
--int screen;
--int DisplayDepth;
-+extern Display *display;
-+extern Window Root;
-+extern Window iconwin, win;
-+extern int screen;
-+extern int DisplayDepth;
-
-
-
diff --git a/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild b/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
deleted file mode 100644
index 9530051db95..00000000000
--- a/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="dockapp that shows lunar ephemeris to a high accuracy"
-HOMEPAGE="https://www.dockapps.net/wmmoonclock"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXpm"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
diff --git a/x11-plugins/wmmoonclock/wmmoonclock-1.30.ebuild b/x11-plugins/wmmoonclock/wmmoonclock-1.30.ebuild
index e40b73d04b9..ac62f79bf63 100644
--- a/x11-plugins/wmmoonclock/wmmoonclock-1.30.ebuild
+++ b/x11-plugins/wmmoonclock/wmmoonclock-1.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~mips ppc ~sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmpager/wmpager-1.2-r2.ebuild b/x11-plugins/wmpager/wmpager-1.2-r2.ebuild
index 920a6e876ac..541b6e136aa 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
diff --git a/x11-plugins/wmrack/wmrack-1.4-r1.ebuild b/x11-plugins/wmrack/wmrack-1.4-r1.ebuild
index f40d1f91620..87ecae2c815 100644
--- a/x11-plugins/wmrack/wmrack-1.4-r1.ebuild
+++ b/x11-plugins/wmrack/wmrack-1.4-r1.ebuild
@@ -1,8 +1,7 @@
-# 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 sound mixer and CD player dockapp"
HOMEPAGE="http://wmrack.sourceforge.net"
@@ -22,6 +21,7 @@ DOCS=( CHANGES README TODO )
src_prepare() {
default
+ ln -s grey.style XPM/standart.style || die
sed -i \
-e 's:gcc:$(CC):' \
-e 's:$(OBJECTS) -o:$(OBJECTS) $(LDFLAGS) -o:' "${S}"/Makefile.in || die
diff --git a/x11-plugins/wmsysmon/Manifest b/x11-plugins/wmsysmon/Manifest
index 12e312cd5b7..adb9c097c63 100644
--- a/x11-plugins/wmsysmon/Manifest
+++ b/x11-plugins/wmsysmon/Manifest
@@ -1 +1 @@
-DIST wmsysmon-0.7.8.tar.gz 23533 BLAKE2B 830edc78222e8997c6ee23bdd9fcb28729e9b80d92b07f70a53d841065b7377f5c450024c511b4faa92043bd45aa0cc92e89ff900d7d4a53d3c9f4b57b4e6e7e SHA512 b1afd176851e8f89896e39b55d24d6efeb97eb5fdbb9c181cb030320445f1d8b22d31073edc615e6b47b91fd133b381f00b612901c8b312e7da404a4746bb97c
+DIST wmsysmon-0.8.0.tar.gz 21262 BLAKE2B 50c7e3149fbad711f7505558549eadede78abf4f52d5c2c6eff0bd74bbb9838f85b78d73a7021a3baf9776cdccfb2b8e621de897fdafe5a7af71cd8518933852 SHA512 af9f939de5031387abf31d7ad9b4f767056a5f0d1494ee95476fb6c3bafab95ffe78148da74bf004b40a1e0d4ace9616c272bce0f4900491c8983c34531c29e7
diff --git a/x11-plugins/wmsysmon/files/wmsysmon-0.7.8-gcc-10.patch b/x11-plugins/wmsysmon/files/wmsysmon-0.7.8-gcc-10.patch
deleted file mode 100644
index e9477899b1b..00000000000
--- a/x11-plugins/wmsysmon/files/wmsysmon-0.7.8-gcc-10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur src.orig/wmgeneral.h src/wmgeneral.h
---- src.orig/wmgeneral.h 2017-12-06 15:00:16.000000000 +0100
-+++ src/wmgeneral.h 2020-03-01 16:03:18.293199660 +0100
-@@ -38,7 +38,7 @@
- /* Global variable */
- /*******************/
-
--Display *display;
-+extern Display *display;
-
- /***********************/
- /* Function Prototypes */
-diff -Naur src.orig/wmsysmon.c src/wmsysmon.c
---- src.orig/wmsysmon.c 2017-12-06 15:00:16.000000000 +0100
-+++ src/wmsysmon.c 2020-03-01 16:03:32.992203044 +0100
-@@ -138,6 +138,7 @@
- time_t curtime;
- time_t prevtime;
-
-+Display *display;
-
- kernel_versions Get_Kernel_version(void);
- void usage(void);
diff --git a/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild b/x11-plugins/wmsysmon/wmsysmon-0.8.0.ebuild
index 4a1faee41b2..70a26acef4a 100644
--- a/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild
+++ b/x11-plugins/wmsysmon/wmsysmon-0.8.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit toolchain-funcs
DESCRIPTION="a dockapp to monitor: CPU, Memory, Uptime, IRQs, Paging and Swap activity"
@@ -13,12 +13,12 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
-DEPEND="x11-libs/libX11
+DEPEND=">=x11-libs/libdockapp-0.7:=
+ x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
DOCS=( ../ChangeLog ../README )
S=${WORKDIR}/${P}/src
diff --git a/x11-plugins/wmweather+/Manifest b/x11-plugins/wmweather+/Manifest
index 11e7543e7bc..1204dbc1d81 100644
--- a/x11-plugins/wmweather+/Manifest
+++ b/x11-plugins/wmweather+/Manifest
@@ -1,2 +1 @@
-DIST wmweather+-2.17.tar.gz 212763 BLAKE2B e810ecaf6858bba0cb3bdb32517f5c1cbaa552ed071b1ce6dfca33b41ad75c5272616c9be78930f47ee3980d2ab8c51a29caaec627c5e608e9c2790d940cfe65 SHA512 45622513792698f1adf4a686506913146e2a24c9ff39fda1129132aae864528184aa122b525e00b079f416fd131c1369ff95e430c4c63877bdc166c982f841eb
DIST wmweather+-2.18.tar.gz 206062 BLAKE2B 14fe0b49b5541d5e093c958d1c12c4c28c3bae53f8539402a61800d1817bf22eae426d4733e08ae3f1e90057e7dd297a9412d62e5edd9fb973b0a9e799b3f792 SHA512 538325b1d2bd7dd3a89a006d88868e02a71318b6e49001033d0f543965fb21f91b265e116d3b929a096e99719c99241d520a7eb395ec55f721de0d01dcbedbc0
diff --git a/x11-plugins/wmweather+/files/wmweather+-2.17-gcc-10.patch b/x11-plugins/wmweather+/files/wmweather+-2.17-gcc-10.patch
deleted file mode 100644
index 1b26aa3936e..00000000000
--- a/x11-plugins/wmweather+/files/wmweather+-2.17-gcc-10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur wmweather+-2.17.orig/wmgeneral/wmgeneral-x11.c wmweather+-2.17/wmgeneral/wmgeneral-x11.c
---- wmweather+-2.17.orig/wmgeneral/wmgeneral-x11.c 2014-02-07 20:17:44.000000000 +0100
-+++ wmweather+-2.17/wmgeneral/wmgeneral-x11.c 2020-02-24 22:11:47.226905019 +0100
-@@ -94,6 +94,7 @@
- GC NormalGC;
- GC RedrawGC;
- XpmIcon wmgen;
-+Display *display;
-
- /***********************/
- /* Function Prototypes */
-diff -Naur wmweather+-2.17.orig/wmgeneral/wmgeneral-x11.h wmweather+-2.17/wmgeneral/wmgeneral-x11.h
---- wmweather+-2.17.orig/wmgeneral/wmgeneral-x11.h 2014-02-07 20:17:44.000000000 +0100
-+++ wmweather+-2.17/wmgeneral/wmgeneral-x11.h 2020-02-24 22:10:45.233884234 +0100
-@@ -17,7 +17,7 @@
- /* Global variable */
- /*******************/
-
--Display *display;
-+extern Display *display;
-
- /***********************/
- /* Function Prototypes */
diff --git a/x11-plugins/wmweather+/wmweather+-2.17.ebuild b/x11-plugins/wmweather+/wmweather+-2.17.ebuild
deleted file mode 100644
index 94bc2487217..00000000000
--- a/x11-plugins/wmweather+/wmweather+-2.17.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A dockapp for displaying data collected from METAR, AVN, ETA, and MRF forecasts"
-HOMEPAGE="https://www.sourceforge.net/projects/wmweatherplus/"
-SRC_URI="mirror://sourceforge/wmweatherplus/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~mips ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-DEPEND="dev-libs/libpcre
- >=net-misc/curl-7.17.1
- x11-libs/libXpm
- x11-libs/libXext
- x11-libs/libX11
- x11-wm/windowmaker"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
diff --git a/x11-plugins/wmweather+/wmweather+-2.18.ebuild b/x11-plugins/wmweather+/wmweather+-2.18.ebuild
index 7dffde689df..3ff86617830 100644
--- a/x11-plugins/wmweather+/wmweather+-2.18.ebuild
+++ b/x11-plugins/wmweather+/wmweather+-2.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/wmweatherplus/${P}.tar.gz"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~mips ppc ~ppc64 ~sparc x86"
IUSE=""
DEPEND="dev-libs/libpcre
diff --git a/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild b/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild
index e8fd4e681e8..c5dac0be2f9 100644
--- a/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild
+++ b/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,4 +20,4 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${P}/src"
DOCS=( ../{CHANGES,README} )
-PATCHES=( ${FILESDIR}/${P}-gcc-10.patch )
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )