From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EAB66158089 for ; Mon, 2 Oct 2023 12:24:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 082DC2BC0F6; Mon, 2 Oct 2023 12:24:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E6E6A2BC0F6 for ; Mon, 2 Oct 2023 12:24:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E781E335D0A for ; Mon, 2 Oct 2023 12:24:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A85DD93A for ; Mon, 2 Oct 2023 12:24:18 +0000 (UTC) From: "David Roman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Roman" Message-ID: <1696169853.6a4c8c116f84181576536b19fbe666674bb99ffe.davidroman@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: net-im/abaddon/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-im/abaddon/Manifest net-im/abaddon/abaddon-0.1.12.ebuild net-im/abaddon/abaddon-9999.ebuild X-VCS-Directories: net-im/abaddon/ X-VCS-Committer: davidroman X-VCS-Committer-Name: David Roman X-VCS-Revision: 6a4c8c116f84181576536b19fbe666674bb99ffe X-VCS-Branch: master Date: Mon, 2 Oct 2023 12:24:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1d4178bc-3beb-48de-8363-68d0b09dbe2a X-Archives-Hash: 67891e0e739ae9d0a9f62d3a51388f6c commit: 6a4c8c116f84181576536b19fbe666674bb99ffe Author: Remigiusz Micielski purelymail com> AuthorDate: Sun Oct 1 14:16:28 2023 +0000 Commit: David Roman gmail com> CommitDate: Sun Oct 1 14:17:33 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6a4c8c11 net-im/abaddon: update 9999 Signed-off-by: Remigiusz Micielski purelymail.com> net-im/abaddon/Manifest | 2 +- net-im/abaddon/abaddon-0.1.12.ebuild | 14 ++++++++++---- net-im/abaddon/abaddon-9999.ebuild | 35 ++++++++++++++++++++++------------- 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index 712e7baca5..71ff3721d2 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1,2 +1,2 @@ -DIST abaddon-0.1.12.gh.tar.gz 12889771 BLAKE2B baeb6fb88eeb30332c290976f104a7efcfd09d8ed5a73464387b20abb41c1b899a926fdacfb7ddd069a843112c0d4ae08787a097842051abecc333f5e1709bbe SHA512 50e7af172fa12f382976c9bc10c9c1cde371866faf422f578c7ca8517facdf9331577bc69c5c856a75c8dc4014c0ed6ad2cef662cde7d551c212f412303e816b +DIST abaddon-0.1.12.tar.gz 12889771 BLAKE2B baeb6fb88eeb30332c290976f104a7efcfd09d8ed5a73464387b20abb41c1b899a926fdacfb7ddd069a843112c0d4ae08787a097842051abecc333f5e1709bbe SHA512 50e7af172fa12f382976c9bc10c9c1cde371866faf422f578c7ca8517facdf9331577bc69c5c856a75c8dc4014c0ed6ad2cef662cde7d551c212f412303e816b DIST abaddon-0.1.8.gh.tar.gz 12829641 BLAKE2B f69210694bdb4d2d7a2cc4c4babbccc8afc15ba4429c08f6b477372c6d77af23d9d2e55b1283ce87b1a1a8cd10609723bc2b49cce21b6a6cdc2352a164cdcc77 SHA512 f9a52b76c4f39d28d5f3b17df9760dd45d3ee25ea254b267537544408a85f33f62c1f82febc2c5426b3533ec148ae9d25eb6ff167b61c1fd5b51c6bd6c923275 diff --git a/net-im/abaddon/abaddon-0.1.12.ebuild b/net-im/abaddon/abaddon-0.1.12.ebuild index 481d002478..3c1ff56c4f 100644 --- a/net-im/abaddon/abaddon-0.1.12.ebuild +++ b/net-im/abaddon/abaddon-0.1.12.ebuild @@ -7,13 +7,19 @@ inherit cmake desktop DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon" -SRC_URI=" - https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz -" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/uowuo/abaddon.git" + # All dependencies are provided by portage + EGIT_SUBMODULES=() + inherit git-r3 +else + KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +fi LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" IUSE="+libhandy +rnnoise" RDEPEND=" diff --git a/net-im/abaddon/abaddon-9999.ebuild b/net-im/abaddon/abaddon-9999.ebuild index 2811c3dc1e..3c1ff56c4f 100644 --- a/net-im/abaddon/abaddon-9999.ebuild +++ b/net-im/abaddon/abaddon-9999.ebuild @@ -1,47 +1,56 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake desktop git-r3 +inherit cmake desktop DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon" -SRC_URI="" -EGIT_REPO_URI="https://github.com/uowuo/abaddon.git" -# Submodules shouldn't be used since all dependencies are provided by -# portage -EGIT_SUBMODULES=() + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/uowuo/abaddon.git" + # All dependencies are provided by portage + EGIT_SUBMODULES=() + inherit git-r3 +else + KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +fi LICENSE="GPL-3" SLOT="0" -KEYWORDS="" -IUSE="+libhandy" +IUSE="+libhandy +rnnoise" RDEPEND=" + >=net-libs/ixwebsocket-11.0.8 dev-cpp/gtkmm:3.0= dev-db/sqlite:3 + dev-libs/miniaudio net-misc/curl - >=net-libs/ixwebsocket-11.0.8 sys-libs/zlib:= libhandy? ( gui-libs/libhandy:= ) + rnnoise? ( media-libs/rnnoise ) " DEPEND=" ${RDEPEND} dev-cpp/nlohmann_json " -BDEPEND="" src_configure() { + # Disable keychain because there's currently + # no package for it in ::guru or ::gentoo + # also disable QRCODE, for the same reason local mycmakeargs=( -DUSE_LIBHANDY="$(usex libhandy)" + -DENABLE_RNNOISE="$(usex rnnoise)" + -DUSE_KEYCHAIN="no" + -DENABLE_QRCODE_LOGIN="no" ) cmake_src_configure } src_install() { - dodoc README.md - dobin "${BUILD_DIR}"/abaddon insinto /usr/share/${PN}