gentoo resync : 28.04.2019

6 files changed, 87 insertions, 59 deletions

diff --git a/dev-vcs/git-remote-hg/Manifest b/dev-vcs/git-remote-hg/Manifest
index 2c2b43d8dd00..fda23b9e3bf1 100644
--- a/dev-vcs/git-remote-hg/Manifest
+++ b/dev-vcs/git-remote-hg/Manifest
@@ -1,5 +1,4 @@
-DIST git-remote-hg-0.2.tar.gz 30397 BLAKE2B 9c96c420a9e38fb3e0a223f12343834abdb742d15140330b1f5a12b68da924466106a279802a525c085c176d706cce427e73b1f86eeb99a6a413ab6de5954b18 SHA512 eb08a90b786593602510fef6210bb381a605d6c4cfda7e0c1051162d0a9929c077081f530dcdfb95f6fd8f0114ed44ea2c8f267e0e7ac110f9445941c9dd8546
-DIST git-remote-hg-0.3.tar.gz 30995 BLAKE2B c65918a985459149df85b1519f4d4b15be53c26d28a32cb660d85fa386a488668e2d042c7687fd4ea0928237d3098d5d3bcd77f8a0e78742b530b7cc2dff1195 SHA512 33ff1874909c0ce4d8b44d1dfd6ae706df44b36ead566e09be0f4e94e3b2a5c8603bd2f2fd50e8faa99d6aeb44a7792d7118c4413f8c9a8b8c29108b534bb4f4
-EBUILD git-remote-hg-0.2.ebuild 533 BLAKE2B 2bc0641461db8c97947e64d4990e6d1672327b149b1b653777881f8c251df7ef093e2aef901f790b46c0a237efd303c49edfb3686be9f4926de46e37bfc5419b SHA512 e0ae87af402526dac263d36c5b13faa7fbac95fe7b2d897502086f010ff2c14c146800de0d51392ac60ebe2dc4a3ba74033ce166b062bd9ba2d6b46dd4d34b9c
-EBUILD git-remote-hg-0.3.ebuild 576 BLAKE2B a82d541d1c4d58f8a67d9c7902876a964eaf0dde80bca5c9ba59770b31fe79dec635ba4379a749ed27323fcd03df3000b59c183978381b07b12e94ee19994846 SHA512 369c2d2be9efb854b1564b0268b8959563a32cd372150e0c6b430e1db5bf3124a0fa84e8dd97153bdf3e9d12fc977f1ca88f9b91c4b1e8a79a9f69a0ec8555d2
-MISC metadata.xml 570 BLAKE2B de338749634d4141b4c73fe511c6b2097edd36ed633cb58ef1c9e6ddb237876d4a55f1423e2d6c04805de38b133f700a2784268dc3926cc731ccc5c8bb256a77 SHA512 07bfa78ad5d7558a6c3607e4b5dfcd2908d9227acedd4393c7a0002fed383dc85a68f6758b2013b83a6f810188c99952e7718d987f1cfddfd710f5a135ccf3d5
+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
+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
new file mode 100644
index 000000000000..7226e33aa431
--- /dev/null
+++ b/dev-vcs/git-remote-hg/files/git-remote-hg-1.0.0-get_version_from_release.patch
@@ -0,0 +1,34 @@
+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-0.2.ebuild b/dev-vcs/git-remote-hg/git-remote-hg-0.2.ebuild
deleted file mode 100644
index 297bee0751bb..000000000000
--- a/dev-vcs/git-remote-hg/git-remote-hg-0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=(python2_7)
-
-DESCRIPTION="Semi-official Mercurial bridge from Git project"
-HOMEPAGE="https://github.com/felipec/git-remote-hg"
-SRC_URI="https://github.com/felipec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-vcs/git
-		dev-vcs/mercurial"
-RDEPEND="${DEPEND}"
-
-# Most (21/25) tests fail:
-RESTRICT="test"
-
-src_install() {
-	dobin git-remote-hg
-}
diff --git a/dev-vcs/git-remote-hg/git-remote-hg-0.3.ebuild b/dev-vcs/git-remote-hg/git-remote-hg-0.3.ebuild
deleted file mode 100644
index 3d5b16b08b94..000000000000
--- a/dev-vcs/git-remote-hg/git-remote-hg-0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=(python2_7)
-
-DESCRIPTION="Semi-official Mercurial bridge from Git project"
-HOMEPAGE="https://github.com/felipec/git-remote-hg"
-SRC_URI="https://github.com/felipec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-vcs/git
-		dev-vcs/mercurial"
-
-DEPEND="${CDEPEND}
-		app-text/asciidoc"
-RDEPEND="${CDEPEND}"
-
-# Most (21/25) tests fail:
-RESTRICT="test"
-
-src_install() {
-	dobin git-remote-hg
-}
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.0-r1.ebuild
new file mode 100644
index 000000000000..18d62626ba6e
--- /dev/null
+++ b/dev-vcs/git-remote-hg/git-remote-hg-1.0.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Semi-official Mercurial bridge from Git project"
+HOMEPAGE="https://github.com/mnauw/git-remote-hg"
+SRC_URI="https://github.com/mnauw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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"
+
+src_compile() {
+	distutils-r1_src_compile
+	emake doc
+}
+
+src_install() {
+	distutils-r1_src_install
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install-doc
+}
diff --git a/dev-vcs/git-remote-hg/metadata.xml b/dev-vcs/git-remote-hg/metadata.xml
index 0fe237632666..516b1c49f64f 100644
--- a/dev-vcs/git-remote-hg/metadata.xml
+++ b/dev-vcs/git-remote-hg/metadata.xml
@@ -2,8 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>wizardedit@gentoo.org</email>
-		<name>Austin English</name>
+		<email>realnc@gmail.com</email>
+		<name>Nikos Chantziaras</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		'git-remote-hg' is the semi-official Mercurial bridge from Git project,
@@ -11,6 +15,6 @@
 		Mercurial repositories as if they were Git ones.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">felipec/git-remote-hg</remote-id>
+		<remote-id type="github">mnauw/git-remote-hg</remote-id>
 	</upstream>
 </pkgmetadata>