gentoo auto-resync : 22:02:2023 - 20:29:22

8 files changed, 59 insertions, 51 deletions

diff --git a/app-crypt/moolticute/Manifest b/app-crypt/moolticute/Manifest
index 8aa49c1f07a5..61cde14978be 100644
--- a/app-crypt/moolticute/Manifest
+++ b/app-crypt/moolticute/Manifest
@@ -1,8 +1,8 @@
-AUX 50-mooltipass.rule 84 BLAKE2B 574568b60d33216a8de4a90866f2dd4a53d5369fb7e112c6125b8492e8cdaff51067dffe4e36e07fa24cf8a9aaaa77a388f3217ad039a51d7ba0781239020a43 SHA512 26f8a9f2c5fb2f3a87a486f91d5fae7069955dc528eacb8a37a833d393be38b70e3a9784024287cdfeb93a90abad83400395bb803e82a091100bd44cb7b2c28d
-AUX moolticuted.init 309 BLAKE2B 1f967b7e497e7e2d5547baf3e1b18127590997d8221ed34da1b4b4b2843bb1590fbb0c4153cb89d7f68b4fc0852e66f38879362fdd482414e4b6ba6862f06e30 SHA512 bbb80cf14d3adf744538f03513b461eb8bd2b633ef314f9e935e919f288f629aa8d84ff856e3aa104a2933e16143fbdbff90d9df8651473c39907f5aff580ed0
-AUX moolticuted.init-r1 262 BLAKE2B 42ac9a89fc99f54bf1ce986f9b77703dfe7db7a3abadf136c5756de7fc556210496c16fca6e84fe148d88c2f61e94c1fa813b840bb1814e3e01f685c83e5f956 SHA512 558eba22241351b3cba3f1e346bb45a76942a5a26a991a99ba5b4d26513f829e2ac8527a6692a57ed022ee695950338fe8c7b2a0cbf354beb358dadce12b752e
+AUX 50-mooltipass.rules 963 BLAKE2B cb2d382eb57f3d802e23b115d6978373dd5e4c250e82804af59ae5ea15db3853765fb0afe9a7ba928be6dbd9069714480b683b3129802b9fe2cb234e10cfcdb8 SHA512 223bdc6b8c5b87ef2691d45cb3888ad83a58d42383331a1fbf9ffa359f8c78b51b4ea188dc1d52db7f5cdaa8b6a1393452fcfc22fbcb1b4bfed0cb146f68be0f
+AUX moolticuted.init 262 BLAKE2B f4eb3e905d03de4586d040dbcbeb3e381e6ae64d80b10f69b0f3016018276d8f0d5a0f42102f5e75c43531fe94693565d29417c116f9e0ea196f3634f6e69355 SHA512 42ab6aa95943bc16e32914d05a6f418e7e84f60b9516304ab3790e3992f51d9d552e14606b944b96868d826e86ba10ac1e2ba57568fe8ca13eb107c4bd433f35
 DIST moolticute-0.43.19.tar.gz 5675421 BLAKE2B 8fbe68a86978970768870ac334c38b5cd532e97cb29e03975d6700a98074c51959747c35dee528275b41ef08cf42817f69337c8b93b8c2554729754d4ee818dd SHA512 fb343411854490f8e9bf937728889fc329d2f90274a34bafebacf711b02b3ff04ecad34480b786a59fda07a50f12f572b58fd2c397d46b63dc76df9228ad8711
