From 7a1378ad8c136a7d957ebebbde3d88235a7cef71 Mon Sep 17 00:00:00 2001
From: Alarig Le Lay <alarig@swordarmor.fr>
Date: Mon, 6 Apr 2020 11:10:13 +0200
Subject: [PATCH] net-im/fractal:

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Alarig Le Lay <alarig@swordarmor.fr
---
 net-im/fractal/Manifest             |  2 --
 net-im/fractal/fractal-4.2.0.ebuild | 24 +++++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/net-im/fractal/Manifest b/net-im/fractal/Manifest
index b241858..ed173df 100644
--- a/net-im/fractal/Manifest
+++ b/net-im/fractal/Manifest
@@ -45,7 +45,6 @@ DIST crossbeam-epoch-0.7.1.crate 35215 BLAKE2B 617e49a766075033e62f5268a6425f7d2
 DIST crossbeam-queue-0.1.2.crate 14104 BLAKE2B b084846e3adaefb33991770d53130b361f2dfa76ac9f4793618643afff09c4ebeae1545c33c59211d09427bf8d13d13d3ed0965211568884b0b2042e5542327d SHA512 f799ec04a78ee86051bc6a0b99dc95766c83d2ae8672015d1fa95e53aa0f93232f3816b7b2d38bfbcc577516f45af009a5aac04be21f521550347fe87ca0b444
 DIST crossbeam-utils-0.6.5.crate 31735 BLAKE2B adeec7df0627b73169e04b53883f44b9d4c54f0b97ef2e49cfadc565c5c3324bf3dfe39158a65ec4b6676a8fba2696d43b2ce1aea75fb8bf2120ff4ad9eb45f9 SHA512 5bcf3eed8f28d608b675aa4588b133393ced515e2f7fa37b413b34aa5ee550100899d957906dd04fcaee68cea57d2c8f230e06d6903f5ef117c9313d6cdbc2a8
 DIST crypto-mac-0.7.0.crate 7636 BLAKE2B 30158db3eb9511373013558e5e430ab4412705843375d6a48f015a534199dc16beadfe6b94c601ea5df329b0aed9392bb20fc0c95d01b7b0f42408756a73c000 SHA512 7297396fc06aae578644d47c8ef1053895e0a29d1c007f303631166cf12711f106eb91c9c11d01497e7a85fb461b84a16d2e0f1020444ab16fb4b8f2dfee18b1
-DIST danigm-gettext-rs-0.4.1.crate 7226178 BLAKE2B d50c20e9f4d1b89d707a3310156ca5d5ca22531c7d524a792cad0fe06535783a41fcdf0fdd19d01a22966f0dfdc6d3d7fdd742898594e0b6cf4879c6809c4c47 SHA512 9a34700ab622493daf1ac7e986b19b1dc9bdaee16fa93140e89e6554e9726e3bacf49658751f82c1a522400961094cbef517a87c42caea03364e8698d1bcff03
 DIST dbus-0.2.3.crate 36325 BLAKE2B 8ab6cf46f4e139a91ce7e4068362a150f4041ce7a2db4db604203d65a122bba7d0311b430bf569555b48258017603b0540754868c0babbde867bfc4a90c7d9a1 SHA512 31398900fd3b388c02eaec0eed568add3c26ab862f04c391598709ff35d851cc8833b6332864973096257f27f8d405b617beb83cb5c2090900bb8061119e4c1d
 DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
 DIST directories-1.0.2.crate 16020 BLAKE2B 76fe417487118cad8dc8a6a64b07f62d83550b00fa230f06902d9252dfe74134bcf722d33967d65131cd1e036bd1b4b117b8f56a3f96a073e24509ee0add5410 SHA512 6b1ed06a66e43115c5446ad19d6960ae6ed7956982b23727422ed49e285ba0b86ec9721a83a7949772faf7d1db28abb499f0983c53e70da529a54ef7fadb26f5
@@ -77,7 +76,6 @@ DIST gdk-pixbuf-sys-0.9.0.crate 8489 BLAKE2B 544a317f1dc9f0f6fbfd8f17068660618e4
 DIST gdk-sys-0.9.0.crate 59791 BLAKE2B 8d49e1da1e13c71673d93ac2a907b121ce6592fc283304c0019084a82e5fdff0cbea73023643d302f078bfccc55ae9034f7913f0a69d73c0fae475a141d4130b SHA512 01bb69387a01016b0d7016d3c41e43535b6308358391650fa004e21fca0ef63165358d7ad650c0e1888ef65e18a11139ecef6fdaa60bf104501abcdfae0a5d14
 DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
 DIST getrandom-0.1.6.crate 18529 BLAKE2B 11b9f6475686f59ac710705c2ffb3de3e248cc38c4da8c0d00e7ec938adcc4ffdb120a472d5a9416a9093f62c77a1565ef42a9614d7bfbe5a48aa460a16e4ebd SHA512 e4426a90e1a942344568c087b27a7e7f483e715947ddf25b5a2671b7844b646d09033994a810c9bc96c905d75bf0552e217cf93526a6294a73cb3ddc02540801
