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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 72BD0158011 for ; Mon, 20 Sep 2021 19:03:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C257CE0965; Mon, 20 Sep 2021 19:03:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5932E0965 for ; Mon, 20 Sep 2021 19:03:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7AEFD34301B for ; Mon, 20 Sep 2021 19:03:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C4C49E5 for ; Mon, 20 Sep 2021 19:03:22 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1632164424.e9a1e263a237475646e6f38e1d250f65a42ba479.arthurzam@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-im/abaddon/Manifest net-im/abaddon/abaddon-0.1.0.ebuild X-VCS-Directories: net-im/abaddon/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: e9a1e263a237475646e6f38e1d250f65a42ba479 X-VCS-Branch: dev Date: Mon, 20 Sep 2021 19:03:22 +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: b9c363e0-de64-45d8-ba59-925bcc240614 X-Archives-Hash: bf73afda68b6549cedf004f474f7f4c7 Message-ID: <20210920190322.Rl08QNg0IY4qFIb8YfSfnfgQtBl7oziqOqLSz6n8YIg@z> commit: e9a1e263a237475646e6f38e1d250f65a42ba479 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Sep 20 19:00:24 2021 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Mon Sep 20 19:00:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e9a1e263 net-im/abaddon: dont use git-r3 Not live packages (non *9999) shouldn't inherit git-r3. We can use GitHub's snapshots to receive a tarball of simpleini at the wanted commit, and then link it in the wanted position by abaddon. Note: here I'm using bundled software, which is discouraged in Gentoo. simpleini should become a new package, on which abaddon depends. Signed-off-by: Arthur Zamarin gentoo.org> net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index a9031ec07..b9936a57a 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1 +1,2 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 +DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index 54be008c5..f987740f9 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -3,13 +3,16 @@ EAPI=7 -inherit cmake desktop git-r3 +inherit cmake desktop + +SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" 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}.tar.gz" -EGIT_REPO_URI="https://github.com/brofield/simpleini.git" -EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" +SRC_URI=" + https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz +" LICENSE="GPL-3" SLOT="0" @@ -28,11 +31,10 @@ DEPEND=" " BDEPEND="" -EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" - src_unpack() { default - git-r3_src_unpack + rm -r "${S}/thirdparty/simpleini" || die + ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die } src_install() {