-EBUILD moolticute-0.43.19-r1.ebuild 1237 BLAKE2B 8a88551a38062e833e3c4ba08ad1c48dcab0154bb855cdc8e3f553aa5e7fe51e297af22e7498328657db7b19f2b9c5c34d00a42e4808154cb3240bf59364906a SHA512 cca54e3655c9037b3abc20a971e58b4ff37f33c6a591e373f2d7ed484ba74b16c3a773d09001e69679ca000d65e162415ad1c7ba415152ade428e6f3eb591861
-EBUILD moolticute-0.43.19.ebuild 1234 BLAKE2B b084b0e2a94b272d775823e64336de19f8aa377c44aabe733866fa9eb80bccf8ab366a29b0c2d9bfb094ac28d3ce2fb0d0b47138eec8d2c20667ff9183a4a511 SHA512 67b55d0e56e7c96f45af9cf41487fc4aa40cdbc700e03d10a4441cee5b376df51986ecb8f6433e5c905f99eb93986692d582dab9477ff396dcacf04d50a4f30a
-EBUILD moolticute-9999.ebuild 1237 BLAKE2B 8a88551a38062e833e3c4ba08ad1c48dcab0154bb855cdc8e3f553aa5e7fe51e297af22e7498328657db7b19f2b9c5c34d00a42e4808154cb3240bf59364906a SHA512 cca54e3655c9037b3abc20a971e58b4ff37f33c6a591e373f2d7ed484ba74b16c3a773d09001e69679ca000d65e162415ad1c7ba415152ade428e6f3eb591861
+DIST moolticute-1.00.1.tar.gz 5911062 BLAKE2B c3e20d4466c6020842447cb2fa54eee309664e8bbbb52aff8582ff7d333c8e5a9a2d286dace8207f62aacc41e0d9a99b733cfc5788dac72933ae7e15dc91a779 SHA512 c1a4ab39abc8360d088f267ae06f69deb135975caaf9224488d5e33127c1a9c1d2c80795d901e83bd13c82f80f1e362acfe59b03ad024b88ef7b8a7d56acd79b
+EBUILD moolticute-0.43.19-r2.ebuild 1357 BLAKE2B b1d01c117607f24f66d78a700ed270ca045080af61ae3f26b176387bd16e97467dd0e4c514047ca9d3c739838113e0aaf7c9477448a908ab96892273041aeb2d SHA512 333701b211629d8a0fe8caf28f53cf87d3ab3daa1cc95489ec2906fbaa8d4ed1742ba2ca8467945796f3379afc7e3b8f3f0e93638d56f3bac060167c96f92aaa
+EBUILD moolticute-1.00.1.ebuild 1357 BLAKE2B b1d01c117607f24f66d78a700ed270ca045080af61ae3f26b176387bd16e97467dd0e4c514047ca9d3c739838113e0aaf7c9477448a908ab96892273041aeb2d SHA512 333701b211629d8a0fe8caf28f53cf87d3ab3daa1cc95489ec2906fbaa8d4ed1742ba2ca8467945796f3379afc7e3b8f3f0e93638d56f3bac060167c96f92aaa
+EBUILD moolticute-9999.ebuild 1357 BLAKE2B b1d01c117607f24f66d78a700ed270ca045080af61ae3f26b176387bd16e97467dd0e4c514047ca9d3c739838113e0aaf7c9477448a908ab96892273041aeb2d SHA512 333701b211629d8a0fe8caf28f53cf87d3ab3daa1cc95489ec2906fbaa8d4ed1742ba2ca8467945796f3379afc7e3b8f3f0e93638d56f3bac060167c96f92aaa
 MISC metadata.xml 561 BLAKE2B 3acaed8d64be983605a440f04e23f2ea9c6a8f8506276900a1b7256e863d2ebd1713a5310740e3b670997c3420b038703ead60db752d1d8a1b7ff0d0885dc854 SHA512 a83b9cfd8d7d94df853e5d1abde7bc01137d847679c9dc96203af4cd87547ec747e557502a1e34e713e11f4867da4b0b784428b75a6af2e97d57f63b920cb730
