gentoo auto-resync : 05:12:2022 - 03:04:53

11 files changed, 156 insertions, 50 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 467aab9b169d..fe1f1fdb28ed 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/lndir/Manifest b/x11-misc/lndir/Manifest
index e9e19e4de5a0..1e2136587b1f 100644
--- a/x11-misc/lndir/Manifest
+++ b/x11-misc/lndir/Manifest
@@ -1,4 +1,5 @@
 DIST lndir-1.0.3.tar.bz2 114392 BLAKE2B 2e9feb3057f1508a118c4dd6212305e626ba25dd32296d35a553b5c42cb441e494d386d4c9afe15f150a9a8da2b7fac0ae7a128948544c4545ea740d7e7e21a6 SHA512 c9f03c825c627935abe399bf8292bbf69304cb9e9d65a4c860b49e32e2ed4dde25bf658a5ab2116cd215381d0a52f464a8a53469c27adddbd9fa2bfd135a7289
+DIST lndir-1.0.4.tar.xz 120136 BLAKE2B dbc9370c66bfffe02a9dfa2004a354f006dad1252c6d76f9707fa6b420be2b4072941c9c65bf695dbf6f0a7a01f6ef8152146d6aa3b5eda310e6f3f1412a6747 SHA512 71ebebaa9edb1ffe9d833cf23241bd7d99f4704a2eec20638eb9af1ff34bd42882557dadbcbe84a9e26f9d885caf1e555dca4756efd9915ca7642e39a8c6f711
 EBUILD lndir-1.0.3-r2.ebuild 910 BLAKE2B 906a5caa398da8f4292fe88dacd9bb00ddad281bf61574feb42413e583aa9404615c92634ebf74a8d1eb0b0314953593e45a5657249db16be0d23f4c2bcf10a4 SHA512 33ad53cf1cdaef8960bae040863d01eb1f05ca5122f08feeb81059d3f1eb3cabcb611c0fda9117b58936cb21350d6c723d638cb02c54ea4db9bcd610329e7ea8
-EBUILD lndir-9999.ebuild 915 BLAKE2B 5d39545b53476c04a51537deae25f6447bbc7988adfc0b06346dcf767bc699203063eef4030aa2bb6c7a4015fcf69fe4631a6f7bbfc5897998a14c0b71e1086f SHA512 c909db16fba15ac836c801a7d383169fc7c45bf49a8202ac668b8bd3c05fac7565eab7d22a1def4b858d8c3e4c1af9641a728b72613bf9ffad36185fda9e61d2
+EBUILD lndir-1.0.4.ebuild 348 BLAKE2B 07889fb004bc86fd3fb419fe398f8c8803c537fe1758607260ead06887769bca1983b76c4f16a4c27d53f9339b0142a2542c9d03d61b99c42c8d4d69845ede8b SHA512 43652db2fbcd104a90508fafc81bf1b36903135839365fe76b16f68a33a5e403c8e9a9ca05d42438c4e552e39ddf2cafcf8eb59cbb8c862b4df5d1a197ef8338
 MISC metadata.xml 337 BLAKE2B 1385412391438bffb9150bb67b5d5f3c5dd67c820e57ea859ad0dae6e2bb0a61df54469d0b44534b9248010ac7244c350116f7f2f22c484a43d97f269c2708c0 SHA512 b882f390c8dec906f76c2e05f89639d1afa89b3a03475631911d25b46c1df6fbb3df8a35ac341c0845fcfd690668a211f3cbf2e3fd72238c25242bd1347b764c
