From 9481e1a377ae0410f0a365faf4b1c7519d43e0a8 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 02:04:35 +0200 Subject: [PATCH] x11-misc/*: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- x11-misc/greenclip-bin/greenclip-bin-4.2.ebuild | 11 ++++++----- x11-misc/gromit-mpx/gromit-mpx-1.5.1.ebuild | 2 +- x11-misc/gromit-mpx/gromit-mpx-1.6.0.ebuild | 2 +- x11-misc/gromit-mpx/gromit-mpx-9999.ebuild | 2 +- x11-misc/i3-restore/i3-restore-4.1.ebuild | 11 +++++------ x11-misc/selx/selx-1.1.0.ebuild | 4 ++-- x11-misc/xbanish/xbanish-1.8.ebuild | 3 +-- x11-misc/xbanish/xbanish-1.8_p20230519.ebuild | 2 +- .../xscreensaver-anclock-2.2.1.ebuild | 4 ++-- 9 files changed, 20 insertions(+), 21 deletions(-) diff --git a/x11-misc/greenclip-bin/greenclip-bin-4.2.ebuild b/x11-misc/greenclip-bin/greenclip-bin-4.2.ebuild index 7faa454d15..f2b98eca1d 100644 --- a/x11-misc/greenclip-bin/greenclip-bin-4.2.ebuild +++ b/x11-misc/greenclip-bin/greenclip-bin-4.2.ebuild @@ -3,21 +3,22 @@ EAPI=7 -HOMEPAGE="https://github.com/erebe/greenclip" -DESCRIPTION="Simple clipboard manager to be integrated with rofi" - MY_PN=${PN%-bin} + +DESCRIPTION="Simple clipboard manager to be integrated with rofi" +HOMEPAGE="https://github.com/erebe/greenclip" SRC_URI=" https://github.com/erebe/${MY_PN}/releases/download/v${PV}/${MY_PN} -> ${P} https://raw.githubusercontent.com/erebe/${MY_PN}/v${PV}/README.md -> ${P}.README.md " -KEYWORDS="~amd64" +S="${WORKDIR}" + LICENSE="BSD" SLOT="0" +KEYWORDS="~amd64" QA_PREBUILT="/usr/bin/${MY_PN}" -S="${WORKDIR}" src_install() { newbin "${DISTDIR}/${P}" "${MY_PN}" diff --git a/x11-misc/gromit-mpx/gromit-mpx-1.5.1.ebuild b/x11-misc/gromit-mpx/gromit-mpx-1.5.1.ebuild index 95600ede05..074c4f1534 100644 --- a/x11-misc/gromit-mpx/gromit-mpx-1.5.1.ebuild +++ b/x11-misc/gromit-mpx/gromit-mpx-1.5.1.ebuild @@ -16,8 +16,8 @@ else KEYWORDS="~amd64 ~x86" fi -SLOT="0" LICENSE="GPL-2" +SLOT="0" RDEPEND=" x11-libs/gtk+:3 diff --git a/x11-misc/gromit-mpx/gromit-mpx-1.6.0.ebuild b/x11-misc/gromit-mpx/gromit-mpx-1.6.0.ebuild index 3b827169fc..18ac1a5e82 100644 --- a/x11-misc/gromit-mpx/gromit-mpx-1.6.0.ebuild +++ b/x11-misc/gromit-mpx/gromit-mpx-1.6.0.ebuild @@ -16,8 +16,8 @@ else KEYWORDS="~amd64 ~x86" fi -SLOT="0" LICENSE="GPL-2" +SLOT="0" RDEPEND=" x11-libs/gtk+:3 diff --git a/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild b/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild index 95600ede05..074c4f1534 100644 --- a/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild +++ b/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild @@ -16,8 +16,8 @@ else KEYWORDS="~amd64 ~x86" fi -SLOT="0" LICENSE="GPL-2" +SLOT="0" RDEPEND=" x11-libs/gtk+:3 diff --git a/x11-misc/i3-restore/i3-restore-4.1.ebuild b/x11-misc/i3-restore/i3-restore-4.1.ebuild index 2d3d1965b9..662d841413 100644 --- a/x11-misc/i3-restore/i3-restore-4.1.ebuild +++ b/x11-misc/i3-restore/i3-restore-4.1.ebuild @@ -3,17 +3,18 @@ EAPI=8 +PYTHON_COMPAT=( python3_{7..12} ) +inherit python-single-r1 + DESCRIPTION="A simple bash + python script to restore your i3 session" HOMEPAGE="https://github.com/jdholtz/i3-restore/" - SRC_URI="https://github.com/jdholtz/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" LICENSE="GPL-3" SLOT="0" +KEYWORDS="~amd64" -PYTHON_COMPAT=( python3_{7..12} ) -inherit python-single-r1 +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" x11-wm/i3 @@ -26,8 +27,6 @@ DEPEND=" 'dev-python/psutil[${PYTHON_USEDEP}]' ) " -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - src_prepare() { sed -i 's#CURR_DIR="$(dirname "${0}")"#CURR_DIR=/usr/libexec/i3-restore#' i3-save i3-restore || die "Sed error" sed -i "s/version=.*/version=${PV}/" utils/common.bash diff --git a/x11-misc/selx/selx-1.1.0.ebuild b/x11-misc/selx/selx-1.1.0.ebuild index 15f8e130fa..5d796ec1df 100644 --- a/x11-misc/selx/selx-1.1.0.ebuild +++ b/x11-misc/selx/selx-1.1.0.ebuild @@ -7,13 +7,13 @@ inherit toolchain-funcs edo DESCRIPTION="Minimal X11 rectangle selection tool" HOMEPAGE="https://codeberg.org/NRK/selx" - SRC_URI="https://codeberg.org/NRK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}" -KEYWORDS="~amd64" LICENSE="GPL-3+" SLOT="0" +KEYWORDS="~amd64" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/xbanish/xbanish-1.8.ebuild b/x11-misc/xbanish/xbanish-1.8.ebuild index 8b3a322920..a25dd0baec 100644 --- a/x11-misc/xbanish/xbanish-1.8.ebuild +++ b/x11-misc/xbanish/xbanish-1.8.ebuild @@ -7,12 +7,11 @@ inherit toolchain-funcs DESCRIPTION="Banish the mouse cursor when typing, show it again when the mouse moves" HOMEPAGE="https://github.com/jcs/xbanish" - SRC_URI="https://github.com/jcs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" LICENSE="ISC" SLOT="0" +KEYWORDS="~amd64" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/xbanish/xbanish-1.8_p20230519.ebuild b/x11-misc/xbanish/xbanish-1.8_p20230519.ebuild index 69ede7d3bd..c00734e962 100644 --- a/x11-misc/xbanish/xbanish-1.8_p20230519.ebuild +++ b/x11-misc/xbanish/xbanish-1.8_p20230519.ebuild @@ -12,9 +12,9 @@ COMMIT="189ce79b1df4eb4995980530ebc3d28715a67488" SRC_URI="https://github.com/jcs/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" -KEYWORDS="~amd64" LICENSE="ISC" SLOT="0" +KEYWORDS="~amd64" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/xscreensaver-anclock/xscreensaver-anclock-2.2.1.ebuild b/x11-misc/xscreensaver-anclock/xscreensaver-anclock-2.2.1.ebuild index 977e129968..2a7207390c 100644 --- a/x11-misc/xscreensaver-anclock/xscreensaver-anclock-2.2.1.ebuild +++ b/x11-misc/xscreensaver-anclock/xscreensaver-anclock-2.2.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="http://pt2k.xii.jp/software/anclock/xscreensaver/index_e.html" SRC_URI="https://www.jwz.org/xscreensaver/xscreensaver-6.05.1.tar.gz \ http://pt2k.xii.jp/software/anclock/xscreensaver/oldver/anclock-${PV}-for-xscreensaver-6.04.patch.gz" +S="${WORKDIR}"/xscreensaver-6.05/ + LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" @@ -55,8 +57,6 @@ PATCHES=( "${FILESDIR}"/xscreensaver-6.05-configure-exit-codes.patch ) -S="${WORKDIR}"/xscreensaver-6.05/ - src_unpack() { default gunzip --force "${DISTDIR}/anclock-${PV}-for-xscreensaver-6.04.patch.gz"