diff options
Diffstat (limited to 'sys-apps/roccat-tools')
| -rw-r--r-- | sys-apps/roccat-tools/Manifest | 1 | ||||
| -rw-r--r-- | sys-apps/roccat-tools/files/roccat-tools-5.9.0-cmake_lua_impl.patch | 11 | ||||
| -rw-r--r-- | sys-apps/roccat-tools/files/roccat-tools-5.9.0-fno-common.patch | 11 | ||||
| -rw-r--r-- | sys-apps/roccat-tools/metadata.xml | 7 | ||||
| -rw-r--r-- | sys-apps/roccat-tools/roccat-tools-5.7.0.ebuild | 108 | ||||
| -rw-r--r-- | sys-apps/roccat-tools/roccat-tools-5.9.0-r101.ebuild (renamed from sys-apps/roccat-tools/roccat-tools-5.9.0.ebuild) | 65 |
6 files changed, 66 insertions, 137 deletions
diff --git a/sys-apps/roccat-tools/Manifest b/sys-apps/roccat-tools/Manifest index 518d6dba87b8..99375a0d2c83 100644 --- a/sys-apps/roccat-tools/Manifest +++ b/sys-apps/roccat-tools/Manifest @@ -1,2 +1 @@ -DIST roccat-tools-5.7.0.tar.bz2 3737735 BLAKE2B fdd86cef425f1f33309165673be52c8297380a1f0a722e827c2b3697c59dd787f4b473186ab5b8ff8fadcfc851f3bb5e76c8407d831b31f82cd360679d3c1a09 SHA512 209f9fa5302806a2d2681077e990a39a4913d47b82e73f9acd86f734affd8b3a7c0087e815e5cc1dfec1787d868d09b87211d9c2a90f2ced67c150eec1b2d290 DIST roccat-tools-5.9.0.tar.bz2 3736671 BLAKE2B 4cdd0c6b50021cfae127a692d5a2a7fff5e7e1281da7add0cf9cd8f5fbfd8882186142d56982bf929867bde2950440f26ced167b52707c9d810ab53a62a4bded SHA512 d825fc372654257f330abbc7e611e87c4888924288ad56c8e57c9db5c8c25426d454ae1ab4dd591ef3b930bed410497c0aa88095d5319e2708f4b263d16eca00 diff --git a/sys-apps/roccat-tools/files/roccat-tools-5.9.0-cmake_lua_impl.patch b/sys-apps/roccat-tools/files/roccat-tools-5.9.0-cmake_lua_impl.patch new file mode 100644 index 000000000000..3009572a8114 --- /dev/null +++ b/sys-apps/roccat-tools/files/roccat-tools-5.9.0-cmake_lua_impl.patch @@ -0,0 +1,11 @@ +--- a/cmake_modules/FindLUA.cmake ++++ b/cmake_modules/FindLUA.cmake +@@ -36,7 +36,7 @@ + ${_LUA_FIND_VERSION_SHORT} + -${_LUA_FIND_VERSION_SHORT} + ) +-SET(_LUA_NAMES luajit lua) ++SET(_LUA_NAMES ${LUA_IMPL}) + + FIND_PACKAGE(PkgConfig) + diff --git a/sys-apps/roccat-tools/files/roccat-tools-5.9.0-fno-common.patch b/sys-apps/roccat-tools/files/roccat-tools-5.9.0-fno-common.patch new file mode 100644 index 000000000000..ba37866efe77 --- /dev/null +++ b/sys-apps/roccat-tools/files/roccat-tools-5.9.0-fno-common.patch @@ -0,0 +1,11 @@ +--- a/ryosmk/libroccatryosmk/ryos_device.h ++++ b/ryosmk/libroccatryosmk/ryos_device.h +@@ -22,7 +22,7 @@ + + G_BEGIN_DECLS + +-enum { ++typedef enum { + RYOS_WRITE_CHECK_WAIT_LIGHT_CONTROL = 10, + } RyosWriteCheckWait; + diff --git a/sys-apps/roccat-tools/metadata.xml b/sys-apps/roccat-tools/metadata.xml index 7ee8c8162316..5010191bf4d2 100644 --- a/sys-apps/roccat-tools/metadata.xml +++ b/sys-apps/roccat-tools/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">roccat</remote-id> </upstream> diff --git a/sys-apps/roccat-tools/roccat-tools-5.7.0.ebuild b/sys-apps/roccat-tools/roccat-tools-5.7.0.ebuild deleted file mode 100644 index ddaecc9fce6f..000000000000 --- a/sys-apps/roccat-tools/roccat-tools-5.7.0.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit readme.gentoo-r1 cmake-utils gnome2-utils udev user - -DESCRIPTION="Utility for advanced configuration of Roccat devices" - -HOMEPAGE="http://roccat.sourceforge.net/" -SRC_URI="mirror://sourceforge/roccat/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE_INPUT_DEVICES=( - input_devices_roccat_arvo - input_devices_roccat_isku - input_devices_roccat_iskufx - input_devices_roccat_kiro - input_devices_roccat_kone - input_devices_roccat_koneplus - input_devices_roccat_konepure - input_devices_roccat_konepuremilitary - input_devices_roccat_konepureoptical - input_devices_roccat_konextd - input_devices_roccat_konextdoptical - input_devices_roccat_kovaplus - input_devices_roccat_kova2016 - input_devices_roccat_lua - input_devices_roccat_nyth - input_devices_roccat_pyra - input_devices_roccat_ryosmk - input_devices_roccat_ryosmkfx - input_devices_roccat_ryostkl - input_devices_roccat_savu - input_devices_roccat_skeltr - input_devices_roccat_sova - input_devices_roccat_suora - input_devices_roccat_tyon -) - -IUSE="${IUSE_INPUT_DEVICES[@]}" - -RDEPEND=" - dev-libs/dbus-glib - dev-libs/glib:2 - >=dev-libs/libgaminggear-0.15.1 - sys-apps/dbus - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/libX11 - virtual/libgudev:= - virtual/libusb:1 - input_devices_roccat_ryosmk? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) ) - input_devices_roccat_ryosmkfx? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) ) - input_devices_roccat_ryostkl? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) ) -" - -DEPEND=" - ${RDEPEND} -" - -DOCS=( Changelog KNOWN_LIMITATIONS README ) - -pkg_setup() { - enewgroup roccat - - local model - for model in ${IUSE_INPUT_DEVICES[@]} ; do - use ${model} && USED_MODELS+="${model/input_devices_roccat_/;}" - done -} - -src_configure() { - mycmakeargs=( - -DDEVICES="${USED_MODELS/;/}" - -DUDEVDIR="$(get_udevdir)/rules.d" - -DWITH_LUA=5.1 - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - local stat_dir=/var/lib/roccat - keepdir ${stat_dir} - fowners root:roccat ${stat_dir} - fperms 2770 ${stat_dir} - readme.gentoo_create_doc -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - readme.gentoo_print_elog - ewarn - ewarn "This version breaks stored data for some devices. Before reporting bugs please delete" - ewarn "affected folder(s) in /var/lib/roccat" - ewarn -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/sys-apps/roccat-tools/roccat-tools-5.9.0.ebuild b/sys-apps/roccat-tools/roccat-tools-5.9.0-r101.ebuild index 1f81be7eaa34..aad5624c63ae 100644 --- a/sys-apps/roccat-tools/roccat-tools-5.9.0.ebuild +++ b/sys-apps/roccat-tools/roccat-tools-5.9.0-r101.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit readme.gentoo-r1 cmake-utils udev user xdg +LUA_COMPAT=( lua5-1 luajit ) + +inherit readme.gentoo-r1 cmake flag-o-matic lua-single toolchain-funcs udev xdg DESCRIPTION="Utility for advanced configuration of Roccat devices" HOMEPAGE="http://roccat.sourceforge.net/" -SRC_URI="mirror://sourceforge/roccat/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/roccat/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -42,31 +44,47 @@ IUSE_INPUT_DEVICES=( IUSE="${IUSE_INPUT_DEVICES[@]}" -LUA_DEPEND="|| ( dev-lang/lua:5.1 dev-lang/lua:0 )" +REQUIRED_USE=" + input_devices_roccat_ryosmk? ( ${LUA_REQUIRED_USE} ) + input_devices_roccat_ryosmkfx? ( ${LUA_REQUIRED_USE} ) + input_devices_roccat_ryostkl? ( ${LUA_REQUIRED_USE} ) +" RDEPEND=" + acct-group/roccat dev-libs/dbus-glib dev-libs/glib:2 >=dev-libs/libgaminggear-0.15.1 + dev-libs/libgudev:= sys-apps/dbus x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 - virtual/libgudev:= virtual/libusb:1 - input_devices_roccat_ryosmk? ( ${LUA_DEPEND} ) - input_devices_roccat_ryosmkfx? ( ${LUA_DEPEND} ) - input_devices_roccat_ryostkl? ( ${LUA_DEPEND} ) + input_devices_roccat_ryosmk? ( ${LUA_DEPS} ) + input_devices_roccat_ryosmkfx? ( ${LUA_DEPS} ) + input_devices_roccat_ryostkl? ( ${LUA_DEPS} ) " DEPEND=" ${RDEPEND} " +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.9.0-cmake_lua_impl.patch + "${FILESDIR}"/${PN}-5.9.0-fno-common.patch +) DOCS=( Changelog KNOWN_LIMITATIONS README ) pkg_setup() { - enewgroup roccat + # Don't bother checking all the relevant USE flags, this is harmless + # to call even when no Lua implementations have been pulled in + # by dependencies. + lua-single_pkg_setup local model for model in ${IUSE_INPUT_DEVICES[@]} ; do @@ -74,13 +92,19 @@ pkg_setup() { done } -# Required because xdg.eclass overrides src_prepare() from cmake-utils.eclass +# Required because xdg.eclass overrides src_prepare() from cmake.eclass src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { - mycmakeargs=( + if has_version \>=x11-libs/pango-1.44.0 ; then + # Fix build with pango-1.44 which depends on harfbuzz + local PKGCONF="$(tc-getPKG_CONFIG)" + append-cflags "$(${PKGCONF} --cflags harfbuzz)" + fi + + local mycmakeargs=( -DDEVICES="${USED_MODELS/;/}" -DUDEVDIR="${EPREFIX}$(get_udevdir)/rules.d" ) @@ -93,16 +117,19 @@ src_configure() { local luse for luse in ${lua_use[@]} ; do if use ${luse} ; then - mycmakeargs+=( -DWITH_LUA="5.1" ) + mycmakeargs+=( + -DLUA_IMPL="${ELUA}" + -DWITH_LUA="$(ver_cut 1-2 $(lua_get_version))" + ) break fi done - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install local stat_dir=/var/lib/roccat keepdir ${stat_dir} fowners root:roccat ${stat_dir} @@ -110,10 +137,6 @@ src_install() { readme.gentoo_create_doc } -pkg_preinst() { - xdg_pkg_preinst -} - pkg_postinst() { xdg_pkg_postinst readme.gentoo_print_elog @@ -122,7 +145,3 @@ pkg_postinst() { ewarn "affected folder(s) in /var/lib/roccat" ewarn } - -pkg_postrm() { - xdg_pkg_postrm -} |