diff options
author | Nikos Chantziaras <realnc@gmail.com> | 2019-06-05 20:40:48 +0300 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2019-06-07 15:14:14 +0200 |
commit | fb11a3905b6a6d41f1ddb257263f63b9b97649fe (patch) | |
tree | 19013263a9b3853cf8057f1d7266cb1cf10ef19f /dev-vcs | |
parent | dev-vcs/git-remote-hg: bump version to 1.0.1 (diff) | |
download | gentoo-fb11a3905b6a6d41f1ddb257263f63b9b97649fe.tar.gz gentoo-fb11a3905b6a6d41f1ddb257263f63b9b97649fe.tar.bz2 gentoo-fb11a3905b6a6d41f1ddb257263f63b9b97649fe.zip |
dev-vcs/git-remote-hg: delete old, delete patch
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Nikos Chantziaras <realnc@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11875
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-vcs')
-rw-r--r-- | dev-vcs/git-remote-hg/Manifest | 1 | ||||
-rw-r--r-- | dev-vcs/git-remote-hg/files/git-remote-hg-1.0.0-get_version_from_release.patch | 34 | ||||
-rw-r--r-- | dev-vcs/git-remote-hg/git-remote-hg-1.0.0-r1.ebuild | 42 |
3 files changed, 0 insertions, 77 deletions
diff --git a/dev-vcs/git-remote-hg/Manifest b/dev-vcs/git-remote-hg/Manifest index ac7f4a97ddf8..6e1d26b61663 100644 --- a/dev-vcs/git-remote-hg/Manifest +++ b/dev-vcs/git-remote-hg/Manifest @@ -1,2 +1 @@ -DIST git-remote-hg-1.0.0.tar.gz 57611 BLAKE2B f46ca860bd7c46985ef53d5adfb949290208e351425a31fbfd33e6cf632c40b043397d398a5c378c653ab2b303d427c4b5bf29250fb51631f87cb2dbb0b541b5 SHA512 344349b8c64db5ad629176c664713773b4e8fe5ddf6bd13e7f3cac421f82eeb93fdd8aa59a2baab4b36b533cd6721adf8d31c69d4cc761e43c093c4d531c1a7d DIST git-remote-hg-1.0.1.tar.gz 57856 BLAKE2B 635073fbd0d9fe0ebbc2e9b5e49298bdb9f6b02f964219271a4bd930746e892e58fabde2afa94e998e4bd4aede91d9ac80291eef1bd3eb16cf82f6691514259b SHA512 b665cb6dc0564dc7f2cacade9000378f895b77a3186e091b841e58ddef37834e3cc87e81a76ab713997c6f837a768eff91d6b8a156c6277da0e34a2f156a5290 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.0-r1.ebuild deleted file mode 100644 index 18d62626ba6e..000000000000 --- a/dev-vcs/git-remote-hg/git-remote-hg-1.0.0-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# 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 -} |