gentoo resync : 23.09.2020

4 files changed, 36 insertions, 75 deletions

diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 15432b39ae32..a6830acdecfe 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,6 +1,4 @@
-DIST tortoisehg-5.3.2.tar.gz 8910859 BLAKE2B 4cc2253f0adbd79fe84507043491198ddd9fa559c3e9296c831b8e0fccd6cb2806a31ffd6d417591f5fcb3afce78e696f7052d70b760a566bf72c6602ca31ea8 SHA512 b15894158a0d5e628015d07b4f8c77c96f3e1d7543fe2984693b99b2acfa411922b06683e62de437cb50dd5817155d4e59045d7fb47c9be8ee27b9bccf77da7e
-DIST tortoisehg-5.4.1.tar.gz 8580608 BLAKE2B db66e114d046fdf2228779a2e224c6244afe4e6463d8f00b7f3b291f0dc9fd043ca3e938a6769e3c6a54ec4d2252dca44fedf790ca9683fa42a55d0cdfce0cb9 SHA512 f8d4bda4ac23b49f304e3561930b75f899ac09937b4da446ee3f38236fa0095e19228dc2e388d5608077096209ded161d194f6edef5d2d4a257b5bf57c0634cc
-EBUILD tortoisehg-5.3.2.ebuild 1506 BLAKE2B 7ee7236d6237e664131219cc5aadc3cab5d2085fc8d113a5139b28053d870d8dec3c193e7d308d71e1fc65f814811cbd4ea6277befa60bd1a097c663918bb1e7 SHA512 05df1967214d5f238efec09cbdd5dc36f20ccfee018b179a7ef3eb2b44aedd24f1813f3b1b62a53cd8a7efa1af0be6386f62d6bb4ba67d4b67f3b323fd2eba6d
-EBUILD tortoisehg-5.4.1.ebuild 1417 BLAKE2B 2d46a8ce8af3621445eb5911f4a62c1eba1572a0ed30f0729f0286c60727d6c8b22782612ffb85e5b6f82a0543113a22a687e2f5e4d7e121b78b3d572c2da069 SHA512 5db18fff1118902258468f8e34a394b4465b85e7f762dd08361dff2b581c583370abf9a71ced361cdaabb7835eac26f49cf8f27b7cee19030b729bee00b45fb3
-EBUILD tortoisehg-9999.ebuild 1544 BLAKE2B 2f31a2367a6b87d29c7830b9841a3af8db0b0278d11d13ec5dbf814f9baebb25b0eb35d42f79f54d2b2a755e2f2d20d54b3deb52472e388069d081eb12fd1074 SHA512 ab1dc02cbfa9b3eda70c7e5582e70f5ec864ee8c89f37c65ced12a2b79ae71881fec7142877c642fa52f428da8691a0e3de91a4a89123a2c9bcad3956339dfa8
+DIST tortoisehg-5.5.1.tar.gz 8918085 BLAKE2B 33aef61d97a34f45b10b291eb3a71bc46b70a1f24006fda0e651e88c61b0351701a3abdf6c1b0277fd81a0c5c9ff225b742215103c280eb11976a86e6bf2a47c SHA512 ca2d3833e379620b1a467b5a6016c8dbd54837d6ac5267063eb6768675dcb0c020a9b4ca2b2b8924a57c9e7d117668347e23762e8ff46c87825290071783aaa8
+EBUILD tortoisehg-5.5.1.ebuild 1599 BLAKE2B 105f731aa25c4039994c6c165b4bdbe84558a6a8f91e4d2025a11fd068d39050a12a20c8e133b3cfe72aafa2be4edd8a1e47a10f77359fbf3704a3fe13b5e02a SHA512 0302ce34c000a686bb101e1d2f91a199baa4a744368740338bc60ba8b6cb49420237525db201ac1f78932d961622887b8e2560bda2f4c62b58b236f25590b9a0
+EBUILD tortoisehg-9999.ebuild 1599 BLAKE2B 105f731aa25c4039994c6c165b4bdbe84558a6a8f91e4d2025a11fd068d39050a12a20c8e133b3cfe72aafa2be4edd8a1e47a10f77359fbf3704a3fe13b5e02a SHA512 0302ce34c000a686bb101e1d2f91a199baa4a744368740338bc60ba8b6cb49420237525db201ac1f78932d961622887b8e2560bda2f4c62b58b236f25590b9a0
 MISC metadata.xml 480 BLAKE2B bcedb4594b6c09b3e55feace29681250fca0131c51b0181b0c79231117137a3f3813f88b2384b51f9bc116d5cbe189b7a9505797f33fba3bc53c7c1f1989a552 SHA512 bc98f7e0444dabd2ae4f771f647cedacee2006c5e2f1d903dd8363f05a4a42b3d9a3f183798147d59091efadaf01d0001af19a0670e9a4a33d7215803b2c56fd
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.4.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.4.1.ebuild
deleted file mode 100644
index 22bb6864ee17..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-5.4.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit desktop distutils-r1
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-SRC_URI="https://bitbucket.org/tortoisehg/thg/get/${PV}.tar.gz -> ${P}.tar.gz"
-
-DESCRIPTION="Set of graphical tools for Mercurial"
-HOMEPAGE="https://tortoisehg.bitbucket.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-S_MAGIC="290ae7c8fa05"
-S="${WORKDIR}/tortoisehg-thg-${S_MAGIC}"
-distutils_enable_sphinx html
-
-RDEPEND=">=dev-vcs/mercurial-5.4[${PYTHON_USEDEP}]
-	<dev-vcs/mercurial-5.5[${PYTHON_USEDEP}]
-	dev-python/iniparse[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
-	>=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	# Remove file that collides with >=mercurial-4.0 (bug #599266).
-	rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py"
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
-	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
-	domenu contrib/thg.desktop
-}
-
-pkg_postinst() {
-	elog "When startup of ${PN} fails with an API version mismatch error"
-	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
-	elog "dev-python/qscintilla-python."
-}
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.3.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.5.1.ebuild
index 757231a11582..1a78d11682d2 100644
--- a/dev-vcs/tortoisehg/tortoisehg-5.3.2.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-5.5.1.ebuild
@@ -4,18 +4,18 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit desktop distutils-r1
+inherit desktop distutils-r1 xdg-utils
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
-	HG_DEPEND=" >=dev-vcs/mercurial-5.3.1
-		<dev-vcs/mercurial-5.4"
+	SRC_URI="https://www.mercurial-scm.org/release/tortoisehg/targz/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-5.4
+		<dev-vcs/mercurial-5.6"
 else
 	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REPO_URI="https://foss.heptapod.net/mercurial/tortoisehg/thg"
 	EHG_REVISION="stable"