diff --git a/x11-misc/lndir/lndir-1.0.4.ebuild b/x11-misc/lndir/lndir-1.0.4.ebuild
new file mode 100644
index 000000000000..0808c0f74471
--- /dev/null
+++ b/x11-misc/lndir/lndir-1.0.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="create a shadow directory of symbolic links to another directory tree"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="dev-libs/libbsd"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-misc/lndir/lndir-9999.ebuild b/x11-misc/lndir/lndir-9999.ebuild
deleted file mode 100644
index 14cec61a311d..000000000000
--- a/x11-misc/lndir/lndir-9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="create a shadow directory of symbolic links to another directory tree"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/lndir"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/util/lndir.git"
-	inherit autotools git-r3
-	# x11-misc-util/macros only required on live ebuilds
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND=""
-DEPEND="
-	${LIVE_DEPEND}
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--disable-selective-werror
-	)
-
-	econf "${econfargs[@]}"
-}
diff --git a/x11-misc/trayer-srg/Manifest b/x11-misc/trayer-srg/Manifest
index d6927440a156..ac06b04efe1e 100644
--- a/x11-misc/trayer-srg/Manifest
+++ b/x11-misc/trayer-srg/Manifest
@@ -1,3 +1,5 @@
+AUX trayer-srg-1.1.8-avoid-prestripping-of-files.patch 418 BLAKE2B 184505920237aca82d6f8e12d73df6f80b47a35849339ebb019283f2be348b96448d9c279355761309ee5064c7a637f2e050e7d96b48e952a6735001406f6730 SHA512 e0d8d8a7251e693c44f7974231f391478847582ac9debd42939bcd3eb1c34ab50e6766ac34dde07d02bcb38320329f5a73868a510aca255df867bc8b3ab46a2a
 DIST trayer-srg-1.1.8.tar.gz 28025 BLAKE2B 3eca8faf7237e1941a611a85a4460310dda1a8d89cb96ae2ac7d77c47a7f8b4fa4bb1a2bcc549fef285ca14a74dce23d9af1b349bb5b0ff9d3bf4abe1ed06351 SHA512 5ae92fdcee64ad1ca59846874dcd4bd4859adeeb80a86f1ed97d62e6306f8ec62d1ee26dba251257242dc25d158a6a550e69f2fcc8739242a2311e37fe1ce310
 EBUILD trayer-srg-1.1.8-r1.ebuild 733 BLAKE2B 059bb4b8896fd03bd4dfab5501afd14b12807c313649fb45de429649bb47f5df6935f0125831c7575f3156f874c83ae2b38480f844e936f917eac76e944d66d6 SHA512 e1368c5aa91c982d864f671b4072b84d5a999a191b97e696c744a9220e5a85f3055ba6f4b58ecdf5b062ba6661da5bba1ef1881377d438c5eea433af8c3edda1
-MISC metadata.xml 250 BLAKE2B 183552a2f861b4003230edf6c0eb30cf21c4fcb91ee7ab4df15980e9d75162431aa6e3fee0849aa657ce63c4234b9e453f702e8a6bed3670942290fba9c7cf3b SHA512 a01fbd281bd274d9714e95cf2d59840bdb983b5eebd9ddbfdfea6b2144cb15ef48919a0974c73f28c87d5b4a91f4b5e071665ef3ab0ee827a27414362b674613
+EBUILD trayer-srg-1.1.8-r2.ebuild 800 BLAKE2B 8350f8f6b749f3aa6fed5594401b8aa2065e4dcf9473c8f4be4c67550cd75e439ffcaef8b23aff5f1beb45b3ab633ea246c98f827e800a52d800672161796e3f SHA512 d2471e15a547bd2570d823a4ff358bbc44c575419a4d6375c5fc40c8e621b02bac6008ce6106cb0fea66997e189cb0a7a796bfb9d76a69c5413ed9a471f406fa
+MISC metadata.xml 501 BLAKE2B 9251421498077d5a34ae6871270f908d51362cd42971b5c1ea4583c8643f26b7e64eed15cbd8396abc6093024df850aa0814748cd76794ecae8d94514d8adc41 SHA512 78dfec041f277181951f07716211407cf4f36ddf8ee8e6b75d7b865cc10cdbfb14d898ea39ed0f012a704c448be2b22290ebb19d272bf859bf6c14780e30c8ce
diff --git a/x11-misc/trayer-srg/files/trayer-srg-1.1.8-avoid-prestripping-of-files.patch b/x11-misc/trayer-srg/files/trayer-srg-1.1.8-avoid-prestripping-of-files.patch
new file mode 100644
index 000000000000..c0cc5a562da8
--- /dev/null
+++ b/x11-misc/trayer-srg/files/trayer-srg-1.1.8-avoid-prestripping-of-files.patch
@@ -0,0 +1,24 @@
+Date: Sat, 3 Dec 2022 17:24:58 +0100
+Subject: [PATCH] avoid prestripping of files
+
+Bug: https://bugs.gentoo.org/837260
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+--- a/Makefile
++++ b/Makefile
+@@ -20,9 +20,9 @@ endif
+ TARGET = trayer
+ $(TARGET): $(OBJ)
+ 	$(CC) $(LDFLAGS) $(OBJ) -o $@ $(LIBS)
+-ifeq (,$(DEVEL))
+-	strip $@
+-endif
++# ifeq (,$(DEVEL))
++# 	strip $@
++# endif
+ 
+ all: $(TARGET)
+ 
+-- 
+2.38.1
+
diff --git a/x11-misc/trayer-srg/metadata.xml b/x11-misc/trayer-srg/metadata.xml
index 652c2be274b3..a1757eadc52d 100644
--- a/x11-misc/trayer-srg/metadata.xml
+++ b/x11-misc/trayer-srg/metadata.xml
@@ -1,8 +1,15 @@
 <?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">sargon/trayer-srg</remote-id>