diff --git a/app-crypt/moolticute/files/50-mooltipass.rule b/app-crypt/moolticute/files/50-mooltipass.rule
deleted file mode 100644
index 4bfd907d7257..000000000000
--- a/app-crypt/moolticute/files/50-mooltipass.rule
+++ /dev/null
@@ -1 +0,0 @@
-SUBSYSTEM=="usb", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="09a0", TAG+="uaccess"
diff --git a/app-crypt/moolticute/files/50-mooltipass.rules b/app-crypt/moolticute/files/50-mooltipass.rules
new file mode 100644
index 000000000000..8492743bab93
--- /dev/null
+++ b/app-crypt/moolticute/files/50-mooltipass.rules
@@ -0,0 +1,15 @@
+# udev rules for allowing console user(s) and libusb access to Mooltipass Mini devices
+# Used udev rules from https://github.com/mooltipass/mooltipass-udev
+ACTION!="add|change", GOTO="mooltipass_end"
+
+# console user
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="09a0", MODE="0660", SYMLINK+="mooltipass_keyboard", TAG+="uaccess", TAG+="udev-acl"
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="4321", MODE="0660", SYMLINK+="mooltipass_keyboard", TAG+="uaccess", TAG+="udev-acl"
+# libusb
+SUBSYSTEM=="usb", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="09a0", MODE="0660", SYMLINK+="mooltipass_device", TAG+="uaccess"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="4321", MODE="0660", SYMLINK+="mooltipass_device", TAG+="uaccess"
+
+# required for newer versions of bluez
+SUBSYSTEM=="hidraw", KERNELS=="*1209:4321*", MODE="0660", SYMLINK+="mooltipass_keyboard", TAG+="uaccess", TAG+="udev-acl"
+
+LABEL="mooltipass_end"
diff --git a/app-crypt/moolticute/files/moolticuted.init b/app-crypt/moolticute/files/moolticuted.init
index 4a331db1c3a4..56b15ff3d5c2 100644
--- a/app-crypt/moolticute/files/moolticuted.init
+++ b/app-crypt/moolticute/files/moolticuted.init
@@ -1,11 +1,11 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command=/usr/bin/moolticuted
-command_args=""
+command_background="yes"
 pidfile=/var/run/moolticuted.pid
