From: "Arthur Zamarin" <arthurzam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: net-im/abaddon/
Date: Mon, 20 Sep 2021 19:06:29 +0000 (UTC) [thread overview]
Message-ID: <1632164424.e9a1e263a237475646e6f38e1d250f65a42ba479.arthurzam@gentoo> (raw)
commit: e9a1e263a237475646e6f38e1d250f65a42ba479
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 20 19:00:24 2021 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> 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 <arthurzam <AT> 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() {
WARNING: multiple messages have this Message-ID (diff)
From: "Arthur Zamarin" <arthurzam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/
Date: Mon, 20 Sep 2021 19:03:22 +0000 (UTC) [thread overview]
Message-ID: <1632164424.e9a1e263a237475646e6f38e1d250f65a42ba479.arthurzam@gentoo> (raw)
Message-ID: <20210920190322.Rl08QNg0IY4qFIb8YfSfnfgQtBl7oziqOqLSz6n8YIg@z> (raw)
commit: e9a1e263a237475646e6f38e1d250f65a42ba479
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 20 19:00:24 2021 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> 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 <arthurzam <AT> 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() {
next reply other threads:[~2021-09-20 19:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-20 19:06 Arthur Zamarin [this message]
2021-09-20 19:03 ` [gentoo-commits] repo/proj/guru:dev commit in: net-im/abaddon/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2021-09-20 19:06 [gentoo-commits] repo/proj/guru:master " Arthur Zamarin
2022-04-10 12:35 Andrew Ammerlaan
2022-05-23 17:15 Haelwenn Monnier
2022-05-23 17:15 Haelwenn Monnier
2023-10-02 12:24 David Roman
2023-10-02 12:24 David Roman
2023-10-02 12:24 David Roman
2023-10-02 12:27 David Roman
2023-10-02 12:27 David Roman
2023-11-01 23:27 Haelwenn Monnier
2023-11-01 23:27 Haelwenn Monnier
2023-11-01 23:27 Haelwenn Monnier
2023-11-01 23:27 Haelwenn Monnier
2023-11-01 23:27 Haelwenn Monnier
2023-11-29 22:47 David Roman
2024-02-23 13:11 David Roman
2024-02-24 12:14 Haelwenn Monnier
2024-02-25 17:05 Viorel Munteanu
2024-06-15 11:12 Julien Roy
2024-11-02 20:52 David Roman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1632164424.e9a1e263a237475646e6f38e1d250f65a42ba479.arthurzam@gentoo \
--to=arthurzam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox