commit: 7d789ee5f7292e9ccd4adefe671774a6ebdc5393 Author: ingenarel <ingenarelitems <AT> gmail <DOT> com> AuthorDate: Tue Dec 9 23:43:17 2025 +0000 Commit: Saad Abdullah <ingenarelitems <AT> gmail <DOT> com> CommitDate: Wed Dec 10 01:29:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7d789ee5
net-im/discordo: fix LICENSE for dependencies; update format - I did a typo where I used LICENSES instead of LICENSE when trying to append license for go modules. I fixed that - go-license was generating Gentoo incompatible license names, the issue didn't get caught because of the typo. I also fixed that. See https://bugs.gentoo.org/967017 for more info about the issue related to go-license I used my wrapper to fix it, which can be found here: https://github.com/ingenarel/gentoo-dev-scripts/blob/master/gentoo-go-license format changes: - use ${var} instead of $var, which was recommended by negril - don't use *9999, instead use 9999, it was recommended by negril, because packages like blender have versions like 5.0.9999, so using a good format logic is nice Signed-off-by: ingenarel <ingenarelitems <AT> gmail.com> ...20251202.ebuild => discordo-0_pre20251202-r1.ebuild} | 17 +++++++---------- net-im/discordo/discordo-9999.ebuild | 17 +++++++---------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/net-im/discordo/discordo-0_pre20251202.ebuild b/net-im/discordo/discordo-0_pre20251202-r1.ebuild similarity index 68% rename from net-im/discordo/discordo-0_pre20251202.ebuild rename to net-im/discordo/discordo-0_pre20251202-r1.ebuild index f0ecfe4e7d..79cc0b82fb 100644 --- a/net-im/discordo/discordo-0_pre20251202.ebuild +++ b/net-im/discordo/discordo-0_pre20251202-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/ayn2op/discordo"; if [[ "${PV}" == 9999 ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/ayn2op/$PN.git"; + EGIT_REPO_URI="https://github.com/ayn2op/${PN}.git"; else # use this only for 0pre_YYYYMMDD builds, otherwise, keep it empty. @@ -20,8 +20,8 @@ else # If another person updates it, be sure to change this line to your own depfile link SRC_URI="https://github.com/ingenarel/guru-depfiles/releases/download/${P}-deps.tar.xz/${P}-deps.tar.xz " - if [[ -n "$GIT_COMMIT" ]]; then - SRC_URI+="https://github.com/ayn2op/$PN/archive/$GIT_COMMIT.tar.gz -> ${P}.tar.gz" + if [[ -n "${GIT_COMMIT}" ]]; then + SRC_URI+="https://github.com/ayn2op/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${GIT_COMMIT}" else SRC_URI+="https://github.com/ayn2op/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" @@ -32,11 +32,8 @@ fi LICENSE="GPL-3" -# echo "# dependency licenses:"; printf 'LICENSES+=" '; go-licenses report ./... 2>/dev/null | -# awk -F ',' '{ print $NF }' | sort --unique | sed -E 's/BSD-3-Clause/BSD/' | tr '[:space:]' ' '; echo '"' - # dependency licenses: -LICENSES+=" Apache-2.0 BSD-2-Clause BSD GPL-3.0 ISC MIT " +LICENSE+=" Apache-2.0 BSD-2 BSD GPL-3 ISC MIT " SLOT="0" BDEPEND=" @@ -47,7 +44,7 @@ BDEPEND=" DOCS=( README.md internal/config/config.toml ) src_unpack() { - if [[ "$PV" == *9999* ]];then + if [[ "${PV}" == 9999 ]];then git-r3_src_unpack go-module_live_vendor else @@ -56,10 +53,10 @@ src_unpack() { } src_compile() { - CGO_ENABLED=0 ego build -o "bin/$PN" + CGO_ENABLED=0 ego build -o "bin/${PN}" } src_install() { - dobin "bin/$PN" + dobin "bin/${PN}" einstalldocs } diff --git a/net-im/discordo/discordo-9999.ebuild b/net-im/discordo/discordo-9999.ebuild index f14ba7b97c..fae87cc111 100644 --- a/net-im/discordo/discordo-9999.ebuild +++ b/net-im/discordo/discordo-9999.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/ayn2op/discordo"; if [[ "${PV}" == 9999 ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/ayn2op/$PN.git"; + EGIT_REPO_URI="https://github.com/ayn2op/${PN}.git"; else # use this only for 0pre_YYYYMMDD builds, otherwise, keep it empty. @@ -20,8 +20,8 @@ else # If another person updates it, be sure to change this line to your own depfile link SRC_URI="https://github.com/ingenarel/guru-depfiles/releases/download/${P}-deps.tar.xz/${P}-deps.tar.xz " - if [[ -n "$GIT_COMMIT" ]]; then - SRC_URI+="https://github.com/ayn2op/$PN/archive/$GIT_COMMIT.tar.gz -> ${P}.tar.gz" + if [[ -n "${GIT_COMMIT}" ]]; then + SRC_URI+="https://github.com/ayn2op/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${GIT_COMMIT}" else SRC_URI+="https://github.com/ayn2op/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" @@ -32,11 +32,8 @@ fi LICENSE="GPL-3" -# echo "# dependency licenses:"; printf 'LICENSES+=" '; go-licenses report ./... 2>/dev/null | -# awk -F ',' '{ print $NF }' | sort --unique | sed -E 's/BSD-3-Clause/BSD/' | tr '[:space:]' ' '; echo '"' - # dependency licenses: -LICENSES+=" Apache-2.0 BSD-2-Clause BSD GPL-3.0 ISC MIT " +LICENSE+=" Apache-2.0 BSD-2 BSD GPL-3 ISC MIT " SLOT="0" BDEPEND=" @@ -47,7 +44,7 @@ BDEPEND=" DOCS=( README.md internal/config/config.toml ) src_unpack() { - if [[ "$PV" == *9999* ]];then + if [[ "${PV}" == 9999 ]];then git-r3_src_unpack go-module_live_vendor else @@ -56,10 +53,10 @@ src_unpack() { } src_compile() { - CGO_ENABLED=0 ego build -o "bin/$PN" + CGO_ENABLED=0 ego build -o "bin/${PN}" } src_install() { - dobin "bin/$PN" + dobin "bin/${PN}" einstalldocs }