-DIST gettext-rs-0.4.1.crate 8488 BLAKE2B 3ec1982b15314a700e06a41c41b7b6c06ddde5e05410b48908c9ff7b143f70a5cd45890bca140c966b63991253668db78682a4675fa735e6239a92e59c9df0d0 SHA512 f51abc31ac3ecac2f89aa5fff4ff0d22cf4c51cf24100afb44e209cb72e43bbeddf9efcd76789abb7b52726748890b215200ea6ccd33205c5f1650166d007830
 DIST gettext-sys-0.19.8.crate 7215851 BLAKE2B 80680f6a27cc61db4db1ebdfb86edda0bfa0bc5b44e3053b8b0e7c01488b5e8715405b2053a685afebd1742f2f00c05c660c9ed3682a08509aac2462946ad7b6 SHA512 aa200f5f43e3ffe26ffea50c1f5e0f1d201c6afc2526ec6289897f321d09beb75a0f43374390185e216b7b54703e9ba5d1e54db5ee6b099c8d6d44ae353683ff
 DIST gio-0.7.0.crate 123602 BLAKE2B 6f1d4e5f1bcba83495c5c5181d7ac39b437c33ff016d26292763266a49aca4320e2db9ae8dd5c2a1036739a10c709133575e411bcc24f80eda7f294b3df2a61b SHA512 2d46776fc64b9d63fd8dbd485ea3fc80a49bb86ff945628c81f33f877243c747fadae3bbb6ce228ca3e96870655a57c4d2881ee1454da2e310a7ad83d4a0e952
 DIST gio-sys-0.9.0.crate 68946 BLAKE2B 498271d0d2b2d03cd23afa006e2f6219756e5f7db81f266f2041da79d6d39c3f4e30fe8bc390be33b051ea06b3fc66c2cbb909b90d334efd255dfba63db765dd SHA512 60011e8128f99bf436df002e020d16b7cbdfee20569b401c9a7a4a23a18204e067fd58cdca911b343e85c28e7363f2158334149536c10360741f988ad3cf4a7f
diff --git a/net-im/fractal/fractal-4.2.0.ebuild b/net-im/fractal/fractal-4.2.0.ebuild
index 0da3b8e..346e563 100644
--- a/net-im/fractal/fractal-4.2.0.ebuild
+++ b/net-im/fractal/fractal-4.2.0.ebuild
@@ -81,7 +81,6 @@ gdk-pixbuf-sys-0.9.0
 gdk-sys-0.9.0
 generic-array-0.12.3
 getrandom-0.1.6
-gettext-rs-0.4.1
 gettext-sys-0.19.8
 gio-0.7.0
 gio-sys-0.9.0
@@ -297,12 +296,11 @@ ws2_32-sys-0.2.1
 DESCRIPTION="Matrix group messaging app"
 HOMEPAGE="https://wiki.gnome.org/Apps/Fractal"
 
-inherit cargo meson gnome2-utils xdg-utils
+inherit cargo git-r3 gnome2-utils meson xdg-utils
 
 SRC_URI="
 	https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz
 	$(cargo_crate_uris ${CRATES})
-	https://github.com/danigm/gettext-rs/archive/0.4.1.tar.gz -> danigm-gettext-rs-0.4.1.crate
 "
 KEYWORDS="~amd64 ~x86"
 
@@ -313,6 +311,7 @@ IUSE=""
 RDEPEND="
 	>=app-text/gspell-1.8.1
 	>=gui-libs/libhandy-0.0.10:0.0=
+	media-libs/gst-plugins-bad
 	media-libs/gstreamer-editing-services
 	>=x11-libs/cairo-1.16.0
 	x11-libs/gtksourceview:3.0
@@ -331,14 +330,18 @@ PATCHES=(
 )
 
 src_unpack() {
-	mkdir -p "${ECARGO_VENDOR}"/danigm-gettext-rs-0.4.1
 	cargo_src_unpack
 
-	mv "${ECARGO_VENDOR}"/danigm-gettext-rs-0.4.1/ "${ECARGO_VENDOR}"/gettext-rs-0.4.1
-	# generate sha256sum of the crate itself as cargo needs this
+	EGIT_REPO_URI="https://github.com/danigm/gettext-rs"
+	EGIT_BRANCH="no-gettext"
+	EGIT_COMMIT="6b0f498c45bab57081701cf95dadd5e65107de06"
+	EGIT_CHECKOUT_DIR="${ECARGO_VENDOR}"/gettext-rs-0.4.1
+	git-r3_fetch
+	git-r3_checkout
 	cat <<- EOF > ${ECARGO_VENDOR}/gettext-rs-0.4.1/.cargo-checksum.json
 	{
-		"package": "$(sha256sum ${DISTDIR}/danigm-gettext-rs-0.4.1.crate | cut -d ' ' -f 1)",
+		"package": "$(tar -zcf - \"${ECARGO_VENDOR}/gettext-rs-0.4.1/\" | \
+			sha256sum - | cut -d ' ' -f 1)",
 		"files": {}
 	}
 	EOF
@@ -352,11 +355,10 @@ src_configure() {
 }
 
 src_compile() {
-	for dir in fractal-gtk fractal-matrix-api; do
-		cd "${dir}" || die
-		cargo_src_compile
-	done
+	cd fractal-gtk || die
+	cargo_src_compile
 
+	cd "${S}"
 	meson_src_compile
 }