gentoo resync : 08.06.2019

3 files changed, 6 insertions, 43 deletions

diff --git a/dev-vcs/git-remote-hg/Manifest b/dev-vcs/git-remote-hg/Manifest
index fda23b9e3bf1..e7389f9c431b 100644
--- a/dev-vcs/git-remote-hg/Manifest
+++ b/dev-vcs/git-remote-hg/Manifest
@@ -1,4 +1,3 @@
-AUX git-remote-hg-1.0.0-get_version_from_release.patch 891 BLAKE2B 1b58f32021a988624c2d1113a2d0d8622b593ac14bc34d6df082a2c65b52322fd00c0ec97f547cd6dec746003f0ccc308130f6d1248678e2b6f5de458410f5b6 SHA512 4ba7a808ce7c67562046f5274839ba9336456a18bb063537fce4320a66f41cd69e7101b6c0ad1e3d01a2030146ca5468aec6992846b358b44b083ea1901cbfd5
-DIST git-remote-hg-1.0.0.tar.gz 57611 BLAKE2B f46ca860bd7c46985ef53d5adfb949290208e351425a31fbfd33e6cf632c40b043397d398a5c378c653ab2b303d427c4b5bf29250fb51631f87cb2dbb0b541b5 SHA512 344349b8c64db5ad629176c664713773b4e8fe5ddf6bd13e7f3cac421f82eeb93fdd8aa59a2baab4b36b533cd6721adf8d31c69d4cc761e43c093c4d531c1a7d
-EBUILD git-remote-hg-1.0.0-r1.ebuild 781 BLAKE2B f28b2f0d414912f58e5feeb173ca3518629e48747c1838fb7aa47f7edf8fb3a91e094f695a19fab21d23f380909791cb865d8432e8e3e8d2a7544fe9c8b81307 SHA512 9cdcabea84f9e231b71a28cd334368a522054391023baf031cc3bd92575ed2b5bea57644b6859f0a4b5b7b6837a6d40d785f4a8184c34428d70b04e8fab71acc
+DIST git-remote-hg-1.0.1.tar.gz 57856 BLAKE2B 635073fbd0d9fe0ebbc2e9b5e49298bdb9f6b02f964219271a4bd930746e892e58fabde2afa94e998e4bd4aede91d9ac80291eef1bd3eb16cf82f6691514259b SHA512 b665cb6dc0564dc7f2cacade9000378f895b77a3186e091b841e58ddef37834e3cc87e81a76ab713997c6f837a768eff91d6b8a156c6277da0e34a2f156a5290
+EBUILD git-remote-hg-1.0.1.ebuild 698 BLAKE2B 96e24765fee1fdf7d41fbe0cee636a4ed117f781ae7609f7c36d2dd0429b107d54161c92e869ed26e74bbddbc605d446ff13645378374ae8cfc7baccd36a7cf0 SHA512 61866d63fdc99f379da6b84492174103585d034a69b87c36e2d256c74bd380861de518bf9b22c8cf22823ef9f9d14fece0167ee8edb32960acf042253eb5fb67
 MISC metadata.xml 683 BLAKE2B 04203fd44fc7820216ad8b9f72a9bae1f4320a759dd6d2787c163f6aa9e42349169a82668e5be895516418b8ec3a9bb6df9519d85b67cf1bafa6f771aeb14aae SHA512 55d7417f87a517729b6ee14dff7cc282b208b95bc36b325435c6f1c1a2efeade8302372bca999739cf16d8ad180bae4d3f3df74c179c4dfc09ce0df7462bee40
diff --git a/dev-vcs/git-remote-hg/files/git-remote-hg-1.0.0-get_version_from_release.patch b/dev-vcs/git-remote-hg/files/git-remote-hg-1.0.0-get_version_from_release.patch
deleted file mode 100644
index 7226e33aa431..000000000000
--- a/dev-vcs/git-remote-hg/files/git-remote-hg-1.0.0-get_version_from_release.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From bad5ec1a42d6c1ffae3ac94a5bacc95ffdbe3626 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sun, 21 Apr 2019 20:34:41 +0200
-Subject: [PATCH] Don't try to fetch version via git from a release
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- setup.py | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 26afd17..6c84c99 100644
---- a/setup.py
-+++ b/setup.py
-@@ -5,15 +5,7 @@ import subprocess
- import sys
- import os
- 
--# derive version from git repo
--cmd = ["git", "describe", "--tags"]
--commit = os.environ.get('REV', None)
--if commit:
--  cmd.append(commit)
--process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
--version = process.communicate()[0].strip()
--# strip leading v
--version = version[1:]
-+version = os.environ['PV']
- 
- # check for released version
- assert (len(version) > 0)
--- 
-2.21.0
-
diff --git a/dev-vcs/git-remote-hg/git-remote-hg-1.0.0-r1.ebuild b/dev-vcs/git-remote-hg/git-remote-hg-1.0.1.ebuild
index 18d62626ba6e..6351daeb396a 100644
--- a/dev-vcs/git-remote-hg/git-remote-hg-1.0.0-r1.ebuild
+++ b/dev-vcs/git-remote-hg/git-remote-hg-1.0.1.ebuild
@@ -17,17 +17,11 @@ KEYWORDS="~amd64 ~x86"
 BDEPEND="
 	app-text/asciidoc
 "
-DEPEND="${PYTHON_DEPEND}"
 RDEPEND="
-	${DEPEND}
 	dev-vcs/git
 	dev-vcs/mercurial
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-get_version_from_release.patch"
-)
-
 # Some tests fail.
 RESTRICT="test"
 
@@ -40,3 +34,7 @@ src_install() {
 	distutils-r1_src_install
 	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install-doc
 }
+
+src_test() {
+	default
+}