-	</upstream>
+  <maintainer type="person" proxied="yes">
+    <email>pascal.jaeger@leimstift.de</email>
+    <name>Pascal Jäger</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sargon/trayer-srg</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild
new file mode 100644
index 000000000000..66b135e9ea5f
--- /dev/null
+++ b/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="trayer fork with multi monitor support and cleaned up codebase"
+HOMEPAGE="https://github.com/sargon/trayer-srg"
+SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-trayer-${PV}
+
+LICENSE="MIT GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	x11-libs/gdk-pixbuf:2
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-avoid-prestripping-of-files.patch" )
+
+src_configure() {
+	./configure --prefix="${EPREFIX}" || die
+}
+
+src_compile() {
+	emake TARGET=${PN} CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ${PN}
+	einstalldocs
+}
diff --git a/x11-misc/trayer/Manifest b/x11-misc/trayer/Manifest
index ca47700a4880..d84a6efac86e 100644
--- a/x11-misc/trayer/Manifest
+++ b/x11-misc/trayer/Manifest
@@ -1,8 +1,10 @@
 AUX trayer-1.0-as-needed-and-pre-stripped.patch 300 BLAKE2B d941ab99841ed60de03866e53be1ea517dd6a7fc10bd10aed053b8ef378cd85e2b65e5da1fa1cb0701970d6d3a287777ed292118486d48af7de0bb32999f4f65 SHA512 5dac4a877f32fa63d18013c8c67666520ceac51de55a2e42c5f03db60487e82b7aac2f43e07ba40e7f2ff48e7fca56f11eee6eb90759db37cd0722164f14cc9f
 AUX trayer-1.0-dont-include-gdk-pixbuf-xlib.patch 745 BLAKE2B 8fc70b5b9bf8d0764e0da5138cb89a57874e5987f2531ea72837aeaf152db98312d774bb1c7692c3e935ccf90133c05f3dd5bdaac1db0092bdaa528c0a401db7 SHA512 48efbf9de7c608fa4981e658eb815ef5d40e113ef85363bd09db7ed8a09ea807b38b359380f8f5499e4e9e996cd1a6d3f26dce4a5348a654aa67a6a6d0e75d73
 AUX trayer-1.0-dont-include-libXmu.patch 190 BLAKE2B 34460fc49d3c6836bb9a41840a808c16b0ca6400face67330b0e3feeeb633a25f8e6ecc542f3fba59d9b48b2673c3162e4c3797fd29b32aba77af110d6432f44 SHA512 b17ea529431e36e82c5aaab6548410a1f839d978ece5ca42ac90732ca899012b9b871a5b9a37d3b2ee05238222c02b1ac4c6edbdb70f6a04e39267fce1c2fba0
