commit: 89b25248e5a901570ccdef5a3166228b1f08b40b Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net> AuthorDate: Tue May 14 00:17:10 2024 +0000 Commit: Julien Roy <julien <AT> jroy <DOT> ca> CommitDate: Tue May 14 20:37:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=89b25248
net-misc/*: fix variable order Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net> Signed-off-by: Julien Roy <julien <AT> jroy.ca> net-misc/FORT-validator/FORT-validator-1.5.3.ebuild | 4 ++-- net-misc/FORT-validator/FORT-validator-1.5.4.ebuild | 4 ++-- net-misc/eg25-manager/eg25-manager-0.4.2.ebuild | 6 +++--- net-misc/gemserv/gemserv-0.6.5.ebuild | 4 ++-- net-misc/gemserv/gemserv-0.6.6.ebuild | 4 ++-- net-misc/openbgpd/openbgpd-6.9_p0.ebuild | 4 ++-- net-misc/openbgpd/openbgpd-8.0.ebuild | 4 ++-- net-misc/rpki-client/rpki-client-8.0.ebuild | 3 ++- net-misc/rpki-client/rpki-client-8.4.ebuild | 3 ++- net-misc/rpki-client/rpki-client-8.8.ebuild | 3 ++- net-misc/smcroute/smcroute-2.5.6.ebuild | 10 +++------- net-misc/xkcd-handler/xkcd-handler-1.1.4.ebuild | 4 ++-- net-misc/xmrig-mo/xmrig-mo-6.21.2.ebuild | 7 ++++--- net-misc/yacy/yacy-1.924.20210209.10069.ebuild | 4 ++-- net-misc/yt-dlg/yt-dlg-2023.08.16.ebuild | 16 ++++++++-------- 15 files changed, 40 insertions(+), 40 deletions(-) diff --git a/net-misc/FORT-validator/FORT-validator-1.5.3.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.3.ebuild index 5642e8bc64..95c00d6ff9 100644 --- a/net-misc/FORT-validator/FORT-validator-1.5.3.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.5.3.ebuild @@ -11,6 +11,8 @@ DESCRIPTION="FORT validator is an open source RPKI validator" HOMEPAGE="https://fortproject.net/validator?2"; SRC_URI="https://github.com/NICMx/${PN}/releases/download/${PV}/fort-${PV}.tar.gz"; +S="${WORKDIR}/${MY_PN}-${PV}" + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -32,8 +34,6 @@ BDEPEND=" dev-build/automake " -S="${WORKDIR}/${MY_PN}-${PV}" - src_prepare() { default # Don't strip CFLAGS diff --git a/net-misc/FORT-validator/FORT-validator-1.5.4.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.4.ebuild index 4b1ba919b3..3d59fe3055 100644 --- a/net-misc/FORT-validator/FORT-validator-1.5.4.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.5.4.ebuild @@ -11,6 +11,8 @@ DESCRIPTION="FORT validator is an open source RPKI validator" HOMEPAGE="https://fortproject.net/validator?2"; SRC_URI="https://github.com/NICMx/${PN}/releases/download/${PV}/fort-${PV}.tar.gz"; +S="${WORKDIR}/${MY_PN}-${PV}" + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -32,8 +34,6 @@ BDEPEND=" dev-build/automake " -S="${WORKDIR}/${MY_PN}-${PV}" - src_prepare() { default # Don't strip CFLAGS diff --git a/net-misc/eg25-manager/eg25-manager-0.4.2.ebuild b/net-misc/eg25-manager/eg25-manager-0.4.2.ebuild index 07234104bf..1b4ab8b7d5 100644 --- a/net-misc/eg25-manager/eg25-manager-0.4.2.ebuild +++ b/net-misc/eg25-manager/eg25-manager-0.4.2.ebuild @@ -11,9 +11,11 @@ DESCRIPTION="Daemon for managing the Quectel EG25 modem" HOMEPAGE="https://gitlab.com/mobian1/devices/eg25-manager"; SRC_URI="https://gitlab.com/mobian1/devices/eg25-manager/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~arm64" +S="${WORKDIR}/${PN}-${COMMIT}" + LICENSE="GPL-3" SLOT="0" +KEYWORDS="~arm64" RDEPEND=" dev-libs/libgpiod @@ -21,8 +23,6 @@ RDEPEND=" net-misc/modemmanager " -S="${WORKDIR}/${PN}-${COMMIT}" - src_install() { meson_src_install systemd_dounit "${FILESDIR}"/eg25-manager.service diff --git a/net-misc/gemserv/gemserv-0.6.5.ebuild b/net-misc/gemserv/gemserv-0.6.5.ebuild index d88f401b33..118f42bb49 100644 --- a/net-misc/gemserv/gemserv-0.6.5.ebuild +++ b/net-misc/gemserv/gemserv-0.6.5.ebuild @@ -115,6 +115,8 @@ SRC_URI=" $(cargo_crate_uris ${CRATES}) " +S="${WORKDIR}/${PN}-v${PV}" + # openssl and SSLeay come from the “ring” crate. LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0 openssl SSLeay ZLIB" SLOT="0" @@ -125,8 +127,6 @@ RDEPEND=" " DEPEND="${RDEPEND}" -S="${WORKDIR}/${PN}-v${PV}" - # Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings. QA_FLAGS_IGNORED="usr/bin/gemserv" diff --git a/net-misc/gemserv/gemserv-0.6.6.ebuild b/net-misc/gemserv/gemserv-0.6.6.ebuild index 738a467df1..2ad3af58b9 100644 --- a/net-misc/gemserv/gemserv-0.6.6.ebuild +++ b/net-misc/gemserv/gemserv-0.6.6.ebuild @@ -118,6 +118,8 @@ SRC_URI=" $(cargo_crate_uris ${CRATES}) " +S="${WORKDIR}/${PN}-v${PV}" + # openssl and SSLeay come from the “ring” crate. LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0 openssl SSLeay ZLIB" SLOT="0" @@ -128,8 +130,6 @@ RDEPEND=" " DEPEND="${RDEPEND}" -S="${WORKDIR}/${PN}-v${PV}" - # Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings. QA_FLAGS_IGNORED="usr/bin/gemserv" diff --git a/net-misc/openbgpd/openbgpd-6.9_p0.ebuild b/net-misc/openbgpd/openbgpd-6.9_p0.ebuild index e7ce495b5c..346d1f7bbc 100644 --- a/net-misc/openbgpd/openbgpd-6.9_p0.ebuild +++ b/net-misc/openbgpd/openbgpd-6.9_p0.ebuild @@ -12,6 +12,8 @@ DESCRIPTION="OpenBGPD is a free implementation of BGPv4" HOMEPAGE="http://www.openbgpd.org/index.html"; SRC_URI="mirror://openbsd/OpenBGPD/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + LICENSE="ISC" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -26,8 +28,6 @@ BDEPEND=" dev-build/libtool " -S="${WORKDIR}/${MY_P}" - src_install() { default diff --git a/net-misc/openbgpd/openbgpd-8.0.ebuild b/net-misc/openbgpd/openbgpd-8.0.ebuild index 9f7921ac09..480afe2ae0 100644 --- a/net-misc/openbgpd/openbgpd-8.0.ebuild +++ b/net-misc/openbgpd/openbgpd-8.0.ebuild @@ -12,6 +12,8 @@ DESCRIPTION="OpenBGPD is a free implementation of BGPv4" HOMEPAGE="http://www.openbgpd.org/index.html"; SRC_URI="mirror://openbsd/OpenBGPD/${PN}-${MY_PV}.tar.gz" +S="${WORKDIR}/${MY_P}" + LICENSE="ISC" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -26,8 +28,6 @@ BDEPEND=" dev-build/libtool " -S="${WORKDIR}/${MY_P}" - src_install() { default diff --git a/net-misc/rpki-client/rpki-client-8.0.ebuild b/net-misc/rpki-client/rpki-client-8.0.ebuild index e9459f77f3..1fac52ea0d 100644 --- a/net-misc/rpki-client/rpki-client-8.0.ebuild +++ b/net-misc/rpki-client/rpki-client-8.0.ebuild @@ -11,6 +11,8 @@ HOMEPAGE="https://rpki-client.org/"; SRC_URI="mirror://openbsd/${PN}/${PN}-${MY_PV}.tar.gz https://lg.breizh-ix.net/ssl/cert.pem -> ${PN}-${MY_PV}-cert.pem" +S="${WORKDIR}/${MY_P}" + LICENSE="ISC" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -26,7 +28,6 @@ BDEPEND=" dev-build/libtool " -S="${WORKDIR}/${MY_P}" src_configure() { local myeconfargs=( --with-rsync=rsync diff --git a/net-misc/rpki-client/rpki-client-8.4.ebuild b/net-misc/rpki-client/rpki-client-8.4.ebuild index e9459f77f3..1fac52ea0d 100644 --- a/net-misc/rpki-client/rpki-client-8.4.ebuild +++ b/net-misc/rpki-client/rpki-client-8.4.ebuild @@ -11,6 +11,8 @@ HOMEPAGE="https://rpki-client.org/"; SRC_URI="mirror://openbsd/${PN}/${PN}-${MY_PV}.tar.gz https://lg.breizh-ix.net/ssl/cert.pem -> ${PN}-${MY_PV}-cert.pem" +S="${WORKDIR}/${MY_P}" + LICENSE="ISC" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -26,7 +28,6 @@ BDEPEND=" dev-build/libtool " -S="${WORKDIR}/${MY_P}" src_configure() { local myeconfargs=( --with-rsync=rsync diff --git a/net-misc/rpki-client/rpki-client-8.8.ebuild b/net-misc/rpki-client/rpki-client-8.8.ebuild index 452a51417a..d89b3a724d 100644 --- a/net-misc/rpki-client/rpki-client-8.8.ebuild +++ b/net-misc/rpki-client/rpki-client-8.8.ebuild @@ -11,6 +11,8 @@ HOMEPAGE="https://rpki-client.org/"; SRC_URI="mirror://openbsd/${PN}/${PN}-${MY_PV}.tar.gz https://lg.breizh-ix.net/ssl/cert.pem -> ${PN}-${MY_PV}-cert.pem" +S="${WORKDIR}/${MY_P}" + LICENSE="ISC" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -28,7 +30,6 @@ BDEPEND=" dev-build/libtool " -S="${WORKDIR}/${MY_P}" src_configure() { local myeconfargs=( --with-rsync=rsync diff --git a/net-misc/smcroute/smcroute-2.5.6.ebuild b/net-misc/smcroute/smcroute-2.5.6.ebuild index 3c9edd39d6..1c1482ef22 100644 --- a/net-misc/smcroute/smcroute-2.5.6.ebuild +++ b/net-misc/smcroute/smcroute-2.5.6.ebuild @@ -9,21 +9,17 @@ DESCRIPTION="A static multicast routing daemon" HOMEPAGE="https://troglobit.com/projects/smcroute/"; SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.gz"; -SLOT="0" LICENSE="GPL-2+" +SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" IUSE="caps systemd" -BDEPEND=" - virtual/pkgconfig -" RDEPEND=" caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:0= ) " -DEPEND=" - ${RDEPEND} -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" CONFIG_CHECK=" ~IP_MROUTE diff --git a/net-misc/xkcd-handler/xkcd-handler-1.1.4.ebuild b/net-misc/xkcd-handler/xkcd-handler-1.1.4.ebuild index eea52196e8..873035534d 100644 --- a/net-misc/xkcd-handler/xkcd-handler-1.1.4.ebuild +++ b/net-misc/xkcd-handler/xkcd-handler-1.1.4.ebuild @@ -9,14 +9,14 @@ DESCRIPTION="A handler for XKCD urls" HOMEPAGE="https://github.com/mazunki/xkcd"; SRC_URI="https://github.com/mazunki/xkcd/archive/refs/tags/v${PV}.tar.gz -> xkcd-${PV}.tar.gz" +S="${WORKDIR}/xkcd-${PV}" + LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND="x11-misc/xdg-utils" -S="${WORKDIR}/xkcd-${PV}" - src_install() { dobin xkcd domenu xkcd.desktop diff --git a/net-misc/xmrig-mo/xmrig-mo-6.21.2.ebuild b/net-misc/xmrig-mo/xmrig-mo-6.21.2.ebuild index 828e71adeb..983aa72112 100644 --- a/net-misc/xmrig-mo/xmrig-mo-6.21.2.ebuild +++ b/net-misc/xmrig-mo/xmrig-mo-6.21.2.ebuild @@ -9,10 +9,13 @@ MO_PV="mo1" DESCRIPTION="MoneroOcean fork of xmrig that supports algo switching" HOMEPAGE="https://github.com/MoneroOcean/xmrig"; SRC_URI="https://github.com/MoneroOcean/xmrig/archive/v${PV}-${MO_PV}.tar.gz -> ${P}-${MO_PV}.tar.gz" -KEYWORDS="~amd64 ~arm64" + +S="${WORKDIR}/xmrig-${PV}-${MO_PV}" LICENSE="Apache-2.0 GPL-3+ MIT" SLOT="0" +KEYWORDS="~amd64 ~arm64" + IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl" DEPEND=" @@ -32,8 +35,6 @@ PATCHES=( "${FILESDIR}"/${PN}-6.21.2-fix-length-error.patch ) -S="${WORKDIR}/xmrig-${PV}-${MO_PV}" - src_prepare() { if ! use donate ; then sed -i 's/1;/0;/g' src/donate.h || die diff --git a/net-misc/yacy/yacy-1.924.20210209.10069.ebuild b/net-misc/yacy/yacy-1.924.20210209.10069.ebuild index 12214f85c0..31b1370933 100644 --- a/net-misc/yacy/yacy-1.924.20210209.10069.ebuild +++ b/net-misc/yacy/yacy-1.924.20210209.10069.ebuild @@ -13,6 +13,8 @@ DESCRIPTION="YaCy - p2p based distributed web-search engine" HOMEPAGE="https://www.yacy.net/"; SRC_URI="https://www.yacy.net/release/yacy_v${MAJOR_PV}_${REL_PV}_${SVN_PV}.tar.gz"; +S="${WORKDIR}/${PN}" + LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -25,8 +27,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}" - EANT_BUILD_TARGET="all" UNINSTALL_IGNORE="/usr/share/yacy/DATA" diff --git a/net-misc/yt-dlg/yt-dlg-2023.08.16.ebuild b/net-misc/yt-dlg/yt-dlg-2023.08.16.ebuild index b65b75a8f1..02741e7341 100644 --- a/net-misc/yt-dlg/yt-dlg-2023.08.16.ebuild +++ b/net-misc/yt-dlg/yt-dlg-2023.08.16.ebuild @@ -15,11 +15,13 @@ HOMEPAGE="https://yt-dlg.github.io/yt-dlg/"; SHA="692e5c5deee95c721a4ad92ecae7ca86de8bef35" SRC_URI="https://github.com/yt-dlg/yt-dlg/archive/${SHA}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/${PN}-${SHA}" + LICENSE="public-domain" SLOT="0" KEYWORDS="~amd64" -IUSE="ffmpeg test" +IUSE="ffmpeg" # net-misc/youtube-dl isn't available in gentoo anymore but I kept it as a dependency option just in case someone still # use it or yt-dlp gets merged to youtube-dl. @@ -34,6 +36,11 @@ DEPEND="${PYTHON_DEPS} " RDEPEND="${DEPEND}" +# I don't know how to enable the test phase. +distutils_enable_tests pytest + +DOCS=( README.md ) + python_test() { local tests=( ditem dlist parsers utils widgets ) local current_test @@ -42,13 +49,6 @@ python_test() { done } -# I don't know how to enable the test phase. -distutils_enable_tests pytest - -S="${WORKDIR}/${PN}-${SHA}" - -DOCS=( README.md ) - src_install() { distutils-r1_src_install domenu yt-dlg.desktop
