gentoo auto-resync : 13:04:2023 - 17:43:46

9 files changed, 142 insertions, 35 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 237345d3d300..b95e9b3ba675 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/allin1/Manifest b/x11-plugins/allin1/Manifest
index ef3edc523086..cdf83359f701 100644
--- a/x11-plugins/allin1/Manifest
+++ b/x11-plugins/allin1/Manifest
@@ -1,4 +1,4 @@
-AUX makefile-r2.patch 587 BLAKE2B 0aab33c0b78c37f097237180663a929fcd1b6cc356afd36dcf07a88573a9214dd588a316ea06f6807536665b6663b0cd2c578873cbf6cdbc4a1f30d3ed844c0a SHA512 13b366ce564ddbf3aac94dae0ac7e4b1f5ea77755ae875bdb70b1ba9706045f6424c5fea3c870f6f9f0da0a986268ebdf81ebf71e9621c9e0256a3ecd738bab2
+AUX allin1-0.5.0-makefile.patch 1624 BLAKE2B d966d5d87f09f6873bece00ab4711506be23dbec57161939076f22065f8456b9759f8b45483474815e7be6db93729972646158c8dac6e6e411e51329855b4181 SHA512 e840a0752ef99b490d36d0a3e6d3c8bcf6ad49a8857a709382c1c90faa78ffee040bc16f13f85df6bee96d1dc3e39473defdddf36651f255ac2c576f5d3fbd7c
 DIST allin1-0.5.0.tar.gz 43905 BLAKE2B e914d174d4b1c15e8df53deb793388d8d5cbe9e1a663663b08aad052654b6b759670310d1276f0705bd8faa459c33144a6656cb64610b9d6814809e65ea34798 SHA512 2728bc86b59850dd3e928ea62f00e32bb06a1ea4b8dc3611b2fdc952de8decef7d9ac3c51ed3676d242b5de670270e19bf5783658c6651ae534154249d99a4e7
-EBUILD allin1-0.5.0-r2.ebuild 764 BLAKE2B 091505c9b4a8ed62086ffd511ec0c4e508741d75e8c082d82c021279ea8b0b2ed7aab5136253328e81bf0ea672bcb11dab43ee9f4d5c0a0ca42dee9ac2444e23 SHA512 2e190ad6ba8943ce8fa467b295086e1a5e7be92c7b4a0d3abefebb390d7b7e392831e1c950f5e15c255b18b39427a16464227770b6e7bd48781ddb1ee94f85fc
+EBUILD allin1-0.5.0-r3.ebuild 722 BLAKE2B b1e467e168f3fc531b6111bd5abcccc50bb8e6d99ea97aade6a2774db697ddbc9ad923e44faf840bb9ac55f2fc488b9a140fe1add9ee7d320a66ad04960c561c SHA512 dc5a7131df87fda035f626b156477e43263a4138cb996360511c3582aeb06fb093232924aa366a7d868c7fa62164f15c60ed6aafa5c68ae660004f3ef78b353d
 MISC metadata.xml 566 BLAKE2B fc386e39f96e66a724f38ac22176b39bf7a655cc210ad4d9228b8c6723906ba0204fab551c59cc84eb0880e8f2f31b6b55f18ac1753f9199fae0cf3edd6ff46a SHA512 ee310bb63bba1069791a7e0779f85d0257abb0c455cb1aeaecf46debe5f8b98ac5fdf8595a091471f89d9141e7d27964890b96ec9589026ec1987392c39cf0f1
diff --git a/x11-plugins/allin1/allin1-0.5.0-r2.ebuild b/x11-plugins/allin1/allin1-0.5.0-r3.ebuild
index 8fbbd58b567a..3d5fb558e2e9 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-2023 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="sys-devel/flex"
 
-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/wmamixer/Manifest b/x11-plugins/wmamixer/Manifest
index 16fe92677342..3f2e43a79fd0 100644
--- a/x11-plugins/wmamixer/Manifest
+++ b/x11-plugins/wmamixer/Manifest
@@ -1,4 +1,6 @@
 DIST wmamixer-1.0.tar.gz 93181 BLAKE2B 16370da2c1f408b3b584a649e1317850963f2446997e1027cfa7b2cdfa1351807761d3981e2a2cc91ef42272df1146550b3943862d1cf03af5f96d83e6c2c42f SHA512 a5eac2ea3f63770f64f6d2c921aec0d38c54e953c7f5bf1d7ba14c510cc21927751d6939571eb3aede2c7bd0e44bfc84f8dd06ae1af0ef71f2bce8f1b6614708
