Merge updates from master

2026-07-18 03:23:20 -04:00 · 2021-09-20 09:51:15 +00:00
parent e071c85ca8 a6d001c9b2
commit 7ee93516e2
26 changed files with 26 additions and 75 deletions
--- a/app-admin/grub-customizer/grub-customizer-5.1.0.ebuild
+++ b/app-admin/grub-customizer/grub-customizer-5.1.0.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="8"
+EAPI=8

 inherit cmake flag-o-matic

 DESCRIPTION="A graphical grub2 settings manager"
 HOMEPAGE="https://launchpad.net/grub-customizer"
-SRC_URI="https://launchpad.net/grub-customizer/5.1/5.1.0/+download/grub-customizer_5.1.0.tar.gz"
+SRC_URI="https://launchpad.net/grub-customizer/$(ver_cut 1-2)/${PV}/+download/grub-customizer_${PV}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""

 DEPEND="dev-cpp/gtkmm:3.0
 	dev-libs/openssl
--- a/app-admin/grub-customizer/metadata.xml
+++ b/app-admin/grub-customizer/metadata.xml
@@ -5,9 +5,6 @@
 		<email>codeswhite@pm.me</email>
 		<name>Max Grinberg</name>
 	</maintainer>
-	<longdescription lang="en">
-			Grub Customizer is a graphical interface to configure the GRUB2/BURG settings and menuentries
-	</longdescription>
 	<upstream>
 		<remote-id type="launchpad">grub-customizer</remote-id>
 	</upstream>
--- a/app-doc/ford/metadata.xml
+++ b/app-doc/ford/metadata.xml
@@ -5,10 +5,6 @@
 		<email>torokhov-s-a@yandex.ru</email>
 		<name>Sergey Torokhov</name>
 	</maintainer>
-	<longdescription lang="en">
-		FORD, standing for FORtran Documenter,
-		is an automatic documentation generator for modern Fortran programs.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">FORD</remote-id>
 		<remote-id type="github">Fortran-FOSS-Programmers/ford</remote-id>
--- a/app-emacs/flycheck/Manifest
+++ b/app-emacs/flycheck/Manifest
@@ -1 +0,0 @@
-DIST flycheck-31.tar.gz 1056558 BLAKE2B 16a63d15748d1a9ca89dd5af80e2fb14923e33e80a05393f6c2c3b353ef4cdf32b69493ca6cc152a07ba4ac58ff627a81e61d13190b9926b3a85a1b4780071af SHA512 e7b3707f38a913d483109cf0e581d41053363e6fc0b849805d13076cc30eca19ec875c44590c3ffb383b73670c6763582f54a2df5502f287ec04b80a542182ec
--- a/app-emacs/flycheck/files/50flycheck-gentoo.el
+++ b/app-emacs/flycheck/files/50flycheck-gentoo.el
@@ -1 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
--- a/app-emacs/flycheck/flycheck-31.ebuild
+++ b/app-emacs/flycheck/flycheck-31.ebuild
@@ -1,24 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-DESCRIPTION="On the fly syntax checking for GNU Emacs"
-HOMEPAGE="https://www.flycheck.org/en/latest/"
-SRC_URI="https://github.com/flycheck/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="app-emacs/dash"
-RDEPEND="${BDEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
-
-# Running tests requires a lot of external dependencies that don't exist in
-# portage
-RESTRICT=test
--- a/app-emacs/flycheck/metadata.xml
+++ b/app-emacs/flycheck/metadata.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
-<pkgmetadata>
-	<maintainer type="person">
-		<email>brian@kubisiak.com</email>
-		<name>Brian Kubisiak</name>
-	</maintainer>
-</pkgmetadata>
--- a/app-misc/doublecmd-bin/doublecmd-bin-0.9.10.ebuild
+++ b/app-misc/doublecmd-bin/doublecmd-bin-0.9.10.ebuild
@@ -3,7 +3,7 @@

 EAPI=7

-inherit desktop xdg
+inherit desktop wrapper xdg

 MY_PN="doublecmd"
 DESCRIPTION="Free cross platform open source file manager with two panels side by side."
--- a/app-text/koodo-reader-bin/koodo-reader-bin-1.3.0.ebuild
+++ b/app-text/koodo-reader-bin/koodo-reader-bin-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troyeguo/koodo-reader/releases/download/v${PV}/Koodo
 S="${WORKDIR}"
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 -*"
+KEYWORDS="-* ~amd64"

 DEPEND="
 	x11-libs/libXcomposite
--- a/dev-python/md-environ/metadata.xml
+++ b/dev-python/md-environ/metadata.xml
@@ -5,9 +5,6 @@
 		<email>torokhov-s-a@yandex.ru</email>
 		<name>Sergey Torokhov</name>
 	</maintainer>
-	<longdescription>
-		This is an extension to Python-Markdown which allows environment variables to be used in the text.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">cmacmackin/md-environ</remote-id>
 		<remote-id type="pypi">md-environ</remote-id>