+AUX trayer-1.0-fix-incompatible-pointer-types.patch 331 BLAKE2B 35416ddcbf32588ab4c238b4fdeb3e559a4313730aa53a5ec19093a3f6c47f1311e50b5f37467aa7637e9e2b35537d9358bcc7f16ee141ecd0d762424f8b312e SHA512 ba7bb5fe0d310e346ee3520387363f6a4b5a8bbbfcd9fb69f467311b5fbfbe91c56dff5c75d633fa2ebfebaec45a760dfdbdae50639c0b84ee5d47bb1ce4d85e
 AUX trayer-1.0-fno-common.patch 167 BLAKE2B 31ec6428dc5732fba6f165e71483573668dd6efa658785cbe6d1f7a52cf030ee1ce288ced90b673210b49302c57cb62471f95d3be16a41d350d3273064f64027 SHA512 9a15a1905e33676bef0eee7426a07223a8ee59089ab63888e35c8035b1c7dcdeabdffd59e9df55369b7e1475cda1b341725fc9e3dfae31dd26101fb7c922da55
 AUX trayer.1 4448 BLAKE2B 663b00da3409d8366fc110fd2f67876f9b6cba4059410ac4d280c647022fd763a6e999dd953e02fec0d7130e16c5034b0c865766c0fd6c8bfd7ddf648c6ca258 SHA512 c55299fbec8f9bfcaeb262a3d2833af4ec111354c4e18bce219568b4a788b298d3d762f657c2fcc787c6ac8959934e9d459f6a808e618cc4769e2989c59659a1
 DIST trayer-1.0-sourceforge.tar.gz 29713 BLAKE2B 6a874781979c512e4fea06b0dcef30be73821e502553ebdad38ab2e152d070f6633dd6f8059d5532a51648ea10cbdfd752a65da11d2a992687a6f3ee4d289d01 SHA512 9903a78a1c185515e87552732449937daa23187d54a3ccbf19bc9fc569d6a440600c879fe78edbea3eff6b66a1f3fc5054d474dfeaca53af3521a6f18b454049
 EBUILD trayer-1.0-r4.ebuild 1035 BLAKE2B bd09726103477c85a99d17cfcac65a00c0a139869a3fdd1178b8e662750663d329c6bc79c9f9213e59af7f391534faff42a9a7aca320c04798f5d000bd34d529 SHA512 462d5a2667996c6ee532e992d734a9c3d850fabf86be33b6f707daa450277afe42604669395f9c58a8fbe7a558e1303cb92a7014275363025f4b4319022b7484
+EBUILD trayer-1.0-r5.ebuild 1096 BLAKE2B bac5980b5918c77f59634534bfa307ec04b6049ea6685f7cf282c8309f98f8c9ffe90874a68b52d6cc5926e5d17d4fb4158906bdf4de2c2cab6f64cee30a5a8d SHA512 e0392ab83e61f4bb20fea8f96377203f706a4addfd6aa70bf8409ec8e1dae5ff85c8eb8329f70c1ee9e3b13fa01eb51c1a21ea2566f74281aaa7d515cfe09ed7
 MISC metadata.xml 221 BLAKE2B 2bdd4cc2d7f7a4fb627addf3608926b0ec64c4e8f5b764c625482fa803b883ccc5a4d89ce3f0190bbd5772ed719455c46ffd6c4674adcff6044642ce50d8592d SHA512 4d656cd01a75b528e757bfda686503d56ec9753562c6c52fedbd1f897285fd6cce36da0beba020875e29b8e240821456a4ebf26ccda72b8aac6456d8aa8b6a8c
diff --git a/x11-misc/trayer/files/trayer-1.0-fix-incompatible-pointer-types.patch b/x11-misc/trayer/files/trayer-1.0-fix-incompatible-pointer-types.patch
new file mode 100644
index 000000000000..e2d750641214
--- /dev/null
+++ b/x11-misc/trayer/files/trayer-1.0-fix-incompatible-pointer-types.patch
@@ -0,0 +1,19 @@
+Clang16 will not allow incompatible pointer types by default.
+
+Bug: https://bugs.gentoo.org/881081
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+--- a/plugin.h
++++ b/plugin.h
+@@ -9,6 +9,8 @@
+ #include <stdio.h>
+ #include "panel.h"
+ 
++struct _plugin;
++
+ typedef struct {
+     /* common */
+     char *fname;
+-- 
+2.38.1
+
diff --git a/x11-misc/trayer/trayer-1.0-r5.ebuild b/x11-misc/trayer/trayer-1.0-r5.ebuild
new file mode 100644
index 000000000000..051d15d92456
--- /dev/null
+++ b/x11-misc/trayer/trayer-1.0-r5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop"
+HOMEPAGE="https://sourceforge.net/projects/fvwm-crystal/"
+SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.tar.gz/download -> ${P}-sourceforge.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch
+	"${FILESDIR}"/${P}-dont-include-libXmu.patch
+	"${FILESDIR}"/${P}-as-needed-and-pre-stripped.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-fix-incompatible-pointer-types.patch
+)
+
+src_compile() {
+	tc-export PKG_CONFIG
+
+	emake "CC=$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" -C systray
+	emake "CC=$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
+}
+
+src_install() {
+	dobin trayer
+	doman "${FILESDIR}"/trayer.1
+	einstalldocs
+}