diff options
Diffstat (limited to 'app-crypt/moolticute')
| -rw-r--r-- | app-crypt/moolticute/Manifest | 4 | ||||
| -rw-r--r-- | app-crypt/moolticute/files/50-mooltipass.rule | 1 | ||||
| -rw-r--r-- | app-crypt/moolticute/files/50-mooltipass.rules | 15 | ||||
| -rw-r--r-- | app-crypt/moolticute/files/moolticute-1.03.0-fix-return-type.patch | 13 | ||||
| -rw-r--r-- | app-crypt/moolticute/files/moolticuted.init | 6 | ||||
| -rw-r--r-- | app-crypt/moolticute/moolticute-1.00.1.ebuild (renamed from app-crypt/moolticute/moolticute-0.43.19.ebuild) | 20 | ||||
| -rw-r--r-- | app-crypt/moolticute/moolticute-1.01.0.ebuild | 68 | ||||
| -rw-r--r-- | app-crypt/moolticute/moolticute-1.03.0.ebuild | 72 | ||||
| -rw-r--r-- | app-crypt/moolticute/moolticute-9999.ebuild | 20 |
9 files changed, 196 insertions, 23 deletions
diff --git a/app-crypt/moolticute/Manifest b/app-crypt/moolticute/Manifest index 46c1f1988c22..fb33279877a9 100644 --- a/app-crypt/moolticute/Manifest +++ b/app-crypt/moolticute/Manifest @@ -1 +1,3 @@ -DIST moolticute-0.43.19.tar.gz 5675421 BLAKE2B 8fbe68a86978970768870ac334c38b5cd532e97cb29e03975d6700a98074c51959747c35dee528275b41ef08cf42817f69337c8b93b8c2554729754d4ee818dd SHA512 fb343411854490f8e9bf937728889fc329d2f90274a34bafebacf711b02b3ff04ecad34480b786a59fda07a50f12f572b58fd2c397d46b63dc76df9228ad8711 +DIST moolticute-1.00.1.tar.gz 5911062 BLAKE2B c3e20d4466c6020842447cb2fa54eee309664e8bbbb52aff8582ff7d333c8e5a9a2d286dace8207f62aacc41e0d9a99b733cfc5788dac72933ae7e15dc91a779 SHA512 c1a4ab39abc8360d088f267ae06f69deb135975caaf9224488d5e33127c1a9c1d2c80795d901e83bd13c82f80f1e362acfe59b03ad024b88ef7b8a7d56acd79b +DIST moolticute-1.01.0.tar.gz 5912712 BLAKE2B dd6e22235978424744a6b0791c479c6cf233645a1a3879db6913acfca16ccb49eec45be5e9e2f6ba0f730edec658daa3aba91fcbd0389e734aeab7f89ca7a7ba SHA512 b5998f6739bd095e0ce8a18a9cc576a9f97b6e214b47670e5858937358f35c9dc36c3357b9ff943eabcd4a3feb7179cbc2640888aae8d59481abb41a81527c52 +DIST moolticute-1.03.0.tar.gz 5963926 BLAKE2B a5b5f98bb501811891c9ac22754538cd1df21b9cc848cb883d5babad89bb76bb9f9b4c533250b0eedca7a8b79ff44f85e6de1e00cdd6d6220ba61b67958be3fc SHA512 450753c5d7f1e226d9b75b8ab4d61970120a2685d249a637c1323141b73108321b346001d2310558e2365ca842c7a3d5ab2f7773d32b5365d2bb3f937108d186 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/moolticute-1.03.0-fix-return-type.patch b/app-crypt/moolticute/files/moolticute-1.03.0-fix-return-type.patch new file mode 100644 index 000000000000..039f2ccb6605 --- /dev/null +++ b/app-crypt/moolticute/files/moolticute-1.03.0-fix-return-type.patch @@ -0,0 +1,13 @@ +https://github.com/mooltipass/moolticute/pull/1204 +https://bugs.gentoo.org/916994 +--- a/src/MPDeviceBleImpl.cpp ++++ b/src/MPDeviceBleImpl.cpp +@@ -735,7 +735,7 @@ bool MPDeviceBleImpl::processReceivedData(const QByteArray &data, QByteArray &da + { + if (data.size() < 2) + { +- return {0}; ++ return {QByteArray::number(0)}; + } + QVector<QByteArray> res; + for (int i = 0; i < data.size() - 1; i += 2) 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/moolticute-0.43.19.ebuild b/app-crypt/moolticute/moolticute-1.00.1.ebuild index b4fd0cdb9d53..d7fa4843bf98 100644 --- a/app-crypt/moolticute/moolticute-0.43.19.ebuild +++ b/app-crypt/moolticute/moolticute-1.00.1.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-1.01.0.ebuild b/app-crypt/moolticute/moolticute-1.01.0.ebuild new file mode 100644 index 000000000000..d7fa4843bf98 --- /dev/null +++ b/app-crypt/moolticute/moolticute-1.01.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm" +fi + +DESCRIPTION="Mooltipass crossplatform daemon/tools" +HOMEPAGE="https://github.com/mooltipass/moolticute" + +LICENSE="GPL-3" +SLOT="0" +IUSE="systemd" + +RDEPEND=" + >=dev-libs/libusb-1.0.20 + dev-qt/qtdbus:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + 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 +" + +src_prepare() { + default + + # Fill version.h with package version + if [[ ${PV} != 9999* ]]; then + sed -i "s/\"git\"/\"v${PV/_/-}\"/" src/version.h || die + fi +} + +src_configure() { + eqmake5 PREFIX="/usr" Moolticute.pro +} + +src_install() { + emake install INSTALL_ROOT="${D}" + + udev_dorules "${FILESDIR}/50-mooltipass.rules" + systemd_dounit systemd/moolticuted.service + newinitd "${FILESDIR}/moolticuted.init" moolticuted +} + +pkg_postinst() { + udev_reload + xdg_icon_cache_update +} + +pkg_postrm() { + udev_reload + xdg_icon_cache_update +} diff --git a/app-crypt/moolticute/moolticute-1.03.0.ebuild b/app-crypt/moolticute/moolticute-1.03.0.ebuild new file mode 100644 index 000000000000..706c83a1a2da --- /dev/null +++ b/app-crypt/moolticute/moolticute-1.03.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm" +fi + +DESCRIPTION="Mooltipass crossplatform daemon/tools" +HOMEPAGE="https://github.com/mooltipass/moolticute" + +LICENSE="GPL-3" +SLOT="0" +IUSE="systemd" + +RDEPEND=" + >=dev-libs/libusb-1.0.20 + dev-qt/qtdbus:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + 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 +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.03.0-fix-return-type.patch +) + +src_prepare() { + default + + # Fill version.h with package version + if [[ ${PV} != 9999* ]]; then + sed -i "s/\"git\"/\"v${PV/_/-}\"/" src/version.h || die + fi +} + +src_configure() { + eqmake5 PREFIX="/usr" Moolticute.pro +} + +src_install() { + emake install INSTALL_ROOT="${D}" + + udev_dorules "${FILESDIR}/50-mooltipass.rules" + systemd_dounit systemd/moolticuted.service + newinitd "${FILESDIR}/moolticuted.init" moolticuted +} + +pkg_postinst() { + udev_reload + xdg_icon_cache_update +} + +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 08512b4847b9..d7fa4843bf98 100644 --- a/app-crypt/moolticute/moolticute-9999.ebuild +++ b/app-crypt/moolticute/moolticute-9999.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=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 } |