summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-plugins')
-rw-r--r--x11-plugins/asclock/asclock-2.0.12-r4.ebuild74
-rw-r--r--x11-plugins/asclock/files/asclock-2.0.12-fix-implicit-func-decl.patch13
-rw-r--r--x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild8
-rw-r--r--x11-plugins/cputnik/files/cputnik-0.2.0-libdir.patch12
-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/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild2
-rw-r--r--x11-plugins/gkrellm-countdown/metadata.xml3
-rw-r--r--x11-plugins/pidgin-otr/metadata.xml5
-rw-r--r--x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r1.ebuild (renamed from x11-plugins/pidgin-otr/pidgin-otr-4.0.2.ebuild)16
-rw-r--r--x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild4
-rw-r--r--x11-plugins/vicious/Manifest1
-rw-r--r--x11-plugins/vicious/vicious-2.5.0.ebuild64
-rw-r--r--x11-plugins/vicious/vicious-2.5.1.ebuild2
-rw-r--r--x11-plugins/wmbattery/Manifest1
-rw-r--r--x11-plugins/wmbattery/wmbattery-2.56.ebuild27
-rw-r--r--x11-plugins/wmbio/wmbio-1.02.ebuild16
-rw-r--r--x11-plugins/wmblob/metadata.xml3
-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/Manifest1
-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.9-64bit.patch94
-rw-r--r--x11-plugins/wmhdplop/wmhdplop-0.9.10.ebuild37
-rw-r--r--x11-plugins/wmhdplop/wmhdplop-0.9.11-r1.ebuild (renamed from x11-plugins/wmhdplop/wmhdplop-0.9.11.ebuild)9
-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/wmnet/wmnet-1.06-r2.ebuild5
-rw-r--r--x11-plugins/wmnetload/metadata.xml3
-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/Manifest1
-rw-r--r--x11-plugins/wmsysmon/wmsysmon-0.8.0.ebuild32
-rw-r--r--x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild4
50 files changed, 585 insertions, 486 deletions
diff --git a/x11-plugins/asclock/asclock-2.0.12-r4.ebuild b/x11-plugins/asclock/asclock-2.0.12-r4.ebuild
new file mode 100644
index 00000000000..4d5b8555b83
--- /dev/null
+++ b/x11-plugins/asclock/asclock-2.0.12-r4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+DESCRIPTION="Clock applet for AfterStep"
+HOMEPAGE="http://tigr.net/afterstep/applets/"
+SRC_URI="http://www.tigr.net/afterstep/download/asclock/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+DEPEND="x11-libs/libXpm"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-gcc41.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+ "${FILESDIR}"/${P}-fix-implicit-func-decl.patch
+)
+
+src_prepare() {
+ default
+
+ ln -s themes/classic default_theme || die
+}
+
+src_configure() {
+ :;
+}
+
+src_compile() {
+ local x
+
+ # Will break Solaris
+ [[ ${CHOST} == *-linux-gnu ]] && CFLAGS="${CFLAGS} \
+ -Dlinux \
+ -D_POSIX_C_SOURCE=199309L \
+ -D_POSIX_SOURCE \
+ -D_XOPEN_SOURCE"
+
+ for x in asclock parser symbols config; do
+ edo $(tc-getCC) \
+ ${CPPFLAGS} ${CFLAGS} ${ASFLAGS} \
+ -I"${EPREFIX}"/usr/include \
+ -D_BSD_SOURCE \
+ -D_SVID_SOURCE \
+ -DFUNCPROTO=15 \
+ -DNARROWPROTO \
+ -c -o ${x}.o ${x}.c
+ done
+
+ edo $(tc-getCC) \
+ ${LDFLAGS} \
+ -o asclock \
+ asclock.o parser.o symbols.o config.o \
+ -L"${ESYSROOT}/usr/$(get_libdir)" \
+ -L"${ESYSROOT}"/usr/lib/X11 \
+ -lXpm -lXext -lX11
+}
+
+src_install() {
+ dobin asclock
+ local themesdir="/usr/share/${PN}/themes"
+ insinto ${themesdir}
+ doins -r themes/*
+ dodoc README README.THEMES TODO
+ cd "${ED}"/${themesdir} || die
+ rm Freeamp/Makefile{,.*} || die
+ ln -s classic default_theme || die
+}
diff --git a/x11-plugins/asclock/files/asclock-2.0.12-fix-implicit-func-decl.patch b/x11-plugins/asclock/files/asclock-2.0.12-fix-implicit-func-decl.patch
new file mode 100644
index 00000000000..b0379a39612
--- /dev/null
+++ b/x11-plugins/asclock/files/asclock-2.0.12-fix-implicit-func-decl.patch
@@ -0,0 +1,13 @@
+diff --git a/asclock.h b/asclock.h
+index 7580df8..ec6883b 100644
+--- a/asclock.h
++++ b/asclock.h
+@@ -137,6 +137,8 @@ extern char *hour_map;
+ extern char *min_map;
+ extern char *sec_map;
+
++int mytime();
++
+ /********* symbols.c ***************/
+ void init_symbols();
+ void postconfig();
diff --git a/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild b/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
index eb195d5a676..031cf79deae 100644
--- a/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
+++ b/x11-plugins/cputnik/cputnik-0.2.0-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
@@ -22,9 +22,11 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${P}/src
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch
+PATCHES=(
+ "${FILESDIR}"/${P}-makefile.patch
"${FILESDIR}"/${P}-fno-common.patch
- )
+ "${FILESDIR}"/${P}-libdir.patch
+)
src_compile() {
emake CC="$(tc-getCC)"
diff --git a/x11-plugins/cputnik/files/cputnik-0.2.0-libdir.patch b/x11-plugins/cputnik/files/cputnik-0.2.0-libdir.patch
new file mode 100644
index 00000000000..4c613d739f0
--- /dev/null
+++ b/x11-plugins/cputnik/files/cputnik-0.2.0-libdir.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/732444
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+
+ CFLAGS += -Wall
+ INCS = -I/usr/include/X11
+-LIBS = -L/usr/lib -lXpm -lXext -lX11
++LIBS = -lXpm -lXext -lX11
+ INSTALL_PREFIX = /usr
+
+
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/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild
index 29c9fb53247..e67c4488f86 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
@@ -16,7 +16,7 @@ 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-countdown/metadata.xml b/x11-plugins/gkrellm-countdown/metadata.xml
index f4b97237020..115e9d64a66 100644
--- a/x11-plugins/gkrellm-countdown/metadata.xml
+++ b/x11-plugins/gkrellm-countdown/metadata.xml
@@ -2,7 +2,4 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
- <upstream>
- <remote-id type="freecode">gkrellm-countdown</remote-id>
- </upstream>
</pkgmetadata>
diff --git a/x11-plugins/pidgin-otr/metadata.xml b/x11-plugins/pidgin-otr/metadata.xml
index 99e2666c588..115e9d64a66 100644
--- a/x11-plugins/pidgin-otr/metadata.xml
+++ b/x11-plugins/pidgin-otr/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/x11-plugins/pidgin-otr/pidgin-otr-4.0.2.ebuild b/x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r1.ebuild
index 13cd6b3ec41..fce6c905d79 100644
--- a/x11-plugins/pidgin-otr/pidgin-otr-4.0.2.ebuild
+++ b/x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging"
HOMEPAGE="http://www.cypherpunks.ca/otr/"
@@ -16,8 +16,16 @@ RDEPEND="dev-libs/libgcrypt:0
net-im/pidgin[gtk]
>=net-libs/libotr-4.0.0
x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-util/intltool
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_install() {
+ default
+
+ find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild b/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
index 54ed903d1c5..04b255be574 100644
--- a/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
+++ b/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.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
@@ -6,7 +6,7 @@ EAPI=7
inherit autotools
DESCRIPTION="Provide libnotify interface to Pidgin and Finch"
-HOMEPAGE="http://purple-libnotify-plus.sardemff7.net/"
+HOMEPAGE="https://github.com/sardemff7/purple-libnotify-plus"
SRC_URI="https://github.com/sardemff7/purple-libnotify-plus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/x11-plugins/vicious/Manifest b/x11-plugins/vicious/Manifest
index e69f05a97f7..943dd61e014 100644
--- a/x11-plugins/vicious/Manifest
+++ b/x11-plugins/vicious/Manifest
@@ -1,2 +1 @@
-DIST vicious-2.5.0.tar.gz 67557 BLAKE2B ffbc1b3c0e32b554cc367a51e5e17130e1b9f7fed2e8505aaa1845719ecd6d465d43ba839ac3a9b73a87e43ff3144c2074f3750d5f67b516d033a74144e9e12f SHA512 deb21587d1d7f2e6e4dd77c74abbfa337acf6c99ef9bebc0e505f1508afc6e3b03f043a639f866fcda0191447c103d3fba51376682201482fb669a263321dee5
DIST vicious-2.5.1.tar.gz 68635 BLAKE2B fa952f878140e76a44bde98ab928fe2a01a12f0e931a4f8ee366acba584661a0e42b150d4f69bfaaf7c58c68d57d2e261d8b586fb1abbd329d9f30fe90c2e21d SHA512 63de92a4e7d666d5737bfc0f50857c48f40818e5f1cf81ba672284db764c68d151f73afd6507b7392b38ae91cf1d18104284618430d15dd8837c56a0283571fe
diff --git a/x11-plugins/vicious/vicious-2.5.0.ebuild b/x11-plugins/vicious/vicious-2.5.0.ebuild
deleted file mode 100644
index 31dbb976d37..00000000000
--- a/x11-plugins/vicious/vicious-2.5.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature
-
-DESCRIPTION="Modular widget library for x11-wm/awesome"
-HOMEPAGE="https://github.com/vicious-widgets/vicious"
-SRC_URI="https://github.com/${PN}-widgets/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="contrib"
-
-RDEPEND="x11-wm/awesome"
-
-src_install() {
- insinto /usr/share/awesome/lib/vicious
- doins -r widgets spawn.lua helpers.lua init.lua
-
- if use contrib; then
- insinto /usr/share/awesome/lib/vicious/contrib
- doins contrib/*.lua
- fi
-
- einstalldocs
-}
-
-pkg_postinst() {
- # Note that as of 2.5.0 this list may or may not be incomplete - it has been produced
- # only by searching for occurrences of vicious.spawn (the recommended way of calling
- # external helpers because it supports async) and popen (still used by many contrib widgets).
- # Moreover, dependencies of all non-Linux widgets have been excluded on purpose.
- optfeature_header "These widgets need some dependencies:"
- optfeature "cmus" "media-sound/cmus"
- optfeature "fs" "sys-apps/coreutils" # df
- optfeature "gmail" "net-misc/curl"
- optfeature "hddtemp" "net-misc/curl[telnet] app-admin/hddtemp"
- optfeature "hwmontemp" "sys-apps/grep"
- optfeature "mdir" "sys-apps/findutils"
- optfeature "mpd" "net-misc/curl[telnet] media-sound/mpd"
- optfeature "notmuch" "net-mail/notmuch"
- optfeature "volume" "media-sound/alsa-utils" # amixer
- optfeature "weather" "net-misc/curl"
- optfeature "wifi" "net-wireless/wireless-tools"
- optfeature "wifiiw" "net-wireless/iw"
- if use contrib; then
- optfeature "contrib/btc" "net-misc/curl"
- optfeature "contrib/buildbot" "net-misc/curl"
- optfeature "contrib/countfiles" "sys-apps/findutils"
- optfeature "contrib/mpc" "media-sound/mpc"
- optfeature "contrib/openweather" "net-misc/curl"
- optfeature "contrib/netcfg" "sys-apps/coreutils" # ls
- optfeature "contrib/nvinf" "x11-drivers/nvidia-drivers" # nvidia-settings
- # ossvol needs 'ossmix' - not packaged?
- optfeature "contrib/pulse" "media-sound/pulseaudio" # pacmd
- optfeature "contrib/rss" "net-misc/curl"
- optfeature "contrib/sensors" "sys-apps/lm-sensors"
- optfeature "contrib/wpa" "net-wireless/wpa_supplicant" # wpa-cli
- fi
- elog
-}
diff --git a/x11-plugins/vicious/vicious-2.5.1.ebuild b/x11-plugins/vicious/vicious-2.5.1.ebuild
index e52e28e1f48..be454b1fadb 100644
--- a/x11-plugins/vicious/vicious-2.5.1.ebuild
+++ b/x11-plugins/vicious/vicious-2.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}-widgets/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~riscv x86"
IUSE="contrib"
RDEPEND="x11-wm/awesome"
diff --git a/x11-plugins/wmbattery/Manifest b/x11-plugins/wmbattery/Manifest
index 0b9532910b5..68e10adb9c2 100644
--- a/x11-plugins/wmbattery/Manifest
+++ b/x11-plugins/wmbattery/Manifest
@@ -1 +1,2 @@
DIST wmbattery-2.54.tar.gz 87925 BLAKE2B 692549909d52096ecf7997de5122f07d9fd59b3e2d99c1421b871671a9e43f2bbdb9742e89f835a58114238509b8f8b03fd0619da4a66d8e43b6b787d4e5f6a9 SHA512 58c901ed85d3ea7e0c750bb968c3250706ed693162fe4684d75683a3897df7ff02ee4afbe12a5d26b1f1b632d4c6f9902713a632e6784173ea49bad312fd30aa
+DIST wmbattery-2.56.tar.gz 120578 BLAKE2B 992b3f2964b1ca06aabcc1727a972dcc3e7fbc294b2265c9d0435b3bb7d0c425cded78d4057d7d33ac6b3e70322d5b4b3c0cf4ce8142fb6b3222e85100937eb3 SHA512 834dd4b8b5f880c31c0c1c95c5f9580e8cc795ae8f5c56cf94957bd8d7383d4b3c0903063430a329533ae8b5eff8eed1a464cdcf3ad67bc9f6ef3c35cc9d5662
diff --git a/x11-plugins/wmbattery/wmbattery-2.56.ebuild b/x11-plugins/wmbattery/wmbattery-2.56.ebuild
new file mode 100644
index 00000000000..aef01b77a87
--- /dev/null
+++ b/x11-plugins/wmbattery/wmbattery-2.56.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A dockable app to report APM, ACPI, or SPIC battery status"
+HOMEPAGE="https://www.dockapps.net/wmbattery"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc -sparc ~x86"
+IUSE="apm +upower"
+
+RDEPEND="apm? ( sys-apps/apmd )
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXpm
+ upower? ( >=sys-power/upower-0.9.23 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ChangeLog README TODO )
+
+src_configure() {
+ econf --disable-hal $(use_enable upower)
+}
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/wmblob/metadata.xml b/x11-plugins/wmblob/metadata.xml
index 0ff962f909a..8a473e90e02 100644
--- a/x11-plugins/wmblob/metadata.xml
+++ b/x11-plugins/wmblob/metadata.xml
@@ -5,7 +5,4 @@
<email>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
</maintainer>
- <upstream>
- <remote-id type="freshmeat">wmblob</remote-id>
- </upstream>
</pkgmetadata>
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..8e39b34be7c 100644
--- a/x11-plugins/wmhdplop/Manifest
+++ b/x11-plugins/wmhdplop/Manifest
@@ -1,2 +1 @@
-DIST wmhdplop-0.9.10.tar.gz 163491 BLAKE2B dd05bcddd4be666e403e7d0ccdbdba9048af6eb15dd72657b657bc4eb8eea1a6a7a78da820f143f6f377949bd9d8df89c5ae129f40374586633f8cdb174b9146 SHA512 9bd79ab5c271e2fbd7d415a1ea20eda5412d7657d9ccfd4781a6d42b834107b65e110231718ad686355e76590cd39f556ebfc9b14e7a4048a68d62503df94f46
DIST wmhdplop-0.9.11.tar.gz 163931 BLAKE2B 9a30f0ea11fd9abd5419612a413187299945b415ed9231e878aeea5a395627b21d77b99bbac3bd8d2b0673069c2011974355c9056d2dbe46688ed7606e8f9b8c SHA512 e77802945b0c4213212922307416e8f99f1fe99de4ade6200bdd9cd8687926ddc7e67b437109174fb8544eebd8a6aea22ba685624842b54134bff48ea8aaa540
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.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.10.ebuild
deleted file mode 100644
index d8f6755165d..00000000000
--- 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 2806056295d..2f766c78898 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() {
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/wmnet/wmnet-1.06-r2.ebuild b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
index df752012095..1b2ce83086b 100644
--- a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
+++ b/x11-plugins/wmnet/wmnet-1.06-r2.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
@@ -17,7 +17,8 @@ IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXext"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ elibc_musl? ( net-libs/ppp-defs )"
BDEPEND="
x11-base/xorg-proto
>=x11-misc/imake-1.0.8-r1
diff --git a/x11-plugins/wmnetload/metadata.xml b/x11-plugins/wmnetload/metadata.xml
index b86cbf3cb45..cd9959ef134 100644
--- a/x11-plugins/wmnetload/metadata.xml
+++ b/x11-plugins/wmnetload/metadata.xml
@@ -13,7 +13,4 @@ throughput, along with an auto-scaling graph of recent network activity (the
graph separates upstream and downstream traffic load cleanly without resorting
to colors).
</longdescription>
- <upstream>
- <remote-id type="freshmeat">wmnetload</remote-id>
- </upstream>
</pkgmetadata>
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..3f36f55d0ec 100644
--- a/x11-plugins/wmsysmon/Manifest
+++ b/x11-plugins/wmsysmon/Manifest
@@ -1 +1,2 @@
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/wmsysmon-0.8.0.ebuild b/x11-plugins/wmsysmon/wmsysmon-0.8.0.ebuild
new file mode 100644
index 00000000000..70a26acef4a
--- /dev/null
+++ b/x11-plugins/wmsysmon/wmsysmon-0.8.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs
+
+DESCRIPTION="a dockapp to monitor: CPU, Memory, Uptime, IRQs, Paging and Swap activity"
+HOMEPAGE="https://github.com/voyageur/wmsysmon"
+SRC_URI="https://github.com/voyageur/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=x11-libs/libdockapp-0.7:=
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXpm"
+RDEPEND="${DEPEND}"
+
+DOCS=( ../ChangeLog ../README )
+S=${WORKDIR}/${P}/src
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin wmsysmon
+ einstalldocs
+}
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 )