--- a/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.20.ebuild
+++ b/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.20.ebuild
@@ -17,8 +17,7 @@ S="${WORKDIR}/${MY_PN}"

 LICENSE="EPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 -*"
-IUSE=""
+KEYWORDS="-* ~amd64 ~arm64"
 RESTRICT="mirror"

 RDEPEND="
--- a/dev-util/fypp/fypp-3.1.ebuild
+++ b/dev-util/fypp/fypp-3.1.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1

 DESCRIPTION="Fypp - Python powered Fortran preprocessor"
 HOMEPAGE="https://github.com/aradi/fypp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD-2"
 SLOT="0"
--- a/gnome-extra/iio-sensor-proxy/iio-sensor-proxy-3.1.ebuild
+++ b/gnome-extra/iio-sensor-proxy/iio-sensor-proxy-3.1.ebuild
@@ -3,7 +3,7 @@

 EAPI=7

-inherit gnome2-utils meson systemd udev
+inherit gnome2-utils meson systemd udev xdg

 DESCRIPTION="IIO sensors to D-Bus proxy"
 HOMEPAGE="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/"
--- a/gui-wm/phosh/phosh-0.13.1.ebuild
+++ b/gui-wm/phosh/phosh-0.13.1.ebuild
@@ -66,8 +66,7 @@ src_install() {
 	meson_src_install
 	newpamd "${FILESDIR}"/pam_phosh 'phosh'
 	systemd_newunit "${FILESDIR}"/phosh.service 'phosh.service'
-	insinto /usr/share/applications/
-	doins "${FILESDIR}"/sm.puri.OSK0.desktop
+	domenu "${FILESDIR}"/sm.puri.OSK0.desktop

 	DOC_CONTENTS="To amend the existing password policy please see the man 5 passwdqc.conf
 				page and then edit the /etc/security/passwdqc.conf file to change enforce=none
--- a/media-gfx/WebPlotDigitizer-bin/WebPlotDigitizer-bin-4.5.ebuild
+++ b/media-gfx/WebPlotDigitizer-bin/WebPlotDigitizer-bin-4.5.ebuild
@@ -9,7 +9,7 @@ MY_PN=${PN%-*}
 inherit desktop python-single-r1 xdg

 DESCRIPTION="Web based tool to extract data from plots, images, and maps"
-HOMEPAGE="https://automeris.io/${MY_PN}/"
+HOMEPAGE="https://automeris.io/WebPlotDigitizer/"
 SRC_URI="https://automeris.io/downloads/${MY_PN}-${PV}-linux-x64.zip"

 LICENSE="AGPL-3"
@@ -33,6 +33,7 @@ RDEPEND="
 	dev-libs/nss
 	x11-libs/gtk+:3[X,cups,introspection]
 "
+BDEPEND="app-arch/unzip"

 S="${WORKDIR}/${MY_PN}-${PV}-linux-x64"

--- a/media-plugins/qt-heif-image-plugin/qt-heif-image-plugin-0.3.3-r2.ebuild
+++ b/media-plugins/qt-heif-image-plugin/qt-heif-image-plugin-0.3.3-r2.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-qt/qtcore
 	dev-qt/qtgui
-	>=media-libs/libheif-1.10.0:0=[libde265]
+	>=media-libs/libheif-1.10.0:0=
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
--- a/media-video/obs-vkcapture/Manifest
+++ b/media-video/obs-vkcapture/Manifest
@@ -1 +1 @@
-DIST obs-vkcapture.tar.gz 84852 BLAKE2B 632d8db777b80e1efca48ca93edb9e400fed9edcfd7caf1108ba6f7481e1fdcfab2db715797e0019dec2fd65ed9ee3095285f2332609a848fa9a50585740eab9 SHA512 c2da876a9c13cb172bbcc122ada04e2b65278d292e1addfd591e50529cf64eabd43ac7902106b87095019f64536a7adb946d7c63b1125a4eb90da4908753c423
+DIST obs-vkcapture-1.0.tar.gz 84852 BLAKE2B 632d8db777b80e1efca48ca93edb9e400fed9edcfd7caf1108ba6f7481e1fdcfab2db715797e0019dec2fd65ed9ee3095285f2332609a848fa9a50585740eab9 SHA512 c2da876a9c13cb172bbcc122ada04e2b65278d292e1addfd591e50529cf64eabd43ac7902106b87095019f64536a7adb946d7c63b1125a4eb90da4908753c423
--- a/media-video/obs-vkcapture/obs-vkcapture-1.0.ebuild
+++ b/media-video/obs-vkcapture/obs-vkcapture-1.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/nowrep/obs-vkcapture"
 else
-	SRC_URI="https://github.com/nowrep/obs-vkcapture/archive/refs/tags/v${PV}.tar.gz -> obs-vkcapture.tar.gz"
+	SRC_URI="https://github.com/nowrep/obs-vkcapture/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi

--- a/media-video/obs-vkcapture/obs-vkcapture-9999.ebuild
+++ b/media-video/obs-vkcapture/obs-vkcapture-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/nowrep/obs-vkcapture"
 else
-	SRC_URI="https://github.com/nowrep/obs-vkcapture/archive/refs/tags/v${PV}.tar.gz -> obs-vkcapture.tar.gz"
+	SRC_URI="https://github.com/nowrep/obs-vkcapture/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi

--- a/net-misc/eg25-manager/metadata.xml
+++ b/net-misc/eg25-manager/metadata.xml
@@ -5,9 +5,6 @@
 		<email>gjdijkman@gjdwebserver.nl</email>
 		<name>Gerben Jan Dijkman</name>
 	</maintainer>
-	<longdescription lang="en">
-	Manager daemon for the Quectel EG25 mobile broadband modem.
-	</longdescription>
 	<upstream>
 		<doc>https://gitlab.com/mobian1/devices/eg25-manager</doc>
 		<bugs-to>https://gitlab.com/mobian1/devices/eg25-manager/-/issues</bugs-to>
--- a/sys-fs/gfs2-utils/gfs2-utils-3.4.1.ebuild
+++ b/sys-fs/gfs2-utils/gfs2-utils-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"

 IUSE="nls test"
-
+RESTRICT="!test? ( test )"

 BDEPEND="sys-devel/autoconf
 		sys-devel/automake
--- a/sys-libs/nss-tls/nss-tls-1.0.ebuild
+++ b/sys-libs/nss-tls/nss-tls-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -7,7 +7,7 @@ DESCRIPTION="A DNS over HTTPS resolver for glibc"
 HOMEPAGE="https://github.com/dimkr/nss-tls"
 SRC_URI="https://github.com/dimkr/nss-tls/archive/v${PV}.tar.gz -> ${P}.tar.gz"

-inherit meson ninja-utils
+inherit meson ninja-utils systemd

 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
--- a/sys-libs/nss-tls/nss-tls-1.1.ebuild
+++ b/sys-libs/nss-tls/nss-tls-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -7,7 +7,7 @@ DESCRIPTION="A DNS over HTTPS resolver for glibc"
 HOMEPAGE="https://github.com/dimkr/nss-tls"
 SRC_URI="https://github.com/dimkr/nss-tls/archive/${PV}.tar.gz -> ${P}.tar.gz"

-inherit meson ninja-utils
+inherit meson ninja-utils systemd

 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
--- a/sys-libs/nss-tls/nss-tls-9999.ebuild
+++ b/sys-libs/nss-tls/nss-tls-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -7,7 +7,7 @@ EGIT_REPO_URI="https://github.com/dimkr/nss-tls.git"
 DESCRIPTION="A DNS over HTTPS resolver for glibc"
 HOMEPAGE="https://github.com/dimkr/nss-tls"

-inherit git-r3 meson ninja-utils
+inherit git-r3 meson ninja-utils systemd

 S="${WORKDIR}/${PN}-9999"
 LICENSE="LGPL-2.1"
--- a/www-servers/hinsightd/hinsightd-0.9.11_p20210831.ebuild
+++ b/www-servers/hinsightd/hinsightd-0.9.11_p20210831.ebuild
@@ -11,20 +11,20 @@ DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals"
 HOMEPAGE="https://gitlab.com/tiotags/hin9"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"

 mycommit="f04d7703f6cdbd2e33f8a7289d80a01dba5e970f"

 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"
-	KEYWORDS=
 elif [[ ! -z "$mycommit" ]]; then
 	SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/${mycommit}/hin9-${mycommit}.tar.gz"
 	S="${WORKDIR}/hin9-${mycommit}"
+	KEYWORDS="~amd64"
 else
 	SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"
 	S="${WORKDIR}/hin9-v${PV}"
+	KEYWORDS="~amd64"
 fi

 IUSE="+openssl"
--- a/www-servers/hinsightd/hinsightd-9999.ebuild
+++ b/www-servers/hinsightd/hinsightd-9999.ebuild
@@ -11,18 +11,18 @@ DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals"
 HOMEPAGE="https://gitlab.com/tiotags/hin9"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"

 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"
-	KEYWORDS=
 elif [[ ! -z "$mycommit" ]]; then
 	SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/${mycommit}/hin9-${mycommit}.tar.gz"
 	S="${WORKDIR}/hin9-${mycommit}"
+	KEYWORDS="~amd64"
 else
 	SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"
 	S="${WORKDIR}/hin9-v${PV}"
+	KEYWORDS="~amd64"
 fi

 IUSE="+openssl cgi +fcgi +rproxy"
				`@@ -1 +0,0 @@`
				`DIST flycheck-31.tar.gz 1056558 BLAKE2B 16a63d15748d1a9ca89dd5af80e2fb14923e33e80a05393f6c2c3b353ef4cdf32b69493ca6cc152a07ba4ac58ff627a81e61d13190b9926b3a85a1b4780071af SHA512 e7b3707f38a913d483109cf0e581d41053363e6fc0b849805d13076cc30eca19ec875c44590c3ffb383b73670c6763582f54a2df5502f287ec04b80a542182ec`