| 1 |
commit: e9a1e263a237475646e6f38e1d250f65a42ba479 |
| 2 |
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 20 19:00:24 2021 +0000 |
| 4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 20 19:00:24 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e9a1e263 |
| 7 |
|
| 8 |
net-im/abaddon: dont use git-r3 |
| 9 |
|
| 10 |
Not live packages (non *9999) shouldn't inherit git-r3. We can use |
| 11 |
GitHub's snapshots to receive a tarball of simpleini at the wanted |
| 12 |
commit, and then link it in the wanted position by abaddon. |
| 13 |
|
| 14 |
Note: here I'm using bundled software, which is discouraged in |
| 15 |
Gentoo. simpleini should become a new package, on which abaddon |
| 16 |
depends. |
| 17 |
|
| 18 |
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> |
| 19 |
|
| 20 |
net-im/abaddon/Manifest | 1 + |
| 21 |
net-im/abaddon/abaddon-0.1.0.ebuild | 16 +++++++++------- |
| 22 |
2 files changed, 10 insertions(+), 7 deletions(-) |
| 23 |
|
| 24 |
diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest |
| 25 |
index a9031ec07..b9936a57a 100644 |
| 26 |
--- a/net-im/abaddon/Manifest |
| 27 |
+++ b/net-im/abaddon/Manifest |
| 28 |
@@ -1 +1,2 @@ |
| 29 |
DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 |
| 30 |
+DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 |
| 31 |
|
| 32 |
diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild |
| 33 |
index 54be008c5..f987740f9 100644 |
| 34 |
--- a/net-im/abaddon/abaddon-0.1.0.ebuild |
| 35 |
+++ b/net-im/abaddon/abaddon-0.1.0.ebuild |
| 36 |
@@ -3,13 +3,16 @@ |
| 37 |
|
| 38 |
EAPI=7 |
| 39 |
|
| 40 |
-inherit cmake desktop git-r3 |
| 41 |
+inherit cmake desktop |
| 42 |
+ |
| 43 |
+SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" |
| 44 |
|
| 45 |
DESCRIPTION="Alternative Discord client using GTK instead of Electron" |
| 46 |
HOMEPAGE="https://github.com/uowuo/abaddon" |
| 47 |
-SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" |
| 48 |
-EGIT_REPO_URI="https://github.com/brofield/simpleini.git" |
| 49 |
-EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" |
| 50 |
+SRC_URI=" |
| 51 |
+ https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz |
| 52 |
+ https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz |
| 53 |
+" |
| 54 |
|
| 55 |
LICENSE="GPL-3" |
| 56 |
SLOT="0" |
| 57 |
@@ -28,11 +31,10 @@ DEPEND=" |
| 58 |
" |
| 59 |
BDEPEND="" |
| 60 |
|
| 61 |
-EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" |
| 62 |
- |
| 63 |
src_unpack() { |
| 64 |
default |
| 65 |
- git-r3_src_unpack |
| 66 |
+ rm -r "${S}/thirdparty/simpleini" || die |
| 67 |
+ ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die |
| 68 |
} |
| 69 |
|
| 70 |
src_install() { |
Archives