Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/hg-git/files/, dev-vcs/hg-git/
Date: Tue, 02 Aug 2016 08:37:58
Message-Id: 1470127067.0b4b434a766712e43a13ee40cefc1e0ab8194f74.polynomial-c@gentoo
1 commit: 0b4b434a766712e43a13ee40cefc1e0ab8194f74
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 2 08:37:33 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 2 08:37:47 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b4b434a
7
8 dev-vcs/hg-git: Removed old (QA fix).
9
10 Package-Manager: portage-2.3.0
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 dev-vcs/hg-git/Manifest | 4 ---
14 .../hg-git-0.3.4-git_handler-bookmarks-hg25.patch | 31 ----------------------
15 dev-vcs/hg-git/hg-git-0.7.0.ebuild | 26 ------------------
16 dev-vcs/hg-git/hg-git-0.8.2.ebuild | 25 -----------------
17 dev-vcs/hg-git/hg-git-0.8.3.ebuild | 25 -----------------
18 dev-vcs/hg-git/hg-git-0.8.4.ebuild | 25 -----------------
19 6 files changed, 136 deletions(-)
20
21 diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
22 index 975d844..c264bbf 100644
23 --- a/dev-vcs/hg-git/Manifest
24 +++ b/dev-vcs/hg-git/Manifest
25 @@ -1,5 +1 @@
26 -DIST hg-git-0.7.0.tar.gz 42956 SHA256 9db9cd87b9b173c192b29336b4029122a4fe2858c369dc8c5a59228515bc61a9 SHA512 732dbd12184a5346310b6d14bb0b24c2255ff607ef54d064387b7cadd64aa84dd2d6909e6dde36f9fa8ac8131c1adc315c2bae2e068066864c086b239524d5d4 WHIRLPOOL 0c8216da9fdaebc2fcb56d7bec12e9a087570cf032d253e77833cbf8f31a2d581d85b820c51e37cd519ce720bd49fec5be27211b58b64fb9c18b1fff1c24d26e
27 -DIST hg-git-0.8.2.tar.gz 48461 SHA256 fea6f48da28cef3fc30a51b1cfec0a52df405b35c85b2d92607158f6b089e043 SHA512 7315e60d494b73862e6c3a90624f5ba0698c885f9b66e4bfe636bb74cd178a0d5a23614c647b6d16db7f78c06516e9a8415c443effb6cc1a102cf87ac76aa041 WHIRLPOOL 1437bfa6a0ccf2e15cc3eef195a6b176606f2be74d2b1381524a1fef3431e1f8b8e0c537325daa5a11d1b709630cc282acebdffddbf602144f115e76aea61270
28 -DIST hg-git-0.8.3.tar.gz 48198 SHA256 5c624af512c969ac3628fd658670e9170812f570eb02d2a6c76c216b80341179 SHA512 857961004103ccdabb7d15d778ef7044a5f17dd0dd045f402269b5cbf8faf1a9a4f56d2d0d5b9d24a2d6c54a0d791ad079598d5f930f4d12d3290ad3f9b90207 WHIRLPOOL 657d5cb85fe003596919db44bd53eba60e88b56fd7ca6ef8f8833c37a9b5088cceea180e83e8edde9e2a8ccd3a356722d6d01d7980819aac6460ea789fdb4406
29 -DIST hg-git-0.8.4.tar.gz 96421 SHA256 aa8f1d4ccf110480950a7de82f30c1233e20c8148a384f0a8f43779686cfd90c SHA512 9a6d01489eaf9252a09c3778ddbde562f31637a7d8d9b67f544af5aaec31426ab74f05e065405c56ad37d58ae82ef702ef5a6e1ad9a9ea5aa23af98cf42726b1 WHIRLPOOL beb6b37911f9b4cff902fa35a857eb79b6eb4adca0077c2413801b93f64b6f450df5781716c31ccc6075313ab3d08ded2ea3011f767442945f694f414bdfe0fc
30 DIST hg-git-0.8.5.tar.gz 96675 SHA256 f5cab3cc610926458733a2321ad3df5a7c56870bbf0c6d962dfa742e6ea04782 SHA512 f03c118b58c1ba4cb34ba8c953c7b1d57207548cd613d1f9f716691cbd131008b802ef21baee484881c72318f46c78b946c2d3fa77ebf5efb3ab0b7e1b9d4ca2 WHIRLPOOL cf5c2e8b69b2489aa459b9c25a51dae67bc044075f2271b1ae1006113651a0053d748a1c8801fecf7d8e8d57f219a1d04ad7cd5256acfc96feecbb7d62bae264
31
32 diff --git a/dev-vcs/hg-git/files/hg-git-0.3.4-git_handler-bookmarks-hg25.patch b/dev-vcs/hg-git/files/hg-git-0.3.4-git_handler-bookmarks-hg25.patch
33 deleted file mode 100644
34 index 2d3e06a..0000000
35 --- a/dev-vcs/hg-git/files/hg-git-0.3.4-git_handler-bookmarks-hg25.patch
36 +++ /dev/null
37 @@ -1,31 +0,0 @@
38 -From 90904fffd50fa95cd9c0f4f9210a2e800b08a50d Mon Sep 17 00:00:00 2001
39 -From: "David M. Carr" <david@××××××××.us>
40 -Date: Thu, 22 Nov 2012 18:44:09 -0500
41 -Subject: [PATCH] git_handler: add bookmark compatibility with new bmstore
42 - (issue #60)
43 -
44 -Prior to this fix, tests against the latest hg codebase would fail with:
45 -creating bookmarks failed, do you have bookmarks enabled?
46 ----
47 - hggit/git_handler.py | 5 ++++-
48 - 1 file changed, 4 insertions(+), 1 deletion(-)
49 -
50 -diff --git a/hggit/git_handler.py b/hggit/git_handler.py
51 -index 2563e1b..a14c770 100644
52 ---- a/hggit/git_handler.py
53 -+++ b/hggit/git_handler.py
54 -@@ -1044,7 +1044,10 @@ def update_hg_bookmarks(self, refs):
55 - bookmarks.write(self.repo, bms)
56 - else:
57 - self.repo._bookmarks = bms
58 -- bookmarks.write(self.repo)
59 -+ if getattr(bms, 'write', None): # hg >= 2.5
60 -+ bms.write()
61 -+ else: # hg < 2.5
62 -+ bookmarks.write(self.repo)
63 -
64 - except AttributeError:
65 - self.ui.warn(_('creating bookmarks failed, do you have'
66 ---
67 -1.8.1.5
68 -
69
70 diff --git a/dev-vcs/hg-git/hg-git-0.7.0.ebuild b/dev-vcs/hg-git/hg-git-0.7.0.ebuild
71 deleted file mode 100644
72 index 89016f5..0000000
73 --- a/dev-vcs/hg-git/hg-git-0.7.0.ebuild
74 +++ /dev/null
75 @@ -1,26 +0,0 @@
76 -# Copyright 1999-2015 Gentoo Foundation
77 -# Distributed under the terms of the GNU General Public License v2
78 -# $Id$
79 -
80 -EAPI="5"
81 -PYTHON_COMPAT=( python2_7 )
82 -
83 -inherit distutils-r1
84 -
85 -DESCRIPTION="push to and pull from a Git repository using Mercurial"
86 -HOMEPAGE="http://hg-git.github.io https://pypi.python.org/pypi/hg-git"
87 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
88 -
89 -LICENSE="GPL-2"
90 -SLOT="0"
91 -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
92 -IUSE=""
93 -
94 -RDEPEND="
95 - >=dev-vcs/mercurial-1.9.3[${PYTHON_USEDEP}]
96 - <dev-vcs/mercurial-3.3.3[${PYTHON_USEDEP}]
97 - >=dev-python/dulwich-0.9.4[${PYTHON_USEDEP}]
98 -"
99 -DEPEND="${RDEPEND}
100 - dev-python/setuptools[${PYTHON_USEDEP}]
101 -"
102
103 diff --git a/dev-vcs/hg-git/hg-git-0.8.2.ebuild b/dev-vcs/hg-git/hg-git-0.8.2.ebuild
104 deleted file mode 100644
105 index e2c3fb3..0000000
106 --- a/dev-vcs/hg-git/hg-git-0.8.2.ebuild
107 +++ /dev/null
108 @@ -1,25 +0,0 @@
109 -# Copyright 1999-2015 Gentoo Foundation
110 -# Distributed under the terms of the GNU General Public License v2
111 -# $Id$
112 -
113 -EAPI="5"
114 -PYTHON_COMPAT=( python2_7 )
115 -
116 -inherit distutils-r1
117 -
118 -DESCRIPTION="push to and pull from a Git repository using Mercurial"
119 -HOMEPAGE="http://hg-git.github.io https://pypi.python.org/pypi/hg-git"
120 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
121 -
122 -LICENSE="GPL-2"
123 -SLOT="0"
124 -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
125 -IUSE=""
126 -
127 -RDEPEND="
128 - >=dev-vcs/mercurial-1.9.3[${PYTHON_USEDEP}]
129 - >=dev-python/dulwich-0.9.4[${PYTHON_USEDEP}]
130 -"
131 -DEPEND="${RDEPEND}
132 - dev-python/setuptools[${PYTHON_USEDEP}]
133 -"
134
135 diff --git a/dev-vcs/hg-git/hg-git-0.8.3.ebuild b/dev-vcs/hg-git/hg-git-0.8.3.ebuild
136 deleted file mode 100644
137 index e2c3fb3..0000000
138 --- a/dev-vcs/hg-git/hg-git-0.8.3.ebuild
139 +++ /dev/null
140 @@ -1,25 +0,0 @@
141 -# Copyright 1999-2015 Gentoo Foundation
142 -# Distributed under the terms of the GNU General Public License v2
143 -# $Id$
144 -
145 -EAPI="5"
146 -PYTHON_COMPAT=( python2_7 )
147 -
148 -inherit distutils-r1
149 -
150 -DESCRIPTION="push to and pull from a Git repository using Mercurial"
151 -HOMEPAGE="http://hg-git.github.io https://pypi.python.org/pypi/hg-git"
152 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
153 -
154 -LICENSE="GPL-2"
155 -SLOT="0"
156 -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
157 -IUSE=""
158 -
159 -RDEPEND="
160 - >=dev-vcs/mercurial-1.9.3[${PYTHON_USEDEP}]
161 - >=dev-python/dulwich-0.9.4[${PYTHON_USEDEP}]
162 -"
163 -DEPEND="${RDEPEND}
164 - dev-python/setuptools[${PYTHON_USEDEP}]
165 -"
166
167 diff --git a/dev-vcs/hg-git/hg-git-0.8.4.ebuild b/dev-vcs/hg-git/hg-git-0.8.4.ebuild
168 deleted file mode 100644
169 index 55574cc..0000000
170 --- a/dev-vcs/hg-git/hg-git-0.8.4.ebuild
171 +++ /dev/null
172 @@ -1,25 +0,0 @@
173 -# Copyright 1999-2016 Gentoo Foundation
174 -# Distributed under the terms of the GNU General Public License v2
175 -# $Id$
176 -
177 -EAPI="5"
178 -PYTHON_COMPAT=( python2_7 )
179 -
180 -inherit distutils-r1
181 -
182 -DESCRIPTION="push to and pull from a Git repository using Mercurial"
183 -HOMEPAGE="http://hg-git.github.io https://pypi.python.org/pypi/hg-git"
184 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
185 -
186 -LICENSE="GPL-2"
187 -SLOT="0"
188 -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
189 -IUSE=""
190 -
191 -RDEPEND="
192 - >=dev-vcs/mercurial-1.9.3[${PYTHON_USEDEP}]
193 - >=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}]
194 -"
195 -DEPEND="${RDEPEND}
196 - dev-python/setuptools[${PYTHON_USEDEP}]
197 -"