6 files changed, 168 insertions, 3 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 91284782c39f..4f2e69fede5c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 981fe7da1775..e79b6579eee4 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -3,5 +3,5 @@ AUX dbus-1.15.0-daemon-optional.patch 2442 BLAKE2B 9fb08fc24f8a6ee1feba274b60c33
 AUX dbus-1.15.0-enable-elogind.patch 3045 BLAKE2B 450a63270867b1c570af595492e90a8040195b6145e4f9463b186ebcec2f7128ee0b1d55d695fa81efda5391455dac69d67c4717e888ceab550763558f8eb929 SHA512 e24af56f6f7eb71d3c17a040e84a294a4cadd972bbc41010fdb79d6d541ec8cc271b25921d1c997550150b2e0c0dc5bb0c4df0ba300b22526de1fa1fb91c483f
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.15.4.tar.xz 1404576 BLAKE2B 6007be414497ef95f1e6a7e937c6a0a9b590c163b6b3a1c3e61b6726b988192728aa85a328d89472f34613d48ca1bb6844e86bee997acb4f377a228b2072fbce SHA512 53a5b7161940c5d4432b902c3c0ac1f1965978e3791a640d1a71f2d819474b727497f7a13c95d7c5850baef659062f1434296a3f5e56701383cc573dfbf187ee
-EBUILD dbus-1.15.4-r1.ebuild 8204 BLAKE2B 4fd95ce02ed9b89de812ee0eb12c9d6ace03af277776c171dd25dabcbb90a7b0cef4a652172961d0cf38ee4badf13e0d3a1d7f712a8b850dc4fef83bccf1c351 SHA512 d4418ec711d91da26fe06844d6c326325557fb68ba501529758bedb95f9b74d168a59f440f5a7c1188786a7569b37c1451703baea365728b09f23a9fbeb8a7b6
-MISC metadata.xml 501 BLAKE2B 7a39c6df0072e46a515e88bbf4023713826167924dda328657fc36f169f4918f92ef59127c435055d942018b6370c47d55fa288ccd6a88414e86e6fab65a0751 SHA512 b750d80e9c8a8cad6eb42952d72fd65868e69ab686a5bfc95896b1734960dab4975ff14b6c44637c0c9b80b76a55f826f2d86f6dfa4f075449a2660fbb85a79e
+EBUILD dbus-1.15.4-r1.ebuild 8291 BLAKE2B e2d5abc1f64dee3806ab8df78ac6448188ae68cdd746218957659dd56f121c640632f63592881eff301a1268921b341116a8b382029106272c82c08d05611629 SHA512 a68057507e2f7f4195575a7e147b6b6d0cfc508495cebff8395edb274605df35e817dd74e16d856de1f50ba02be6b01f36a9f1de46c7aae931cfc456b37a1770
+MISC metadata.xml 627 BLAKE2B eba16e1d6b462768cfe97de5dc6d870697493665cb2390e471fd0d12a44bc63a9a16ba1a0ba55ca733e3f251cd6df77d567303aa24dfc17cbbfff8a1a7cdaaf7 SHA512 d4d2793cac29c70092cd1d40ec19de08b2f52966d364ccf1fda0abec343c0802595735862756fb884268cc7dd7e25e13f45120023b923fb487d0a8bda5895dc5
diff --git a/sys-apps/dbus/dbus-1.15.4-r1.ebuild b/sys-apps/dbus/dbus-1.15.4-r1.ebuild
index 9f1bd7c14747..9bf17a2cd2b7 100644
--- a/sys-apps/dbus/dbus-1.15.4-r1.ebuild
+++ b/sys-apps/dbus/dbus-1.15.4-r1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz"
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc elogind selinux static-libs systemd test X"
+IUSE="debug doc elogind selinux static-libs systemd test valgrind X"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( elogind systemd )"
@@ -57,6 +57,7 @@ DEPEND="${COMMON_DEPEND}
 		${PYTHON_DEPS}
 		>=dev-libs/glib-2.40:2
 	)
+	valgrind? ( >=dev-util/valgrind-3.6 )
 	X? ( x11-base/xorg-proto )
 "
 RDEPEND="${COMMON_DEPEND}
@@ -149,6 +150,7 @@ multilib_src_configure() {
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 		--with-systemduserunitdir="$(systemd_get_userunitdir)"
 		--with-dbus-user=messagebus
+		$(multilib_native_use_with valgrind)
 		$(use_with X x)
 	)
 
