www-client/torbrowser: use SRC_URI instead of git sources

Closes: #28 Package-Manager: Portage-2.3.40, Repoman-2.3.9 RepoMan-Options: --ignore-arches
MeisterP · Sep 8, 2018 · f5e0781 · f5e0781
1 parent e5ffcd8
commit f5e0781
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/www-client/torbrowser/Manifest b/www-client/torbrowser/Manifest
@@ -1,3 +1,4 @@
 DIST firefox-60.0-patches-03.tar.xz 111764 BLAKE2B dd6fca1a7dad526cf1bdebb606773fab6bbb18e3cd601252f5b627e3d5ccb50a60bdc3ca228b1ed57d8b2334275fe5ef2669f8c98f8acf278effdb9dc7fc61df SHA512 24a09df0e785cd9ba71ae6baee33ef159c1fc3b580784f7d20a775dc846aaa51d660eca67e284960af72651d245236623a0736695c76be75a8b395e5b69ba1ce
+DIST tor-browser-60.2.0esr-8.0-1-build1.tar.gz 384208935 BLAKE2B 28d27f8ad875cc58574b4970eeaeb93ace273b96fa81a6be6a8ed2c16567bb5f1f037aad258a02d43fc1c1e8e1af82eba74e0cc468070bb28ac39dca8e6c9deb SHA512 50edf1b071a011f710e0623a6f1d176521e082d256de3156063131799b917202bc8fafc9762d002a39f93a3480e15fe668383f8cf6e3495cf226dd933bf1af55
 DIST tor-browser-linux32-8.0_en-US.tar.xz 76406784 BLAKE2B 0b6809df78a85ed8cc2e653e12d08629cc7ac2f555106ba3f08ccfdc0d497585b4136a0b135b616d8906fd4fa62acfcedaf0e0c2dfa5fe26813af115e357ea94 SHA512 067676cc6288df9b5cbc489a174584a14ee920507fe5fa0f7893cadbe0aa1aad452af0bf3575efec054f2a879acd2e841029149e72d5215495e8eae45f32cc1a
 DIST tor-browser-linux64-8.0_en-US.tar.xz 74878356 BLAKE2B 26a409024d18e3590ded8a8acf4d19787d52cd3f59c542b72336ed293a34741593ffbabbb296d1808c0b689fceeadc3224745e72a7b6dde2e0e08e8a2ddcdb0e SHA512 0bac7a820282f0a44259fdd9ada238538c3f6bff8ed2d25312892eed623f3b150fc8a68d41a28a6bdc7f575983e23f66ba8fa678e98fc002d6104273cad0859a
diff --git a/www-client/torbrowser/torbrowser-60.2.0_p800.ebuild b/www-client/torbrowser/torbrowser-60.2.0_p800.ebuild
@@ -13,12 +13,12 @@ fi
 
 # see https://gitweb.torproject.org/builders/tor-browser-build.git/tree/projects/firefox/config#n4
 TOR_PV="8.0"
-EGIT_COMMIT="tor-browser-${MOZ_PV}-${TOR_PV%.*}.0-1-build1"
+TOR_COMMIT="tor-browser-${MOZ_PV}-${TOR_PV%.*}.0-1-build1"
 
 # Patch version
 PATCH="${MY_PN}-60.0-patches-03"
 
-inherit git-r3 check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
 		mozconfig-v6.60 pax-utils autotools
 
 DESCRIPTION="The Tor Browser"
@@ -33,13 +33,12 @@ SLOT="0"
 LICENSE="BSD CC-BY-3.0 MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="hardened"
 
-EGIT_REPO_URI="https://git.torproject.org/tor-browser.git"
-EGIT_CLONE_TYPE="shallow"
 BASE_SRC_URI="https://dist.torproject.org/${PN}/${TOR_PV}"
 ARCHIVE_SRC_URI="https://archive.torproject.org/tor-package-archive/${PN}/${TOR_PV}"
 
 PATCH_URIS=( https://dev.gentoo.org/~whissi/dist/firefox/${PATCH}.tar.xz https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz )
 SRC_URI="${SRC_URI}
+	https://gitweb.torproject.org/tor-browser.git/snapshot/${TOR_COMMIT}.tar.gz -> ${TOR_COMMIT}.tar.gz
 	x86? ( ${BASE_SRC_URI}/tor-browser-linux32-${TOR_PV}_en-US.tar.xz
 		${ARCHIVE_SRC_URI}/tor-browser-linux32-${TOR_PV}_en-US.tar.xz )
 	amd64? ( ${BASE_SRC_URI}/tor-browser-linux64-${TOR_PV}_en-US.tar.xz
@@ -92,7 +91,7 @@ pkg_pretend() {
 
 src_unpack() {
 	unpack ${A}
-	git-r3_src_unpack
+	mv "${WORKDIR}/${TOR_COMMIT}" "${WORKDIR}/${P}" || die
 }
 
 src_prepare() {