commit: 446abbd80b9c4b321bc57052e6e19d6a172c34ae Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Sun Aug 27 14:54:55 2023 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Aug 27 14:56:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=446abbd8
Revert "app-misc/logiops: drop 0.3.1, 0.3.2" This reverts commit 99e4d4ad42eb5f763997795f3b3cc37850ea55d5. Bug: https://bugs.gentoo.org/913104 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> app-misc/logiops/Manifest | 3 + app-misc/logiops/files/ipcgull-0.1-gcc13.patch | 31 +++++++++++ app-misc/logiops/files/logid.initd | 19 +++++++ app-misc/logiops/logiops-0.3.1.ebuild | 77 ++++++++++++++++++++++++++ app-misc/logiops/logiops-0.3.2.ebuild | 77 ++++++++++++++++++++++++++ 5 files changed, 207 insertions(+) diff --git a/app-misc/logiops/Manifest b/app-misc/logiops/Manifest index 1ad31885753e..bceb3208b732 100644 --- a/app-misc/logiops/Manifest +++ b/app-misc/logiops/Manifest @@ -1 +1,4 @@ +DIST ipcgull-0.1.tar.gz 31909 BLAKE2B dc86ce909682e6683ed127eb0824c1dd031a2082879f02832005f4ee7157e89a584829d96d9656a984047fea27094f59591361b0a491cd07a9331a6fa9c2560b SHA512 04dc7305d0fc825fc701ff13bee44ed0606eaed29428d82e93c600efc8fba3cc47895ecd32d4ab9d045ca561161cce9f5bd30e87192e83916a433f4919454d76 +DIST logiops-0.3.1.tar.gz 85535 BLAKE2B edef0ab57ee09d47cd6f0c214189c7b7afaa113ab882d7e3449a0818d4753250627671ad135748824de77680b63d113a64d8581571fdcaf2adbb5ed7c9a3885a SHA512 9b98b415fc3231066a51d3da780fd230f43a823316405eb4faba454b6fc5e3eb3b3b30cdeaf83126b848bfb267d4ff97ae8a19a9a76f48510f3af8fe3969bdab +DIST logiops-0.3.2.tar.gz 87067 BLAKE2B 0c938824c8c8f8e5a26fbdcb47a2f04ef0316e3750cb85425083e17d68ee23726d99ba6c811045201cebe1c1ef3e58f1bcec0512f599c487494841f2ac3aa9c0 SHA512 c69dbf6f220e57515a9641de83625b533943fc78197dc1abbd9767e22fe58e60a55eedb2e9510131cfcda4e9d4f304038be89a70c7c45238a1c7846047d8d59a DIST logiops-v0.3.3.tar.gz 117966 BLAKE2B b7bb2997b38c33d70d2c8a8ef5a931d6aa021e200a48141dc3aca106e081adde91f23aece0c5d5a9dc66376a7b98354b6e59a13360e55cb7db631322b2fe2ee3 SHA512 87d84c9778cd046761a639fc775e8ea4f01d9864c532c55768a35dbd8718a561c398b44f0f3147403d45eac121c74f9fe84f6ac75e4d1c26d3f4f0da2ee5b4fa diff --git a/app-misc/logiops/files/ipcgull-0.1-gcc13.patch b/app-misc/logiops/files/ipcgull-0.1-gcc13.patch new file mode 100644 index 000000000000..38ec2e123ea8 --- /dev/null +++ b/app-misc/logiops/files/ipcgull-0.1-gcc13.patch @@ -0,0 +1,31 @@ +From 745329ed9d41051ddb6e4010229d4b54d868e1a4 Mon Sep 17 00:00:00 2001 +From: pixl <pixl...@pm.me> +Date: Wed, 3 May 2023 17:48:28 -0400 +Subject: [PATCH] Require stdexcept in node.h + +Fixes compile errors on some systems +--- + src/ipcgull/src/include/ipcgull/node.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/ipcgull/src/include/ipcgull/node.h b/src/ipcgull/src/include/ipcgull/node.h +index dbc8b33..8c5442a 100644 +--- a/src/ipcgull/src/include/ipcgull/node.h ++++ b/src/ipcgull/src/include/ipcgull/node.h +@@ -19,13 +19,14 @@ + #ifndef IPCGULL_NODE_H + #define IPCGULL_NODE_H + ++#include <ipcgull/variant.h> ++#include <ipcgull/server.h> + #include <map> + #include <list> + #include <memory> + #include <string> +-#include <ipcgull/variant.h> ++#include <stdexcept> + #include <cassert> +-#include <ipcgull/server.h> + + namespace ipcgull { + class interface; diff --git a/app-misc/logiops/files/logid.initd b/app-misc/logiops/files/logid.initd new file mode 100644 index 000000000000..3c852c6e4397 --- /dev/null +++ b/app-misc/logiops/files/logid.initd @@ -0,0 +1,19 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +logid_config="/etc/logid.cfg" +name="Logitech Configuration Daemon" +pidfile="${RC_PREFIX}/run/logid.pid" + +command="${RC_PREFIX}/usr/bin/logid" +command_background="true" +command_args="-c ${logid_config}" + +start_pre() { + if [ ! -f "${logid_config}" ]; then + eerror "The file '${logid_config}' could not be found!" + eerror "Please create one before you start the daemon." + exit 1 + fi +} diff --git a/app-misc/logiops/logiops-0.3.1.ebuild b/app-misc/logiops/logiops-0.3.1.ebuild new file mode 100644 index 000000000000..147c5fb8398d --- /dev/null +++ b/app-misc/logiops/logiops-0.3.1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN_IPCGULL="ipcgull" +MY_PV_IPCGULL="0.1" + +inherit cmake linux-info + +DESCRIPTION="An unofficial userspace driver for HID++ Logitech devices" +HOMEPAGE="https://github.com/PixlOne/logiops"; +SRC_URI=" + https://github.com/PixlOne/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/PixlOne/${MY_PN_IPCGULL}/archive/refs/tags/v${MY_PV_IPCGULL}.tar.gz -> ${MY_PN_IPCGULL}-${MY_PV_IPCGULL}.tar.gz +" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="systemd" + +DEPEND=" + dev-libs/glib + dev-libs/libconfig:=[cxx] + dev-libs/libevdev + sys-apps/dbus + virtual/libudev + systemd? ( sys-apps/systemd ) +" + +RDEPEND="${DEPEND}" + +BDEPEND="virtual/pkgconfig" + +DOCS=( "README.md" "TESTED.md" ) + +PATCHES=( "${FILESDIR}/${MY_PN_IPCGULL}-0.1-gcc13.patch" ) + +pkg_pretend() { + local CHECK_CONFIG="~HID_LOGITECH ~HID_LOGITECH_HIDPP" + + check_extra_config +} + +src_unpack() { + default + + # Submodule, which needs to be present for compilation + mv "${WORKDIR}/${MY_PN_IPCGULL}-${MY_PV_IPCGULL}" "${WORKDIR}/${MY_PN_IPCGULL}" || die + mv "${WORKDIR}/${MY_PN_IPCGULL}" "${S}/src" || die +} + +src_configure() { + local mycmakeargs=( -DLOGIOPS_VERSION="${PV}" ) + + cmake_src_configure +} + +src_install() { + default + + cmake_src_install + + # Install lib of submodule, as no install routine exist + dolib.so "${BUILD_DIR}/src/ipcgull/libipcgull.so" + + insinto /etc + newins logid.example.cfg logid.cfg + + newinitd "${FILESDIR}"/logid.initd logid +} + +pkg_postinst() { + einfo "An example config file has been installed as /etc/logid.cfg." + einfo "See https://github.com/PixlOne/logiops/wiki/Configuration for more information." +} diff --git a/app-misc/logiops/logiops-0.3.2.ebuild b/app-misc/logiops/logiops-0.3.2.ebuild new file mode 100644 index 000000000000..147c5fb8398d --- /dev/null +++ b/app-misc/logiops/logiops-0.3.2.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN_IPCGULL="ipcgull" +MY_PV_IPCGULL="0.1" + +inherit cmake linux-info + +DESCRIPTION="An unofficial userspace driver for HID++ Logitech devices" +HOMEPAGE="https://github.com/PixlOne/logiops"; +SRC_URI=" + https://github.com/PixlOne/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/PixlOne/${MY_PN_IPCGULL}/archive/refs/tags/v${MY_PV_IPCGULL}.tar.gz -> ${MY_PN_IPCGULL}-${MY_PV_IPCGULL}.tar.gz +" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="systemd" + +DEPEND=" + dev-libs/glib + dev-libs/libconfig:=[cxx] + dev-libs/libevdev + sys-apps/dbus + virtual/libudev + systemd? ( sys-apps/systemd ) +" + +RDEPEND="${DEPEND}" + +BDEPEND="virtual/pkgconfig" + +DOCS=( "README.md" "TESTED.md" ) + +PATCHES=( "${FILESDIR}/${MY_PN_IPCGULL}-0.1-gcc13.patch" ) + +pkg_pretend() { + local CHECK_CONFIG="~HID_LOGITECH ~HID_LOGITECH_HIDPP" + + check_extra_config +} + +src_unpack() { + default + + # Submodule, which needs to be present for compilation + mv "${WORKDIR}/${MY_PN_IPCGULL}-${MY_PV_IPCGULL}" "${WORKDIR}/${MY_PN_IPCGULL}" || die + mv "${WORKDIR}/${MY_PN_IPCGULL}" "${S}/src" || die +} + +src_configure() { + local mycmakeargs=( -DLOGIOPS_VERSION="${PV}" ) + + cmake_src_configure +} + +src_install() { + default + + cmake_src_install + + # Install lib of submodule, as no install routine exist + dolib.so "${BUILD_DIR}/src/ipcgull/libipcgull.so" + + insinto /etc + newins logid.example.cfg logid.cfg + + newinitd "${FILESDIR}"/logid.initd logid +} + +pkg_postinst() { + einfo "An example config file has been installed as /etc/logid.cfg." + einfo "See https://github.com/PixlOne/logiops/wiki/Configuration for more information." +}