diff --git a/sys-apps/dbus/metadata.xml b/sys-apps/dbus/metadata.xml
index 010eeadbdd2c..7dc4c23f223c 100644
--- a/sys-apps/dbus/metadata.xml
+++ b/sys-apps/dbus/metadata.xml
@@ -7,6 +7,7 @@
 	<use>
 		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
 		<flag name="systemd">Build with <pkg>sys-apps/systemd</pkg> at_console support</flag>
+		<flag name="valgrind">Support Valgrind for <pkg>dev-util/valgrind</pkg> annotations to improve results for memcheck.</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:freedesktop:dbus</remote-id>
diff --git a/sys-apps/openrazer/Manifest b/sys-apps/openrazer/Manifest
index 9e0c459c45e0..a021dbbcdb0a 100644
--- a/sys-apps/openrazer/Manifest
+++ b/sys-apps/openrazer/Manifest
@@ -1,5 +1,7 @@
 DIST openrazer-3.5.1.tar.gz 240254 BLAKE2B 7f6b887c22c81c8cd3d7908f94748879aa4c89f6446e073aeaed0d33f8d58bd7b618768a9915a451d6659c0cdf428b52e055641420553a00f2cf41b0a9737487 SHA512 dc32f040f4b9ecbefbd2b4afc34edcc97fbda16f6dd9a64ed61d637233ea5d0e6f046685837635a177d3cab8506224c973ea26972a6ea7cc20d7bcce60065e39
 DIST openrazer-3.6.0.tar.gz 243924 BLAKE2B 7b782990cf5afedb88adafe310bcba6512ff8009cee6bbf8e005f4780c711ccc724cacc3056f471002268c61e6d3bfce0ba6b5c72e502ad83b954c45f70b521a SHA512 fb08a8a38ce582099e6c1a98df73aacf9dd437beb4be9cc0e7e3e14f4da6e53de90058a8cc22daeda0bbcfe111b2bc5a38c0503e0020239d44dae2f199219695
+DIST openrazer-3.6.1.tar.gz 244061 BLAKE2B f5fa8bf4ec383cf92d3c9c66db6b2f6cc9e4cf1969558d187ff62e687316b861d3c0f0ba37f5addc0911a49794acc648ae2d6be6f519ea1d33afa3cc9ab7bd1b SHA512 1e1db191e4daa028fe177e9c50ddf2dfffdf7c8ba68d108a2e74232b9accb344dbc5c3352aba223434cf16d79c113e7ba19dc9f2e6672758153c25ba9391cbff
 EBUILD openrazer-3.5.1.ebuild 3703 BLAKE2B fda67f9e5979847b7607bc93bfacfd54018917ce856445054e54cd1476b41959d45d28e21ea6dff5d7631446011cb3897509880c3fcd404eaacf243a1b510f3d SHA512 111f3f3a8d604be9a5ae2cbee75758e5035efb9fe54139a9070e6be85919ec61430ea605c2a3259e3aae1f188993e3541322b3f9980a2d7d4e6cc596256debc0
 EBUILD openrazer-3.6.0.ebuild 3704 BLAKE2B 32c2bf5d14c10a2665d71c50c12b8fe1548ac328a37856810c4a5c97f4f0ce005715950841d266aba5128b21ef4c6b9ff6184ad95c11bc0b7b731f6e77f6f2a5 SHA512 700d25569fb0974368daed4153994632de2028b881331d4a9e0a24bf3c257ee7b66b666756345d5df9d99d72b423ba9a03871ad22b45b35154e6d3db447b91d3
+EBUILD openrazer-3.6.1.ebuild 3704 BLAKE2B 32c2bf5d14c10a2665d71c50c12b8fe1548ac328a37856810c4a5c97f4f0ce005715950841d266aba5128b21ef4c6b9ff6184ad95c11bc0b7b731f6e77f6f2a5 SHA512 700d25569fb0974368daed4153994632de2028b881331d4a9e0a24bf3c257ee7b66b666756345d5df9d99d72b423ba9a03871ad22b45b35154e6d3db447b91d3
 MISC metadata.xml 557 BLAKE2B c7d8fe83eb9f1d3d5361d816e6bad6abd2eea172e743a3482b1e67bb77019251b26b2ecb7d9d8e7efd4ada69990ea07735446771a836a64bd110cac6b72a626a SHA512 87490d202ae606a8f4d1fe63e5631c7eae1ae13f0705dc6553f79b351d6181183cc81c69b5740647298a48e35db407821835c8309db725b609f4bcfd8d0bdd56
