diff options
Diffstat (limited to 'x11-plugins')
286 files changed, 3021 insertions, 2287 deletions
diff --git a/x11-plugins/allin1/allin1-0.5.0-r2.ebuild b/x11-plugins/allin1/allin1-0.5.0-r3.ebuild index 8fbbd58b567a..80f291bf4e95 100644 --- a/x11-plugins/allin1/allin1-0.5.0-r2.ebuild +++ b/x11-plugins/allin1/allin1-0.5.0-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -12,21 +12,19 @@ SRC_URI="mirror://sourceforge/allinone/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" -RDEPEND="x11-libs/libX11 +RDEPEND=" + x11-libs/libX11 x11-libs/libXext x11-libs/libXpm" DEPEND="${RDEPEND} x11-base/xorg-proto" +BDEPEND="app-alternatives/lex" -PATCHES=( "${FILESDIR}/makefile-r2.patch" ) +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) -src_compile() { - emake \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" +src_configure() { + tc-export CC } src_install() { diff --git a/x11-plugins/allin1/files/allin1-0.5.0-makefile.patch b/x11-plugins/allin1/files/allin1-0.5.0-makefile.patch new file mode 100644 index 000000000000..244605ac88e1 --- /dev/null +++ b/x11-plugins/allin1/files/allin1-0.5.0-makefile.patch @@ -0,0 +1,63 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -9,12 +9,10 @@ + + # General vars + +-CC = gcc + FLEX = flex +-LIBFLAGS = -ggdb -Wall -O2 -fPIC +-CFLAGS = -ggdb -Wall -O2 ++LIBFLAGS = -fPIC + GENERATED = allin1 confparse.c +-LIBRARIES = -L/usr/X11R6/lib -lXext -lX11 -lXpm -lm ++LIBRARIES = -lXext -lX11 -lXpm -lm + MODULES = allin1.o dockhelper.o memory.o battery.o cpu.o \ + network.o filesys.o confparse.o seti.o + INCLUDES = dockhelper.h memory.h battery.h cpu.h network.h filesys.h seti.h \ +@@ -30,35 +28,35 @@ + $(FLEX) -o$@ -i -s $< + + confparse.o: confparse.c confparse.h +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + + dockhelper.o: dockhelper.c dockhelper.h +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + + cpu.o: cpu.c dockhelper.h cpu.h +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + + memory.o: memory.c memory.h dockhelper.h +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + + seti.o: seti.c seti.h dockhelper.h +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + + battery.o: battery.c battery.h batt.xpm dockhelper.h +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + + network.o: network.c network.h net.xpm dockhelper.h +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + + filesys.o: filesys.c filesys.h dockhelper.h +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + + allin1.o: allin1.c $(INCLUDES) +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + + + allin1: $(MODULES) +- $(CC) $(CFLAGS) -o $@ $(MODULES) -DDEBUG $(LIBRARIES) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MODULES) -DDEBUG $(LIBRARIES) + + + install: allin1 diff --git a/x11-plugins/allin1/files/makefile-r2.patch b/x11-plugins/allin1/files/makefile-r2.patch deleted file mode 100644 index 9d0b2ab028fa..000000000000 --- a/x11-plugins/allin1/files/makefile-r2.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/src/Makefile.old 2012-10-24 13:12:48.128285694 +0200 -+++ b/src/Makefile 2012-10-24 13:19:56.135247071 +0200 -@@ -11,8 +11,9 @@ - - CC = gcc - FLEX = flex --LIBFLAGS = -ggdb -Wall -O2 -fPIC --CFLAGS = -ggdb -Wall -O2 -+LIBFLAGS = -fPIC -+CFLAGS = -+LDFLAGS = - GENERATED = allin1 confparse.c - LIBRARIES = -L/usr/X11R6/lib -lXext -lX11 -lXpm -lm - MODULES = allin1.o dockhelper.o memory.o battery.o cpu.o \ -@@ -58,7 +59,7 @@ - - - allin1: $(MODULES) -- $(CC) $(CFLAGS) -o $@ $(MODULES) -DDEBUG $(LIBRARIES) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MODULES) -DDEBUG $(LIBRARIES) - - - install: allin1 diff --git a/x11-plugins/asclock/asclock-2.0.12-r3.ebuild b/x11-plugins/asclock/asclock-2.0.12-r3.ebuild deleted file mode 100644 index ef27e399a5fe..000000000000 --- a/x11-plugins/asclock/asclock-2.0.12-r3.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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 -) - -src_prepare() { - default - ln -s themes/classic default_theme -} - -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 - $(tc-getCC) \ - ${CPPFLAGS} ${CFLAGS} ${ASFLAGS} \ - -I"${EPREFIX}"/usr/include \ - -D_BSD_SOURCE \ - -D_SVID_SOURCE \ - -DFUNCPROTO=15 \ - -DNARROWPROTO \ - -c -o ${x}.o ${x}.c || die "compile asclock failed" - done - $(tc-getCC) \ - ${LDFLAGS} \ - -o asclock \ - asclock.o parser.o symbols.o config.o \ - -L"${EPREFIX}"/usr/lib \ - -L"${EPREFIX}"/usr/lib/X11 \ - -lXpm -lXext -lX11 || die "link asclock failed" -} - -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/asclock-2.0.12-r4.ebuild b/x11-plugins/asclock/asclock-2.0.12-r4.ebuild index 4d5b8555b83d..db92adc56a8e 100644 --- a/x11-plugins/asclock/asclock-2.0.12-r4.ebuild +++ b/x11-plugins/asclock/asclock-2.0.12-r4.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" DEPEND="x11-libs/libXpm" RDEPEND="${DEPEND}" diff --git a/x11-plugins/ascpu/Manifest b/x11-plugins/ascpu/Manifest deleted file mode 100644 index 1167dffc60d1..000000000000 --- a/x11-plugins/ascpu/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ascpu-1.11.tar.gz 43867 BLAKE2B 208b2c35ac233a3b33a48f27c3173ba05f321b0f235e199d7165e4be3ed5b638f820685847affb12a576a3ed03e684ed99448ce6557e7e7e4416f9b1eeb1a769 SHA512 fd2b4b7f27a9b585b4454237b39f5a8e662e309274a350d55e0c6f552c3d7a9626b47b84d889fd773d3785076fac08d5a595c92f81947e601d23f1f96421eb61 diff --git a/x11-plugins/ascpu/ascpu-1.11-r1.ebuild b/x11-plugins/ascpu/ascpu-1.11-r1.ebuild deleted file mode 100644 index 3fd3792e775f..000000000000 --- a/x11-plugins/ascpu/ascpu-1.11-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 toolchain-funcs - -DESCRIPTION="CPU statistics monitor utility for X Windows" -SRC_URI="http://www.tigr.net/afterstep/download/ascpu/${P}.tar.gz" -HOMEPAGE="http://www.tigr.net/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ~mips ppc ppc64 sparc x86" -IUSE="jpeg" - -RDEPEND="x11-libs/libXpm - x11-libs/libSM - jpeg? ( virtual/jpeg:0 )" - -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -PATCHES=( "${FILESDIR}/${P}-gentoo-r1.patch" ) - -src_configure() { - econf $(use_enable jpeg) -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - dodir /usr/bin - dodir /usr/share/man/man1 - dodoc README - default -} diff --git a/x11-plugins/ascpu/files/ascpu-1.11-gentoo-r1.patch b/x11-plugins/ascpu/files/ascpu-1.11-gentoo-r1.patch deleted file mode 100644 index 868c1d53b96a..000000000000 --- a/x11-plugins/ascpu/files/ascpu-1.11-gentoo-r1.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/autoconf/Makefile.common.in 1999-05-06 23:35:32.000000000 +0200 -+++ b/autoconf/Makefile.common.in 2006-09-11 23:07:41.000000000 +0200 -@@ -9,11 +9,10 @@ - install: install.bin install.man - - install.bin: $(PROG) -- $(STRIP) $(PROG) -- $(INSTALL_PROGRAM) $(PROG) $(AFTER_BIN_DIR) -+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(AFTER_BIN_DIR) - - install.man: -- $(INSTALL_DATA) $(PROG).man $(AFTER_MAN_DIR)/$(PROG).1x -+ $(INSTALL_DATA) $(PROG).man $(DESTDIR)$(AFTER_MAN_DIR)/$(PROG).1x - - uninstall: - $(RMF) $(AFTER_BIN_DIR)/$(PROG) ---- a/autoconf/Makefile.defines.in 1999-05-06 23:35:32.000000000 +0200 -+++ b/autoconf/Makefile.defines.in 2006-09-11 23:17:40.000000000 +0200 -@@ -2,6 +2,7 @@ - # Copyright (c) 1998, Guylhem AZNAR <guylhem@oeil.qc.ca> - # - -+DESTDIR = - CC = @CC@ - CCFLAGS = @CFLAGS@ - # -march=pentiumpro -mcpu=pentiumpro -@@ -21,7 +22,7 @@ - LEXFLAGS = - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL@ -s -m 755 -+INSTALL_PROGRAM = @INSTALL@ -m 755 - INSTALL_DATA = @INSTALL@ -m 644 - - INCS_X = @X_CFLAGS@ ---- a/autoconf/Makefile.common.in 1999-05-06 23:35:32.000000000 +0200 -+++ b/autoconf/Makefile.common.in 2013-03-18 18:13:05.550047149 +0100 -@@ -34,7 +34,7 @@ - done - - $(PROG): $(OBJS) -- $(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@) -+ $(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@) $(LDFLAGS) - - .c.o: - $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c diff --git a/x11-plugins/ascpu/metadata.xml b/x11-plugins/ascpu/metadata.xml deleted file mode 100644 index 85e4ed814fa2..000000000000 --- a/x11-plugins/ascpu/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/x11-plugins/asmem/asmem-1.12-r1.ebuild b/x11-plugins/asmem/asmem-1.12-r2.ebuild index b8aeeafc0159..02804f6c2ddb 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,27 +14,37 @@ 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-implicits.patch +) src_configure() { + tc-export CC # old autoconf + econf $(use_enable jpeg) } src_compile() { - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" + emake LDFLAGS="${LDFLAGS}" } 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-implicits.patch b/x11-plugins/asmem/files/configure-implicits.patch new file mode 100644 index 000000000000..14eff8f58e3a --- /dev/null +++ b/x11-plugins/asmem/files/configure-implicits.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/870679 +https://bugs.gentoo.org/871279 + +Generated file and configure.in is written for autoconf 2.13. +--- a/configure ++++ b/configure +@@ -752,5 +752,5 @@ + #include "confdefs.h" + +-main(){return(0);} ++int main(void){return(0);} + EOF + if { (eval echo configure:757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +@@ -1356,4 +1356,5 @@ + #include "confdefs.h" + ++void ${x_direct_test_function}(void); + int main() { + ${x_direct_test_function}() +@@ -2440,4 +2441,5 @@ + #include "confdefs.h" + ++void XpmReadFileToPixmap(void); + int main() { + XpmReadFileToPixmap() diff --git a/x11-plugins/astime/astime-2.8-r2.ebuild b/x11-plugins/astime/astime-2.8-r2.ebuild deleted file mode 100644 index 030c08793e3d..000000000000 --- a/x11-plugins/astime/astime-2.8-r2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Analogue clock utility for X Windows" -HOMEPAGE="http://www.tigr.net/" -SRC_URI="http://www.tigr.net/afterstep/download/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="jpeg" - -RDEPEND="x11-libs/libXpm - x11-libs/libSM - jpeg? ( virtual/jpeg:0 )" - -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -PATCHES=( "${FILESDIR}/respect-ldflags.patch" ) - -src_configure() { - econf $(use_enable jpeg) -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - dobin "${PN}" - newman "${PN}.man" "${PN}.1" - einstalldocs -} diff --git a/x11-plugins/astime/astime-2.8-r3.ebuild b/x11-plugins/astime/astime-2.8-r3.ebuild new file mode 100644 index 000000000000..abdde0084527 --- /dev/null +++ b/x11-plugins/astime/astime-2.8-r3.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="Analogue clock utility for X Windows" +HOMEPAGE="https://tigr.net/afterstep/applets/ http://www.afterstep.org/" +SRC_URI="http://www.tigr.net/afterstep/download/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 x86" +IUSE="jpeg" + +RDEPEND=" + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm + jpeg? ( media-libs/libjpeg-turbo:= ) +" + +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" + +PATCHES=( + "${FILESDIR}/${P}-respect-ldflags.patch" + "${FILESDIR}/${P}-remove-double-config.h-autotools.patch" + "${FILESDIR}/${P}-fix-implicit-function-decl.patch" +) + +src_prepare() { + default + cd "${S}/autoconf" || die + eautoreconf + cp "${S}/autoconf/configure" "${S}/" || die +} + +src_configure() { + econf $(use_enable jpeg) --with-xpm-library=/usr/$(get_libdir) +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + dobin "${PN}" + newman "${PN}.man" "${PN}.1" + einstalldocs +} diff --git a/x11-plugins/astime/files/astime-2.8-fix-implicit-function-decl.patch b/x11-plugins/astime/files/astime-2.8-fix-implicit-function-decl.patch new file mode 100644 index 000000000000..2db4db842685 --- /dev/null +++ b/x11-plugins/astime/files/astime-2.8-fix-implicit-function-decl.patch @@ -0,0 +1,17 @@ +File uses implicit declaration of a library function. This is not allow with clang16s default settings. + +Bug: https://bugs.gentoo.org/882175 +Patch has been sent to upstream via mail + +# Pascal Jäger <pascal.jaeger@leimstift.de> (2023-09-18) + +--- a/astime_x.c ++++ b/astime_x.c +@@ -11,6 +11,7 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> + #include <math.h> + #include <time.h> + diff --git a/x11-plugins/astime/files/astime-2.8-remove-double-config.h-autotools.patch b/x11-plugins/astime/files/astime-2.8-remove-double-config.h-autotools.patch new file mode 100644 index 000000000000..bcfba897fcb8 --- /dev/null +++ b/x11-plugins/astime/files/astime-2.8-remove-double-config.h-autotools.patch @@ -0,0 +1,27 @@ +In order to do a full eautoreconf we need to remove the double declarations of config.h in configure.in + +Bug: https://bugs.gentoo.org/874714 +Bug: https://bugs.gentoo.org/898458 +Patch has been sent to upstream via mail + +# Pascal Jäger <pascal.jaeger@leimstift.de> (2023-09-18) + +--- a/autoconf/configure.in ++++ b/autoconf/configure.in +@@ -60,7 +60,6 @@ AC_PATH_XTRA + AC_CHECK_HEADERS(sys/wait.h sys/time.h) + AC_CHECK_HEADERS(sys/statvfs.h sys/vfs.h sys/mount.h ustat.h) + AC_CHECK_HEADERS(machine/soundcard.h linux/soundcard.h linux/radio.h) +-AC_CONFIG_HEADER(config.h) + + dnl# Check for X + +@@ -120,8 +119,6 @@ AC_SUBST(with_afterdir) + + dnl# Write results + +-AC_CONFIG_HEADER(config.h) +- + dnl# Common parts of the Makefile + MAKEFILEDEFINES=./autoconf/Makefile.defines + MAKEFILECOMMON=./autoconf/Makefile.common diff --git a/x11-plugins/astime/files/respect-ldflags.patch b/x11-plugins/astime/files/astime-2.8-respect-ldflags.patch index 09325594f242..09325594f242 100644 --- a/x11-plugins/astime/files/respect-ldflags.patch +++ b/x11-plugins/astime/files/astime-2.8-respect-ldflags.patch diff --git a/x11-plugins/bfm/bfm-0.6.4-r3.ebuild b/x11-plugins/bfm/bfm-0.6.4-r4.ebuild index d93d9ff88a99..9e1bdbf76da7 100644 --- a/x11-plugins/bfm/bfm-0.6.4-r3.ebuild +++ b/x11-plugins/bfm/bfm-0.6.4-r4.ebuild @@ -1,26 +1,31 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit toolchain-funcs -DESCRIPTION="a dockapp and gkrellm plug-in combining timecop's bubblemon and wmfishtime" -HOMEPAGE="https://github.com/JNRowe-retired/bfm" -SRC_URI="https://github.com/JNRowe-retired/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +DESCRIPTION="Dockapp and gkrellm plug-in combining timecop's bubblemon and wmfishtime" +HOMEPAGE="https://github.com/JNRowe/bfm" +SRC_URI="https://github.com/JNRowe/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux" IUSE="gkrellm" -RDEPEND="x11-libs/gtk+:2 +RDEPEND=" + gkrellm? ( >=app-admin/gkrellm-2[X] ) + x11-libs/gtk+:2 x11-libs/libX11 - x11-libs/libXext" -DEPEND="${RDEPEND} - virtual/pkgconfig - gkrellm? ( >=app-admin/gkrellm-2[X] )" - -PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) + x11-libs/libXext +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch +) src_compile() { emake CC="$(tc-getCC)" GENTOO_LDFLAGS="${LDFLAGS}" diff --git a/x11-plugins/bfm/metadata.xml b/x11-plugins/bfm/metadata.xml index 5e8b4e0622fc..9b182362bb4f 100644 --- a/x11-plugins/bfm/metadata.xml +++ b/x11-plugins/bfm/metadata.xml @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>voyageur@gentoo.org</email> - <name>Bernard Cafarelli</name> -</maintainer> - -<use> - <flag name="gkrellm">Enable building of <pkg>app-admin/gkrellm</pkg> - module</flag> -</use> + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> + <use> + <flag name="gkrellm">Enable building of <pkg>app-admin/gkrellm</pkg>module</flag> + </use> + <upstream> + <remote-id type="github">JNRowe-retired/bfm</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-plugins/e16-epplets/Manifest b/x11-plugins/e16-epplets/Manifest index 5fbf1f3995b3..d97bb22a35c4 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 000000000000..643433afff87 --- /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 000000000000..d6c2a6bbd3a6 --- /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/e16-epplets/metadata.xml b/x11-plugins/e16-epplets/metadata.xml index c0a9cf49feaf..0e17a8d18ad2 100644 --- a/x11-plugins/e16-epplets/metadata.xml +++ b/x11-plugins/e16-epplets/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="cdaudio">Enable CD Audio support using <pkg>media-libs/libcdaudio</pkg></flag> <flag name="libgtop">Use <pkg>gnome-base/libgtop</pkg> to obtain system load information</flag> diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest deleted file mode 100644 index b9b811817e9a..000000000000 --- a/x11-plugins/enigmail/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -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 be2ff9a0c6a1..000000000000 --- 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 deleted file mode 100644 index 016d8fd4ed1a..000000000000 --- a/x11-plugins/enigmail/enigmail-2.2.4.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/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild deleted file mode 100644 index b312a52459c0..000000000000 --- 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 11d9702eb970..000000000000 --- 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/enigmail/files/enigmail-no_pEp_auto_download.patch b/x11-plugins/enigmail/files/enigmail-no_pEp_auto_download.patch deleted file mode 100644 index 086e00e649ae..000000000000 --- a/x11-plugins/enigmail/files/enigmail-no_pEp_auto_download.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> -Date: Wed, 7 Mar 2018 11:31:50 +0100 -Subject: Avoid auto-download of pEpEngine (Closes: #891882) - -When pEpEngine is available in debian, enigmail should Depend: or -Recommend: it. In the meantime, we should disable auto-download of -the pEp engine and prefer enigmail. ---- - package/prefs/defaultPrefs.js | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/package/prefs/defaultPrefs.js b/package/prefs/defaultPrefs.js -index a1f031e..10f2c25 100755 ---- a/package/prefs/defaultPrefs.js -+++ b/package/prefs/defaultPrefs.js -@@ -14,7 +14,7 @@ - // 0: force using Enigmail - // 1: automatic mode (use pEp if Enigmail and S/MIME are not configured for any identity) - // 2: force using pEp --pref("extensions.enigmail.juniorMode", 1); -+pref("extensions.enigmail.juniorMode", 0); - - // the last configured Enigmail version - pref("extensions.enigmail.configuredVersion", ""); -@@ -204,7 +204,7 @@ pref("extensions.enigmail.warnDownloadContactKeys", true); - pref("extensions.enigmail.wrapHtmlBeforeSend", true); - - // automatically download pepmda if it is available (without askin user) --pref("extensions.enigmail.pEpAutoDownload", true); -+pref("extensions.enigmail.pEpAutoDownload", false); - - // holds the last result of the last check for pEp updates - pref("extensions.enigmail.pEpLastUpdate", 0); diff --git a/x11-plugins/enigmail/metadata.xml b/x11-plugins/enigmail/metadata.xml deleted file mode 100644 index aef898a0bf82..000000000000 --- a/x11-plugins/enigmail/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>mozilla@gentoo.org</email> - <name>Gentoo Mozilla Team</name> -</maintainer> -</pkgmetadata> diff --git a/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r1.ebuild b/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r2.ebuild index 22d81a995f5f..1f0e8d375f1f 100644 --- a/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r1.ebuild +++ b/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r2.ebuild @@ -1,30 +1,31 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit gkrellm-plugin toolchain-funcs DESCRIPTION="Nice analog clock for GKrellM2" -HOMEPAGE="http://www.gkrellm.net/" +HOMEPAGE="http://gkrellm.srcbox.net/" SRC_URI="mirror://gentoo/${P}.tar.gz" +S="${WORKDIR}/${P/a/A}" LICENSE="GPL-2" SLOT="2" KEYWORDS="~alpha amd64 ~ppc sparc x86" -IUSE="" RDEPEND="app-admin/gkrellm:2[X]" DEPEND="${RDEPEND}" -S="${WORKDIR}/${P/a/A}" -PATCHES=( "${FILESDIR}"/${PN}-makefile.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-makefile.patch +) src_prepare() { default # The tarball contains a pre-compiled x86 object that needs to be - # removed if we're going to build it properly. See bug 166133. + # removed if we're going to build it properly. See bug #166133. rm -f gkrellaclock.o || die 'failed to remove gkrellaclock.o' } diff --git a/x11-plugins/gkrellaclock/metadata.xml b/x11-plugins/gkrellaclock/metadata.xml index 85e4ed814fa2..641cbd3703e7 100644 --- a/x11-plugins/gkrellaclock/metadata.xml +++ b/x11-plugins/gkrellaclock/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> </pkgmetadata> diff --git a/x11-plugins/gkrellfire/gkrellfire-0.4.2-r1.ebuild b/x11-plugins/gkrellfire/gkrellfire-0.4.2-r2.ebuild index 498b3ae4f309..bfb9e04f0dad 100644 --- a/x11-plugins/gkrellfire/gkrellfire-0.4.2-r1.ebuild +++ b/x11-plugins/gkrellfire/gkrellfire-0.4.2-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit gkrellm-plugin toolchain-funcs @@ -12,12 +12,13 @@ SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/${P}.tgz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" RDEPEND="app-admin/gkrellm:2[X]" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/fix-CC-CFLAGS-LDFLAGS-handling.patch ) +PATCHES=( + "${FILESDIR}"/fix-CC-CFLAGS-LDFLAGS-handling.patch +) src_compile() { emake CC="$(tc-getCC)" diff --git a/x11-plugins/gkrellfire/metadata.xml b/x11-plugins/gkrellfire/metadata.xml index 85e4ed814fa2..641cbd3703e7 100644 --- a/x11-plugins/gkrellfire/metadata.xml +++ b/x11-plugins/gkrellfire/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> </pkgmetadata> diff --git a/x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild b/x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild index 951eb4818034..f64705fbb506 100644 --- a/x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild +++ b/x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit gkrellm-plugin toolchain-funcs +inherit gkrellm-plugin multilib toolchain-funcs MY_P=${P/-/_} @@ -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 3831e4e1f7fb..000000000000 --- 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/gkrellkam/metadata.xml b/x11-plugins/gkrellkam/metadata.xml index 9ce0c03b69e8..41fcc1c138a1 100644 --- a/x11-plugins/gkrellkam/metadata.xml +++ b/x11-plugins/gkrellkam/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> <upstream> <remote-id type="sourceforge">gkrellkam</remote-id> </upstream> 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 fb9bd912a808..000000000000 --- 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-bgchanger/gkrellm-bgchanger-0.1.11-r3.ebuild b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r3.ebuild index 199b007d13d1..6c089bb0d800 100644 --- a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r3.ebuild +++ b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit gkrellm-plugin toolchain-funcs +inherit gkrellm-plugin multilib toolchain-funcs MY_PN="gkrellmbgchg2" MY_P="${MY_PN}-${PV}" diff --git a/x11-plugins/gkrellm-bgchanger/metadata.xml b/x11-plugins/gkrellm-bgchanger/metadata.xml index 85e4ed814fa2..641cbd3703e7 100644 --- a/x11-plugins/gkrellm-bgchanger/metadata.xml +++ b/x11-plugins/gkrellm-bgchanger/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> </pkgmetadata> diff --git a/x11-plugins/gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch b/x11-plugins/gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch index 6a9841652dd2..548da1f0f46f 100644 --- a/x11-plugins/gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch +++ b/x11-plugins/gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch @@ -1,6 +1,5 @@ -diff -u --new-file gkrellm-bluez-0.2-orig/src/decal_net_leds.xpm gkrellm-bluez-0.2/src/decal_net_leds.xpm ---- gkrellm-bluez-0.2-orig/src/decal_net_leds.xpm 1969-12-31 18:00:00.000000000 -0600 -+++ gkrellm-bluez-0.2/src/decal_net_leds.xpm 2007-03-08 09:07:50.000000000 -0600 +--- a/src/decal_net_leds.xpm ++++ b/src/decal_net_leds.xpm @@ -0,0 +1,66 @@ +/* XPM */ +static char * decal_net_leds_xpm[] = { @@ -68,9 +67,8 @@ diff -u --new-file gkrellm-bluez-0.2-orig/src/decal_net_leds.xpm gkrellm-bluez-0 +"34567890ab", +"cdefghijkl", +"34567890ab"}; -diff -u --new-file gkrellm-bluez-0.2-orig/src/gkrellm-bluez-chart.c gkrellm-bluez-0.2/src/gkrellm-bluez-chart.c ---- gkrellm-bluez-0.2-orig/src/gkrellm-bluez-chart.c 2006-11-14 13:50:24.000000000 -0600 -+++ gkrellm-bluez-0.2/src/gkrellm-bluez-chart.c 2007-03-08 09:13:29.000000000 -0600 +--- a/src/gkrellm-bluez-chart.c ++++ b/src/gkrellm-bluez-chart.c @@ -22,6 +22,8 @@ #include "gkrellm-bluez-chart.h" diff --git a/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild b/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r3.ebuild index dd151ebe1f93..e66fcc14de62 100644 --- a/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild +++ b/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r3.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit gkrellm-plugin +inherit gkrellm-plugin multilib DESCRIPTION="GKrellm plugin for monitoring bluetooth (Linux BlueZ) adapters" -SRC_URI="mirror://sourceforge/gkrellm-bluez/${P}.tar.gz" HOMEPAGE="http://gkrellm-bluez.sourceforge.net" +SRC_URI="mirror://sourceforge/gkrellm-bluez/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -15,15 +15,19 @@ KEYWORDS="amd64 x86" RDEPEND=" app-admin/gkrellm:2[X] - net-wireless/bluez" + net-wireless/bluez +" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${P}-notheme.patch ) +PATCHES=( + "${FILESDIR}"/${P}-notheme.patch +) PLUGIN_DOCS=( THEMING NEWS ) src_prepare() { default + # Be a bit more future proof, bug #260948 sed "s/-Werror//" -i src/Makefile.am src/Makefile.in || die } @@ -31,5 +35,5 @@ src_prepare() { src_configure() { PLUGIN_SO=( src/.libs/gkrellmbluez$(get_modname) ) - econf --disable-static + default } diff --git a/x11-plugins/gkrellm-bluez/metadata.xml b/x11-plugins/gkrellm-bluez/metadata.xml index 18edf05f70f7..57c612088af5 100644 --- a/x11-plugins/gkrellm-bluez/metadata.xml +++ b/x11-plugins/gkrellm-bluez/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> <upstream> <remote-id type="sourceforge">gkrellm-bluez</remote-id> </upstream> diff --git a/x11-plugins/gkrellm-countdown/files/gkrellm-countdown-makefile.patch b/x11-plugins/gkrellm-countdown/files/gkrellm-countdown-makefile.patch index af241de73e92..e2a2dc54f68f 100644 --- a/x11-plugins/gkrellm-countdown/files/gkrellm-countdown-makefile.patch +++ b/x11-plugins/gkrellm-countdown/files/gkrellm-countdown-makefile.patch @@ -1,10 +1,10 @@ This patch is by Michael Mair-Keimberger, as part of bug 339657. It teaches the Makefile to support the user's LDFLAGS. -Gentoo-Bug: 339657 +Gentoo-Bug: https://bugs.gentoo.org/339657 ---- a/Makefile 2003-12-30 23:07:29.000000000 +0100 -+++ b/Makefile 2013-03-16 14:23:47.671010566 +0100 +--- a/Makefile ++++ b/Makefile @@ -9,7 +9,7 @@ IMLIB_LIB ?= PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins 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 965055c8df49..000000000000 --- 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 29c9fb53247e..5dfcb6a4155f 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-countdown/metadata.xml b/x11-plugins/gkrellm-countdown/metadata.xml index 115e9d64a669..641cbd3703e7 100644 --- a/x11-plugins/gkrellm-countdown/metadata.xml +++ b/x11-plugins/gkrellm-countdown/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> </pkgmetadata> 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 dcf420b95721..000000000000 --- 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-cpupower/gkrellm-cpupower-0.2-r2.ebuild b/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r2.ebuild index a3c27d5e817e..18ed8acf679c 100644 --- a/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r2.ebuild +++ b/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r2.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit gkrellm-plugin toolchain-funcs +inherit gkrellm-plugin multilib toolchain-funcs MY_P="${P/gkrellm/gkrellm2}" DESCRIPTION="A Gkrellm2 plugin for displaying and manipulating CPU frequency" -HOMEPAGE="https://github.com/sainsaar/gkrellm2-cpupower/" +HOMEPAGE="https://github.com/sainsaar/gkrellm2-cpupower" SRC_URI="https://github.com/sainsaar/gkrellm2-cpupower/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" @@ -20,7 +20,8 @@ DEPEND="app-admin/gkrellm:2[X]" RDEPEND=" ${DEPEND} app-admin/sudo - sys-power/cpupower" + sys-power/cpupower +" BDEPEND="virtual/pkgconfig" PATCHES=( diff --git a/x11-plugins/gkrellm-cpupower/metadata.xml b/x11-plugins/gkrellm-cpupower/metadata.xml index 8e381cab9236..db7314d8bbfd 100644 --- a/x11-plugins/gkrellm-cpupower/metadata.xml +++ b/x11-plugins/gkrellm-cpupower/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">sainsaar/gkrellm2-cpupower</remote-id> - </upstream> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <upstream> + <remote-id type="github">sainsaar/gkrellm2-cpupower</remote-id> + </upstream> </pkgmetadata> 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 42c94a2c151c..000000000000 --- 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 a06fa4d4fd66..4805ff89832a 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-imonc/metadata.xml b/x11-plugins/gkrellm-imonc/metadata.xml index acb644f24e24..356ccc1dd14b 100644 --- a/x11-plugins/gkrellm-imonc/metadata.xml +++ b/x11-plugins/gkrellm-imonc/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> <upstream> <remote-id type="sourceforge">gkrellm-imonc</remote-id> </upstream> 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 ee631d42e276..000000000000 --- 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 6cb881e555ab..638caa4a234e 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 @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit gkrellm-plugin autotools +inherit autotools gkrellm-plugin multilib MY_P="${P/rellm-/}" @@ -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-leds/metadata.xml b/x11-plugins/gkrellm-leds/metadata.xml index 85e4ed814fa2..641cbd3703e7 100644 --- a/x11-plugins/gkrellm-leds/metadata.xml +++ b/x11-plugins/gkrellm-leds/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> </pkgmetadata> diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch index 158357dc4855..cbffef6c2def 100644 --- a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch +++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch @@ -5,12 +5,6 @@ Subject: [PATCH 1/3] Respect LDFLAGS Instead of using a non-standard varible name like LFLAGS, using LDFLAGS lets this play nice with Gentoo's build system. ---- - Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index b8cf927..02ca376 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ INSTALL=install -c -m 755 diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch index 7edff1c74990..0b5f345f0bdb 100644 --- a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch +++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch @@ -7,12 +7,6 @@ This wrapper is designed to transition from GdkFont to PangoFontDescription. Without it, there is a warning and a probable runtime crash, as we are feeding the wrong structure into 'gdk_string_width'. ---- - mailwatch.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/mailwatch.c b/mailwatch.c -index 3f0f0a2..5cca01e 100644 --- a/mailwatch.c +++ b/mailwatch.c @@ -608,7 +608,7 @@ update_plugin(void) { diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch index 5cc76c6fc828..6e91c94e7a01 100644 --- a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch +++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch @@ -4,12 +4,6 @@ Date: Mon, 1 Nov 2010 08:44:17 -0400 Subject: [PATCH 3/3] Remove a few more GCC warnings These are mostly harmless, but no harm in cleaning them up. ---- - mailwatch.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/mailwatch.c b/mailwatch.c -index 5cca01e..fcb77a8 100644 --- a/mailwatch.c +++ b/mailwatch.c @@ -198,7 +198,7 @@ check_mh(Mailbox * mbox) { diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch index 828c9dd2d5f4..f95fbe4dfbb0 100644 --- a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch +++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch @@ -5,12 +5,6 @@ Subject: [PATCH 4/4] Do not force -O2 in CFLAGS Only uses -O2 if the user has not specified any CFLAGS in the environment. ---- - Makefile | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index 02ca376..c4ca35c 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,8 @@ GKRELLM_INCLUDE= -I/usr/local/include 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 e02392547a60..000000000000 --- 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-mailwatch/gkrellm-mailwatch-2.4.3-r3.ebuild b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r3.ebuild index 54c18b282740..a95fd891b314 100644 --- a/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r3.ebuild +++ b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit gkrellm-plugin toolchain-funcs +inherit gkrellm-plugin multilib toolchain-funcs DESCRIPTION="A GKrellM2 plugin that shows the status of additional mail boxes" HOMEPAGE="http://gkrellm.luon.net/mailwatch.php" diff --git a/x11-plugins/gkrellm-mailwatch/metadata.xml b/x11-plugins/gkrellm-mailwatch/metadata.xml index 85e4ed814fa2..641cbd3703e7 100644 --- a/x11-plugins/gkrellm-mailwatch/metadata.xml +++ b/x11-plugins/gkrellm-mailwatch/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> </pkgmetadata> diff --git a/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild b/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0-r1.ebuild index 5bc906f72683..0d3c7b4a1bb1 100644 --- a/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild +++ b/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0-r1.ebuild @@ -1,24 +1,24 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -DESCRIPTION="emerge this package to install all of the gkrellm plugins" +DESCRIPTION="Meta-package for all of the gkrellm plugins" HOMEPAGE="http://gkrellm.srcbox.net/" +LICENSE="metapackage" SLOT="0" -LICENSE="GPL-2" KEYWORDS="~ppc ~x86" IUSE="wifi" -RDEPEND="!<app-admin/gkrellm-2 +RDEPEND=" + !<app-admin/gkrellm-2 >=x11-plugins/gkrellaclock-0.3.2 >=x11-plugins/gkrellkam-2.0.0 >=x11-plugins/gkrellm-leds-0.8.0 >=x11-plugins/gkrellm-volume-2.1.4 >=x11-plugins/gkrellmlaunch-0.5 >=x11-plugins/gkrellmoon-0.6 - wifi? ( >=x11-plugins/gkrellmwireless-2.0.2 ) >=x11-plugins/gkrellshoot-0.4.1 >=x11-plugins/gkrellstock-0.5 >=x11-plugins/gkrellsun-0.12.2 @@ -26,4 +26,5 @@ RDEPEND="!<app-admin/gkrellm-2 >=x11-plugins/gkrellweather-2.0.6 x11-plugins/gkrellm-countdown x11-plugins/gkrellm-trayicons + wifi? ( >=x11-plugins/gkrellmwireless-2.0.2 ) " diff --git a/x11-plugins/gkrellm-plugins/metadata.xml b/x11-plugins/gkrellm-plugins/metadata.xml index 85e4ed814fa2..641cbd3703e7 100644 --- a/x11-plugins/gkrellm-plugins/metadata.xml +++ b/x11-plugins/gkrellm-plugins/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> </pkgmetadata> diff --git a/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-Use-standard-int-types.patch b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-Use-standard-int-types.patch new file mode 100644 index 000000000000..ed29ace772fa --- /dev/null +++ b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-Use-standard-int-types.patch @@ -0,0 +1,152 @@ +From 6cbfd2d76c5c48913c29bf1b27e0fdadba508a7a Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 3 Feb 2023 09:53:57 +0000 +Subject: [PATCH] Use standard int types + +Bug: https://bugs.gentoo.org/833164 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/videodev.h ++++ b/videodev.h +@@ -1,6 +1,7 @@ + #ifndef __LINUX_VIDEODEV_H + #define __LINUX_VIDEODEV_H + ++#include <stdint.h> + #include <linux/types.h> + + #ifdef __KERNEL__ +@@ -73,44 +74,44 @@ struct video_channel + int channel; + char name[32]; + int tuners; +- __u32 flags; ++ uint32_t flags; + #define VIDEO_VC_TUNER 1 /* Channel has a tuner */ + #define VIDEO_VC_AUDIO 2 /* Channel has audio */ +- __u16 type; ++ uint16_t type; + #define VIDEO_TYPE_TV 1 + #define VIDEO_TYPE_CAMERA 2 +- __u16 norm; /* Norm set by channel */ ++ uint16_t norm; /* Norm set by channel */ + }; + + struct video_tuner + { + int tuner; + char name[32]; +- ulong rangelow, rangehigh; /* Tuner range */ +- __u32 flags; ++ unsigned long rangelow, rangehigh; /* Tuner range */ ++ uint32_t flags; + #define VIDEO_TUNER_PAL 1 + #define VIDEO_TUNER_NTSC 2 + #define VIDEO_TUNER_SECAM 4 + #define VIDEO_TUNER_LOW 8 /* Uses KHz not MHz */ + #define VIDEO_TUNER_NORM 16 /* Tuner can set norm */ + #define VIDEO_TUNER_STEREO_ON 128 /* Tuner is seeing stereo */ +- __u16 mode; /* PAL/NTSC/SECAM/OTHER */ ++ uint16_t mode; /* PAL/NTSC/SECAM/OTHER */ + #define VIDEO_MODE_PAL 0 + #define VIDEO_MODE_NTSC 1 + #define VIDEO_MODE_SECAM 2 + #define VIDEO_MODE_AUTO 3 +- __u16 signal; /* Signal strength 16bit scale */ ++ uint16_t signal; /* Signal strength 16bit scale */ + }; + + struct video_picture + { +- __u16 brightness; +- __u16 hue; +- __u16 colour; +- __u16 contrast; +- __u16 whiteness; /* Black and white only */ +- __u16 depth; /* Capture depth */ +- __u16 palette; /* Palette in use */ ++ uint16_t brightness; ++ uint16_t hue; ++ uint16_t colour; ++ uint16_t contrast; ++ uint16_t whiteness; /* Black and white only */ ++ uint16_t depth; /* Capture depth */ ++ uint16_t palette; /* Palette in use */ + #define VIDEO_PALETTE_GREY 1 /* Linear greyscale */ + #define VIDEO_PALETTE_HI240 2 /* High 240 cube (BT848) */ + #define VIDEO_PALETTE_RGB565 3 /* 565 16 bit RGB */ +@@ -134,9 +135,9 @@ struct video_picture + struct video_audio + { + int audio; /* Audio channel */ +- __u16 volume; /* If settable */ +- __u16 bass, treble; +- __u32 flags; ++ uint16_t volume; /* If settable */ ++ uint16_t bass, treble; ++ uint32_t flags; + #define VIDEO_AUDIO_MUTE 1 + #define VIDEO_AUDIO_MUTABLE 2 + #define VIDEO_AUDIO_VOLUME 4 +@@ -147,24 +148,24 @@ struct video_audio + #define VIDEO_SOUND_STEREO 2 + #define VIDEO_SOUND_LANG1 4 + #define VIDEO_SOUND_LANG2 8 +- __u16 mode; /* detected audio carriers or one to set */ +- __u16 balance; /* Stereo balance */ +- __u16 step; /* Step actual volume uses */ ++ uint16_t mode; /* detected audio carriers or one to set */ ++ uint16_t balance; /* Stereo balance */ ++ uint16_t step; /* Step actual volume uses */ + }; + + struct video_clip + { +- __s32 x,y; +- __s32 width, height; ++ int32_t x,y; ++ int32_t width, height; + struct video_clip *next; /* For user use/driver use only */ + }; + + struct video_window + { +- __u32 x,y; /* Position of window */ +- __u32 width,height; /* Its size */ +- __u32 chromakey; +- __u32 flags; ++ uint32_t x,y; /* Position of window */ ++ uint32_t width,height; /* Its size */ ++ uint32_t chromakey; ++ uint32_t flags; + struct video_clip *clips; /* Set only */ + int clipcount; + #define VIDEO_WINDOW_INTERLACE 1 +@@ -175,10 +176,10 @@ struct video_window + + struct video_capture + { +- __u32 x,y; /* Offsets into image */ +- __u32 width, height; /* Area to capture */ +- __u16 decimation; /* Decimation divder */ +- __u16 flags; /* Flags for capture */ ++ uint32_t x,y; /* Offsets into image */ ++ uint32_t width, height; /* Area to capture */ ++ uint16_t decimation; /* Decimation divder */ ++ uint16_t flags; /* Flags for capture */ + #define VIDEO_CAPTURE_ODD 0 /* Temporal */ + #define VIDEO_CAPTURE_EVEN 1 + }; +@@ -200,8 +201,8 @@ struct video_mmap + + struct video_key + { +- __u8 key[8]; +- __u32 flags; ++ uint8_t key[8]; ++ uint32_t flags; + }; + + +-- +2.39.1 + diff --git a/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch index a5fcabfea07b..e718366fa093 100644 --- a/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch +++ b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch @@ -1,5 +1,5 @@ ---- a/Makefile 2003-09-20 13:02:15.000000000 +0200 -+++ b/Makefile_new 2013-03-16 14:38:19.122375762 +0100 +--- a/Makefile ++++ b/Makefile_new @@ -9,8 +9,8 @@ DISTFILES=gkrellm_radio.c radio.c radio.h videodev.h README Makefile CHANGES diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild index d5fcf32c4c2f..f874b192ebb9 100644 --- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild +++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit gkrellm-plugin toolchain-funcs +inherit gkrellm-plugin multilib toolchain-funcs DESCRIPTION="A minimalistic GKrellM2 plugin to control radio tuners" HOMEPAGE="http://gkrellm.luon.net/gkrellm-radio.php" @@ -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=" @@ -23,6 +23,7 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${P}-makefile.patch "${FILESDIR}"/${P}-r1-pkgconfig.patch + "${FILESDIR}"/${P}-Use-standard-int-types.patch ) src_configure() { 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 37e9b9d77ffe..000000000000 --- 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-radio/metadata.xml b/x11-plugins/gkrellm-radio/metadata.xml index 85e4ed814fa2..641cbd3703e7 100644 --- a/x11-plugins/gkrellm-radio/metadata.xml +++ b/x11-plugins/gkrellm-radio/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> </pkgmetadata> diff --git a/x11-plugins/gkrellm-trayicons/files/gkrellm-trayicons-1.03-ldflags.patch b/x11-plugins/gkrellm-trayicons/files/gkrellm-trayicons-1.03-ldflags.patch index 92764a9b32af..06d28eed9ea3 100644 --- a/x11-plugins/gkrellm-trayicons/files/gkrellm-trayicons-1.03-ldflags.patch +++ b/x11-plugins/gkrellm-trayicons/files/gkrellm-trayicons-1.03-ldflags.patch @@ -1,5 +1,5 @@ ---- a/Makefile 2003-11-26 00:27:29.000000000 +0100 -+++ b/Makefile_new 2013-03-15 21:36:05.331857288 +0100 +--- a/Makefile ++++ b/Makefile_new @@ -6,19 +6,18 @@ GKRELLM_INCLUDE = -I$(PREFIX)/include GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 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 7dfa3d5636f2..000000000000 --- 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 7cd6220fe5a7..b99a9aa63faf 100644 --- a/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r2.ebuild +++ b/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit gkrellm-plugin toolchain-funcs +inherit gkrellm-plugin multilib toolchain-funcs DESCRIPTION="Configurable Tray Icons for GKrellM" HOMEPAGE="http://gkrellm.srcbox.net/Plugins.html" @@ -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-trayicons/metadata.xml b/x11-plugins/gkrellm-trayicons/metadata.xml index 85e4ed814fa2..641cbd3703e7 100644 --- a/x11-plugins/gkrellm-trayicons/metadata.xml +++ b/x11-plugins/gkrellm-trayicons/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> </pkgmetadata> diff --git a/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-Fix-Wreturn-type.patch b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-Fix-Wreturn-type.patch new file mode 100644 index 000000000000..992f3b66b1b8 --- /dev/null +++ b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-Fix-Wreturn-type.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/742902 + +From 5312ab56edcc721529af6520c9ecccaa20af4cdc Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 3 Feb 2023 09:46:55 +0000 +Subject: [PATCH 1/2] Fix -Wreturn-type + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/vaiobright.c ++++ b/vaiobright.c +@@ -110,7 +110,7 @@ static int vaiobright_get_brightness() { + // If we're broken, try again to open it + if (vaiobright_bslider->broken == 1) { + if (vaiobright_open_device() == -1) +- return; ++ return -1; + } + + if (ioctl(vaiobright_bslider->sony_fd, SONYPI_IOCGBRT, &value) < 0) { +-- +2.39.1 + diff --git a/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-Use-standard-int-types.patch b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-Use-standard-int-types.patch new file mode 100644 index 000000000000..cec38819ff3f --- /dev/null +++ b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-Use-standard-int-types.patch @@ -0,0 +1,48 @@ +From ab824d40f56e3c8037df77a15114de6bd0a332e0 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 3 Feb 2023 09:48:01 +0000 +Subject: [PATCH 2/2] Use standard int types + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/vaiobright.c ++++ b/vaiobright.c +@@ -15,6 +15,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <stdint.h> + #include <fcntl.h> + #include <unistd.h> + #include <sys/ioctl.h> +@@ -24,8 +25,8 @@ + #include <linux/types.h> + + // Define our ioctl's (stolen from spicctrl) +-#define SONYPI_IOCGBRT _IOR('v', 0, __u8) +-#define SONYPI_IOCSBRT _IOW('v', 0, __u8) ++#define SONYPI_IOCGBRT _IOR('v', 0, uint8_t) ++#define SONYPI_IOCSBRT _IOW('v', 0, uint8_t) + + static void create_vaiobright_plug_config(GtkWidget *tab); + static void load_vaiobright_plug_config(gchar *arg); +@@ -88,7 +89,7 @@ static void vaiobright_close_device(void) { + + // Write a new brightness level out to the control application + static void vaiobright_set_brightness(int level) { +- __u8 value = (__u8) level; ++ uint8_t value = (uint8_t) level; + + // If we're broken, try again to open it + if (vaiobright_bslider->broken == 1) { +@@ -105,7 +106,7 @@ static void vaiobright_set_brightness(int level) { + } + + static int vaiobright_get_brightness() { +- __u8 value = 0; ++ uint8_t value = 0; + + // If we're broken, try again to open it + if (vaiobright_bslider->broken == 1) { +-- +2.39.1 + 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 878c46863e63..000000000000 --- 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-r4.ebuild index 8593c3874109..8f5fc00a19ce 100644 --- a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r3.ebuild +++ b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit gkrellm-plugin toolchain-funcs +inherit gkrellm-plugin multilib toolchain-funcs MY_P=${P/gkrellm-/} @@ -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}" @@ -23,6 +23,8 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-textrel.patch "${FILESDIR}"/${P}-fixinfo.patch + "${FILESDIR}"/${P}-Fix-Wreturn-type.patch + "${FILESDIR}"/${P}-Use-standard-int-types.patch ) src_configure() { diff --git a/x11-plugins/gkrellm-vaiobright/metadata.xml b/x11-plugins/gkrellm-vaiobright/metadata.xml index 85e4ed814fa2..641cbd3703e7 100644 --- a/x11-plugins/gkrellm-vaiobright/metadata.xml +++ b/x11-plugins/gkrellm-vaiobright/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> </pkgmetadata> diff --git a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-makefile.patch b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-makefile.patch index 23d822ca7fc8..cc0a16e31b88 100644 --- a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-makefile.patch +++ b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-makefile.patch @@ -1,5 +1,5 @@ ---- a/Makefile 2004-08-19 22:07:27.000000000 +0200 -+++ b/Makefile_new 2013-03-16 21:16:03.919755685 +0100 +--- a/Makefile ++++ b/Makefile_new @@ -3,7 +3,7 @@ PACKAGE ?= gkrellm-volume LOCALEDIR ?= /usr/local/share/locale diff --git a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch index a3e3218dc02f..6aadd5c9248c 100644 --- a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch +++ b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch @@ -1,5 +1,3 @@ -diff --git a/volume.c b/volume.c -index 18418d1..58708d4 100644 --- a/volume.c +++ b/volume.c @@ -74,6 +74,9 @@ static void remove_all_mixers() { 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 e330327d324b..000000000000 --- 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 b3affa03f88b..8cc643552eee 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 @@ -1,8 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit gkrellm-plugin toolchain-funcs + +inherit gkrellm-plugin multilib toolchain-funcs DESCRIPTION="A mixer control plugin for gkrellm" HOMEPAGE="http://gkrellm.luon.net/volume.php" @@ -11,7 +12,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-volume/metadata.xml b/x11-plugins/gkrellm-volume/metadata.xml index 85e4ed814fa2..641cbd3703e7 100644 --- a/x11-plugins/gkrellm-volume/metadata.xml +++ b/x11-plugins/gkrellm-volume/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> </pkgmetadata> diff --git a/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-1.05-r2-pkgconfig.patch b/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-1.05-r2-pkgconfig.patch index 59208c8814bb..55ff0e67e880 100644 --- a/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-1.05-r2-pkgconfig.patch +++ b/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-1.05-r2-pkgconfig.patch @@ -3,12 +3,6 @@ From: Thomas Bracht Laumann Jespersen <t@laumann.xyz> Date: Sat, 26 Mar 2022 16:08:49 +0100 Subject: [PATCH] pkgconfig ---- - Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 13f2dd3..a63b4ab 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ diff --git a/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-makefile.patch b/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-makefile.patch index 425a0a0417ee..7c309be95b60 100644 --- a/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-makefile.patch +++ b/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-makefile.patch @@ -3,8 +3,8 @@ teaches the Makefile to support the user's LDFLAGS. Gentoo-Bug: 338786 ---- a/Makefile 2004-01-05 07:34:36.000000000 +0100 -+++ b/Makefile 2013-03-15 22:11:58.105227982 +0100 +--- a/Makefile ++++ b/Makefile @@ -5,18 +5,16 @@ GKRELLM_INCLUDE = -I$(PREFIX)/include GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 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 eb076714e07d..000000000000 --- 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 c148d04e190e..5d337fbdf60c 100644 --- a/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild +++ b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit gkrellm-plugin toolchain-funcs +inherit gkrellm-plugin multilib toolchain-funcs DESCRIPTION="XKB keyboard switcher for gkrellm2" HOMEPAGE="http://tripie.sweb.cz/gkrellm/xkb/" @@ -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/gkrellm-xkb/metadata.xml b/x11-plugins/gkrellm-xkb/metadata.xml index 85e4ed814fa2..641cbd3703e7 100644 --- a/x11-plugins/gkrellm-xkb/metadata.xml +++ b/x11-plugins/gkrellm-xkb/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> </pkgmetadata> diff --git a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5-r1.ebuild b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5-r1.ebuild index a3f3ab6d277b..63baf176087c 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 410946fe33dd..000000000000 --- 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/gkrellmlaunch/metadata.xml b/x11-plugins/gkrellmlaunch/metadata.xml index 0ee768f19d61..93ae15130bfa 100644 --- a/x11-plugins/gkrellmlaunch/metadata.xml +++ b/x11-plugins/gkrellmlaunch/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> <upstream> <remote-id type="sourceforge">gkrellmlaunch</remote-id> </upstream> diff --git a/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch index 4f4bd0e403f3..7cf07197431f 100644 --- a/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch +++ b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch @@ -1,5 +1,5 @@ ---- a/Makefile 2002-12-11 04:36:06.000000000 +0100 -+++ b/Makefile_new 2013-03-16 13:04:00.963512605 +0100 +--- a/Makefile ++++ b/Makefile_new @@ -4,23 +4,26 @@ INSTALLDIR = ${DESTDIR}/usr/lib/gkrellm2/plugins 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 15a6d866c2d2..000000000000 --- 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 35005ac0c50a..fc0bc2407693 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/gkrellmoon/metadata.xml b/x11-plugins/gkrellmoon/metadata.xml index 7157545c0755..1eae391cc8de 100644 --- a/x11-plugins/gkrellmoon/metadata.xml +++ b/x11-plugins/gkrellmoon/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> <upstream> <remote-id type="sourceforge">gkrellmoon</remote-id> </upstream> diff --git a/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch b/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch index 59f1d0a200f9..83bcb283ff0e 100644 --- a/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch +++ b/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch @@ -3,12 +3,6 @@ From: Jim Ramsay <lack@gentoo.org> Date: Wed, 11 Aug 2010 08:37:20 -0400 Subject: [PATCH] Respect LDFLAGS ---- - src/Makefile | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index e618bd4..35a1453 100644 --- a/src/Makefile +++ b/src/Makefile @@ -78,6 +78,8 @@ LFLAGS = -shared 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 cfd3b71cfb01..000000000000 --- 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 33ca3455e91c..589a6c67f0c8 100644 --- a/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild +++ b/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit gkrellm-plugin +inherit gkrellm-plugin multilib toolchain-funcs DESCRIPTION="A plugin for GKrellM2 that has a VU meter and a sound chart" HOMEPAGE="http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html" @@ -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/gkrellmss/metadata.xml b/x11-plugins/gkrellmss/metadata.xml index 85e4ed814fa2..641cbd3703e7 100644 --- a/x11-plugins/gkrellmss/metadata.xml +++ b/x11-plugins/gkrellmss/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> </pkgmetadata> 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 1edfe3999836..000000000000 --- 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 45819d00691d..c849f82400ba 100644 --- a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild +++ b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit gkrellm-plugin toolchain-funcs +inherit gkrellm-plugin multilib toolchain-funcs DESCRIPTION="A plugin for GKrellM that monitors your wireless network card" HOMEPAGE="http://gkrellm.luon.net/gkrellmwireless.php" @@ -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/gkrellmwireless/metadata.xml b/x11-plugins/gkrellmwireless/metadata.xml index 85e4ed814fa2..641cbd3703e7 100644 --- a/x11-plugins/gkrellmwireless/metadata.xml +++ b/x11-plugins/gkrellmwireless/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> </pkgmetadata> diff --git a/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch index d6dfb54e4354..1f3186f652f4 100644 --- a/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch +++ b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch @@ -3,12 +3,6 @@ From: Thomas Bracht Laumann Jespersen <t@laumann.xyz> Date: Sat, 26 Mar 2022 10:32:18 +0100 Subject: [PATCH] pkgconfig ---- - Makefile | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index e5a4895..296f807 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ diff --git a/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r5-fix-implicit-int.patch b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r5-fix-implicit-int.patch new file mode 100644 index 000000000000..f9ee064b0a73 --- /dev/null +++ b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r5-fix-implicit-int.patch @@ -0,0 +1,19 @@ +By default clang16 will not allow implicit integer declarations in function parameters. + +Bug: https://bugs.gentoo.org/874891 + +Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de> +--- a/gkrellshoot.c ++++ b/gkrellshoot.c +@@ -436,7 +436,7 @@ double star_screenx[NUM_STARS]; + double star_screeny[NUM_STARS]; + + static void +-draw_starfield ( chart_index ) ++draw_starfield ( size_t chart_index ) + { + gint i; + guchar b; +-- +2.38.1 + diff --git a/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch b/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch index 8de89009dbbc..9b3dd81c3d1b 100644 --- a/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch +++ b/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch @@ -1,5 +1,5 @@ ---- a/Makefile 2006-12-09 04:24:36.000000000 +0100 -+++ b/Makefile 2013-03-16 13:50:00.147834790 +0100 +--- a/Makefile ++++ b/Makefile @@ -1,16 +1,20 @@ GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags` GTK_LIB = `pkg-config gtk+-2.0 --libs` 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 e6674a3e30d4..000000000000 --- 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-r5.ebuild index d5bff5dbad4b..ff56a3187ad0 100644 --- a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild +++ b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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=" @@ -23,6 +23,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/makefile-respect-flags.patch "${FILESDIR}/${P}"-r4-pkgconfig.patch + "${FILESDIR}/${P}"-r5-fix-implicit-int.patch ) src_compile() { diff --git a/x11-plugins/gkrellshoot/metadata.xml b/x11-plugins/gkrellshoot/metadata.xml index 3d7faef781c6..48af24755ee1 100644 --- a/x11-plugins/gkrellshoot/metadata.xml +++ b/x11-plugins/gkrellshoot/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> <upstream> <remote-id type="sourceforge">gkrellshoot</remote-id> </upstream> diff --git a/x11-plugins/gkrellstock/files/gkrellstock-0.5-ldflags.patch b/x11-plugins/gkrellstock/files/gkrellstock-0.5-ldflags.patch index 116e6ec3e4bd..6ef942944ea9 100644 --- a/x11-plugins/gkrellstock/files/gkrellstock-0.5-ldflags.patch +++ b/x11-plugins/gkrellstock/files/gkrellstock-0.5-ldflags.patch @@ -1,8 +1,6 @@ Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile b/Makefile -index eb26b17..79e4391 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ CC = gcc $(CFLAGS) $(FLAGS) diff --git a/x11-plugins/gkrellstock/gkrellstock-0.5.1-r1.ebuild b/x11-plugins/gkrellstock/gkrellstock-0.5.1-r1.ebuild deleted file mode 100644 index 452543dd2dc6..000000000000 --- a/x11-plugins/gkrellstock/gkrellstock-0.5.1-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic gkrellm-plugin toolchain-funcs - -DESCRIPTION="Get Stock quotes plugin for Gkrellm2" -HOMEPAGE="http://gkrellstock.sourceforge.net/" -SRC_URI="mirror://sourceforge/gkrellstock/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="amd64 ~ppc x86" -IUSE="" - -RDEPEND=" - app-admin/gkrellm:2[X] - dev-libs/glib:2 - x11-libs/gtk+:2 - dev-perl/libwww-perl - dev-perl/Finance-Quote" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${P/s/S}" -PATCHES=( "${FILESDIR}"/${PN}-0.5-ldflags.patch ) - -src_configure() { - append-cppflags $($(tc-getPKG_CONFIG) --cflags gtk+-2.0) - append-flags -fPIC -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - gkrellm-plugin_src_install - dobin GetQuote2 -} diff --git a/x11-plugins/gkrellstock/gkrellstock-0.5.1-r2.ebuild b/x11-plugins/gkrellstock/gkrellstock-0.5.1-r2.ebuild index 6fcbaee5ee28..9d13c976cc54 100644 --- a/x11-plugins/gkrellstock/gkrellstock-0.5.1-r2.ebuild +++ b/x11-plugins/gkrellstock/gkrellstock-0.5.1-r2.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${P/s/S}" LICENSE="GPL-2" SLOT="2" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" RDEPEND=" app-admin/gkrellm:2[X] diff --git a/x11-plugins/gkrellstock/metadata.xml b/x11-plugins/gkrellstock/metadata.xml index 5ff88a6803d2..30a270e4cfe0 100644 --- a/x11-plugins/gkrellstock/metadata.xml +++ b/x11-plugins/gkrellstock/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">gkrellstock</remote-id> - </upstream> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">gkrellstock</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-Respect-LDFLAGS.patch b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-Respect-LDFLAGS.patch index 548039dd0e0b..dc3ddaefab2a 100644 --- a/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-Respect-LDFLAGS.patch +++ b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-Respect-LDFLAGS.patch @@ -1,5 +1,3 @@ -diff --git a/src20/Makefile b/src20/Makefile -index 3e8e62c..ef96fa2 100644 --- a/src20/Makefile +++ b/src20/Makefile @@ -16,6 +16,8 @@ FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) diff --git a/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-reenable.patch b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-reenable.patch index f47b96e88905..4b15d8467e64 100644 --- a/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-reenable.patch +++ b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-reenable.patch @@ -1,5 +1,3 @@ -diff --git a/src20/gkrellsun.c b/src20/gkrellsun.c -index f3adff5..0738bfc 100644 --- a/src20/gkrellsun.c +++ b/src20/gkrellsun.c @@ -1140,7 +1140,10 @@ cb_plugin_disabled() 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 3e9401aa303e..000000000000 --- 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 4d5e865d0b77..6a028f6a52fb 100644 --- a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild +++ b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit gkrellm-plugin toolchain-funcs +inherit gkrellm-plugin multilib toolchain-funcs DESCRIPTION="A GKrellM plugin that shows sunrise and sunset times" HOMEPAGE="http://gkrellsun.sourceforge.net/" @@ -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/gkrellsun/metadata.xml b/x11-plugins/gkrellsun/metadata.xml index 58242da549d6..12ea6bc09219 100644 --- a/x11-plugins/gkrellsun/metadata.xml +++ b/x11-plugins/gkrellsun/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> <upstream> <remote-id type="sourceforge">gkrellsun</remote-id> </upstream> diff --git a/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-r3-pkgconfig.patch b/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-r3-pkgconfig.patch index 552190827da5..6351ffb9991b 100644 --- a/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-r3-pkgconfig.patch +++ b/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-r3-pkgconfig.patch @@ -35,8 +35,6 @@ Makefile and configure should respect user's pkg-config LIBSD = endif INSTALLDIRD ?= $(PREFIXD)/$(DESTDIR) -diff --git a/configure b/configure -index f0b7366..99f58d8 100755 --- a/configure +++ b/configure @@ -4,8 +4,9 @@ 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 337fb6a341b3..000000000000 --- 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 c9faf9266655..2a2d642c9d04 100644 --- a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild +++ b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit gkrellm-plugin toolchain-funcs +inherit gkrellm-plugin multilib toolchain-funcs DESCRIPTION="a GKrellM2 plugin which displays the top three processes" HOMEPAGE="https://sourceforge.net/projects/gkrelltop" @@ -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/gkrelltop/metadata.xml b/x11-plugins/gkrelltop/metadata.xml index 333a771b6259..c13add22299a 100644 --- a/x11-plugins/gkrelltop/metadata.xml +++ b/x11-plugins/gkrelltop/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> <upstream> <remote-id type="sourceforge">gkrelltop</remote-id> </upstream> diff --git a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Move-GrabWeather.patch b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Move-GrabWeather.patch index 5e2eb95e33fc..10d7cfc994bc 100644 --- a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Move-GrabWeather.patch +++ b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Move-GrabWeather.patch @@ -4,13 +4,6 @@ Date: Tue, 24 Aug 2010 12:23:25 -0400 Subject: [PATCH] Move GrabWeather script to $(PREFIX)/libexec/gkrellweather/ This is to avoid a file collision with x11-misc/bbweather (Bug #333289) ---- - Makefile | 4 ++-- - gkrellweather.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index d6dc404..693b4f2 100644 --- a/Makefile +++ b/Makefile @@ -38,13 +38,13 @@ install: @@ -29,8 +22,6 @@ index d6dc404..693b4f2 100644 dist: rm -rf $(PKGNAME)-$(VERSION) -diff --git a/gkrellweather.c b/gkrellweather.c -index 1d4cf4e..224260a 100644 --- a/gkrellweather.c +++ b/gkrellweather.c @@ -721,7 +721,7 @@ apply_air_config (void) diff --git a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-update-locations.patch b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-update-locations.patch index 0faf2627170f..b7190c04f9fe 100644 --- a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-update-locations.patch +++ b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-update-locations.patch @@ -1,5 +1,5 @@ ---- gkrellweather-2.0.8/GrabWeather 2009-01-11 13:15:02.000000000 -0500 -+++ gkrellweather-2.0.8-r1/GrabWeather 2016-08-29 00:02:35.345041005 -0400 +--- a/GrabWeather ++++ b/GrabWeather @@ -12,7 +12,8 @@ $ReportDir = '.wmWeatherReports'; 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 4e0e596730f9..000000000000 --- 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 1a70885d8d3c..eb3d8f00ee1f 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/gkrellweather/metadata.xml b/x11-plugins/gkrellweather/metadata.xml index 85e4ed814fa2..641cbd3703e7 100644 --- a/x11-plugins/gkrellweather/metadata.xml +++ b/x11-plugins/gkrellweather/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> </pkgmetadata> diff --git a/x11-plugins/gkwebmon/Manifest b/x11-plugins/gkwebmon/Manifest index d8d8da7ff8de..5e9a20f7cd6e 100644 --- a/x11-plugins/gkwebmon/Manifest +++ b/x11-plugins/gkwebmon/Manifest @@ -1 +1 @@ -DIST gkwebmon-0.2.tgz 14163 BLAKE2B c6c0c9352e2f68eca56f981abb8188a7a300604c8c0fc05c1b0b95f0cdc117c12e55aeace66f9c3dcc16a13acb2b44683a77de36a83d9e9b7c273ec619173235 SHA512 0af4eaa8636b43232e209e6381a3852eb92b9505da4b19e31137766f4bee7977bf4e4bed40518df0fcc3aef2dc62767c85169e70f1fbfc738bb428ae8affac63 +DIST gkwebmon-0.2.1.tgz 14576 BLAKE2B 12014eef1f73c4b398aeb7e5f5e7821561dd01c2de7d1705f567d60252ce7ce376266612602b58f90bc16dc587d8c5449d791dfd01a9c810fe9c6fb6d05970ce SHA512 f71a106372018c55ca1e31140aedd669df66cb6c3e9613fe5341831fad55e8bdd23c46281c38c553c09d350436bc1e44cee07602a24fc637c7f21f4e0d50cc39 diff --git a/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch b/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch index 5ffe8f12ed42..4c5c786cfed6 100644 --- a/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch +++ b/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch @@ -4,12 +4,6 @@ Date: Mon, 29 Aug 2016 20:44:45 -0400 Subject: [PATCH 1/1] Clean up variable usage in Makefile to support LDFLAGS and friends. ---- - Makefile | 18 +++++++----------- - 1 file changed, 7 insertions(+), 11 deletions(-) - -diff --git a/Makefile b/Makefile -index b422e79..d89977f 100644 --- a/Makefile +++ b/Makefile @@ -3,23 +3,19 @@ diff --git a/x11-plugins/gkwebmon/gkwebmon-0.2-r3.ebuild b/x11-plugins/gkwebmon/gkwebmon-0.2-r3.ebuild deleted file mode 100644 index ed50957c7417..000000000000 --- a/x11-plugins/gkwebmon/gkwebmon-0.2-r3.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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/glib:2 - dev-libs/openssl - x11-libs/gtk+:2" -DEPEND="${RDEPEND}" -BDEPEND="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-r2.ebuild b/x11-plugins/gkwebmon/gkwebmon-0.2.1.ebuild index b915fe941137..2001f084cf9c 100644 --- a/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild +++ b/x11-plugins/gkwebmon/gkwebmon-0.2.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit gkrellm-plugin toolchain-funcs @@ -16,15 +16,16 @@ 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 + dev-libs/glib:2 + dev-libs/openssl:= + x11-libs/gtk+:2 " +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${P}-cc-cflags-ldflags.patch - "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${PN}-0.2-cc-cflags-ldflags.patch + "${FILESDIR}"/${PN}-0.2-fno-common.patch ) src_compile() { diff --git a/x11-plugins/gkwebmon/metadata.xml b/x11-plugins/gkwebmon/metadata.xml index 4c545e85f783..87b87bf394bb 100644 --- a/x11-plugins/gkwebmon/metadata.xml +++ b/x11-plugins/gkwebmon/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> <upstream> <remote-id type="sourceforge">gkwebmon</remote-id> </upstream> diff --git a/x11-plugins/guifications/guifications-2.16-r1.ebuild b/x11-plugins/guifications/guifications-2.16-r1.ebuild new file mode 100644 index 000000000000..e54eb1cf8f87 --- /dev/null +++ b/x11-plugins/guifications/guifications-2.16-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="pidgin-${PN}" +MY_PV="${PV/_beta/beta}" +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="Guifications is a graphical notification plugin for pidgin" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="http://downloads.guifications.org/plugins//Guifications2/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="debug nls" + +RDEPEND="net-im/pidgin[gtk] + x11-libs/gtk+:2" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_configure() { + econf \ + $(use_enable debug ) \ + $(use_enable nls) +} + +src_install() { + default + + find "${D}" -type f -name '*.la' -delete || die "la removal failed" +} diff --git a/x11-plugins/guifications/metadata.xml b/x11-plugins/guifications/metadata.xml index 85e4ed814fa2..e8de1c56b30f 100644 --- a/x11-plugins/guifications/metadata.xml +++ b/x11-plugins/guifications/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>nativemad@gentoo.org</email> + <name>Andreas Schuerch</name> + </maintainer> </pkgmetadata> diff --git a/x11-plugins/i8krellm/files/i8krellm-2.5-Respect-LDFLAGS.patch b/x11-plugins/i8krellm/files/i8krellm-2.5-Respect-LDFLAGS.patch index bc740a415e35..1f879edce023 100644 --- a/x11-plugins/i8krellm/files/i8krellm-2.5-Respect-LDFLAGS.patch +++ b/x11-plugins/i8krellm/files/i8krellm-2.5-Respect-LDFLAGS.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile b/Makefile -index 443a911..ba83210 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ 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 3940327a3c51..000000000000 --- 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 5bdff0ee4969..480e35751f2f 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/i8krellm/metadata.xml b/x11-plugins/i8krellm/metadata.xml index 85e4ed814fa2..641cbd3703e7 100644 --- a/x11-plugins/i8krellm/metadata.xml +++ b/x11-plugins/i8krellm/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> </pkgmetadata> diff --git a/x11-plugins/lurch/metadata.xml b/x11-plugins/lurch/metadata.xml index 6a22e9e318bb..3f7c99e12d7c 100644 --- a/x11-plugins/lurch/metadata.xml +++ b/x11-plugins/lurch/metadata.xml @@ -5,4 +5,7 @@ <email>sping@gentoo.org</email> <name>Sebastian Pipping</name> </maintainer> + <upstream> + <remote-id type="github">gkdr/lurch</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-plugins/pidgin-birthday-reminder/Manifest b/x11-plugins/pidgin-birthday-reminder/Manifest index 639b877d7be2..3659c47abb78 100644 --- a/x11-plugins/pidgin-birthday-reminder/Manifest +++ b/x11-plugins/pidgin-birthday-reminder/Manifest @@ -1 +1,2 @@ +DIST pidgin-birthday-reminder-1.13.tar.gz 535270 BLAKE2B a49477046b99b3949e72d120ca4f09164d3b844d15b5232eacf8c076d7e2dca629a391fe6c86d69d15d77996a6c0a32224126115cd799b7d77dc31a46a9bd69d SHA512 c858c99c01c1105074d2ece46b8f6dbbf4045ee34dee046286a64b1886e32df416d844070a061a6fc8841d9e698f7d129fcf0b0079de0b24a5baf9a2f0b90e75 DIST pidgin-birthday-reminder-1.7.tar.gz 470361 BLAKE2B ea97e495fa04b5a4860b5363034058defcecd0ae7d911ed2f0eb0e56331ece6d66063ae83a2ec0fd346d935a122b35f45818f58755676c7fc598bbd52e5be5be SHA512 1213c193b141f006caf9cfa7b55b052f54f00426414353e758224a1aa35a70436c452b52ea25fa088c346f4f0da25af40b2f4991452a2d3aabf13d40c8438e47 diff --git a/x11-plugins/pidgin-birthday-reminder/metadata.xml b/x11-plugins/pidgin-birthday-reminder/metadata.xml index 539812e55d71..29879cf2a8c6 100644 --- a/x11-plugins/pidgin-birthday-reminder/metadata.xml +++ b/x11-plugins/pidgin-birthday-reminder/metadata.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>nativemad@gentoo.org</email> + <name>Andreas Schuerch</name> + </maintainer> <upstream> - <bugs-to>https://bugs.launchpad.net/pidgin-birthday-reminder</bugs-to> <remote-id type="launchpad">pidgin-birthday-reminder</remote-id> + <remote-id type="github">kgraefe/pidgin-birthday-reminder</remote-id> </upstream> </pkgmetadata> diff --git a/x11-plugins/pidgin-birthday-reminder/pidgin-birthday-reminder-1.13.ebuild b/x11-plugins/pidgin-birthday-reminder/pidgin-birthday-reminder-1.13.ebuild new file mode 100644 index 000000000000..47ac2a78c511 --- /dev/null +++ b/x11-plugins/pidgin-birthday-reminder/pidgin-birthday-reminder-1.13.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Plugin for Pidgin that reminds you of your buddies birthdays" +HOMEPAGE="https://github.com/kgraefe/pidgin-birthday-reminder" +SRC_URI="https://github.com/kgraefe/pidgin-birthday-reminder/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" +IUSE="static-libs" + +RDEPEND="net-im/pidgin:=[gtk]" +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +src_configure() { + econf \ + $(use_enable static-libs static) +} + +src_install() { + default + mkdir "${D}/usr/share/metainfo" + mv "${D}/usr/share/appdata/pidgin-birthday-reminder.metainfo.xml" "${D}/usr/share/metainfo/" + if ! use static-libs ; then + find "${D}" -type f -name '*.la' -delete || die "la removal failed" + fi +} diff --git a/x11-plugins/pidgin-bot-sentry/pidgin-bot-sentry-1.3.0.ebuild b/x11-plugins/pidgin-bot-sentry/pidgin-bot-sentry-1.3.0-r1.ebuild index a7a0b561c70c..7588bf87e5a5 100644 --- a/x11-plugins/pidgin-bot-sentry/pidgin-bot-sentry-1.3.0.ebuild +++ b/x11-plugins/pidgin-bot-sentry/pidgin-bot-sentry-1.3.0-r1.ebuild @@ -1,27 +1,25 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 MY_P="${P#pidgin-}" DESCRIPTION="Bot Sentry is a Pidgin plugin to prevent Instant Message (IM) spam" -HOMEPAGE="http://pidgin-bs.sourceforge.net/" +HOMEPAGE="https://sourceforge.net/projects/pidgin-bs/" SRC_URI="mirror://sourceforge/pidgin-bs/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~riscv ~x86" -IUSE="" RDEPEND="net-im/pidgin[gtk] x11-libs/gtk+:2" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40 +DEPEND="${RDEPEND}" +BDEPEND=">=dev-util/intltool-0.40 virtual/pkgconfig" -S="${WORKDIR}/${MY_P}" - src_install() { default find "${D}" -name '*.la' -delete || die diff --git a/x11-plugins/pidgin-extprefs/metadata.xml b/x11-plugins/pidgin-extprefs/metadata.xml index 0bd805eba8e6..382736252b3d 100644 --- a/x11-plugins/pidgin-extprefs/metadata.xml +++ b/x11-plugins/pidgin-extprefs/metadata.xml @@ -3,8 +3,8 @@ <pkgmetadata> <!-- maintainer-needed --> <longdescription> -A plugin that takes advantage of existing pidgin functionality to provide preferences that are often desired but are not included in pidgin. -</longdescription> + A plugin that takes advantage of existing pidgin functionality to provide preferences that are often desired but are not included in pidgin. + </longdescription> <upstream> <remote-id type="sourceforge">gaim-extprefs</remote-id> </upstream> diff --git a/x11-plugins/pidgin-funyahoo-plusplus/metadata.xml b/x11-plugins/pidgin-funyahoo-plusplus/metadata.xml deleted file mode 100644 index 19138c6308a8..000000000000 --- a/x11-plugins/pidgin-funyahoo-plusplus/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>lori@icanhas.net</email> - <name>Lori Jakab</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <upstream> - <remote-id type="github">EionRobb/funyahoo-plusplus</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-plugins/pidgin-funyahoo-plusplus/pidgin-funyahoo-plusplus-9999.ebuild b/x11-plugins/pidgin-funyahoo-plusplus/pidgin-funyahoo-plusplus-9999.ebuild deleted file mode 100644 index 549de1ad1ec3..000000000000 --- a/x11-plugins/pidgin-funyahoo-plusplus/pidgin-funyahoo-plusplus-9999.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit git-r3 - -DESCRIPTION="Yahoo! (2016) Protocol Plugin for Pidgin" -HOMEPAGE="https://github.com/EionRobb/funyahoo-plusplus" -EGIT_REPO_URI="https://github.com/EionRobb/funyahoo-plusplus" -LICENSE="GPL-3+" -SLOT="0" - -RDEPEND="net-im/pidgin - dev-libs/json-glib" -DEPEND="${RDEPEND} - virtual/pkgconfig" diff --git a/x11-plugins/pidgin-gpg/files/pidgin-gpg-0.9.3_musl-support.patch b/x11-plugins/pidgin-gpg/files/pidgin-gpg-0.9.3_musl-support.patch new file mode 100644 index 000000000000..47de6808fd5c --- /dev/null +++ b/x11-plugins/pidgin-gpg/files/pidgin-gpg-0.9.3_musl-support.patch @@ -0,0 +1,32 @@ +From https://github.com/Draghtnod/Pidgin-GPG/pull/9 +From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com> +Date: Sat, 17 Feb 2024 13:28:40 +0300 +Subject: [PATCH] Fix compilation on MUSL systems + +In MUSL encrypt() is part of unistd.h, which conflicts with internal +static function encrypt(). Renamed last one to fix that. + +See: https://bugs.gentoo.org/831185 +--- a/src/pidgin-gpg.c ++++ b/src/pidgin-gpg.c +@@ -604,7 +604,7 @@ static char* verify( const char* sig_str ) { + * encrypt a plain string with the key found with fingerprint fpr + * FREE MEMORY AFTER USAGE OF RETURN VALUE! + * ------------------ */ +-static char* encrypt( gpgme_ctx_t* ctx, gpgme_key_t* key_arr, const char* plain_str, const char* fpr ) { ++static char* pidgin_gpg_encrypt( gpgme_ctx_t* ctx, gpgme_key_t* key_arr, const char* plain_str, const char* fpr ) { + if( ctx == NULL ) { + purple_debug_error( PLUGIN_ID, "encrypt: missing ctx\n" ); + return NULL; +@@ -1054,7 +1054,7 @@ void jabber_send_signal_cb( PurpleConnection* pc, xmlnode** packet, gpointer unu + g_free( bare_jid ); + + // encrypt message +- enc_str = encrypt( &item->ctx, item->key_arr, message, item->fpr ); ++ enc_str = pidgin_gpg_encrypt( &item->ctx, item->key_arr, message, item->fpr ); + g_free( message ); + if( enc_str != NULL ) { + // remove message from body +-- +2.43.0 + diff --git a/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.3-r1.ebuild b/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.3-r1.ebuild index ac3eeac2c984..03ca90a1df37 100644 --- a/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.3-r1.ebuild +++ b/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,6 +20,10 @@ BDEPEND="virtual/pkgconfig" S="${WORKDIR}/Pidgin-GPG-${PV}" +PATCHES=( + "${FILESDIR}/pidgin-gpg-0.9.3_musl-support.patch" +) + src_prepare() { default eautoreconf diff --git a/x11-plugins/pidgin-hotkeys/metadata.xml b/x11-plugins/pidgin-hotkeys/metadata.xml index 59c00cc967ef..44b8a99cfc0a 100644 --- a/x11-plugins/pidgin-hotkeys/metadata.xml +++ b/x11-plugins/pidgin-hotkeys/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>nativemad@gentoo.org</email> + <name>Andreas Schuerch</name> + </maintainer> <upstream> <remote-id type="sourceforge">pidgin-hotkeys</remote-id> </upstream> diff --git a/x11-plugins/pidgin-hotkeys/pidgin-hotkeys-0.2.4-r1.ebuild b/x11-plugins/pidgin-hotkeys/pidgin-hotkeys-0.2.4-r1.ebuild new file mode 100644 index 000000000000..bb859ee62736 --- /dev/null +++ b/x11-plugins/pidgin-hotkeys/pidgin-hotkeys-0.2.4-r1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Pidgin plugin to define global hotkeys for various actions" +HOMEPAGE="https://sourceforge.net/projects/pidgin-hotkeys/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~riscv ~x86" + +RDEPEND="net-im/pidgin[gtk] + x11-libs/gtk+:2" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_install() { + default + + find "${D}" -type f -name '*.la' -delete || die +} diff --git a/x11-plugins/pidgin-indicator/files/pidgin-indicator-1.0.1-ayatana-indicator.patch b/x11-plugins/pidgin-indicator/files/pidgin-indicator-1.0.1-ayatana-indicator.patch new file mode 100644 index 000000000000..f3061bc8dee1 --- /dev/null +++ b/x11-plugins/pidgin-indicator/files/pidgin-indicator-1.0.1-ayatana-indicator.patch @@ -0,0 +1,59 @@ +From 0376453849ca2e7ba5ab1ff7feb7a527ec0b1045 Mon Sep 17 00:00:00 2001 +From: Kevin Locke <kevin@kevinlocke.name> +Date: Tue, 22 Feb 2022 18:43:11 -0700 +Subject: [PATCH] Support Ayatana AppIndicators + +Ubuntu AppIndicator ([libappindicator]) was [removed in Debian Bullseye] +and has been superseded by Ayatana AppIndicator +([libayatana-appindicator]) for both [Debian] and [Ubuntu]. + +Add support for building with libayatana-appindicator instead of +libappindicator. + +[libappindicator]: https://launchpad.net/libappindicator +[libayatana-appindicator]: https://github.com/AyatanaIndicators/libayatana-appindicator +[Debian]: https://lists.debian.org/debian-devel/2018/03/msg00506.html +[Ubuntu]: https://bugs.launchpad.net/ubuntu/+source/libayatana-appindicator/+bug/1915695 +[removed in Debian Bullseye]: https://www.debian.org/releases/bullseye/amd64/release-notes/ch-information.en.html#noteworthy-obsolete-packages + +Signed-off-by: Kevin Locke <kevin@kevinlocke.name> +--- + configure.ac | 6 +++++- + debian/control | 2 +- + src/pidgin-indicator.c | 6 +++++- + 3 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fefd90d..195651e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -96,7 +96,11 @@ PKG_CHECK_MODULES(GTK, [gtk+-2.0]) + AC_SUBST(GTK_LIBS) + AC_SUBST(GTK_CFLAGS) + +-PKG_CHECK_MODULES(INDICATOR, [appindicator3-0.1]) ++PKG_CHECK_MODULES( ++ [INDICATOR], ++ [ayatana-appindicator3-0.1], ++ [AC_DEFINE([HAVE_AYATANA_INDICATOR], [1], [Have Ayatana AppIndicator])], ++ [PKG_CHECK_MODULES([INDICATOR], [appindicator3-0.1])]) + AC_SUBST(INDICATOR_LIBS) + AC_SUBST(INDICATOR_CFLAGS) + +diff --git a/src/pidgin-indicator.c b/src/pidgin-indicator.c +index 9eeb8a4..9382a95 100644 +--- a/src/pidgin-indicator.c ++++ b/src/pidgin-indicator.c +@@ -41,7 +41,11 @@ + #include <savedstatuses.h> + #include <version.h> + +-#include <libappindicator/app-indicator.h> ++#ifdef HAVE_AYATANA_INDICATOR ++# include <libayatana-appindicator/app-indicator.h> ++#else ++# include <libappindicator/app-indicator.h> ++#endif + + #include "docklet.h" + diff --git a/x11-plugins/pidgin-indicator/metadata.xml b/x11-plugins/pidgin-indicator/metadata.xml index b04f4b7da0d0..b4940dcfe9a1 100644 --- a/x11-plugins/pidgin-indicator/metadata.xml +++ b/x11-plugins/pidgin-indicator/metadata.xml @@ -2,7 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>pacho@gentoo.org</email> - <name>Pacho Ramos</name> + <email>pacho@gentoo.org</email> + <name>Pacho Ramos</name> </maintainer> +<upstream> + <remote-id type="github">philipl/pidgin-indicator</remote-id> +</upstream> </pkgmetadata> diff --git a/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild b/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1-r2.ebuild index 381a03e9919d..dba9659c6757 100644 --- a/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild +++ b/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools xdg DESCRIPTION="AppIndicator/KStatusNotifierItem plugin for Pidgin" @@ -16,7 +16,7 @@ IUSE="" # No direct gtk3 until pidgin migrates: # https://github.com/philipl/pidgin-indicator/issues/32 RDEPEND=" - dev-libs/libappindicator:3 + dev-libs/libayatana-appindicator net-im/pidgin[gtk] x11-libs/gtk+:2 " @@ -31,14 +31,15 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${P}-appindicator3.patch" + "${FILESDIR}/${P}-ayatana-indicator.patch" ) src_prepare() { - xdg_src_prepare + default eautoreconf } src_install() { default - find "${D}" -name '*.la' -delete || die "Pruning failed" + find "${ED}" -type f -name '*.la' -delete || die } diff --git a/x11-plugins/pidgin-led-notification/metadata.xml b/x11-plugins/pidgin-led-notification/metadata.xml index 85e4ed814fa2..e8de1c56b30f 100644 --- a/x11-plugins/pidgin-led-notification/metadata.xml +++ b/x11-plugins/pidgin-led-notification/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>nativemad@gentoo.org</email> + <name>Andreas Schuerch</name> + </maintainer> </pkgmetadata> diff --git a/x11-plugins/pidgin-led-notification/pidgin-led-notification-0.1.ebuild b/x11-plugins/pidgin-led-notification/pidgin-led-notification-0.1-r1.ebuild index 00d21c5669c0..da59b6d4d098 100644 --- a/x11-plugins/pidgin-led-notification/pidgin-led-notification-0.1.ebuild +++ b/x11-plugins/pidgin-led-notification/pidgin-led-notification-0.1-r1.ebuild @@ -1,29 +1,27 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs -MY_PN=${PN/pidgin-/} -MY_P=${MY_PN}-${PV} +MY_PN="${PN/pidgin-/}" +MY_P="${MY_PN}-${PV}" DESCRIPTION="Pidgin plugin to notify by writing user defined strings to (led control) files" HOMEPAGE="https://sites.google.com/site/simohmattila/led-notification" SRC_URI="https://sites.google.com/site/simohmattila/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~arm ~riscv ~x86" -IUSE="" RDEPEND=" net-im/pidgin[gtk] x11-libs/gtk+:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-hardware.patch ) diff --git a/x11-plugins/pidgin-libnotify/metadata.xml b/x11-plugins/pidgin-libnotify/metadata.xml index d2ead32ea16b..caaf7205d7df 100644 --- a/x11-plugins/pidgin-libnotify/metadata.xml +++ b/x11-plugins/pidgin-libnotify/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>nativemad@gentoo.org</email> + <name>Andreas Schuerch</name> + </maintainer> <upstream> <remote-id type="sourceforge">gaim-libnotify</remote-id> </upstream> diff --git a/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r2.ebuild b/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r2.ebuild new file mode 100644 index 000000000000..355ebc642121 --- /dev/null +++ b/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Pidgin-libnotify provides popups for pidgin via a libnotify interface" +HOMEPAGE="https://gaim-libnotify.sourceforge.net/" +SRC_URI="mirror://sourceforge/gaim-libnotify/${P}.tar.gz + mirror://debian/pool/main/p/${PN}/${PN}_${PV}-4.debian.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~riscv ~x86" +IUSE="nls debug" + +RDEPEND=">=x11-libs/libnotify-0.3.2 + net-im/pidgin[gtk] + x11-libs/gtk+:2" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${WORKDIR}/debian/patches" + "${FILESDIR}/${P}-libnotify-0.7.patch" +) + +src_prepare() { + default + sed -i -e '/CFLAGS/s:-g3::' configure || die "sed failed" +} + +src_configure() { + econf \ + --disable-static \ + $(use_enable debug) \ + $(use_enable nls) +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die "Pruning failed" +} diff --git a/x11-plugins/pidgin-mbpurple/metadata.xml b/x11-plugins/pidgin-mbpurple/metadata.xml index 61a93d27d668..daef1582193d 100644 --- a/x11-plugins/pidgin-mbpurple/metadata.xml +++ b/x11-plugins/pidgin-mbpurple/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>nativemad@gentoo.org</email> + <name>Andreas Schuerch</name> + </maintainer> <use> <flag name="twitgin">Enable graphical plugin for Gtk+ interface of Pidgin.</flag> </use> diff --git a/x11-plugins/pidgin-mbpurple/pidgin-mbpurple-0.3.0-r3.ebuild b/x11-plugins/pidgin-mbpurple/pidgin-mbpurple-0.3.0-r3.ebuild new file mode 100644 index 000000000000..fc5eecc24d38 --- /dev/null +++ b/x11-plugins/pidgin-mbpurple/pidgin-mbpurple-0.3.0-r3.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_P="${P/pidgin-/}" + +DESCRIPTION="Pidgin plug-in supporting microblog services like Twitter or identi.ca" +HOMEPAGE="https://code.google.com/archive/p/microblog-purple/" +SRC_URI="https://microblog-purple.googlecode.com/files/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" +IUSE="+twitgin" + +RDEPEND="net-im/pidgin + twitgin? ( net-im/pidgin[gtk] )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + # upstream Issue 226 (Respect LDFLAGS) + sed -i "/^LDFLAGS/d" global.mak || die "sed for LDFLAGS failed" + + # upstream Issue 225 (Warnings during compilation using make -j2) + sed -i "s/make /\$(MAKE) /g" Makefile || die "sed #2 failed" + + # upstream Issue 224 (configurable twitgin) + if ! use twitgin; then + sed -i 's/twitgin//g' Makefile || die + fi +} + +src_configure() { + tc-export CC +} diff --git a/x11-plugins/pidgin-otr/files/pidgin-otr-4.0.2-dont-clobber-fortify-source.patch b/x11-plugins/pidgin-otr/files/pidgin-otr-4.0.2-dont-clobber-fortify-source.patch new file mode 100644 index 000000000000..e630185cc45f --- /dev/null +++ b/x11-plugins/pidgin-otr/files/pidgin-otr-4.0.2-dont-clobber-fortify-source.patch @@ -0,0 +1,21 @@ +Don't clobber our toolchain defaults. + +https://bugs.gentoo.org/898526 +--- a/configure.ac ++++ b/configure.ac +@@ -141,7 +141,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ + ])], have_clang=yes, have_clang=no) + + if test x$enable_gcc_hardening != xno; then +- CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" ++ CFLAGS="$CFLAGS" + if test x$have_clang = xyes; then + OTR_CHECK_CFLAGS(-Qunused-arguments) + fi +@@ -166,4 +166,6 @@ if test x$enable_linker_hardening != xno; then + OTR_CHECK_LDFLAGS(-z relro -z now, "$all_ldflags_for_check", "$all_libs_for_check") + fi + ++AX_ADD_FORTIFY_SOURCE ++ + AC_OUTPUT([Makefile po/Makefile.in]) diff --git a/x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r1.ebuild b/x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r2.ebuild index fce6c905d795..e6f68bb0cbb3 100644 --- a/x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r1.ebuild +++ b/x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r2.ebuild @@ -3,6 +3,8 @@ EAPI=8 +inherit autotools + DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging" HOMEPAGE="http://www.cypherpunks.ca/otr/" SRC_URI="http://www.cypherpunks.ca/otr/${P}.tar.gz" @@ -24,6 +26,11 @@ BDEPEND=" DOCS=( AUTHORS ChangeLog NEWS README ) +src_prepare() { + default + eautoreconf +} + src_install() { default diff --git a/x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r3.ebuild b/x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r3.ebuild new file mode 100644 index 000000000000..53e2e68dbd8f --- /dev/null +++ b/x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging" +HOMEPAGE="http://www.cypherpunks.ca/otr/" +SRC_URI="http://www.cypherpunks.ca/otr/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + +RDEPEND=" + dev-libs/libgcrypt:0 + net-im/pidgin[gtk] + >=net-libs/libotr-4.0.0 + x11-libs/gtk+:2 +" +DEPEND="${RDEPEND}" +# autoconf-archive for F_S patch +BDEPEND=" + dev-util/intltool + dev-build/autoconf-archive + virtual/pkgconfig +" + +DOCS=( AUTHORS ChangeLog NEWS README ) + +PATCHES=( + "${FILESDIR}"/${PN}-4.0.2-dont-clobber-fortify-source.patch +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/x11-plugins/pidgin-privacy-please/metadata.xml b/x11-plugins/pidgin-privacy-please/metadata.xml index c3c97dea8658..11298de835d5 100644 --- a/x11-plugins/pidgin-privacy-please/metadata.xml +++ b/x11-plugins/pidgin-privacy-please/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>nativemad@gentoo.org</email> + <name>Andreas Schuerch</name> + </maintainer> <upstream> <remote-id type="google-code">pidgin-privacy-please</remote-id> </upstream> diff --git a/x11-plugins/pidgin-privacy-please/pidgin-privacy-please-0.7.1-r1.ebuild b/x11-plugins/pidgin-privacy-please/pidgin-privacy-please-0.7.1-r1.ebuild new file mode 100644 index 000000000000..8c2af2004dc2 --- /dev/null +++ b/x11-plugins/pidgin-privacy-please/pidgin-privacy-please-0.7.1-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Pidgin plugin to stop spammers from annoying you" +HOMEPAGE="https://code.google.com/p/pidgin-privacy-please/" +SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~riscv" + +RDEPEND="<net-im/pidgin-3[gtk]" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + sys-devel/gettext" + +src_prepare() { + default + sed -e 's: -Wall -g3::' -i configure.ac || die + eautoreconf +} + +src_install() { + default + + find "${D}" -type f -name '*.la' -delete || die "la removal failed" +} diff --git a/x11-plugins/pidgin-rhythmbox/pidgin-rhythmbox-2.0.ebuild b/x11-plugins/pidgin-rhythmbox/pidgin-rhythmbox-2.0.ebuild index 242ddbd16662..38b967a053ad 100644 --- a/x11-plugins/pidgin-rhythmbox/pidgin-rhythmbox-2.0.ebuild +++ b/x11-plugins/pidgin-rhythmbox/pidgin-rhythmbox-2.0.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://jon.oberheide.org/${PN}/downloads/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~sparc x86" +KEYWORDS="amd64" IUSE="" RDEPEND="net-im/pidgin diff --git a/x11-plugins/pidgin-sipe/files/pidgin-sipe-1.25.0-bashisms.patch b/x11-plugins/pidgin-sipe/files/pidgin-sipe-1.25.0-bashisms.patch new file mode 100644 index 000000000000..083d41bd0fde --- /dev/null +++ b/x11-plugins/pidgin-sipe/files/pidgin-sipe-1.25.0-bashisms.patch @@ -0,0 +1,53 @@ +Fix bashisms in configure script. + +Bug: https://bugs.gentoo.org/821451 + +--- a/configure.ac ++++ b/configure.ac +@@ -444,10 +444,10 @@ + [PKG_CHECK_MODULES(_SIPE_MEDIA_RECHECK_PLEASE_IGNORE, [$purple_pkgconfig >= 2.8.0], + dnl check purple pkgconfig for gstreamer version + [gstreamer_pkgconfig=`$PKG_CONFIG --variable=gstreamer $purple_pkgconfig` +- AS_IF([test "x$gstreamer_pkgconfig" == x], +- [AS_IF([test "x$purple_pkgconfig" == xpurple-3], ++ AS_IF([test "x$gstreamer_pkgconfig" = x], ++ [AS_IF([test "x$purple_pkgconfig" = xpurple-3], + [gstreamer_pkgconfig=1.0])]) +- AS_IF([test "x$gstreamer_pkgconfig" == x1.0], ++ AS_IF([test "x$gstreamer_pkgconfig" = x1.0], + [gstreamer_pkgconfig="gstreamer-$gstreamer_pkgconfig gstreamer-rtp-$gstreamer_pkgconfig" + + AC_MSG_NOTICE([using packages "$gstreamer_pkgconfig".]) +@@ -556,18 +556,18 @@ + AM_CONDITIONAL(SIPE_WITH_VV, [test "x$with_purple_vv" != xno]) + + dnl raw data RTP streams enable Lync file transfer +-AM_CONDITIONAL(SIPE_HAVE_XDATA, [test "x$ac_have_xdata" == xyes]) +-AS_IF([test "x$ac_have_xdata" == xyes], ++AM_CONDITIONAL(SIPE_HAVE_XDATA, [test "x$ac_have_xdata" = xyes]) ++AS_IF([test "x$ac_have_xdata" = xyes], + [AC_DEFINE(HAVE_XDATA, 1, [Define if we have raw data RTP in media backend.])]) + + dnl enable appshare support +-AM_CONDITIONAL(SIPE_HAVE_APPSHARE, [test "x$ac_have_appshare" == xyes]) +-AS_IF([test "x$ac_have_appshare" == xyes], ++AM_CONDITIONAL(SIPE_HAVE_APPSHARE, [test "x$ac_have_appshare" = xyes]) ++AS_IF([test "x$ac_have_appshare" = xyes], + [AC_DEFINE(HAVE_APPSHARE, 1, [Define to 1 if we have appshare support.])]) + + dnl RDP server for sharing local desktop + AM_CONDITIONAL(SIPE_HAVE_APPSHARE_SERVER, [test "x$ac_have_appshare_server" = xyes]) +-AS_IF([test "x$ac_have_appshare_server" == xyes], ++AS_IF([test "x$ac_have_appshare_server" = xyes], + [AC_DEFINE(HAVE_APPSHARE_SERVER, 1, [Define if appshare server is enabled.])]) + + dnl libpurple API relies on GParameter (deprecated in glib-2.0 >= 2.62.0) +@@ -584,7 +584,7 @@ + [We need GValueArray for which no replacement is available]) + ]) + dnl libpurple 2.x API relies on G_CONST_RETURN (deprecated in glib-2.0 >= 2.30.0) +-AS_IF([test "x$purple_pkgconfig" == xpurple], ++AS_IF([test "x$purple_pkgconfig" = xpurple], + [AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_28, + [libpurple 2.x API uses G_CONST_RETURN]) + ]) diff --git a/x11-plugins/pidgin-sipe/metadata.xml b/x11-plugins/pidgin-sipe/metadata.xml index ce435e0f5671..e7d8bfdc253b 100644 --- a/x11-plugins/pidgin-sipe/metadata.xml +++ b/x11-plugins/pidgin-sipe/metadata.xml @@ -3,8 +3,8 @@ <pkgmetadata> <!-- maintainer-needed --> <longdescription lang="en"> -An Open Implementation of SIP/Simple protocol for Live Communications Server 2003/2005/2007 and Lync. -</longdescription> + An Open Implementation of SIP/Simple protocol for Live Communications Server 2003/2005/2007 and Lync. + </longdescription> <use> <flag name="ocs2005-message-hack">Disable message timeout for OCS2005 clients which causes "false" not delivered error messages</flag> <flag name="telepathy">Support use as a telepathy backend</flag> diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild index 4b73a6e3e9c1..bbdf8d917086 100644 --- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild +++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,6 +7,8 @@ DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)" HOMEPAGE="http://sipe.sourceforge.net/" SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz" +inherit autotools + LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" @@ -43,6 +45,13 @@ BDEPEND=" virtual/pkgconfig " +src_prepare() { + eapply "${FILESDIR}"/${PN}-1.25.0-bashisms.patch + + eautoreconf + default +} + src_configure() { local myeconfargs=( --enable-purple diff --git a/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3-r1.ebuild b/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3-r1.ebuild index 698501dcb085..daea5a9a1079 100644 --- a/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3-r1.ebuild +++ b/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="A Pidgin plugin that merges the Buddy List window with a conversation window" HOMEPAGE="https://github.com/dm0-/window_merge" -SRC_URI="https://github.com/downloads/dm0-/${PN#pidgin-}/${P#pidgin-}.tar.gz" +SRC_URI="mirror://gentoo/${P#pidgin-}.tar.gz" LICENSE="GPL-3" SLOT="0" diff --git a/x11-plugins/pidgin-xmpp-receipts/metadata.xml b/x11-plugins/pidgin-xmpp-receipts/metadata.xml index bef24d2c2337..d0bb041ddfbb 100644 --- a/x11-plugins/pidgin-xmpp-receipts/metadata.xml +++ b/x11-plugins/pidgin-xmpp-receipts/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">noonien-d/pidgin-xmpp-receipts</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-plugins/purple-hangouts/Manifest b/x11-plugins/purple-hangouts/Manifest deleted file mode 100644 index d0248dc056ef..000000000000 --- a/x11-plugins/purple-hangouts/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST purple-hangouts-0_p20200710.tar.gz 153541 BLAKE2B 7a71cb5fdb7ca0636b4eb3d4245347e057e879a6b855451b9330f33cec6ba1a15da071e916a3e3d38094700cd61178947e5aa749e6182d3d0488e01c673568f5 SHA512 ce650c1ee1052803576e163905e906bb6202ce04ea380b52ae7524ec896ad785c1a89a5bc713242e3ad5df2d3ae677e0bd5323c7533daedaf6ac333d8e2f5b34 diff --git a/x11-plugins/purple-hangouts/metadata.xml b/x11-plugins/purple-hangouts/metadata.xml deleted file mode 100644 index c81a2d69675b..000000000000 --- a/x11-plugins/purple-hangouts/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">EionRobb/purple-hangouts</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-plugins/purple-hangouts/purple-hangouts-0_p20200710.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-0_p20200710.ebuild deleted file mode 100644 index f461413cc277..000000000000 --- a/x11-plugins/purple-hangouts/purple-hangouts-0_p20200710.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Hangouts Plugin for libpurple" -HOMEPAGE="https://github.com/EionRobb/purple-hangouts" - -COMMIT_ID="efa7a53e2db4087a1590850423aa16b380bfbbd5" -SRC_URI="https://github.com/EionRobb/purple-hangouts/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${COMMIT_ID}" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="dev-libs/glib:2 - dev-libs/json-glib - dev-libs/protobuf-c:= - net-im/pidgin - sys-libs/zlib" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - - # Does not respect CFLAGS - sed -i Makefile -e 's/-g -ggdb//g' || die -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" -} - -src_install() { - emake \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - DESTDIR="${ED}" \ - install - - einstalldocs -} diff --git a/x11-plugins/vicious/Manifest b/x11-plugins/vicious/Manifest index 943dd61e014f..be914313cc3c 100644 --- a/x11-plugins/vicious/Manifest +++ b/x11-plugins/vicious/Manifest @@ -1 +1,2 @@ -DIST vicious-2.5.1.tar.gz 68635 BLAKE2B fa952f878140e76a44bde98ab928fe2a01a12f0e931a4f8ee366acba584661a0e42b150d4f69bfaaf7c58c68d57d2e261d8b586fb1abbd329d9f30fe90c2e21d SHA512 63de92a4e7d666d5737bfc0f50857c48f40818e5f1cf81ba672284db764c68d151f73afd6507b7392b38ae91cf1d18104284618430d15dd8837c56a0283571fe +DIST vicious-2.6.0.tar.gz 69108 BLAKE2B de86326b8975511cf053e6707bdc133ad23c95cadd64190de326bfae2c710a2f97b7cbc102cf88f14e6ebfdeface2896862b52521ba5d83a47014bc7bd65d0d3 SHA512 d8107ab1bad80b115789d7dbda44568cee17546f76c03889028f61f8293d9c897eec1cb7f96b973a39f0c94889c13f13c6cbccb944390c80820a327691223af6 +DIST vicious-2.7.0.tar.gz 69420 BLAKE2B 5de98a40e2cf0c0d02820c4bc3a6c1f349a0a2efa9b1947ff39b522fe0c58ea92e1772e16d4b798147e985dcd37b4b8c31b67f3c4d791b3d1594af5d13d6b716 SHA512 683816be5a667671ae11b7aa1f5ca718a79f03ebdde8c38a44f2648c1cfd3facea256f0cad04f963ba00766427f8196050a77ff7446ef427a31adfeb0fb6799c diff --git a/x11-plugins/vicious/vicious-2.5.1.ebuild b/x11-plugins/vicious/vicious-2.6.0.ebuild index be454b1fadb4..d0818ac178f4 100644 --- a/x11-plugins/vicious/vicious-2.5.1.ebuild +++ b/x11-plugins/vicious/vicious-2.6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/x11-plugins/vicious/vicious-2.7.0.ebuild b/x11-plugins/vicious/vicious-2.7.0.ebuild new file mode 100644 index 000000000000..b76d5eb36a21 --- /dev/null +++ b/x11-plugins/vicious/vicious-2.7.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 ~riscv ~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.1 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/wmDownload/files/wmDownload-0.1.2a-shorten-integers.patch b/x11-plugins/wmDownload/files/wmDownload-0.1.2a-shorten-integers.patch new file mode 100644 index 000000000000..9a48e8e1ce4c --- /dev/null +++ b/x11-plugins/wmDownload/files/wmDownload-0.1.2a-shorten-integers.patch @@ -0,0 +1,13 @@ +unsigned shorts are enough for libdockapp. Ought to be enough for size of widget +diff -ru wmDownload.orig/wmDownload.c wmDownload/wmDownload.c +--- wmDownload.orig/wmDownload.c 2024-04-02 06:30:58.407108657 +0000 ++++ wmDownload/wmDownload.c 2024-04-02 06:32:26.445684633 +0000 +@@ -266,7 +266,7 @@ + + int main (int argc, char **argv) + { +- unsigned int height, width; ++ unsigned short height, width; + + DACallbacks callbacks = { NULL, buttonPressCallback, NULL, NULL, NULL, NULL, NULL }; + diff --git a/x11-plugins/wmDownload/files/wmDownload-strtouq-musl.patch b/x11-plugins/wmDownload/files/wmDownload-strtouq-musl.patch new file mode 100644 index 000000000000..3a9a5d00b206 --- /dev/null +++ b/x11-plugins/wmDownload/files/wmDownload-strtouq-musl.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/898922 +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Sun, 14 May 2023 14:39:59 +0530 +Subject: [PATCH] Don't use strtouq while building on non-glibc system + +Bug: https://bugs.gentoo.org/898922 +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +--- a/wmDownload.c ++++ b/wmDownload.c +@@ -205,7 +205,11 @@ void checknetstats () + { + p = (char *)strtok (NULL, tokens); + ++#ifdef __GLIBC__ + bytes = strtouq(p, NULL, 0); ++#else ++ bytes = strtoul(p, NULL, 0); ++#endif + + kbytes = (bytes == 0)?0:bytes/base; + bytes = bytes%base; +-- +2.40.1 + diff --git a/x11-plugins/wmDownload/wmDownload-0.1.2a-r3.ebuild b/x11-plugins/wmDownload/wmDownload-0.1.2a-r3.ebuild index ca74298aa724..c268bbecd2a5 100644 --- a/x11-plugins/wmDownload/wmDownload-0.1.2a-r3.ebuild +++ b/x11-plugins/wmDownload/wmDownload-0.1.2a-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ inherit toolchain-funcs DESCRIPTION="dockapp that displays how much data you've received on each eth and ppp device" SRC_URI="mirror://sourceforge/wmdownload/${P}.tar.gz" -HOMEPAGE="http://wmdownload.sourceforge.net/" +HOMEPAGE="https://wmdownload.sourceforge.net/" LICENSE="GPL-2" SLOT="0" diff --git a/x11-plugins/wmDownload/wmDownload-0.1.2a-r5.ebuild b/x11-plugins/wmDownload/wmDownload-0.1.2a-r5.ebuild new file mode 100644 index 000000000000..b99cf3c89f26 --- /dev/null +++ b/x11-plugins/wmDownload/wmDownload-0.1.2a-r5.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit toolchain-funcs + +DESCRIPTION="dockapp that displays how much data you've received on each eth and ppp device" +HOMEPAGE="https://wmdownload.sourceforge.net/" +SRC_URI="mirror://sourceforge/wmdownload/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +RDEPEND=">=x11-libs/libdockapp-0.7:= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${PN}" + +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${PN}-strtouq-musl.patch + "${FILESDIR}"/${P}-shorten-integers.patch + +) +DOCS=( CHANGELOG CREDITS HINTS README TODO ) + +src_prepare() { + sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die + default +} + +src_compile() { + emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" +} diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild index 5b686f451ee5..9106a1b5129e 100644 --- a/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild +++ b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -27,6 +27,12 @@ PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) +src_prepare() { + default + # Use real usleep on modern systems + sed -e "s/short_uusleep/usleep/" -i wmMatrix.c || die +} + src_compile() { # this version is distributed with compiled binaries! make clean diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r2.ebuild index 7fdcae9bcf96..657dd464266d 100644 --- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild +++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -11,13 +11,14 @@ MY_PV_PATCH="${PV/_p/-}" MY_P_ORIG="${MY_PN}_${MY_PV_ORIG}.orig" MY_P_PATCH="${MY_PN}_${MY_PV_PATCH}.diff" -DESCRIPTION="dockapp showing weather at geosynchronous orbit" +DESCRIPTION="Dockapp showing weather at geosynchronous orbit" HOMEPAGE="https://www.dockapps.net/wmspaceweather" SRC_URI="mirror://debian/pool/main/w/${MY_PN}/${MY_P_ORIG}.tar.gz mirror://debian/pool/main/w/${MY_PN}/${MY_P_PATCH}.gz" +S="${WORKDIR}/${MY_P_ORIG/_/-}/${PN}" SLOT="0" -LICENSE="GPL-2" +LICENSE="GPL-2+" KEYWORDS="amd64 ~hppa ~mips ppc ~sparc x86" DOCS=( ../{BUGS,CHANGES,HINTS,README} ) @@ -31,8 +32,6 @@ RDEPEND="${CDEPEND} net-misc/curl dev-lang/perl" -S="${WORKDIR}/${MY_P_ORIG/_/-}/${PN}" - src_prepare() { default diff --git a/x11-plugins/wmSun/Manifest b/x11-plugins/wmSun/Manifest index c0006533da1a..80c12831e959 100644 --- a/x11-plugins/wmSun/Manifest +++ b/x11-plugins/wmSun/Manifest @@ -1 +1,2 @@ DIST wmsun-1.05.tar.gz 20680 BLAKE2B 86e75467133b23e3f062203df6bbd8fe0aa1ca90c468bd91f3de3ec360e4d677bf5a117becf63e111557a17dbf346a1b23a61b78030d197264d71989097c9d77 SHA512 baa610db04ba67ca09112765e28c0fa945a98a61b642925dbaaa56a5b3e7da7424d8dd15097dcec932e3b603219d1f8806c0e50c025370226a157791f16911da +DIST wmsun-1.06.tar.gz 20127 BLAKE2B 29321a11e652d90b62eea54c0db30154f65a1b7f9b9c1638784888fdf17205d4fb2976f39c47508b1822492ceea46fc12df5fc4739d5c1db5f6bdbc0f8018ab3 SHA512 475ebbce615b7b0ba24994654a8cd1e1429bda02d0b95522e8998c2be6ee11830c16be913e295cd77886fe51ac95801cc84c3ff4eb160c70d173e80e43af70ca diff --git a/x11-plugins/wmSun/wmSun-1.06.ebuild b/x11-plugins/wmSun/wmSun-1.06.ebuild new file mode 100644 index 000000000000..c101aec990ed --- /dev/null +++ b/x11-plugins/wmSun/wmSun-1.06.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit toolchain-funcs + +MY_P=${P/S/s} +DESCRIPTION="dockapp which displays the rise/set time of the sun" +HOMEPAGE="https://www.dockapps.net/wmsun" +SRC_URI="https://www.dockapps.net/download/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86" + +RDEPEND=">=x11-libs/libdockapp-0.7:= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +DOCS=( BUGS README TODO ) +S="${WORKDIR}/${MY_P}" + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_install() { + emake DESTDIR="${D}" PREFIX=/usr install + einstalldocs +} 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 05c5ee785dea..4e2f936ff6f6 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,8 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools + MY_P=${P/-ac} DESCRIPTION="WMACPILoad based dockapp to monitor CPU temp and battery time on ACPI kernels" @@ -11,7 +13,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 @@ -30,6 +32,11 @@ PATCHES=( "${FILESDIR}/${PN}-acpi-fix-battery-unit.patch" ) +src_prepare() { + default + eautoreconf +} + src_configure() { econf $(use_enable debug) } 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 5dd7b6116524..000000000000 --- 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/wmacpimon/metadata.xml b/x11-plugins/wmacpimon/metadata.xml index 8c494e92d153..f630ad54cee3 100644 --- a/x11-plugins/wmacpimon/metadata.xml +++ b/x11-plugins/wmacpimon/metadata.xml @@ -6,11 +6,11 @@ <name>Bernard Cafarelli</name> </maintainer> <longdescription> -wmacpimon is a Windowmaker dockapp that monitors -the temperature and Speedstep features in new ACPI-based systems. -It supports batteries, automatic shutdown when the power is low, -and multiple screens. -</longdescription> + wmacpimon is a Windowmaker dockapp that monitors + the temperature and Speedstep features in new ACPI-based systems. + It supports batteries, automatic shutdown when the power is low, + and multiple screens. + </longdescription> <upstream> <remote-id type="sourceforge">wmacpimon</remote-id> </upstream> diff --git a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild b/x11-plugins/wmacpimon/wmacpimon-0.2.1-r1.ebuild index e076f7013f39..50904aa71b6c 100644 --- a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild +++ b/x11-plugins/wmacpimon/wmacpimon-0.2.1-r1.ebuild @@ -1,16 +1,17 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit toolchain-funcs DESCRIPTION="DockApp monitors the temperature and Speedstep features in ACPI-based systems" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="x86" -IUSE="" +KEYWORDS="~amd64 x86" RDEPEND="x11-libs/libX11 x11-libs/libXext @@ -28,6 +29,11 @@ PATCHES=( "${FILESDIR}/Makefile.patch" ) +src_compile() { + tc-export CC + default +} + src_install() { dobin wmacpimond wmacpimon dodoc AUTHORS ChangeLog README diff --git a/x11-plugins/wmamixer/Manifest b/x11-plugins/wmamixer/Manifest index 040afc6a92f7..111d77fbe357 100644 --- a/x11-plugins/wmamixer/Manifest +++ b/x11-plugins/wmamixer/Manifest @@ -1 +1,2 @@ DIST wmamixer-1.0.tar.gz 93181 BLAKE2B 16370da2c1f408b3b584a649e1317850963f2446997e1027cfa7b2cdfa1351807761d3981e2a2cc91ef42272df1146550b3943862d1cf03af5f96d83e6c2c42f SHA512 a5eac2ea3f63770f64f6d2c921aec0d38c54e953c7f5bf1d7ba14c510cc21927751d6939571eb3aede2c7bd0e44bfc84f8dd06ae1af0ef71f2bce8f1b6614708 +DIST wmamixer-1.1.tar.gz 93181 BLAKE2B de2a42d5dd2086c467d1849aeb06e9bf7b6be5efb255e3ae53fd05b050c607cfa2307972566eb41500277cd25d31fd8cb5db10a8b2bde564940904a17361fbb1 SHA512 a372324795be22dd9c6bc2cb78ab363c7f716bb9373dd0127b8e8e5e036d94d0b2df9654d5f75a9b0d318a6a679967fc3fe48b4bf6979faa8f35c6051478bbaf diff --git a/x11-plugins/wmamixer/metadata.xml b/x11-plugins/wmamixer/metadata.xml index 3649b6a22f01..6347235fde9a 100644 --- a/x11-plugins/wmamixer/metadata.xml +++ b/x11-plugins/wmamixer/metadata.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>voyageur@gentoo.org</email> - <name>Bernard Cafarelli</name> -</maintainer> + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> + <longdescription> + Wmamixer is a fork of wmsmixer and is an ALSA mixer dockapp for Window Maker. -<longdescription> -Wmamixer is a fork of wmsmixer and is an ALSA mixer dockapp for Window Maker. - -The code for the ALSA part was taken and adapted from amixer and alsamixer programs from alsa-utils package. -</longdescription> + The code for the ALSA part was taken and adapted from amixer and alsamixer programs from alsa-utils package. + </longdescription> + <upstream> + <remote-id type="github">gryf/wmamixer</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-plugins/wmamixer/wmamixer-1.1.ebuild b/x11-plugins/wmamixer/wmamixer-1.1.ebuild new file mode 100644 index 000000000000..58ae9a06cb97 --- /dev/null +++ b/x11-plugins/wmamixer/wmamixer-1.1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit toolchain-funcs + +DESCRIPTION="ALSA mixer dockapp, fork of wmsmixer" +HOMEPAGE="https://github.com/gryf/wmamixer" +SRC_URI="https://github.com/gryf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="media-libs/alsa-lib + x11-libs/libXpm + x11-libs/libXext + x11-libs/libX11" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +DOCS=( README.rst ) + +src_compile() { + $(tc-getCC) ${CFLAGS} -c -o wmamixer.o wmamixer.c + $(tc-getCC) ${LDFLAGS} -o wmamixer wmamixer.o -lm -lXpm -lXext -lX11 -lasound +} + +src_install() { + dobin wmamixer + einstalldocs +} diff --git a/x11-plugins/wmapmload/wmapmload-0.3.4-r1.ebuild b/x11-plugins/wmapmload/wmapmload-0.3.4-r1.ebuild index 4d08e881baf4..c9c1d830237b 100644 --- a/x11-plugins/wmapmload/wmapmload-0.3.4-r1.ebuild +++ b/x11-plugins/wmapmload/wmapmload-0.3.4-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit autotools DESCRIPTION="dockapp that monitors your apm battery status" HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html" @@ -17,3 +19,8 @@ RDEPEND="x11-libs/libX11 x11-libs/libXt x11-libs/libXpm" DEPEND="${RDEPEND}" + +src_prepare() { + default + eautoreconf +} diff --git a/x11-plugins/wmappl/wmappl-0.71-r1.ebuild b/x11-plugins/wmappl/wmappl-0.71-r1.ebuild index 58df593547ac..895a0e04a33f 100644 --- a/x11-plugins/wmappl/wmappl-0.71-r1.ebuild +++ b/x11-plugins/wmappl/wmappl-0.71-r1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools + DESCRIPTION="Simple application launcher for the Window Maker dock" HOMEPAGE="https://www.dockapps.net/wmappl" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" @@ -17,3 +19,9 @@ DEPEND="${RDEPEND} LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ~sparc x86" + +src_prepare() { + rm -rf "${S}"/icons/CVS || die + default + eautoreconf +} diff --git a/x11-plugins/wmbinclock/Manifest b/x11-plugins/wmbinclock/Manifest index 8af14cabb4c6..efc0adc2e99b 100644 --- a/x11-plugins/wmbinclock/Manifest +++ b/x11-plugins/wmbinclock/Manifest @@ -1 +1,2 @@ DIST wmbinclock-0.5.tar.bz2 15909 BLAKE2B 71a5e53fea8f042bd8e01c0a8dde9057b22e398a4d483b556221d8344b5542f097e835f0d4eafd7cf24964b4b08f04f844c476cddc443ebc8f469e8fbb5142ec SHA512 f0f1f46b19e9c34f9168e03df2d4be2f9c7a73b09dd8247a7bc977309a3354069adf34032f3c0106aa763fe259993176edd84b029941191d05a11505e27de695 +DIST wmbinclock-0.51.tar.gz 11501 BLAKE2B f727a9497a452525bf08daf1a30e8485ca85777a0b938c45634a779cd1adb92afd172ec9455b46e832761d8a45df7a57a4bd93ebbeaa4637da5edb6087f7e30c SHA512 343ac121c93801d69beeef6b4e5ca52020229f61ac723de9b7ee7bea3fb50c51d793b217f848ba9672eb97ec1b70629186e29c27f907798af9d33d5a4faea069 diff --git a/x11-plugins/wmbinclock/metadata.xml b/x11-plugins/wmbinclock/metadata.xml index 7c94bb940cde..e92ba7ab9911 100644 --- a/x11-plugins/wmbinclock/metadata.xml +++ b/x11-plugins/wmbinclock/metadata.xml @@ -6,11 +6,11 @@ <name>Bernard Cafarelli</name> </maintainer> <longdescription> -The windowmaker Binary Clock applet shows the -actual system time as a binary clock. You have to -add up the bits to get the time. The clock has a -24-hour format. -</longdescription> + The windowmaker Binary Clock applet shows the + actual system time as a binary clock. You have to + add up the bits to get the time. The clock has a + 24-hour format. + </longdescription> <upstream> <remote-id type="sourceforge">wmbinclock</remote-id> </upstream> diff --git a/x11-plugins/wmbinclock/wmbinclock-0.51.ebuild b/x11-plugins/wmbinclock/wmbinclock-0.51.ebuild new file mode 100644 index 000000000000..96741ece7841 --- /dev/null +++ b/x11-plugins/wmbinclock/wmbinclock-0.51.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="a nifty little binary clock dockapp" +HOMEPAGE="https://www.dockapps.net/wmbinclock" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND="x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXext" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +PATCHES=( "${FILESDIR}"/${PN}-0.5-gcc-10.patch ) +DOCS=( CHANGELOG README.md ) + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \ + INCDIR="-I/usr/include/X11" LIBDIR="" \ + SYSTEM="${LDFLAGS}" +} + +src_install() { + dobin wmBinClock + einstalldocs +} diff --git a/x11-plugins/wmbio/wmbio-1.02.ebuild b/x11-plugins/wmbio/wmbio-1.02-r1.ebuild index d2d2e7ccc5fb..8b197325f8ef 100644 --- a/x11-plugins/wmbio/wmbio-1.02.ebuild +++ b/x11-plugins/wmbio/wmbio-1.02-r1.ebuild @@ -1,16 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -DESCRIPTION="A Window Maker applet that shows your biorhythm" -HOMEPAGE="http://wmbio.sourceforge.net/" +inherit toolchain-funcs + +DESCRIPTION="Window Maker applet that shows your biorhythm" +HOMEPAGE="https://wmbio.sourceforge.net/" SRC_URI="mirror://sourceforge/wmbio/${P}.tar.gz" +S="${WORKDIR}/${P}/src" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ppc ppc64 sparc x86" -IUSE="" RDEPEND="x11-libs/libX11 x11-libs/libXext @@ -19,14 +21,17 @@ DEPEND="${RDEPEND} x11-base/xorg-proto" PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) -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 8a473e90e026..d3d8ff7a4dbd 100644 --- a/x11-plugins/wmblob/metadata.xml +++ b/x11-plugins/wmblob/metadata.xml @@ -5,4 +5,7 @@ <email>voyageur@gentoo.org</email> <name>Bernard Cafarelli</name> </maintainer> + <upstream> + <remote-id type="github">bbidulock/wmblob</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-plugins/wmblob/wmblob-1.0.4.ebuild b/x11-plugins/wmblob/wmblob-1.0.4-r1.ebuild index 215c1fd29f0e..fa08352fb36b 100644 --- a/x11-plugins/wmblob/wmblob-1.0.4.ebuild +++ b/x11-plugins/wmblob/wmblob-1.0.4-r1.ebuild @@ -1,25 +1,25 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools multilib +EAPI=8 -DESCRIPTION="a fancy but useless dockapp with moving blobs" +inherit autotools + +DESCRIPTION="Fancy but useless dockapp with moving blobs" HOMEPAGE="https://github.com/bbidulock/wmblob" SRC_URI="https://github.com/bbidulock/wmblob/releases/download/${PV}/${P}.tar.bz2" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ppc sparc x86" -IUSE="" RDEPEND="x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXpm x11-libs/libXext" DEPEND="${RDEPEND} - virtual/pkgconfig x11-libs/libXt" +BDEPEND="virtual/pkgconfig" DOCS="AUTHORS ChangeLog NEWS README doc/how_it_works" diff --git a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild b/x11-plugins/wmbutton/wmbutton-0.7.1-r1.ebuild index 4a90d6d6e8a4..0b7b9a05d12d 100644 --- a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild +++ b/x11-plugins/wmbutton/wmbutton-0.7.1-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -DESCRIPTION="a dockapp application that displays nine configurable buttons" +DESCRIPTION="Dockapp application that displays nine configurable buttons" HOMEPAGE="https://www.dockapps.net/wmbutton" SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~ppc sparc x86" IUSE="branding" diff --git a/x11-plugins/wmcalc/wmcalc-0.7.ebuild b/x11-plugins/wmcalc/wmcalc-0.7.ebuild index ec6e2182ba7d..341a863eb908 100644 --- a/x11-plugins/wmcalc/wmcalc-0.7.ebuild +++ b/x11-plugins/wmcalc/wmcalc-0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 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 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~ppc ppc64 ~sparc x86" RDEPEND="x11-libs/libX11 x11-libs/libXext diff --git a/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild b/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild index 1bbb79c3f80c..e12f9d541561 100644 --- a/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild +++ b/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit toolchain-funcs DESCRIPTION="a calendar dockapp" -HOMEPAGE="http://wmcalendar.sourceforge.net" +HOMEPAGE="https://wmcalendar.sourceforge.net" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" diff --git a/x11-plugins/wmcdplay/files/wmcdplay-1.1-cpp11.patch b/x11-plugins/wmcdplay/files/wmcdplay-1.1-cpp11.patch new file mode 100644 index 000000000000..7fdd1021dab3 --- /dev/null +++ b/x11-plugins/wmcdplay/files/wmcdplay-1.1-cpp11.patch @@ -0,0 +1,30 @@ +From bd69f80f597ca589683d6f606e979b8f77e9e0a4 Mon Sep 17 00:00:00 2001 +From: Doug Torrance <dtorrance@piedmont.edu> +Date: Wed, 29 Apr 2020 11:01:30 -0400 +Subject: [PATCH] wmcdplay: Add spaces between macro and string literals for + C++11 + +We may get compile errors (e.g., [1]) otherwise. + +[1] https://clang.debian.net/logs/2020-02-24-9.0.1/ + wmcdplay_1.1-2_unstable_clang9.0.1.log +--- + wmcdplay.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wmcdplay.cc b/wmcdplay.cc +index 46ae03a..675b5dc 100644 +--- a/wmcdplay.cc ++++ b/wmcdplay.cc +@@ -353,7 +353,7 @@ unsigned long mixColor(char *colorname1, int prop1, char *colorname2, int prop2) + void scanArgs(int argc, char **argv){ + for(int i=1;i<argc;i++){ + if(strcmp(argv[i], "-h")==0 || strcmp(argv[i], "-help")==0 || strcmp(argv[i], "--help")==0){ +- fprintf(stderr, "wmcdplay - A cd player designed for WindowMaker\nRelease "VERSION"\n"); ++ fprintf(stderr, "wmcdplay - A cd player designed for WindowMaker\nRelease " VERSION "\n"); + fprintf(stderr, "Copyright (C) 1998 Sam Hawker <shawkie@geocities.com>\n"); + fprintf(stderr, "This software comes with ABSOLUTELY NO WARRANTY\n"); + fprintf(stderr, "This software is free software, and you are welcome to redistribute it\n"); +-- +2.11.4.GIT + diff --git a/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild b/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild index 4751907aadbf..89cc7d94fed4 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/wmcliphist/wmcliphist-2.1-r2.ebuild b/x11-plugins/wmcliphist/wmcliphist-2.1-r3.ebuild index 430468e706bd..72dd056017da 100644 --- a/x11-plugins/wmcliphist/wmcliphist-2.1-r2.ebuild +++ b/x11-plugins/wmcliphist/wmcliphist-2.1-r3.ebuild @@ -1,23 +1,22 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit toolchain-funcs DESCRIPTION="Dockable clipboard history application for Window Maker" HOMEPAGE="https://www.dockapps.net/wmcliphist" SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz" +S="${WORKDIR}/dockapps" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ppc ~sparc x86" -IUSE="" RDEPEND="x11-libs/gtk+:3[X]" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/dockapps +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default diff --git a/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild b/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild index 70c2fcf3f058..af360d3fe27e 100644 --- a/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild +++ b/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit toolchain-funcs + DESCRIPTION="WindowMaker CPU and Memory Usage Monitor Dock App" HOMEPAGE="https://www.geocities.ws/neofpo/wmcms.html" SRC_URI="https://www.geocities.ws/neofpo/files/${P}.tar.gz" @@ -27,7 +29,7 @@ src_prepare() { } src_compile() { - emake CFLAGS="${CFLAGS}" + emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" } src_install() { diff --git a/x11-plugins/wmcoincoin/metadata.xml b/x11-plugins/wmcoincoin/metadata.xml index 37d5d1e6e2e8..c81ddf4c918a 100644 --- a/x11-plugins/wmcoincoin/metadata.xml +++ b/x11-plugins/wmcoincoin/metadata.xml @@ -6,11 +6,11 @@ <name>Bernard Cafarelli</name> </maintainer> <longdescription> -wmCoinCoin is a WindowMaker dockapp that lets you see the latest news from -linuxfr.org. It also graphically represents some statistics about the oneliner -and the clients used to post on it. It also has the ability to post a -customized message to this oneliner. -</longdescription> + wmCoinCoin is a WindowMaker dockapp that lets you see the latest news from + linuxfr.org. It also graphically represents some statistics about the oneliner + and the clients used to post on it. It also has the ability to post a + customized message to this oneliner. + </longdescription> <upstream> <remote-id type="github">d-torrance/wmcoincoin</remote-id> </upstream> diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3-r1.ebuild index 54cf2f2ec83e..944b6e0d1719 100644 --- a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild +++ b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3-r1.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -DESCRIPTION="a dockapp for browsing dacode news and board sites" -HOMEPAGE="http://hules.free.fr/wmcoincoin" +DESCRIPTION="Dockapp for browsing dacode news and board sites" +HOMEPAGE="http://hules.free.fr/wmcoincoin/" SRC_URI="http://hules.free.fr/${PN}/download/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="nls xinerama" -RDEPEND="x11-libs/gtk+:2 - media-libs/imlib2[X] +RDEPEND="media-libs/imlib2[X] + x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft @@ -21,13 +21,11 @@ RDEPEND="x11-libs/gtk+:2 x11-libs/libXpm xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} - virtual/pkgconfig x11-base/xorg-proto - x11-libs/libXt + x11-libs/libXt" +BDEPEND="virtual/pkgconfig nls? ( sys-devel/gettext )" -DOCS="AUTHORS ChangeLog NEWS README" - src_configure() { econf \ $(use_enable nls) \ 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 000000000000..ead6e103b837 --- /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/wmcpuload/wmcpuload-1.1.1.ebuild b/x11-plugins/wmcpuload/wmcpuload-1.1.1-r1.ebuild index eb78e9b41ec3..291bddf05ada 100644 --- a/x11-plugins/wmcpuload/wmcpuload-1.1.1.ebuild +++ b/x11-plugins/wmcpuload/wmcpuload-1.1.1-r1.ebuild @@ -1,21 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -DESCRIPTION="a dockapp for monitoring CPU usage with a LCD display" +DESCRIPTION="Dockapp for monitoring CPU usage with a LCD display" HOMEPAGE="https://www.dockapps.net/wmcpuload" SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha amd64 ~mips ppc ppc64 ~sparc x86" -IUSE="" RDEPEND="x11-libs/libX11 x11-libs/libXext x11-libs/libXpm" DEPEND="${RDEPEND} x11-libs/libICE" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) diff --git a/x11-plugins/wmcpuwatch/wmcpuwatch-0.2-r1.ebuild b/x11-plugins/wmcpuwatch/wmcpuwatch-0.2-r1.ebuild index 0edf74c5ae37..9e3fdd21137e 100644 --- a/x11-plugins/wmcpuwatch/wmcpuwatch-0.2-r1.ebuild +++ b/x11-plugins/wmcpuwatch/wmcpuwatch-0.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ IUSE="doc" RDEPEND=">=x11-libs/libdockapp-0.7:=" DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen[dot] )" +BDEPEND="doc? ( app-text/doxygen[dot] )" DOCS=( ChangeLog README.md ) PATCHES=( "${FILESDIR}"/${P}-cmake.patch ) diff --git a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r4.ebuild index 8ed75478b444..dc96f1f09a67 100644 --- a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild +++ b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r4.ebuild @@ -1,22 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -DESCRIPTION="dockapp which provides a drawer (retractable button bar) to launch applications" +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" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ppc ~sparc x86" -IUSE="" RDEPEND="x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 x11-libs/gtk+:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" DOCS=( README TODO AUTHORS ChangeLog wmdrawerrc.example ) PATCHES=( "${FILESDIR}"/${P}-gtk+-2.patch ) @@ -33,11 +34,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/wmget/wmget-0.6.1.ebuild b/x11-plugins/wmget/wmget-0.6.1-r1.ebuild index 7c6f99f0c6dc..07279d269605 100644 --- a/x11-plugins/wmget/wmget-0.6.1.ebuild +++ b/x11-plugins/wmget/wmget-0.6.1-r1.ebuild @@ -1,17 +1,19 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit autotools -DESCRIPTION="a libcurl based dockapp for automated downloads" +DESCRIPTION="Libcurl based dockapp for automated downloads" HOMEPAGE="https://www.dockapps.net/wmget" SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" +# Specific to this tarball +S="${WORKDIR}/dockapps-5aaf842" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ~ppc ~sparc x86" -IUSE="" RDEPEND="x11-libs/libX11 x11-libs/libXext @@ -20,11 +22,7 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} x11-base/xorg-proto" -# Specific to this tarball -S=${WORKDIR}/dockapps-5aaf842 - src_prepare() { default - eautoreconf } diff --git a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild index b1d7ff43dabc..126ad0294ba9 100644 --- a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild +++ b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit desktop +inherit desktop toolchain-funcs MY_PN=${PN/grabi/GrabI} @@ -39,7 +39,7 @@ src_prepare() { src_compile() { emake clean - emake CFLAGS="${CFLAGS} -Wall" SYSTEM="${LDFLAGS}" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" SYSTEM="${LDFLAGS}" } src_install() { diff --git a/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild b/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild index cfe8a2453c50..c87db8768b1a 100644 --- a/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild +++ b/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="CPU and SYS temperature dockapp" HOMEPAGE="https://www.dockapps.net/wmgtemp" @@ -10,7 +10,6 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" LICENSE="Artistic" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="sys-apps/lm-sensors:= >=x11-libs/libdockapp-0.7:= diff --git a/x11-plugins/wmhdplop/Manifest b/x11-plugins/wmhdplop/Manifest index ff0775b3fe8b..78fb53a7de16 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 999379988317..000000000000 --- a/x11-plugins/wmhdplop/files/wmhdplop-0.9.10-cflags.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur wmhdplop-0.9.10.orig/configure.ac wmhdplop-0.9.10/configure.ac ---- wmhdplop-0.9.10.orig/configure.ac 2016-11-24 16:18:21.000000000 +0100 -+++ wmhdplop-0.9.10/configure.ac 2016-12-02 11:58:28.276017676 +0100 -@@ -19,10 +19,6 @@ - AC_DEFINE(_GNU_SOURCE,[],[uses GNU extensions]) - - --if test x$GCC = xyes; then -- CFLAGS="-O3 -fomit-frame-pointer -ffast-math -Wall -W"; --fi -- - dnl check for X - AC_PATH_X - AC_PATH_XTRA diff --git a/x11-plugins/wmhdplop/files/wmhdplop-0.9.10-sysmacros.patch b/x11-plugins/wmhdplop/files/wmhdplop-0.9.10-sysmacros.patch deleted file mode 100644 index 1346cd2e3641..000000000000 --- a/x11-plugins/wmhdplop/files/wmhdplop-0.9.10-sysmacros.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur wmhdplop-0.9.10.orig/devnames.c wmhdplop-0.9.10/devnames.c ---- wmhdplop-0.9.10.orig/devnames.c 2016-11-24 15:49:55.000000000 +0100 -+++ wmhdplop-0.9.10/devnames.c 2017-02-16 15:03:08.946447885 +0100 -@@ -4,6 +4,7 @@ - #include <string.h> - #include <sys/types.h> - #include <sys/stat.h> -+#include <sys/sysmacros.h> - #include <unistd.h> - #include <linux/major.h> - #include <ctype.h> diff --git a/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-configure.patch b/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-configure.patch new file mode 100644 index 000000000000..1bbe3ad2f388 --- /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 000000000000..30e44715ea2a --- /dev/null +++ b/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-indent.patch @@ -0,0 +1,38 @@ +From f597fc7288f57d1dfddd5bb559cc7b0f598d15e5 Mon Sep 17 00:00:00 2001 +From: "Torrance, Douglas" <dtorrance@piedmont.edu> +Date: Sun, 10 Oct 2021 10:01:04 +0000 +Subject: [PATCH] wmhdplop: Fix "misleadingly indented" compiler warnings. + +--- + wmhdplop/wmhdplop.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/wmhdplop.c b/wmhdplop.c +index 16b9a4f..bbbe971 100644 +--- a/wmhdplop.c ++++ b/wmhdplop.c +@@ -421,7 +421,9 @@ static void draw_hdlist(App *app) { + //printf("update : first displayed(%d) = %p\n", cnt, dl); + + for (dl = first_dev_in_list(), dev_cnt=hd_cnt=-1; dl; dl = dl->next) { +- if (dl->part_id == 0) ++hd_cnt; if (!is_displayed(dl->hd_id, dl->part_id)) continue; ++dev_cnt; ++ if (dl->part_id == 0) ++hd_cnt; ++ if (!is_displayed(dl->hd_id, dl->part_id)) continue; ++ ++dev_cnt; + imlib_get_text_size(shorten_name(dl),&w,&h); + lw = MAX(w,lw); + lh += h; +@@ -440,7 +442,9 @@ static void draw_hdlist(App *app) { + imlib_image_draw_rectangle(lx-1,ly-1,lw+2,lh+2); + + for (dl = first_dev_in_list(), dev_cnt=hd_cnt=-1; dl; dl = dl->next) { +- if (dl->part_id==0) ++hd_cnt; if (!is_displayed(dl->hd_id, dl->part_id)) continue; ++dev_cnt; ++ if (dl->part_id==0) ++hd_cnt; ++ if (!is_displayed(dl->hd_id, dl->part_id)) continue; ++ ++dev_cnt; + int x = lx, y = ly + lh - dev_cnt * h; + if (!Prefs.disable_hd_leds) { + if (dl->touched_r) { +-- +2.11.4.GIT + diff --git a/x11-plugins/wmhdplop/files/wmhdplop-0.9.12-configure.patch b/x11-plugins/wmhdplop/files/wmhdplop-0.9.12-configure.patch new file mode 100644 index 000000000000..89718de34818 --- /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 13650e9bb7d9..000000000000 --- a/x11-plugins/wmhdplop/files/wmhdplop-0.9.9-64bit.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -pudr wmhdplop-0.9.9/devnames.h wmhdplop-0.9.9-fixed/devnames.h ---- wmhdplop-0.9.9/devnames.h 2004-04-07 01:14:01.000000000 +0200 -+++ wmhdplop-0.9.9-fixed/devnames.h 2010-06-25 21:56:10.662190796 +0200 -@@ -9,7 +9,7 @@ typedef struct DiskList { - unsigned major, minor; - int hd_id, part_id; /* part_id = 0 for disks */ - int enable_hddtemp; -- int nr, nw, touched_r, touched_w; -+ long nr, nw, touched_r, touched_w; - struct DiskList *next; - } DiskList; - -diff -pudr wmhdplop-0.9.9/procstat.c wmhdplop-0.9.9-fixed/procstat.c ---- wmhdplop-0.9.9/procstat.c 2007-04-20 11:12:16.000000000 +0200 -+++ wmhdplop-0.9.9-fixed/procstat.c 2010-06-25 21:55:37.086191145 +0200 -@@ -8,7 +8,7 @@ - static ProcStats ps; - int use_proc_diskstats; - --void pstat_init(struct pstat *pst, int nslice, float update_interval) { -+void pstat_init(struct pstat *pst, long nslice, float update_interval) { - pst->nslice = nslice; - ALLOC_VEC(pst->slices, nslice); - pst->cur_slice = 0; -@@ -17,7 +17,7 @@ void pstat_init(struct pstat *pst, int n - } - - float pstat_current(struct pstat *pst) { -- int idx = pst->cur_slice ? pst->cur_slice-1 : pst->nslice-1; -+ long idx = pst->cur_slice ? pst->cur_slice-1 : pst->nslice-1; - return pst->slices[idx]/pst->update_interval; - } - -@@ -101,13 +101,13 @@ void update_stats() { - if (!Prefs.debug_disk_rd) { - pstat_add(&ps.disk_read, nr); - } else { -- static int cntr = 0; cntr+=(rand()%30) == 0 ? Prefs.debug_disk_rd : 0; -+ static long cntr = 0; cntr+=(rand()%30) == 0 ? Prefs.debug_disk_rd : 0; - pstat_add(&ps.disk_read, nr + cntr); - } - if (!Prefs.debug_disk_wr) { - pstat_add(&ps.disk_write, nw); - } else { -- static int cntw = 0; cntw+=(rand()%30) == 0 ? Prefs.debug_disk_wr : 0; -+ static long cntw = 0; cntw+=(rand()%30) == 0 ? Prefs.debug_disk_wr : 0; - pstat_add(&ps.disk_write, nw + cntw); - } - readok = 2; -@@ -121,7 +121,7 @@ void update_stats() { - pstat_add(&ps.swap_in, nr); - pstat_add(&ps.swap_out, nw); - } else { -- static int cnt = 0; cnt+=Prefs.debug_swapio; -+ static long cnt = 0; cnt+=Prefs.debug_swapio; - pstat_add(&ps.swap_in, nr + cnt); - pstat_add(&ps.swap_out, nw + cnt); - } -@@ -144,10 +144,10 @@ void init_stats(float update_interval) { - char s[512]; - FILE *f; - -- pstat_init(&ps.swap_in, (int)(0.5/update_interval)+1, update_interval); -- pstat_init(&ps.swap_out, (int)(0.5/update_interval)+1, update_interval); -- pstat_init(&ps.disk_read, (int)(0.5/update_interval)+1, update_interval); -- pstat_init(&ps.disk_write, (int)(0.5/update_interval)+1, update_interval); -+ pstat_init(&ps.swap_in, (long)(0.5/update_interval)+1, update_interval); -+ pstat_init(&ps.swap_out, (long)(0.5/update_interval)+1, update_interval); -+ pstat_init(&ps.disk_read, (long)(0.5/update_interval)+1, update_interval); -+ pstat_init(&ps.disk_write, (long)(0.5/update_interval)+1, update_interval); - f = fopen("/proc/swaps","r"); - //if (!f) { perror("/proc/swaps"); exit(1); } - if (f) { -diff -pudr wmhdplop-0.9.9/procstat.h wmhdplop-0.9.9-fixed/procstat.h ---- wmhdplop-0.9.9/procstat.h 2004-03-14 12:07:15.000000000 +0100 -+++ wmhdplop-0.9.9-fixed/procstat.h 2010-06-25 21:45:52.146334994 +0200 -@@ -4,7 +4,7 @@ - - struct pstat { - unsigned long total; -- int nslice, cur_slice; -+ long nslice, cur_slice; - unsigned long *slices; - float update_interval; - }; -@@ -15,7 +15,7 @@ typedef struct { - struct pstat disk_read, disk_write; - } ProcStats; - --void pstat_init(struct pstat *pst, int nslice, float update_interval); -+void pstat_init(struct pstat *pst, long nslice, float update_interval); - float pstat_current(struct pstat *pst); - void pstat_add(struct pstat *pst, unsigned long v); - void pstat_advance(struct pstat *pst); diff --git a/x11-plugins/wmhdplop/wmhdplop-0.9.10.ebuild b/x11-plugins/wmhdplop/wmhdplop-0.9.11-r1.ebuild index d8f6755165d8..2f766c788980 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 2806056295d9..2bb210461885 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/wmifinfo/Manifest b/x11-plugins/wmifinfo/Manifest index 3b6947d63963..d5b2273e3a1b 100644 --- a/x11-plugins/wmifinfo/Manifest +++ b/x11-plugins/wmifinfo/Manifest @@ -1 +1,2 @@ DIST wmifinfo-0.10.tar.gz 17418 BLAKE2B 74debc88268e45779131ad6587733343e8be51cfa871ea368ca305a755008fb0a7e3faa332157e79ecea7553d3e523cce4bb9b4a650c2ee73dc1b6acb3db4ff9 SHA512 57731f482b950e968e760315b99ceb715c3aa101f77e5363ee08db231369c5addc4d9cf4da4a24f624313073bc67cd8742030956c5f866fb02c1b24b3cc4e965 +DIST wmifinfo-0.11.tgz 17529 BLAKE2B 18c650a23ef8ca705f7d419b3e270daa941438fb8648fbf7f8e6efad7d066004ec837e4c112074b7d7cb35bd0844a3acd82553aed9cefd047246a5a57923fb71 SHA512 c6dc9c8ac3441e9586e0186278b399b9a61ac91ca9306face5a08e78fb573737b21b0815ceade01efe3b285fe4ff06715c80c64328a582e1ba8c113113c40ae3 diff --git a/x11-plugins/wmifinfo/wmifinfo-0.11.ebuild b/x11-plugins/wmifinfo/wmifinfo-0.11.ebuild new file mode 100644 index 000000000000..7602cb4b6dc5 --- /dev/null +++ b/x11-plugins/wmifinfo/wmifinfo-0.11.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit toolchain-funcs + +DESCRIPTION="a dockapp for monitoring network interfaces" +HOMEPAGE="https://www.dockapps.net/wmifinfo" +SRC_URI="https://www.dockapps.net/download/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +RDEPEND="x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +src_compile() { + emake CC="$(tc-getCC)" LD="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +src_install() { + emake DESTDIR="${D}" PREFIX=/usr install + dodoc README Changelog +} diff --git a/x11-plugins/wmifs/Manifest b/x11-plugins/wmifs/Manifest index 52fcb30217b3..cea53d206c74 100644 --- a/x11-plugins/wmifs/Manifest +++ b/x11-plugins/wmifs/Manifest @@ -1 +1 @@ -DIST wmifs-1.8.tar.gz 107020 BLAKE2B 54b73bf2a49a9c9dd0d16f907cf2211eafb7199d7b77e4cd7e86364ff8bc438d27a57e95c97b47b2dbe308b2d9e6797df287f608dca89ed4b3d6dfb27195b932 SHA512 c88092e8c83ab5bc65813b6fbfe348b3b56eae28885199ba1cc681ba3db7f801f90f5d385cfdbb7304327e085471f6fdc0f712690211dc192763739619c46abb +DIST wmifs-1.9.tar.gz 107318 BLAKE2B b8d12478e93b9a578fe6c5140bcb2ac1bd97bd0d33bc50af6972c7775d8189b9c8f35e90ae4c5f63d444148d3d87c5eb1ccbbc5605b008d58b714da64879869e SHA512 32258ccc72e5ee3f5b886da8963347d28ef3253994e97d1c16abf7706ffbbf4356114681dcace9e8ccddcb8f606f89b30d5390d28895f0b0009f8e8578a726be diff --git a/x11-plugins/wmifs/wmifs-1.8.ebuild b/x11-plugins/wmifs/wmifs-1.9.ebuild index 906cf312e2c2..f42224f1aad1 100644 --- a/x11-plugins/wmifs/wmifs-1.8.ebuild +++ b/x11-plugins/wmifs/wmifs-1.9.ebuild @@ -1,16 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Network monitoring dockapp" HOMEPAGE="https://www.dockapps.net/wmifs" -SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz" +SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha amd64 ~mips ppc sparc x86" -IUSE="" RDEPEND=">=x11-libs/libdockapp-0.7:= x11-libs/libX11 diff --git a/x11-plugins/wmix/wmix-3.5.ebuild b/x11-plugins/wmix/wmix-3.5.ebuild index c0b6a38e180f..c2eab904e70b 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/wmload/wmload-0.9.7-r1.ebuild b/x11-plugins/wmload/wmload-0.9.7-r1.ebuild index 3b438d697b05..e3639a64a47a 100644 --- a/x11-plugins/wmload/wmload-0.9.7-r1.ebuild +++ b/x11-plugins/wmload/wmload-0.9.7-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" RDEPEND="x11-libs/libX11 x11-libs/libXext diff --git a/x11-plugins/wmlongrun/wmlongrun-0.3.1.ebuild b/x11-plugins/wmlongrun/wmlongrun-0.3.1.ebuild index 1609296d7367..68391c02264b 100644 --- a/x11-plugins/wmlongrun/wmlongrun-0.3.1.ebuild +++ b/x11-plugins/wmlongrun/wmlongrun-0.3.1.ebuild @@ -1,16 +1,15 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -DESCRIPTION="A dockapp to monitor LongRun on a Transmeta Crusoe processor" +DESCRIPTION="Dockapp to monitor LongRun on a Transmeta Crusoe processor" HOMEPAGE="https://www.dockapps.net/wmlongrun" SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="-* ~x86" -IUSE="" RDEPEND="x11-libs/libX11 x11-libs/libXext diff --git a/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild b/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild index 02b4de944df1..567a44d7ea36 100644 --- a/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild +++ b/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild @@ -1,19 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit desktop toolchain-funcs -MY_P=wmMand-${PV} +MY_P="wmMand-${PV}" DESCRIPTION="a dockable mandelbrot browser" HOMEPAGE="https://sourceforge.net/projects/wmmand/" SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}/wmMand" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND="x11-libs/libX11 x11-libs/libXext @@ -21,8 +22,6 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} x11-base/xorg-proto" -S=${WORKDIR}/${MY_P}/wmMand - DOCS=( ../{BUGS,changelog,TODO} ) src_prepare() { diff --git a/x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch b/x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch index bbf18433480c..7e41b40d2f04 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 40867577585a..3f78ac23e573 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 e557c839133f..f79fafdda1ab 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 0c06dab67479..000000000000 --- 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/wmmon/wmmon-1.4.ebuild b/x11-plugins/wmmon/wmmon-1.4-r1.ebuild index b52135abe045..9eab5de33cc9 100644 --- a/x11-plugins/wmmon/wmmon-1.4.ebuild +++ b/x11-plugins/wmmon/wmmon-1.4-r1.ebuild @@ -1,16 +1,15 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Dockable system resources monitor applet for WindowMaker" HOMEPAGE="https://www.dockapps.net/wmmon" SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~ppc ~sparc x86" -IUSE="" RDEPEND=">=x11-libs/libdockapp-0.7:= x11-libs/libX11 diff --git a/x11-plugins/wmmoonclock/Manifest b/x11-plugins/wmmoonclock/Manifest index d5aa8989c554..b5594aff13f1 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 9554254e6239..000000000000 --- 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 9530051db958..000000000000 --- 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 e40b73d04b9e..ac62f79bf63e 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/wmmp/Manifest b/x11-plugins/wmmp/Manifest index f891308fcffc..2f90b71b51f4 100644 --- a/x11-plugins/wmmp/Manifest +++ b/x11-plugins/wmmp/Manifest @@ -1 +1 @@ -DIST WMmp-0.10.0.tar.gz 228560 BLAKE2B ec405452112131cad8738b28d13bdbe7f6a60a3204374aa76632bb0cb16c3eea087e58f5294354bd4c201bd9b989d009d417c38fa09d334a4ab72c08e0c527c3 SHA512 5a2777afcb879dd42556f169d4e472660f3cb2bd2b3a1e3833328d3be793e859f7b36dce6e59ca39a4a074b89d305a7704d60382dfc6bed0578c046fe3a8598c +DIST wmmp-0.12.6.tar.gz 33440 BLAKE2B 130d56906f52681147e4a384f578f14b6eb4a958026ad47d8e6726bb35e3ac4324d73bae225e37b512794ca1eaaace4cca413ef518e7456abe4592d14b863e2a SHA512 e2f293743e1d96283179c64a3af30b4f0405e3b9754aac74f92f7c4ce66efc1aeaca1e8ad586c1b3dd596a6145efad3366687bb5fa601e69fcbf33b302154816 diff --git a/x11-plugins/wmmp/metadata.xml b/x11-plugins/wmmp/metadata.xml index 41c26cd44097..ef1a55343d94 100644 --- a/x11-plugins/wmmp/metadata.xml +++ b/x11-plugins/wmmp/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="sourceforge">musicpd</remote-id> + <remote-id type="github">yogsothoth/wmmp</remote-id> </upstream> </pkgmetadata> diff --git a/x11-plugins/wmmp/wmmp-0.10.0-r1.ebuild b/x11-plugins/wmmp/wmmp-0.10.0-r1.ebuild deleted file mode 100644 index 82031dd8b177..000000000000 --- a/x11-plugins/wmmp/wmmp-0.10.0-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P=${P/wm/WM} - -DESCRIPTION="A Window Maker dock app client for Music Player Daemon(media-sound/mpd)" -HOMEPAGE="http://mpd.wikia.com/wiki/Client:WMmp" -SRC_URI="mirror://sourceforge/musicpd/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 sparc x86" -IUSE="" - -RDEPEND="x11-libs/libXext - x11-libs/libXpm" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_configure() { - econf --with-default-port=6600 -} diff --git a/x11-plugins/wmmp/wmmp-0.12.6.ebuild b/x11-plugins/wmmp/wmmp-0.12.6.ebuild new file mode 100644 index 000000000000..910863ce2347 --- /dev/null +++ b/x11-plugins/wmmp/wmmp-0.12.6.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Window Maker dock app client for mpd (Music Player Daemon)" +HOMEPAGE="https://github.com/yogsothoth/wmmp" +SRC_URI="https://github.com/yogsothoth/wmmp/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 sparc x86" + +RDEPEND="x11-libs/libXext + x11-libs/libXpm" +DEPEND="${RDEPEND}" + +src_install() { + doman "${CMAKE_USE_DIR}/doc/WMmp.1" + dobin "${BUILD_DIR}/bin/WMmp" +} diff --git a/x11-plugins/wmmp3/files/wmmp3-0.12-fix-implicit-function-declaration-clang16.patch b/x11-plugins/wmmp3/files/wmmp3-0.12-fix-implicit-function-declaration-clang16.patch new file mode 100644 index 000000000000..6d20bb35b8d2 --- /dev/null +++ b/x11-plugins/wmmp3/files/wmmp3-0.12-fix-implicit-function-declaration-clang16.patch @@ -0,0 +1,40 @@ +Bug: https://bugs.gentoo.org/882321 +--- a/buttons.c ++++ b/buttons.c +@@ -10,6 +10,7 @@ + * $Id: mpg123ctl.c,v 1.12 1999/10/08 06:21:41 pcrosby Exp $ + */ + ++#include "wmgeneral.h" + #include "buttons.h" + + struct coord { +--- a/main.c ++++ b/main.c +@@ -11,6 +11,7 @@ + * $Id: main.c,v 1.11 1999/10/08 22:21:32 pcrosby Exp $ + */ + ++#include <ctype.h> + #include "main.h" + + #define B_STOP 0 +--- a/mpg123ctl.c ++++ b/mpg123ctl.c +@@ -14,6 +14,8 @@ + * $Id: mpg123ctl.c,v 1.15 1999/10/12 04:41:20 pcrosby Exp $ + */ + ++#include <time.h> ++#include <ctype.h> + #include "mpg123ctl.h" + + #define MAXDIRS 100 +--- a/song_hash.c ++++ b/song_hash.c +@@ -1,3 +1,5 @@ ++#include <stdlib.h> ++#include <string.h> + #include "song_hash.h" + + #define HASH_TABLE_SIZE 11 diff --git a/x11-plugins/wmmp3/wmmp3-0.12-r2.ebuild b/x11-plugins/wmmp3/wmmp3-0.12-r2.ebuild new file mode 100644 index 000000000000..1118757da360 --- /dev/null +++ b/x11-plugins/wmmp3/wmmp3-0.12-r2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Mp3 player dock app for WindowMaker; frontend to mpg123" +HOMEPAGE="https://www.dockapps.net/wmmp3" +SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="" + +RDEPEND="x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm" +DEPEND="${RDEPEND} + media-sound/mpg123 + x11-base/xorg-proto" + +PATCHES=( + "${FILESDIR}"/${P}-x_includes_n_libraries.patch + "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-fix-implicit-function-declaration-clang16.patch + ) + +DOCS=( AUTHORS ChangeLog sample.wmmp3 README TODO ) + +src_compile() { + emake prefix="/usr/" +} + +pkg_postinst() { + einfo "Please copy the sample.wmmp3 to your home directory and change it to fit your needs." +} diff --git a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild index 1b2ce83086b5..21e339edf295 100644 --- a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild +++ b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild @@ -18,17 +18,18 @@ IUSE="" RDEPEND="x11-libs/libX11 x11-libs/libXext" DEPEND="${RDEPEND} + x11-base/xorg-proto elibc_musl? ( net-libs/ppp-defs )" BDEPEND=" - x11-base/xorg-proto - >=x11-misc/imake-1.0.8-r1 - app-text/rman" + app-text/rman + sys-devel/gcc + >=x11-misc/imake-1.0.8-r1" PATCHES=( "${WORKDIR}"/${P}-misc.patch ) src_configure() { CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ - IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die "xmkmf failed" + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die "xmkmf failed" } src_compile() { diff --git a/x11-plugins/wmnetload/metadata.xml b/x11-plugins/wmnetload/metadata.xml index cd9959ef1348..82a0a3ce42f6 100644 --- a/x11-plugins/wmnetload/metadata.xml +++ b/x11-plugins/wmnetload/metadata.xml @@ -6,11 +6,14 @@ <name>Bernard Cafarelli</name> </maintainer> <longdescription> -wmnetload is a network interface monitor dockapp for Window Maker. It is -designed to fit well with dockapps like wmcpuload and wmmemmon. It tracks -whether the interface is functioning and displays current network interface -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> + wmnetload is a network interface monitor dockapp for Window Maker. It is + designed to fit well with dockapps like wmcpuload and wmmemmon. It tracks + whether the interface is functioning and displays current network interface + 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="github">bbidulock/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 920a6e876ac9..0b7a24b5c12a 100644 --- a/x11-plugins/wmpager/wmpager-1.2-r2.ebuild +++ b/x11-plugins/wmpager/wmpager-1.2-r2.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 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/" +HOMEPAGE="https://wmpager.sourceforge.net/" SRC_URI="mirror://sourceforge/wmpager/${P}.tar.gz" LICENSE="BSD" @@ -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/wmpasman/metadata.xml b/x11-plugins/wmpasman/metadata.xml index c894cf8be5c9..2dff67ab59e1 100644 --- a/x11-plugins/wmpasman/metadata.xml +++ b/x11-plugins/wmpasman/metadata.xml @@ -6,12 +6,12 @@ <name>Bernard Cafarelli</name> </maintainer> <longdescription> -wmpasman stores passwords and makes them available -for pasting (both via the middle-click primary -selection and the clipboard selection) at the -click of a button. It also contains a digital -clock. Access is controlled by a passphrase. -</longdescription> + wmpasman stores passwords and makes them available + for pasting (both via the middle-click primary + selection and the clipboard selection) at the + click of a button. It also contains a digital + clock. Access is controlled by a passphrase. + </longdescription> <upstream> <remote-id type="sourceforge">wmpasman</remote-id> </upstream> diff --git a/x11-plugins/wmpinboard/files/wmpinboard-1.0.1-memcmp.patch b/x11-plugins/wmpinboard/files/wmpinboard-1.0.1-memcmp.patch new file mode 100644 index 000000000000..616b4b8ddc59 --- /dev/null +++ b/x11-plugins/wmpinboard/files/wmpinboard-1.0.1-memcmp.patch @@ -0,0 +1,443 @@ +diff -Naur wmpinboard-1.0.1.orig/src/Makefile.am wmpinboard-1.0.1/src/Makefile.am +--- wmpinboard-1.0.1.orig/src/Makefile.am 2015-05-25 02:30:37.000000000 +0200 ++++ wmpinboard-1.0.1/src/Makefile.am 2023-03-14 20:57:29.415810929 +0100 +@@ -5,7 +5,7 @@ + + bin_PROGRAMS = wmpinboard + +-wmpinboard_SOURCES = memcmp.c \ ++wmpinboard_SOURCES = \ + misc.c misc.h \ + notes.c notes.h \ + wmpinboard.c wmpinboard.h \ +@@ -13,6 +13,5 @@ + wmpinboard_CFLAGS = -g + + EXTRA_wmpinboard_SOURCES = \ +- getopt.c getopt1.c getopt.h \ +- memcmp.c memcmp.h ++ getopt.c getopt1.c getopt.h + +diff -Naur wmpinboard-1.0.1.orig/src/memcmp.c wmpinboard-1.0.1/src/memcmp.c +--- wmpinboard-1.0.1.orig/src/memcmp.c 2015-05-25 02:30:37.000000000 +0200 ++++ wmpinboard-1.0.1/src/memcmp.c 1970-01-01 01:00:00.000000000 +0100 +@@ -1,394 +0,0 @@ +-/* Copyright (C) 1991, 1993, 1995, 1997, 1998 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- Contributed by Torbjorn Granlund (tege@sics.se). +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Library General Public License as +- published by the Free Software Foundation; either version 2 of the +- License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Library General Public License for more details. +- +- You should have received a copy of the GNU Library General Public +- License along with the GNU C Library; see the file COPYING.LIB. If not, +- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +- Boston, MA 02111-1307, USA. */ +- +-#ifdef HAVE_CONFIG_H +-# include <config.h> +-#endif +- +-#undef __ptr_t +-#if defined __cplusplus || (defined __STDC__ && __STDC__) +-# define __ptr_t void * +-#else /* Not C++ or ANSI C. */ +-# undef const +-# define const +-# define __ptr_t char * +-#endif /* C++ or ANSI C. */ +- +-#ifndef __P +-# if defined __GNUC__ || (defined __STDC__ && __STDC__) +-# define __P(args) args +-# else +-# define __P(args) () +-# endif /* GCC. */ +-#endif /* Not __P. */ +- +-#if defined HAVE_STRING_H || defined _LIBC +-# include <string.h> +-#endif +- +-#undef memcmp +- +-#ifdef _LIBC +- +-# include <memcopy.h> +-# include <endian.h> +- +-# if __BYTE_ORDER == __BIG_ENDIAN +-# define WORDS_BIGENDIAN +-# endif +- +-#else /* Not in the GNU C library. */ +- +-# include <sys/types.h> +- +-/* Type to use for aligned memory operations. +- This should normally be the biggest type supported by a single load +- and store. Must be an unsigned type. */ +-# define op_t unsigned long int +-# define OPSIZ (sizeof(op_t)) +- +-/* Threshold value for when to enter the unrolled loops. */ +-# define OP_T_THRES 16 +- +-/* Type to use for unaligned operations. */ +-typedef unsigned char byte; +- +-# ifndef WORDS_BIGENDIAN +-# define MERGE(w0, sh_1, w1, sh_2) (((w0) >> (sh_1)) | ((w1) << (sh_2))) +-# else +-# define MERGE(w0, sh_1, w1, sh_2) (((w0) << (sh_1)) | ((w1) >> (sh_2))) +-# endif +- +-#endif /* In the GNU C library. */ +- +-#ifdef WORDS_BIGENDIAN +-# define CMP_LT_OR_GT(a, b) ((a) > (b) ? 1 : -1) +-#else +-# define CMP_LT_OR_GT(a, b) memcmp_bytes ((a), (b)) +-#endif +- +-/* BE VERY CAREFUL IF YOU CHANGE THIS CODE! */ +- +-/* The strategy of this memcmp is: +- +- 1. Compare bytes until one of the block pointers is aligned. +- +- 2. Compare using memcmp_common_alignment or +- memcmp_not_common_alignment, regarding the alignment of the other +- block after the initial byte operations. The maximum number of +- full words (of type op_t) are compared in this way. +- +- 3. Compare the few remaining bytes. */ +- +-#ifndef WORDS_BIGENDIAN +-/* memcmp_bytes -- Compare A and B bytewise in the byte order of the machine. +- A and B are known to be different. +- This is needed only on little-endian machines. */ +- +-static int memcmp_bytes __P((op_t, op_t)); +- +-# ifdef __GNUC__ +-__inline +-# endif +-static int +-memcmp_bytes (a, b) +- op_t a, b; +-{ +- long int srcp1 = (long int) &a; +- long int srcp2 = (long int) &b; +- op_t a0, b0; +- +- do +- { +- a0 = ((byte *) srcp1)[0]; +- b0 = ((byte *) srcp2)[0]; +- srcp1 += 1; +- srcp2 += 1; +- } +- while (a0 == b0); +- return a0 - b0; +-} +-#endif +- +-static int memcmp_common_alignment __P((long, long, size_t)); +- +-/* memcmp_common_alignment -- Compare blocks at SRCP1 and SRCP2 with LEN `op_t' +- objects (not LEN bytes!). Both SRCP1 and SRCP2 should be aligned for +- memory operations on `op_t's. */ +-#ifdef __GNUC__ +-__inline +-#endif +-static int +-memcmp_common_alignment (srcp1, srcp2, len) +- long int srcp1; +- long int srcp2; +- size_t len; +-{ +- op_t a0, a1; +- op_t b0, b1; +- +- switch (len % 4) +- { +- default: /* Avoid warning about uninitialized local variables. */ +- case 2: +- a0 = ((op_t *) srcp1)[0]; +- b0 = ((op_t *) srcp2)[0]; +- srcp1 -= 2 * OPSIZ; +- srcp2 -= 2 * OPSIZ; +- len += 2; +- goto do1; +- case 3: +- a1 = ((op_t *) srcp1)[0]; +- b1 = ((op_t *) srcp2)[0]; +- srcp1 -= OPSIZ; +- srcp2 -= OPSIZ; +- len += 1; +- goto do2; +- case 0: +- if (OP_T_THRES <= 3 * OPSIZ && len == 0) +- return 0; +- a0 = ((op_t *) srcp1)[0]; +- b0 = ((op_t *) srcp2)[0]; +- goto do3; +- case 1: +- a1 = ((op_t *) srcp1)[0]; +- b1 = ((op_t *) srcp2)[0]; +- srcp1 += OPSIZ; +- srcp2 += OPSIZ; +- len -= 1; +- if (OP_T_THRES <= 3 * OPSIZ && len == 0) +- goto do0; +- /* Fall through. */ +- } +- +- do +- { +- a0 = ((op_t *) srcp1)[0]; +- b0 = ((op_t *) srcp2)[0]; +- if (a1 != b1) +- return CMP_LT_OR_GT (a1, b1); +- +- do3: +- a1 = ((op_t *) srcp1)[1]; +- b1 = ((op_t *) srcp2)[1]; +- if (a0 != b0) +- return CMP_LT_OR_GT (a0, b0); +- +- do2: +- a0 = ((op_t *) srcp1)[2]; +- b0 = ((op_t *) srcp2)[2]; +- if (a1 != b1) +- return CMP_LT_OR_GT (a1, b1); +- +- do1: +- a1 = ((op_t *) srcp1)[3]; +- b1 = ((op_t *) srcp2)[3]; +- if (a0 != b0) +- return CMP_LT_OR_GT (a0, b0); +- +- srcp1 += 4 * OPSIZ; +- srcp2 += 4 * OPSIZ; +- len -= 4; +- } +- while (len != 0); +- +- /* This is the right position for do0. Please don't move +- it into the loop. */ +- do0: +- if (a1 != b1) +- return CMP_LT_OR_GT (a1, b1); +- return 0; +-} +- +-static int memcmp_not_common_alignment __P((long, long, size_t)); +- +-/* memcmp_not_common_alignment -- Compare blocks at SRCP1 and SRCP2 with LEN +- `op_t' objects (not LEN bytes!). SRCP2 should be aligned for memory +- operations on `op_t', but SRCP1 *should be unaligned*. */ +-#ifdef __GNUC__ +-__inline +-#endif +-static int +-memcmp_not_common_alignment (srcp1, srcp2, len) +- long int srcp1; +- long int srcp2; +- size_t len; +-{ +- op_t a0, a1, a2, a3; +- op_t b0, b1, b2, b3; +- op_t x; +- int shl, shr; +- +- /* Calculate how to shift a word read at the memory operation +- aligned srcp1 to make it aligned for comparison. */ +- +- shl = 8 * (srcp1 % OPSIZ); +- shr = 8 * OPSIZ - shl; +- +- /* Make SRCP1 aligned by rounding it down to the beginning of the `op_t' +- it points in the middle of. */ +- srcp1 &= -OPSIZ; +- +- switch (len % 4) +- { +- default: /* Avoid warning about uninitialized local variables. */ +- case 2: +- a1 = ((op_t *) srcp1)[0]; +- a2 = ((op_t *) srcp1)[1]; +- b2 = ((op_t *) srcp2)[0]; +- srcp1 -= 1 * OPSIZ; +- srcp2 -= 2 * OPSIZ; +- len += 2; +- goto do1; +- case 3: +- a0 = ((op_t *) srcp1)[0]; +- a1 = ((op_t *) srcp1)[1]; +- b1 = ((op_t *) srcp2)[0]; +- srcp2 -= 1 * OPSIZ; +- len += 1; +- goto do2; +- case 0: +- if (OP_T_THRES <= 3 * OPSIZ && len == 0) +- return 0; +- a3 = ((op_t *) srcp1)[0]; +- a0 = ((op_t *) srcp1)[1]; +- b0 = ((op_t *) srcp2)[0]; +- srcp1 += 1 * OPSIZ; +- goto do3; +- case 1: +- a2 = ((op_t *) srcp1)[0]; +- a3 = ((op_t *) srcp1)[1]; +- b3 = ((op_t *) srcp2)[0]; +- srcp1 += 2 * OPSIZ; +- srcp2 += 1 * OPSIZ; +- len -= 1; +- if (OP_T_THRES <= 3 * OPSIZ && len == 0) +- goto do0; +- /* Fall through. */ +- } +- +- do +- { +- a0 = ((op_t *) srcp1)[0]; +- b0 = ((op_t *) srcp2)[0]; +- x = MERGE(a2, shl, a3, shr); +- if (x != b3) +- return CMP_LT_OR_GT (x, b3); +- +- do3: +- a1 = ((op_t *) srcp1)[1]; +- b1 = ((op_t *) srcp2)[1]; +- x = MERGE(a3, shl, a0, shr); +- if (x != b0) +- return CMP_LT_OR_GT (x, b0); +- +- do2: +- a2 = ((op_t *) srcp1)[2]; +- b2 = ((op_t *) srcp2)[2]; +- x = MERGE(a0, shl, a1, shr); +- if (x != b1) +- return CMP_LT_OR_GT (x, b1); +- +- do1: +- a3 = ((op_t *) srcp1)[3]; +- b3 = ((op_t *) srcp2)[3]; +- x = MERGE(a1, shl, a2, shr); +- if (x != b2) +- return CMP_LT_OR_GT (x, b2); +- +- srcp1 += 4 * OPSIZ; +- srcp2 += 4 * OPSIZ; +- len -= 4; +- } +- while (len != 0); +- +- /* This is the right position for do0. Please don't move +- it into the loop. */ +- do0: +- x = MERGE(a2, shl, a3, shr); +- if (x != b3) +- return CMP_LT_OR_GT (x, b3); +- return 0; +-} +- +-int +-memcmp (s1, s2, len) +- const __ptr_t s1; +- const __ptr_t s2; +- size_t len; +-{ +- op_t a0; +- op_t b0; +- long int srcp1 = (long int) s1; +- long int srcp2 = (long int) s2; +- op_t res; +- +- if (len >= OP_T_THRES) +- { +- /* There are at least some bytes to compare. No need to test +- for LEN == 0 in this alignment loop. */ +- while (srcp2 % OPSIZ != 0) +- { +- a0 = ((byte *) srcp1)[0]; +- b0 = ((byte *) srcp2)[0]; +- srcp1 += 1; +- srcp2 += 1; +- res = a0 - b0; +- if (res != 0) +- return res; +- len -= 1; +- } +- +- /* SRCP2 is now aligned for memory operations on `op_t'. +- SRCP1 alignment determines if we can do a simple, +- aligned compare or need to shuffle bits. */ +- +- if (srcp1 % OPSIZ == 0) +- res = memcmp_common_alignment (srcp1, srcp2, len / OPSIZ); +- else +- res = memcmp_not_common_alignment (srcp1, srcp2, len / OPSIZ); +- if (res != 0) +- return res; +- +- /* Number of bytes remaining in the interval [0..OPSIZ-1]. */ +- srcp1 += len & -OPSIZ; +- srcp2 += len & -OPSIZ; +- len %= OPSIZ; +- } +- +- /* There are just a few bytes to compare. Use byte memory operations. */ +- while (len != 0) +- { +- a0 = ((byte *) srcp1)[0]; +- b0 = ((byte *) srcp2)[0]; +- srcp1 += 1; +- srcp2 += 1; +- res = a0 - b0; +- if (res != 0) +- return res; +- len -= 1; +- } +- +- return 0; +-} +- +-#ifdef weak_alias +-# undef bcmp +-weak_alias (memcmp, bcmp) +-#endif +diff -Naur wmpinboard-1.0.1.orig/src/memcmp.h wmpinboard-1.0.1/src/memcmp.h +--- wmpinboard-1.0.1.orig/src/memcmp.h 2015-05-25 02:30:37.000000000 +0200 ++++ wmpinboard-1.0.1/src/memcmp.h 1970-01-01 01:00:00.000000000 +0100 +@@ -1,8 +0,0 @@ +-#ifndef MEMCMP_H_INCLUDED +-#define MEMCMP_H_INCLUDED +- +-extern int memcmp __P ((__const __ptr_t __s1, __const __ptr_t __s2, +- size_t __n)); +- +-#endif /* MEMCMP_H_INCLUDED */ +- +diff -Naur wmpinboard-1.0.1.orig/src/notes.c wmpinboard-1.0.1/src/notes.c +--- wmpinboard-1.0.1.orig/src/notes.c 2015-05-25 02:30:37.000000000 +0200 ++++ wmpinboard-1.0.1/src/notes.c 2023-03-14 20:58:50.523898242 +0100 +@@ -20,9 +20,6 @@ + #ifdef HAVE_STRING_H + #include <string.h> + #endif +-#ifndef HAVE_MEMCMP +-#include "memcmp.h" +-#endif + + /* a list of the upper left corners of the separate areas of the alarm panel, + numbered from left to right and from top to bottom (double digits followed diff --git a/x11-plugins/wmpinboard/metadata.xml b/x11-plugins/wmpinboard/metadata.xml index 0cd5b9db476b..c54db44b0063 100644 --- a/x11-plugins/wmpinboard/metadata.xml +++ b/x11-plugins/wmpinboard/metadata.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>voyageur@gentoo.org</email> - <name>Bernard Cafarelli</name> -</maintainer> - + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> + <upstream> + <remote-id type="github">bbidulock/wmpinboard</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild b/x11-plugins/wmpinboard/wmpinboard-1.0.1-r1.ebuild index 2c2bdf7149ce..428b51dc5d3f 100644 --- a/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild +++ b/x11-plugins/wmpinboard/wmpinboard-1.0.1-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit autotools DESCRIPTION="Window Maker dock applet resembling a miniature pinboard" HOMEPAGE="https://github.com/bbidulock/wmpinboard" @@ -17,3 +19,10 @@ RDEPEND="x11-libs/libX11 x11-libs/libXpm" DEPEND="${RDEPEND} x11-base/xorg-proto" + +PATCHES=( "${FILESDIR}"/${P}-memcmp.patch ) + +src_prepare() { + default + eautoreconf +} diff --git a/x11-plugins/wmping/wmping-0.2.1-r1.ebuild b/x11-plugins/wmping/wmping-0.2.1-r1.ebuild index 489881f2407c..fb1db3e0d48f 100644 --- a/x11-plugins/wmping/wmping-0.2.1-r1.ebuild +++ b/x11-plugins/wmping/wmping-0.2.1-r1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools + DESCRIPTION="a simple host status monitoring dockapp" HOMEPAGE="https://sourceforge.net/projects/wmping" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" @@ -27,6 +29,11 @@ PATCHES=( DOCS=( AUTHORS CHANGES README ) +src_prepare() { + default + eautoreconf +} + src_install() { if use suid; then default diff --git a/x11-plugins/wmpop3/wmpop3-0.5.6a-r1.ebuild b/x11-plugins/wmpop3/wmpop3-0.5.6a-r2.ebuild index 11956e32e29b..0e1868ab15e0 100644 --- a/x11-plugins/wmpop3/wmpop3-0.5.6a-r1.ebuild +++ b/x11-plugins/wmpop3/wmpop3-0.5.6a-r2.ebuild @@ -1,23 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit toolchain-funcs -DESCRIPTION="dockapp for checking pop3 accounts" +DESCRIPTION="Dockapp for checking pop3 accounts" HOMEPAGE="https://www.dockapps.net/wmpop3" SRC_URI="https://www.dockapps.net/download/${P/wmpop3/WMPop3}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~sparc x86" -IUSE="" DEPEND="x11-wm/windowmaker x11-libs/libXpm" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}"/${P}-list.patch +PATCHES=( + "${FILESDIR}"/${P}-list.patch "${FILESDIR}"/${P}-fno-common.patch ) diff --git a/x11-plugins/wmpower/metadata.xml b/x11-plugins/wmpower/metadata.xml index 4adb979b669f..b24bbe2e197e 100644 --- a/x11-plugins/wmpower/metadata.xml +++ b/x11-plugins/wmpower/metadata.xml @@ -6,11 +6,11 @@ <name>Bernard Cafarelli</name> </maintainer> <longdescription> -wmpower is a Window Maker dock application -allowing the user to graphically see (and set) the power management status of his laptop. -It works with both APM and ACPI enabled kernels, has special support for Toshiba, Compal -and Dell hardware, and allows you to dinamically set the frequency of your CPU(s) via CPUfreq. -</longdescription> + wmpower is a Window Maker dock application + allowing the user to graphically see (and set) the power management status of his laptop. + It works with both APM and ACPI enabled kernels, has special support for Toshiba, Compal + and Dell hardware, and allows you to dinamically set the frequency of your CPU(s) via CPUfreq. + </longdescription> <upstream> <remote-id type="sourceforge">wmpower</remote-id> </upstream> diff --git a/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild b/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild index 977f02854a32..c7a36ce9b193 100644 --- a/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild +++ b/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ inherit autotools DESCRIPTION="a dockapp to get/set power management status for laptops (APM, ACPI and CPUfreq)" -HOMEPAGE="http://wmpower.sourceforge.net/" +HOMEPAGE="https://wmpower.sourceforge.net/" SRC_URI="mirror://sourceforge/wmpower/${P}.tar.bz2" LICENSE="GPL-2" diff --git a/x11-plugins/wmppp/wmppp-1.3.2-r2.ebuild b/x11-plugins/wmppp/wmppp-1.3.2-r2.ebuild index 9b9b0e378314..e7cb490bbd0f 100644 --- a/x11-plugins/wmppp/wmppp-1.3.2-r2.ebuild +++ b/x11-plugins/wmppp/wmppp-1.3.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,8 +6,8 @@ inherit toolchain-funcs MY_P=${PN}.app-${PV} DESCRIPTION="PPP dial control and network load monitor with NeXTStep look" -HOMEPAGE="http://www.dockapps.net/wmpppapp" -SRC_URI="http://www.dockapps.net/download/${MY_P}.tar.gz" +HOMEPAGE="https://www.dockapps.net/wmpppapp" +SRC_URI="https://www.dockapps.net/download/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/x11-plugins/wmrack/files/1.4-Fix-type-specifier-missing-and-undeclared-function-c.patch b/x11-plugins/wmrack/files/1.4-Fix-type-specifier-missing-and-undeclared-function-c.patch new file mode 100644 index 000000000000..6e44f34a2ee2 --- /dev/null +++ b/x11-plugins/wmrack/files/1.4-Fix-type-specifier-missing-and-undeclared-function-c.patch @@ -0,0 +1,41 @@ +From ff65fefaa53a199933c005129b78e0c4f5a5ab47 Mon Sep 17 00:00:00 2001 +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Thu, 11 May 2023 11:34:42 +0530 +Subject: [PATCH] Fix type specifier missing and undeclared function call with + clang 16 + +- wmrack.c:1243:12: error: type specifier missing, defaults to 'int' +- wmrack.c:1300:22: error: call to undeclared function 'time'; ISO C99 and later do not support implicit function declarations + +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> + +Bug: https://bugs.gentoo.org/899046 +Upstream Issue: https://sourceforge.net/p/wmrack/patches/3/ +--- + wmrack.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/wmrack.c b/wmrack.c +index ea49d40..4aa3d56 100644 +--- a/wmrack.c ++++ b/wmrack.c +@@ -25,6 +25,7 @@ + #include <unistd.h> + #include <errno.h> + #include <signal.h> ++#include <time.h> + + #include <X11/Xlib.h> + #include <X11/Xresource.h> +@@ -1240,7 +1241,7 @@ redrawDisplay (int force_win, int force_disp) + int track[2] = { 0, 0 }; + int cdtime[4] = { 0, 0, 0, 0 }; + static time_t last_flash_time; +- static flash = 0; ++ static int flash = 0; + int st = 0, newRack = RACK_NODISC, im_stop = 0; + MSF pos; + +-- +2.40.1 + diff --git a/x11-plugins/wmrack/wmrack-1.4-r1.ebuild b/x11-plugins/wmrack/wmrack-1.4-r1.ebuild index f40d1f916205..f41d124b4421 100644 --- a/x11-plugins/wmrack/wmrack-1.4-r1.ebuild +++ b/x11-plugins/wmrack/wmrack-1.4-r1.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 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" +HOMEPAGE="https://wmrack.sourceforge.net" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" @@ -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/wmrack/wmrack-1.4-r2.ebuild b/x11-plugins/wmrack/wmrack-1.4-r2.ebuild new file mode 100644 index 000000000000..694a3530a03b --- /dev/null +++ b/x11-plugins/wmrack/wmrack-1.4-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="a sound mixer and CD player dockapp" +HOMEPAGE="https://wmrack.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +RDEPEND="x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXext" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +DOCS=( CHANGES README TODO ) + +PATCHES=( "${FILESDIR}"/${PV}-Fix-type-specifier-missing-and-undeclared-function-c.patch ) + +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 +} + +src_install() { + emake LIBDIR="${D}/usr/$(get_libdir)/WMRack" \ + MANDIR="${D}/usr/share/man" BINDIR="${D}/usr/bin" \ + install + einstalldocs +} diff --git a/x11-plugins/wmstickynotes/files/wmstickynotes-0.7-clang16.patch b/x11-plugins/wmstickynotes/files/wmstickynotes-0.7-clang16.patch new file mode 100644 index 000000000000..7674dcfd4984 --- /dev/null +++ b/x11-plugins/wmstickynotes/files/wmstickynotes-0.7-clang16.patch @@ -0,0 +1,8 @@ +https://bugs.gentoo.org/874927 +--- a/wmstickynotes.h ++++ b/wmstickynotes.h +@@ -34,3 +34,3 @@ + +-const num_color_schemes = 8; ++const int num_color_schemes = 8; + ColorScheme color_schemes[] = { diff --git a/x11-plugins/wmstickynotes/wmstickynotes-0.7.ebuild b/x11-plugins/wmstickynotes/wmstickynotes-0.7-r1.ebuild index 8b8830387ff3..3058805ac1e9 100644 --- a/x11-plugins/wmstickynotes/wmstickynotes-0.7.ebuild +++ b/x11-plugins/wmstickynotes/wmstickynotes-0.7-r1.ebuild @@ -3,6 +3,8 @@ EAPI=8 +inherit flag-o-matic + DESCRIPTION="A dockapp for keeping small notes around on the desktop" HOMEPAGE="https://sourceforge.net/projects/wmstickynotes/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" @@ -11,5 +13,20 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -DEPEND="x11-libs/gtk+:2" -RDEPEND="${DEPEND}" +RDEPEND=" + dev-libs/glib:2 + x11-libs/gtk+:2 + x11-libs/libX11" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" + +PATCHES=( + "${FILESDIR}"/${P}-clang16.patch +) + +src_configure() { + append-cppflags -D_GNU_SOURCE #874927 + + default +} diff --git a/x11-plugins/wmsysmon/Manifest b/x11-plugins/wmsysmon/Manifest index 12e312cd5b7f..6385c75444c2 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 +DIST wmsysmon-0.8.1.tar.gz 21276 BLAKE2B 17711e383f6285bccb16eeae83bfd302e73bed4b9744aa2ef78e228ff103f2342d024668cf285578cbebb3f9cbbd14ae3b5bab26b3454bb973449cc124068f0c SHA512 d6ce023683083de292284f6e155053a6da2dad87365d63c296b857507f803426fc68880c90489c3f5bd756bf66359b5d4624e928afec9cd1d0a3d5792a3a8f2b 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 e9477899b1b9..000000000000 --- 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 4a1faee41b23..70a26acef4a9 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/wmsysmon/wmsysmon-0.8.1.ebuild b/x11-plugins/wmsysmon/wmsysmon-0.8.1.ebuild new file mode 100644 index 000000000000..6d98e0bd7d33 --- /dev/null +++ b/x11-plugins/wmsysmon/wmsysmon-0.8.1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 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/wmsystemtray/wmsystemtray-1.4-r2.ebuild b/x11-plugins/wmsystemtray/wmsystemtray-1.4-r3.ebuild index 47d0230996a8..4c9322846e2b 100644 --- a/x11-plugins/wmsystemtray/wmsystemtray-1.4-r2.ebuild +++ b/x11-plugins/wmsystemtray/wmsystemtray-1.4-r3.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=7 +EAPI=8 inherit autotools DESCRIPTION="a system tray dockapp with the ability to display more than just four tray icons" @@ -16,7 +16,8 @@ DEPEND="x11-libs/libXext x11-libs/libXfixes x11-libs/libXmu x11-libs/libXpm" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + media-fonts/font-misc-misc" PATCHES=( "${FILESDIR}"/${P}-ar.patch ) diff --git a/x11-plugins/wmsystray/metadata.xml b/x11-plugins/wmsystray/metadata.xml index 0cd5b9db476b..7c3a2439c85d 100644 --- a/x11-plugins/wmsystray/metadata.xml +++ b/x11-plugins/wmsystray/metadata.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>voyageur@gentoo.org</email> - <name>Bernard Cafarelli</name> -</maintainer> - + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> + <upstream> + <remote-id type="github">bbidulock/wmsystray</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-plugins/wmtimer/metadata.xml b/x11-plugins/wmtimer/metadata.xml index b1f32fa558ec..a07ab7abb0ab 100644 --- a/x11-plugins/wmtimer/metadata.xml +++ b/x11-plugins/wmtimer/metadata.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>voyageur@gentoo.org</email> - <name>Bernard Cafarelli</name> -</maintainer> - -<longdescription> -WMTimer is a dockable alarm clock for Windowmaker or Blackbox which can be run -in alarm, countdown timer, or chronograph mode. In alarm or timer mode, you can -either execute a command or sound the system bell when the time is reached. -WMTimer is configurable through the command line or the GTK GUI. -</longdescription> + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> + <longdescription> + WMTimer is a dockable alarm clock for Windowmaker or Blackbox which can be run + in alarm, countdown timer, or chronograph mode. In alarm or timer mode, you can + either execute a command or sound the system bell when the time is reached. + WMTimer is configurable through the command line or the GTK GUI. + </longdescription> + <upstream> + <remote-id type="github">bbidulock/wmtimer</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-plugins/wmtimer/wmtimer-2.92-r2.ebuild b/x11-plugins/wmtimer/wmtimer-2.92-r3.ebuild index bcf6d63c094c..aeb6a3896127 100644 --- a/x11-plugins/wmtimer/wmtimer-2.92-r2.ebuild +++ b/x11-plugins/wmtimer/wmtimer-2.92-r3.ebuild @@ -1,27 +1,26 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit multilib toolchain-funcs +EAPI=8 + +inherit toolchain-funcs DESCRIPTION="Dockable clock which can run in alarm, countdown timer or chronograph mode" HOMEPAGE="https://github.com/bbidulock/wmtimer" SRC_URI="https://github.com/bbidulock/wmtimer/releases/download/v${PV}/${P}.tar.gz" +S="${WORKDIR}/${P}/${PN}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ppc ppc64 ~sparc x86" -IUSE="" RDEPEND=">=dev-libs/glib-2 x11-libs/gtk+:2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${P}/${PN} +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { sed -i -e "s|\$(CFLAGS)||" Makefile || die diff --git a/x11-plugins/wmtop/wmtop-0.85.ebuild b/x11-plugins/wmtop/wmtop-0.85-r1.ebuild index 63b85df2a302..a22492bad3bf 100644 --- a/x11-plugins/wmtop/wmtop-0.85.ebuild +++ b/x11-plugins/wmtop/wmtop-0.85-r1.ebuild @@ -1,17 +1,19 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit autotools -DESCRIPTION="dockapp for monitoring the top three processes using cpu or memory" +DESCRIPTION="Dockapp for monitoring the top three processes using cpu or memory" HOMEPAGE="https://www.dockapps.net/wmtop" SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" +# Incorrect path in this tarball version +S="${WORKDIR}/dockapps-be3f170" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~ppc x86" -IUSE="" RDEPEND=">=x11-libs/libdockapp-0.7:= x11-libs/libX11 @@ -20,11 +22,7 @@ RDEPEND=">=x11-libs/libdockapp-0.7:= DEPEND="${RDEPEND} x11-base/xorg-proto" -# Incorrect path in this tarball version -S=${WORKDIR}/dockapps-be3f170 - src_prepare() { eapply_user - eautoreconf } diff --git a/x11-plugins/wmtz/wmtz-0.7_p20150816.ebuild b/x11-plugins/wmtz/wmtz-0.7_p20150816-r1.ebuild index 1e47374c61b4..b2b4e3f210e1 100644 --- a/x11-plugins/wmtz/wmtz-0.7_p20150816.ebuild +++ b/x11-plugins/wmtz/wmtz-0.7_p20150816-r1.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit multilib toolchain-funcs +EAPI=8 -DESCRIPTION="dockapp that shows the time in multiple timezones" +inherit toolchain-funcs + +DESCRIPTION="Dockapp that shows the time in multiple timezones" HOMEPAGE="https://www.dockapps.net/wmtz" # https://www.dockapps.net/download/${P}.tar.gz SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz" +S="${WORKDIR}/${P}/${PN}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ppc ~sparc x86" -IUSE="" RDEPEND=">=x11-libs/libdockapp-0.7:= x11-libs/libX11 @@ -20,8 +21,6 @@ RDEPEND=">=x11-libs/libdockapp-0.7:= x11-libs/libXpm" DEPEND="${RDEPEND}" -S=${WORKDIR}/${P}/${PN} - src_prepare() { default #Honour Gentoo LDFLAGS, see bug #337890. diff --git a/x11-plugins/wmudmount/metadata.xml b/x11-plugins/wmudmount/metadata.xml index 8468108df3fb..52aeabf7202d 100644 --- a/x11-plugins/wmudmount/metadata.xml +++ b/x11-plugins/wmudmount/metadata.xml @@ -7,7 +7,6 @@ </maintainer> <use> <flag name="gcr">Enable support for secure memory with <pkg>app-crypt/gcr</pkg></flag> - <flag name="secret">Enable support for secret service with <pkg>app-crypt/libsecret</pkg></flag> </use> <upstream> <remote-id type="sourceforge">wmudmount</remote-id> diff --git a/x11-plugins/wmudmount/wmudmount-3.0.ebuild b/x11-plugins/wmudmount/wmudmount-3.0-r2.ebuild index 0c10dbceb600..ac9b162e9b6d 100644 --- a/x11-plugins/wmudmount/wmudmount-3.0.ebuild +++ b/x11-plugins/wmudmount/wmudmount-3.0-r2.ebuild @@ -1,26 +1,31 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit gnome2-utils +EAPI=8 -DESCRIPTION="A filesystem mounter that uses udisks to handle notification and mounting" +inherit xdg-utils + +DESCRIPTION="Filesystem mounter using udisks to handle notification and mounting" HOMEPAGE="https://sourceforge.net/projects/wmudmount/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="gcr libnotify secret" +IUSE="gcr keyring libnotify" -RDEPEND="sys-fs/udisks:2 +RDEPEND=" + sys-fs/udisks:2 >=x11-libs/gtk+-3.16.0:3 - gcr? ( app-crypt/gcr[gtk] ) + gcr? ( app-crypt/gcr:0=[gtk] ) + keyring? ( app-crypt/libsecret ) libnotify? ( >=x11-libs/libnotify-0.7 ) - secret? ( app-crypt/libsecret )" -DEPEND="${RDEPEND} +" +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig - virtual/imagemagick-tools[png]" + virtual/imagemagick-tools[png] +" DOCS="ChangeLog" @@ -30,13 +35,13 @@ src_configure() { econf \ $(use_with gcr) \ $(use_with libnotify) \ - $(use_with secret) + $(use_with keyring secret) } pkg_postinst() { - gnome2_icon_cache_update + xdg_icon_cache_update } pkg_postrm() { - gnome2_icon_cache_update + xdg_icon_cache_update } diff --git a/x11-plugins/wmweather+/Manifest b/x11-plugins/wmweather+/Manifest index 11e7543e7bc7..1204dbc1d818 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 1b26aa3936e5..000000000000 --- 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+/files/wmweather+-2.18-configure-clang16.patch b/x11-plugins/wmweather+/files/wmweather+-2.18-configure-clang16.patch new file mode 100644 index 000000000000..68a4d3f33190 --- /dev/null +++ b/x11-plugins/wmweather+/files/wmweather+-2.18-configure-clang16.patch @@ -0,0 +1,67 @@ +https://sourceforge.net/p/wmweatherplus/bugs/21/ +https://bugs.gentoo.org/870958 + +Port the configure script to C99 by avoiding calls to the undeclared +exit function. Future compilers are likely to reject implicit +function declarations by default; this C features was removed from the +language in 1999. + +--- a/m4/snprintf.m4 ++++ b/m4/snprintf.m4 +@@ -24,7 +24,7 @@ int snprintf(char *str, size_t size, const char *format, ...); + #endif + ]], + [[char foo[]="ABC"; snprintf(foo, 2, "%d", 12); +-exit((foo[0]=='1' && foo[1]=='\0' && foo[2]=='C')?0:1);]])], ++return (foo[0]=='1' && foo[1]=='\0' && foo[2]=='C')?0:1;]])], + [x_cv_func_snprintf_size=yes], + [x_cv_func_snprintf_size=no], + [x_cv_func_snprintf_size=no])]) +@@ -52,7 +52,7 @@ AC_CACHE_CHECK([if snprintf return value is sane], x_cv_func_snprintf_retval, + int snprintf(char *str, size_t size, const char *format, ...); + #endif + ]], +-[[char foo[10]; exit((snprintf(foo, 1, "%d", 9876)==4)?0:1);]])], ++[[char foo[10]; return (snprintf(foo, 1, "%d", 9876)==4)?0:1;]])], + [x_cv_func_snprintf_retval=yes], + [x_cv_func_snprintf_retval=no], + [x_cv_func_snprintf_retval=no])]) +@@ -79,7 +79,7 @@ AC_CACHE_CHECK([if snprintf(NULL, 0, ...) works], x_cv_func_snprintf_null_ok, + int snprintf(char *str, size_t size, const char *format, ...); + #endif + ]], +-[int r=snprintf(NULL, 0, "%d", 100); exit((r==3 || r==-1)?0:1);])], ++[int r=snprintf(NULL, 0, "%d", 100); return (r==3 || r==-1)?0:1;])], + [x_cv_func_snprintf_null_ok=yes], + [x_cv_func_snprintf_null_ok=no], + [x_cv_func_snprintf_null_ok=no])]) +--- a/m4/vsnprintf.m4 ++++ b/m4/vsnprintf.m4 +@@ -37,7 +37,7 @@ int doit(char *str, size_t size, const char *format, ...){ + } + ]], + [[char foo[]="ABC"; doit(foo, 2, "%d", 12); +-exit((foo[0]=='1' && foo[1]=='\0' && foo[2]=='C')?0:1);]])], ++return (foo[0]=='1' && foo[1]=='\0' && foo[2]=='C')?0:1;]])], + [x_cv_func_vsnprintf_size=yes], + [x_cv_func_vsnprintf_size=no], + [x_cv_func_vsnprintf_size=no])]) +@@ -74,7 +74,7 @@ int doit(char *str, size_t size, const char *format, ...){ + return r; + } + ]], +-[[char foo[10]; exit((doit(foo, 1, "%d", 9876)==4)?0:1);]])], ++[[char foo[10]; return (doit(foo, 1, "%d", 9876)==4)?0:1;]])], + [x_cv_func_vsnprintf_retval=yes], + [x_cv_func_vsnprintf_retval=no], + [x_cv_func_vsnprintf_retval=no])]) +@@ -110,7 +110,7 @@ int doit(char *str, size_t size, const char *format, ...){ + return r; + } + ]], +-[int r=doit(NULL, 0, "%d", 100); exit((r==3 || r==-1)?0:1);])], ++[int r=doit(NULL, 0, "%d", 100); return (r==3 || r==-1)?0:1;])], + [x_cv_func_vsnprintf_null_ok=yes], + [x_cv_func_vsnprintf_null_ok=no], + [x_cv_func_vsnprintf_null_ok=no])]) + diff --git a/x11-plugins/wmweather+/wmweather+-2.17.ebuild b/x11-plugins/wmweather+/wmweather+-2.17.ebuild deleted file mode 100644 index 94bc2487217f..000000000000 --- 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-r1.ebuild index 7dffde689df7..0c62154e0166 100644 --- a/x11-plugins/wmweather+/wmweather+-2.18.ebuild +++ b/x11-plugins/wmweather+/wmweather+-2.18-r1.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 @@ -21,7 +21,10 @@ DEPEND="dev-libs/libpcre x11-wm/windowmaker" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}"/${P}-ar.patch ) +PATCHES=( + "${FILESDIR}"/${P}-ar.patch + "${FILESDIR}"/${P}-configure-clang16.patch +) src_prepare() { default diff --git a/x11-plugins/wmweather/Manifest b/x11-plugins/wmweather/Manifest index c6ec022bb541..d623bc25a227 100644 --- a/x11-plugins/wmweather/Manifest +++ b/x11-plugins/wmweather/Manifest @@ -1 +1,2 @@ DIST wmweather_2.4.7.orig.tar.gz 86220 BLAKE2B 55eeab40bb4cdb30d8e82b801728e7d0b8a32f741769e098b6d61ba087af27ed8401391853f53e7f06e616d5a99e6f38714c438b9e66765c1159c07f6d324d12 SHA512 d9d0c46e85a24aaa278aa75e0fcd51fc417c3c094d9e69c5820a288955c3ebdde21a24b26964824d9275a41ec053e3d942b185b24088d806e033e311e6e09108 +DIST wmweather_2.4.8.orig.tar.gz 113536 BLAKE2B b311121cd69e30672dcfef54ac9f9ce39b284df890e02047d98edccfd76d41a22f7524c1b512abe8e458f0a4797aca3911d36bb569e81f547b96bcb8fb331f8f SHA512 b7417de4e300aa25ef32c3218d4788ef4191abd1d942a0d0a532dc168b6c7de7f05d92ba6e568523f63932d910e1b8cbde1543e33eb30662dba4b5e2886cfcaa diff --git a/x11-plugins/wmweather/wmweather-2.4.7.ebuild b/x11-plugins/wmweather/wmweather-2.4.7-r1.ebuild index 174e4977f14a..fe55a40556a3 100644 --- a/x11-plugins/wmweather/wmweather-2.4.7.ebuild +++ b/x11-plugins/wmweather/wmweather-2.4.7-r1.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -DESCRIPTION="a dockable weather monitor for standard METAR stations using ICAO location" +DESCRIPTION="Dockable weather monitor for standard METAR stations using ICAO location" HOMEPAGE="https://people.debian.org/~godisch/wmweather/" SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}.orig.tar.gz" +S="${WORKDIR}/${P}/src" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~mips ppc ppc64 ~sparc x86" -IUSE="" RDEPEND="x11-libs/libX11 x11-libs/libXext @@ -21,8 +21,6 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} x11-base/xorg-proto" -S=${WORKDIR}/${P}/src - DOCS=( "${WORKDIR}"/${P}/CHANGES "${WORKDIR}"/${P}/README diff --git a/x11-plugins/wmweather/wmweather-2.4.8.ebuild b/x11-plugins/wmweather/wmweather-2.4.8.ebuild new file mode 100644 index 000000000000..2fb481c9a1c0 --- /dev/null +++ b/x11-plugins/wmweather/wmweather-2.4.8.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Dockable weather monitor for standard METAR stations using ICAO location" +HOMEPAGE="https://people.debian.org/~godisch/wmweather/" +SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}.orig.tar.gz" +S="${WORKDIR}/${P}/src" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND="x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm + x11-libs/libICE + x11-apps/xmessage + net-misc/curl" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +DOCS=( + "${WORKDIR}"/${P}/CHANGES + "${WORKDIR}"/${P}/README + ) diff --git a/x11-plugins/wmwifi/wmwifi-0.6-r1.ebuild b/x11-plugins/wmwifi/wmwifi-0.6-r1.ebuild index a52c89a719bf..255ed5e11010 100644 --- a/x11-plugins/wmwifi/wmwifi-0.6-r1.ebuild +++ b/x11-plugins/wmwifi/wmwifi-0.6-r1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools + DESCRIPTION="wireless network interface monitor dockapp" HOMEPAGE="https://www.dockapps.net/wmwifi" SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" @@ -19,6 +21,11 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} x11-base/xorg-proto" +src_prepare() { + default + eautoreconf +} + src_compile() { # by default it does not honour our CFLAGS emake CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}" diff --git a/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild b/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild index e8fd4e681e82..6a51842e1cda 100644 --- a/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild +++ b/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools + DESCRIPTION="a dockapp that lets you easily track time spent on different projects" HOMEPAGE="https://www.dockapps.net/wmwork" SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" @@ -20,4 +22,9 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${P}/src" DOCS=( ../{CHANGES,README} ) -PATCHES=( ${FILESDIR}/${P}-gcc-10.patch ) +PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch ) + +src_prepare() { + default + eautoreconf +} diff --git a/x11-plugins/wmxkb/wmxkb-1.2.2-r1.ebuild b/x11-plugins/wmxkb/wmxkb-1.2.2-r1.ebuild index c22114f48ac8..9ada95c7ec20 100644 --- a/x11-plugins/wmxkb/wmxkb-1.2.2-r1.ebuild +++ b/x11-plugins/wmxkb/wmxkb-1.2.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit toolchain-funcs +inherit autotools toolchain-funcs DESCRIPTION="Dockable keyboard layout switcher for Window Maker" HOMEPAGE="http://wmalms.tripod.com/#WMXKB" @@ -26,6 +26,7 @@ HTML_DOCS=( doc/manual{,_body,_title}.html ) src_prepare() { default sed -i -e 's:$(LD) -o:$(CC) $(LDFLAGS) -o:' Makefile.in || die #336528 + eautoreconf } src_compile() { |