-	HG_DEPEND="dev-vcs/mercurial"
+	HG_DEPEND=">=dev-vcs/mercurial-5.4"
 fi
 
 DESCRIPTION="Set of graphical tools for Mercurial"
@@ -23,17 +23,17 @@ HOMEPAGE="https://tortoisehg.bitbucket.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc"
 
-distutils_enable_sphinx html
-
-RDEPEND="${HG_DEPEND}
+RDEPEND="
+	${HG_DEPEND}
 	dev-python/iniparse[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
-	>=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]"
+	>=dev-python/qscintilla-python-2.9.4[qt5(+),${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
+distutils_enable_sphinx doc/source
+
 python_prepare_all() {
 	# Remove file that collides with >=mercurial-4.0 (bug #599266).
 	rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py"
@@ -48,7 +48,12 @@ python_install_all() {
 }
 
 pkg_postinst() {
+	xdg_icon_cache_update
 	elog "When startup of ${PN} fails with an API version mismatch error"
 	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
 	elog "dev-python/qscintilla-python."
 }
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index 6f0201707268..1a78d11682d2 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -4,18 +4,18 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit desktop distutils-r1
+inherit desktop distutils-r1 xdg-utils
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
-	HG_DEPEND=" >=dev-vcs/mercurial-5.3.1
-		<dev-vcs/mercurial-5.4"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SRC_URI="https://www.mercurial-scm.org/release/tortoisehg/targz/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-5.4
+		<dev-vcs/mercurial-5.6"
 else
 	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REPO_URI="https://foss.heptapod.net/mercurial/tortoisehg/thg"
 	EHG_REVISION="stable"
-	HG_DEPEND="dev-vcs/mercurial"
+	HG_DEPEND=">=dev-vcs/mercurial-5.4"
 fi
 
 DESCRIPTION="Set of graphical tools for Mercurial"
@@ -23,17 +23,17 @@ HOMEPAGE="https://tortoisehg.bitbucket.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc"
 
-distutils_enable_sphinx html
-
-RDEPEND="${HG_DEPEND}
+RDEPEND="
+	${HG_DEPEND}
 	dev-python/iniparse[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
-	>=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]"
+	>=dev-python/qscintilla-python-2.9.4[qt5(+),${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
+distutils_enable_sphinx doc/source
+
 python_prepare_all() {
 	# Remove file that collides with >=mercurial-4.0 (bug #599266).
 	rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py"
@@ -48,7 +48,12 @@ python_install_all() {
 }
 
 pkg_postinst() {
+	xdg_icon_cache_update
 	elog "When startup of ${PN} fails with an API version mismatch error"
 	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
 	elog "dev-python/qscintilla-python."
 }
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}