diff --git a/sys-apps/openrazer/openrazer-3.6.1.ebuild b/sys-apps/openrazer/openrazer-3.6.1.ebuild
new file mode 100644
index 000000000000..754d171d5932
--- /dev/null
+++ b/sys-apps/openrazer/openrazer-3.6.1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit readme.gentoo-r1 systemd udev xdg-utils distutils-r1 linux-mod
+
+DESCRIPTION="Drivers and user-space daemon to control Razer devices on GNU/Linux"
+HOMEPAGE="https://openrazer.github.io/
+	https://github.com/openrazer/openrazer/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+client +daemon"
+REQUIRED_USE="
+	client? ( daemon )
+	daemon? ( ${PYTHON_REQUIRED_USE} )
+	test? ( daemon )
+"
+
+RDEPEND="
+	client? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	daemon? (
+		acct-group/plugdev
+		dev-python/daemonize[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/notify2[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyudev[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+		x11-misc/xautomation
+		x11-misc/xdotool
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/linux-sources
+"
+
+DOCS=( README.md )
+
+DOC_CONTENTS="To successfully use OpenRazer: load desired kernel module
+(razeraccessory, razerkbd, razerkraken and/or razermouse),
+add your user to the \"plugdev\" group and start the OpenRazer daemon.
+To automatically start up the OpenRazer daemon on session login copy
+/usr/share/openrazer/openrazer-daemon.desktop file into Your user's
+~/.config/autostart/ directory."
+
+BUILD_TARGETS="clean driver"
+BUILD_PARAMS="-C ${S} SUBDIRS=${S}/driver KERNELDIR=${KERNEL_DIR}"
+MODULE_NAMES="
+	razeraccessory(hid:${S}/driver)
+	razerkbd(hid:${S}/driver)
+	razerkraken(hid:${S}/driver)
+	razermouse(hid:${S}/driver)
+"
+
+distutils_enable_tests unittest
+
+python_compile() {
+	if use daemon ; then
+		( cd "${S}"/daemon || die ; distutils-r1_python_compile )
+	fi
+	if use client ; then
+		( cd "${S}"/pylib || die ; distutils-r1_python_compile )
+	fi
+}
+
+python_install() {
+	if use daemon ; then
+		( cd "${S}"/daemon || die ; distutils-r1_python_install )
+		python_scriptinto /usr/bin
+		python_newscript "${S}"/daemon/run_openrazer_daemon.py ${PN}-daemon
+	fi
+	if use client ; then
+		( cd "${S}"/pylib || die ; distutils-r1_python_install )
+	fi
+}
+
+src_prepare() {
+	xdg_environment_reset
+	distutils-r1_src_prepare
+
+	# Remove bad tests.
+	rm "${S}"/daemon/tests/test_effect_sync.py || die
+}
+
+src_compile() {
+	linux-mod_src_compile
+	distutils-r1_src_compile
+
+	if use daemon ; then
+		emake -C "${S}"/daemon PREFIX=/usr service
+	fi
+
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	( cd "${S}"/daemon/tests || die ; distutils-r1_src_test )
+}
+
+src_install() {
+	linux-mod_src_install
+	distutils-r1_src_install
+
+	udev_dorules "${S}"/install_files/udev/99-razer.rules
+	exeinto "$(get_udevdir)"
+	doexe "${S}"/install_files/udev/razer_mount
+
+	# Install configuration example so that the daemon does not complain.
+	insinto /usr/share/${PN}
+	newins "${S}"/daemon/resources/razer.conf razer.conf.example
+
+	if use daemon ; then
+		# dbus service
+		insinto /usr/share/dbus-1/services
+		doins "${S}"/daemon/org.razer.service
+
+		# systemd unit
+		systemd_douserunit "${S}"/daemon/${PN}-daemon.service
+
+		# xdg autostart example file
+		insinto /usr/share/${PN}
+		doins "${S}"/install_files/desktop/openrazer-daemon.desktop
+
+		# Manpages
+		doman "${S}"/daemon/resources/man/${PN}-daemon.8
+		doman "${S}"/daemon/resources/man/razer.conf.5
+	fi
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	udev_reload
+
+	if use daemon ; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	linux-mod_pkg_postrm
+	udev_reload
+
+	if use daemon ; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}