+DIST wmamixer-1.1.tar.gz 93181 BLAKE2B de2a42d5dd2086c467d1849aeb06e9bf7b6be5efb255e3ae53fd05b050c607cfa2307972566eb41500277cd25d31fd8cb5db10a8b2bde564940904a17361fbb1 SHA512 a372324795be22dd9c6bc2cb78ab363c7f716bb9373dd0127b8e8e5e036d94d0b2df9654d5f75a9b0d318a6a679967fc3fe48b4bf6979faa8f35c6051478bbaf
 EBUILD wmamixer-1.0-r1.ebuild 708 BLAKE2B f545b2fe1c33448907149f4c2f7477799717bf8fbe8bb00de4dfe500dc1a47150f7d4146318eb35b64914128b359ff580657a23d581e32e9358f2d5b77051d43 SHA512 0f9193d7b3d55dc546c83775418a36ae99a5a40c9a5c92be1d9cbf4887c04bc662ad03e831be77997cf8fe94928fa12eb45f8a8e40b0d3f9ed8e05970884804b
 EBUILD wmamixer-1.0.ebuild 690 BLAKE2B 59f091bdd8019d353f5f1e83b428cedd8c69f790fcf5200b0aa14027b093eadf2400266000582f50d9c8b20612b9c442456b3cf58c7d7f92134d559b72d08a1b SHA512 d88c7bcc14fe83d32019499e4f32f77422ccf22389482682a94803fd704f5f9f50238e00d7cc0b2fef645923f91d0adc86eb16dec0ce33fd29d3574449a99197
+EBUILD wmamixer-1.1.ebuild 708 BLAKE2B 0e429d98f691f4ae191e7fdcbc10060bc468dd56abdee61fa38ffe44b8ac0eceee07a2184ef0379e292bfec1e21bb8691840c9326b0bff9624fa78c208cd353e SHA512 0c74429de38eac217f4a25e87990c62d9a93bf95587fbe69dbda7732b3016a6e47decd153a39ffa225ce327c24a5c050067a2fc543cc3d909f6cd39a952cf3e5
 MISC metadata.xml 475 BLAKE2B d88131b6a3b937f08ee3f0a5080b7d0a93400cd8528e6595e815dadfa2fe16a9d7a437754147bea18309817fad614e8cc0fd8f992cb8994e25aeee754752fc01 SHA512 fa250ea6d7cd30cdeb6d00c820ce13655312d8a36db2a2750e2e7b487e549f0ae4b0e49d4a576b4e4e21d5f8b8f72890cc7ed344846bab95d17b75675c612968
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/wmsysmon/Manifest b/x11-plugins/wmsysmon/Manifest
index bb39b07a8933..143823e01c8a 100644
--- a/x11-plugins/wmsysmon/Manifest
+++ b/x11-plugins/wmsysmon/Manifest
@@ -1,3 +1,5 @@
 DIST wmsysmon-0.8.0.tar.gz 21262 BLAKE2B 50c7e3149fbad711f7505558549eadede78abf4f52d5c2c6eff0bd74bbb9838f85b78d73a7021a3baf9776cdccfb2b8e621de897fdafe5a7af71cd8518933852 SHA512 af9f939de5031387abf31d7ad9b4f767056a5f0d1494ee95476fb6c3bafab95ffe78148da74bf004b40a1e0d4ace9616c272bce0f4900491c8983c34531c29e7
+DIST wmsysmon-0.8.1.tar.gz 21276 BLAKE2B 17711e383f6285bccb16eeae83bfd302e73bed4b9744aa2ef78e228ff103f2342d024668cf285578cbebb3f9cbbd14ae3b5bab26b3454bb973449cc124068f0c SHA512 d6ce023683083de292284f6e155053a6da2dad87365d63c296b857507f803426fc68880c90489c3f5bd756bf66359b5d4624e928afec9cd1d0a3d5792a3a8f2b
 EBUILD wmsysmon-0.8.0.ebuild 694 BLAKE2B c1e6259e9194f8f8b41df2a815c42b4b2bdd6fddf0516f58c4b0ff0a17c7fcf12ce245243914d216c0c7250b64d8127507b9d95834b101bc7b5c42298afaeadc SHA512 84a52a1a9293b877f6f83c726cdf3041032038ea3be0dc0b9ed3a4274ab939b3673911f467716088e2dc9cedaeeeeb4806d570b33056eb9c41dffe91766e772d
+EBUILD wmsysmon-0.8.1.ebuild 694 BLAKE2B 67e995b619c2b66b2c0c7ccfdb2e54be0f7ecb9675499390a6b0dbad70cad4d3a055f51eee47bfa667847ee0a11492f25e5d0b3385622d51181885ca5fdb5e82 SHA512 aa54dd10454f7d18262195eb083b16dce4ea500ac1439e4d07dbb7cefa8fe20429302ee57730871b6c9cdd0ec8297bc4e1ad062749260924ab47f588677cb0bc
 MISC metadata.xml 328 BLAKE2B 8d218cb7c1a5950684a74899fb5760682d04086b88c6167721e5239a08bafe65b598a2ca7e0075e32d2214357cd47005bbb14de1fe3a7a7674ab381373374c49 SHA512 d5c6eb8346ac87e5993bf6653805a86dc84fdf3a75410a373637dcc8af0ba7181fa4be1e82b29c138f516961cf8533e5030faa6abb30b60bff69be5dc762a745
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
+}