From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- games-util/joystick/Manifest | 6 +-- .../joystick/files/joystick-1.6.0-build.patch | 34 ---------------- .../files/joystick-1.8.1-optional-ffmvforce.patch | 22 +++++++++++ games-util/joystick/joystick-1.7.1.ebuild | 46 ---------------------- games-util/joystick/joystick-1.8.1.ebuild | 46 ++++++++++++++++++++++ 5 files changed, 71 insertions(+), 83 deletions(-) delete mode 100644 games-util/joystick/files/joystick-1.6.0-build.patch create mode 100644 games-util/joystick/files/joystick-1.8.1-optional-ffmvforce.patch delete mode 100644 games-util/joystick/joystick-1.7.1.ebuild create mode 100644 games-util/joystick/joystick-1.8.1.ebuild (limited to 'games-util/joystick') diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest index 0c187566bade..4f1b2ec44a92 100644 --- a/games-util/joystick/Manifest +++ b/games-util/joystick/Manifest @@ -1,4 +1,4 @@ -AUX joystick-1.6.0-build.patch 831 BLAKE2B 942038f6997caa84cdbc8c05a6353dd448c1b70f9229f38084e2b8c80df2f8d3df3eb8a0da754a7ba56863aaed58375eec22267f08d304bd550d2237054f6e16 SHA512 071b15e16a1688e2d743dbf0bc44c784184ee93698b660394c83bed719d579952c9d73680e3e24754a41d5de69a65559b61255b0366c3437a193fc526c3d6064 -DIST linuxconsoletools-1.7.1.tar.bz2 53153 BLAKE2B e05d04454fefdd4009d0c75f1caf2e6675a8e5f494f6f2f491f4de3c57101a6323b4de5795fccb9fd6a557a1e7bf4befa312661b022ed0503da83ac4dd3ab7c5 SHA512 2ba97e6c5b57aa5d6b08369bae050256f4d039f5b8479ad03cef4a7c43bf772db312de54d9e70a8a92c9ed7933b524715f1ce5448ccf508e6ffe8646a9dbd349 -EBUILD joystick-1.7.1.ebuild 870 BLAKE2B c26d1ee35834da9a7261ebf7c5cbbe4cbf40f529f82260a2f6b0a70a1d32185387e1d316e34fb0f00499a4e2068ff25a41ac3b61bd6e605476be61a1bf637d84 SHA512 22433c957fef2dcf7b5ba89f7030cd18fe282151ead4ee366f70097f27ed9b22bf36bb6f0413fd65d4de7db28d497f5b9b90ef640fe5d0f7415e112373019c44 +AUX joystick-1.8.1-optional-ffmvforce.patch 583 BLAKE2B e309de0639f9917c7fcc5d5a9d390ccdf252a7d0b3642a528110023a2e4660378ea0f198aae47cdee4d9d9bc59479afe25956b43ec0b31fd31966277e475dc67 SHA512 0ed54f1035f4085d412b6570e700104c5e4ab6192f6a2ed659d02c077400b3d984734dd3f59158f9c4e33ca1b6e2d44c6fcd0e623a0c60e4fb5c3ff0c3c79a39 +DIST linuxconsoletools-1.8.1.tar.bz2 53715 BLAKE2B a0fab44762d9f4edcc1e85037efada2dac617873548579a83c3e7791e5a047e1c88243978fee562992f363102a0cb415c75d1286a3eb46a42dfe6afc7e9a0594 SHA512 407fcba552a3e45c60fb4f08217fe17106bedd6fde2fbce84aa6f4fa68ffc032f1683c6154f79daacaf1dcaf484fe943dd7391e787f0290d5bf42c7089c7c20c +EBUILD joystick-1.8.1.ebuild 852 BLAKE2B c126bdcd87e862c5faf67748c715e13347de2c7cbacc591993e93fd2e68f3673bd781b2422bc1faf14a65656e756a0c4f3a95e60dce56bdbe2be69a57ccd3e00 SHA512 dc28ceed8fac57143c89afca6050014fb73f95c9cd8f45edc7dda00e6683262c3da319a91c5eb555c29b0aa32f401b84cec2e3a08a7f46218a7c696d055db295 MISC metadata.xml 336 BLAKE2B 4bc8970a6d397889ee89a784792900188a26a65ec994cd148c6a829e9347f675e9830ef69aa0a2f53c2fbf2870570a01dc19987db3f988376a7c708ed5f16cb4 SHA512 988cd04e5db7046793fc5655309246abb09a5d26844449a392dcafa5362cea4ba94c9fb0f78adb07a6fa2a473a1ed6af651ce344831a5c308bb4451be414b19e diff --git a/games-util/joystick/files/joystick-1.6.0-build.patch b/games-util/joystick/files/joystick-1.6.0-build.patch deleted file mode 100644 index fa60ec719917..000000000000 --- a/games-util/joystick/files/joystick-1.6.0-build.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- linuxconsoletools-1.6.0/docs/Makefile -+++ linuxconsoletools-1.6.0/docs/Makefile -@@ -20,9 +20,13 @@ - # 02110-1301 USA. - - MANPAGES = inputattach.1 jstest.1 jscal.1 fftest.1 \ -- ffmvforce.1 ffset.1 ffcfstress.1 jscal-store.1 \ -+ ffset.1 ffcfstress.1 jscal-store.1 \ - jscal-restore.1 evdev-joystick.1 - -+ifneq ($(USE_SDL),no) -+MANPAGES += ffmvforce.1 -+endif -+ - PREFIX ?= /usr/local - - install: ---- linuxconsoletools-1.6.0/utils/Makefile -+++ linuxconsoletools-1.6.0/utils/Makefile -@@ -27,9 +27,13 @@ - - CFLAGS ?= -g -O2 -Wall - --PROGRAMS = inputattach jstest jscal fftest ffmvforce ffset \ -+PROGRAMS = inputattach jstest jscal fftest ffset \ - ffcfstress jscal-restore jscal-store evdev-joystick - -+ifneq ($(USE_SDL),no) -+PROGRAMS += ffmvforce -+endif -+ - PREFIX ?= /usr/local - - compile: $(PROGRAMS) diff --git a/games-util/joystick/files/joystick-1.8.1-optional-ffmvforce.patch b/games-util/joystick/files/joystick-1.8.1-optional-ffmvforce.patch new file mode 100644 index 000000000000..62f85aea6054 --- /dev/null +++ b/games-util/joystick/files/joystick-1.8.1-optional-ffmvforce.patch @@ -0,0 +1,22 @@ +Keep ffmvforce separately optional given it's the only one +with an additional dependency (sdl) +--- a/docs/Makefile ++++ b/docs/Makefile +@@ -31,3 +31,6 @@ + ifndef DISABLE_FORCEFEEDBACK +-MANPAGES += fftest.1 ffmvforce.1 ffset.1 ffcfstress.1 ++MANPAGES += fftest.1 ffset.1 ffcfstress.1 ++ifndef DISABLE_FFMVFORCE ++MANPAGES += ffmvforce.1 ++endif + endif +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -39,3 +39,6 @@ + ifndef DISABLE_FORCEFEEDBACK +-PROGRAMS += fftest ffmvforce ffset ffcfstress ++PROGRAMS += fftest ffset ffcfstress ++ifndef DISABLE_FFMVFORCE ++PROGRAMS += ffmvforce ++endif + endif diff --git a/games-util/joystick/joystick-1.7.1.ebuild b/games-util/joystick/joystick-1.7.1.ebuild deleted file mode 100644 index 2f1e8014e508..000000000000 --- a/games-util/joystick/joystick-1.7.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -MY_P="linuxconsoletools-${PV}" - -DESCRIPTION="Joystick testing utilities" -HOMEPAGE="https://sourceforge.net/projects/linuxconsole/" -SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="sdl udev" - -DEPEND="sdl? ( media-libs/libsdl2[video] )" -RDEPEND=" - ${DEPEND} - udev? ( virtual/udev )" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.0-build.patch -) - -src_configure() { - tc-export CC PKG_CONFIG - export PREFIX="${EPREFIX}"/usr - export USE_SDL=$(usex sdl) -} - -src_install() { - default - - if ! use udev; then - rm "${ED}"/usr/bin/jscal-{re,}store || die - fi - - if [[ ${EPREFIX} ]]; then - mv {"${D}","${ED}"}/lib || die - fi -} diff --git a/games-util/joystick/joystick-1.8.1.ebuild b/games-util/joystick/joystick-1.8.1.ebuild new file mode 100644 index 000000000000..95bfe6728687 --- /dev/null +++ b/games-util/joystick/joystick-1.8.1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs udev + +MY_P="linuxconsoletools-${PV}" + +DESCRIPTION="Joystick testing utilities" +HOMEPAGE="https://sourceforge.net/projects/linuxconsole/" +SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="sdl" + +RDEPEND="sdl? ( media-libs/libsdl2[video] )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.1-optional-ffmvforce.patch +) + +src_configure() { + tc-export CC PKG_CONFIG + export PREFIX="${EPREFIX}"/usr + use sdl || export DISABLE_FFMVFORCE=1 +} + +src_install() { + default + + [[ ! ${EPREFIX} ]] || mv {"${D}","${ED}"}/lib || die +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} -- cgit v1.2.3