commit: 2c446930f0af6dd0677ee671046ae513af24176d Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net> AuthorDate: Tue May 14 23:48:36 2024 +0000 Commit: Julien Roy <julien <AT> jroy <DOT> ca> CommitDate: Wed May 15 00:59:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2c446930
sys-libs/*: fix variable order Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net> Signed-off-by: Julien Roy <julien <AT> jroy.ca> sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild | 7 +++---- sys-libs/cyclonedds/cyclonedds-9999.ebuild | 7 +++---- sys-libs/gcompat/gcompat-1.1.0.ebuild | 6 +++--- sys-libs/nss-tls/nss-tls-1.0.ebuild | 6 +++--- sys-libs/nss-tls/nss-tls-9999.ebuild | 13 ++++++------- sys-libs/solo-udev-rules/solo-udev-rules-4.1.5.ebuild | 4 ++-- 6 files changed, 20 insertions(+), 23 deletions(-) diff --git a/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild b/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild index 8d0db9c61c..b1e0bed51e 100644 --- a/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild +++ b/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild @@ -5,6 +5,9 @@ EAPI=8 inherit cmake +DESCRIPTION="Eclipse Cyclone DDS project" +HOMEPAGE="https://cyclonedds.io/"; + if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/eclipse-cyclonedds/cyclonedds.git"; inherit git-r3 @@ -13,10 +16,6 @@ else KEYWORDS="~amd64" fi -S="${WORKDIR}/${P}" -DESCRIPTION="Eclipse Cyclone DDS project" -HOMEPAGE="https://cyclonedds.io/"; - LICENSE="EPL-2.0" SLOT="0/$(ver_cut 1-2)" IUSE="test ssl shm parser doc examples ipv6 idlc get-kind" diff --git a/sys-libs/cyclonedds/cyclonedds-9999.ebuild b/sys-libs/cyclonedds/cyclonedds-9999.ebuild index 8d0db9c61c..b1e0bed51e 100644 --- a/sys-libs/cyclonedds/cyclonedds-9999.ebuild +++ b/sys-libs/cyclonedds/cyclonedds-9999.ebuild @@ -5,6 +5,9 @@ EAPI=8 inherit cmake +DESCRIPTION="Eclipse Cyclone DDS project" +HOMEPAGE="https://cyclonedds.io/"; + if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/eclipse-cyclonedds/cyclonedds.git"; inherit git-r3 @@ -13,10 +16,6 @@ else KEYWORDS="~amd64" fi -S="${WORKDIR}/${P}" -DESCRIPTION="Eclipse Cyclone DDS project" -HOMEPAGE="https://cyclonedds.io/"; - LICENSE="EPL-2.0" SLOT="0/$(ver_cut 1-2)" IUSE="test ssl shm parser doc examples ipv6 idlc get-kind" diff --git a/sys-libs/gcompat/gcompat-1.1.0.ebuild b/sys-libs/gcompat/gcompat-1.1.0.ebuild index 6e5d56674c..9479681985 100644 --- a/sys-libs/gcompat/gcompat-1.1.0.ebuild +++ b/sys-libs/gcompat/gcompat-1.1.0.ebuild @@ -7,11 +7,11 @@ inherit multilib-minimal flag-o-matic DESCRIPTION="The GNU C Library compatibility layer for musl" HOMEPAGE="https://git.adelielinux.org/adelie/gcompat"; -KEYWORDS="~amd64 ~x86" -LICENSE="UoI-NCSA" -IUSE="libucontext obstack" SRC_URI="https://distfiles.adelielinux.org/source/${PN}/${P}.tar.xz"; +LICENSE="UoI-NCSA" SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="libucontext obstack" DEPEND=" libucontext? ( sys-libs/libucontext ) diff --git a/sys-libs/nss-tls/nss-tls-1.0.ebuild b/sys-libs/nss-tls/nss-tls-1.0.ebuild index 31fa1f2c5b..ab641fd2d6 100644 --- a/sys-libs/nss-tls/nss-tls-1.0.ebuild +++ b/sys-libs/nss-tls/nss-tls-1.0.ebuild @@ -3,16 +3,16 @@ EAPI=7 +inherit meson systemd + 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 systemd - LICENSE="LGPL-2.1" +SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="systemd" -SLOT="0" RDEPEND="dev-libs/glib net-libs/libsoup" diff --git a/sys-libs/nss-tls/nss-tls-9999.ebuild b/sys-libs/nss-tls/nss-tls-9999.ebuild index 6e215c7336..10fdecdadc 100644 --- a/sys-libs/nss-tls/nss-tls-9999.ebuild +++ b/sys-libs/nss-tls/nss-tls-9999.ebuild @@ -3,16 +3,18 @@ EAPI=7 -EGIT_REPO_URI="https://github.com/dimkr/nss-tls.git"; +inherit git-r3 meson systemd + DESCRIPTION="A DNS over HTTPS resolver for glibc" HOMEPAGE="https://github.com/dimkr/nss-tls"; - -inherit git-r3 meson systemd +EGIT_REPO_URI="https://github.com/dimkr/nss-tls.git"; +EGIT_BRANCH="master" S="${WORKDIR}/${PN}-9999" + LICENSE="LGPL-2.1" -IUSE="systemd" SLOT="0" +IUSE="systemd" RDEPEND="dev-libs/glib net-libs/libsoup" @@ -24,9 +26,6 @@ BDEPEND=" dev-build/meson " -EGIT_REPO_URI="https://github.com/dimkr/nss-tls.git"; -EGIT_BRANCH="master" - src_prepare() { default sed -e "s/@0@\/run\/nss-tls/\/var\/run\/nss-tls/" -i "${S}"/meson.build || die diff --git a/sys-libs/solo-udev-rules/solo-udev-rules-4.1.5.ebuild b/sys-libs/solo-udev-rules/solo-udev-rules-4.1.5.ebuild index 6abd111d3e..ae63e3e8d0 100644 --- a/sys-libs/solo-udev-rules/solo-udev-rules-4.1.5.ebuild +++ b/sys-libs/solo-udev-rules/solo-udev-rules-4.1.5.ebuild @@ -13,6 +13,8 @@ HOMEPAGE=" " SRC_URI="https://github.com/solokeys/solo1/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + LICENSE="|| ( Apache-2.0 MIT )" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ KEYWORDS="~amd64" RDEPEND="virtual/udev" DEPEND="${RDEPEND}" -S="${WORKDIR}/${MY_P}" - src_compile() { # Omitting src_compile() would invoke make, leaving it empty is not allowed. :