-start_stop_daemon_args="--make-pidfile --background --user nobody --group usb"
+command_user="nobody:usb"
 
 depend() {
 	need udev
diff --git a/app-crypt/moolticute/files/moolticuted.init-r1 b/app-crypt/moolticute/files/moolticuted.init-r1
deleted file mode 100644
index 8c4942a34935..000000000000
--- a/app-crypt/moolticute/files/moolticuted.init-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-command=/usr/bin/moolticuted
-command_background="yes"
-pidfile=/var/run/moolticuted.pid
-command_user="nobody:usb"
-
-depend() {
-	need udev
-}
diff --git a/app-crypt/moolticute/moolticute-0.43.19.ebuild b/app-crypt/moolticute/moolticute-0.43.19-r2.ebuild
index b4fd0cdb9d53..d7fa4843bf98 100644
--- a/app-crypt/moolticute/moolticute-0.43.19.ebuild
+++ b/app-crypt/moolticute/moolticute-0.43.19-r2.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit qmake-utils systemd udev xdg-utils
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mooltipass/moolticute.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/mooltipass/moolticute/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/mooltipass/moolticute/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
 fi
 
-inherit xdg-utils qmake-utils udev
-
 DESCRIPTION="Mooltipass crossplatform daemon/tools"
 HOMEPAGE="https://github.com/mooltipass/moolticute"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
+IUSE="systemd"
 
 RDEPEND="
 	>=dev-libs/libusb-1.0.20
@@ -29,13 +29,13 @@ RDEPEND="
 	dev-qt/qttest:5
 	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
+	systemd? ( sys-apps/systemd )
+	!systemd? ( sys-apps/systemd-utils )
 "
 BDEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "
 
-S="${WORKDIR}/${P/_/-}"
-
 src_prepare() {
 	default
 
@@ -52,7 +52,8 @@ src_configure() {
 src_install() {
 	emake install INSTALL_ROOT="${D}"
 
-	udev_dorules "${FILESDIR}/50-mooltipass.rule"
+	udev_dorules "${FILESDIR}/50-mooltipass.rules"
+	systemd_dounit systemd/moolticuted.service
 	newinitd "${FILESDIR}/moolticuted.init" moolticuted
 }
 
@@ -62,5 +63,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	udev_reload
 	xdg_icon_cache_update
 }
diff --git a/app-crypt/moolticute/moolticute-0.43.19-r1.ebuild b/app-crypt/moolticute/moolticute-1.00.1.ebuild
index ea058a356a20..d7fa4843bf98 100644
--- a/app-crypt/moolticute/moolticute-0.43.19-r1.ebuild
+++ b/app-crypt/moolticute/moolticute-1.00.1.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit qmake-utils systemd udev xdg-utils
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mooltipass/moolticute.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/mooltipass/moolticute/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/mooltipass/moolticute/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
 fi
 
-inherit xdg-utils qmake-utils udev
-
 DESCRIPTION="Mooltipass crossplatform daemon/tools"
 HOMEPAGE="https://github.com/mooltipass/moolticute"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
+IUSE="systemd"
 
 RDEPEND="
 	>=dev-libs/libusb-1.0.20
@@ -29,13 +29,13 @@ RDEPEND="
 	dev-qt/qttest:5
 	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
+	systemd? ( sys-apps/systemd )
+	!systemd? ( sys-apps/systemd-utils )
 "
 BDEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "
 
-S="${WORKDIR}/${P/_/-}"
-
 src_prepare() {
 	default
 
@@ -52,8 +52,9 @@ src_configure() {
 src_install() {
 	emake install INSTALL_ROOT="${D}"
 
-	udev_dorules "${FILESDIR}/50-mooltipass.rule"
-	newinitd "${FILESDIR}/moolticuted.init-r1" moolticuted
+	udev_dorules "${FILESDIR}/50-mooltipass.rules"
+	systemd_dounit systemd/moolticuted.service
+	newinitd "${FILESDIR}/moolticuted.init" moolticuted
 }
 
 pkg_postinst() {
@@ -62,5 +63,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	udev_reload
 	xdg_icon_cache_update
 }
diff --git a/app-crypt/moolticute/moolticute-9999.ebuild b/app-crypt/moolticute/moolticute-9999.ebuild
index ea058a356a20..d7fa4843bf98 100644
--- a/app-crypt/moolticute/moolticute-9999.ebuild
+++ b/app-crypt/moolticute/moolticute-9999.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit qmake-utils systemd udev xdg-utils
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mooltipass/moolticute.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/mooltipass/moolticute/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/mooltipass/moolticute/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
 fi
 
-inherit xdg-utils qmake-utils udev
-
 DESCRIPTION="Mooltipass crossplatform daemon/tools"
 HOMEPAGE="https://github.com/mooltipass/moolticute"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
+IUSE="systemd"
 
 RDEPEND="
 	>=dev-libs/libusb-1.0.20
@@ -29,13 +29,13 @@ RDEPEND="
 	dev-qt/qttest:5
 	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
+	systemd? ( sys-apps/systemd )
+	!systemd? ( sys-apps/systemd-utils )
 "
 BDEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "
 
-S="${WORKDIR}/${P/_/-}"
-
 src_prepare() {
 	default
 
@@ -52,8 +52,9 @@ src_configure() {
 src_install() {
 	emake install INSTALL_ROOT="${D}"
 
-	udev_dorules "${FILESDIR}/50-mooltipass.rule"
-	newinitd "${FILESDIR}/moolticuted.init-r1" moolticuted
+	udev_dorules "${FILESDIR}/50-mooltipass.rules"
+	systemd_dounit systemd/moolticuted.service
+	newinitd "${FILESDIR}/moolticuted.init" moolticuted
 }
 
 pkg_postinst() {
@@ -62,5 +63,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	udev_reload
 	xdg_icon_cache_update
 }