summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-08-21 15:17:33 +0000
committerMike Gilbert <floppym@gentoo.org>2012-08-21 15:17:33 +0000
commit60cde926eb9c773b7c839bde9047e5a4f58c3a7b (patch)
tree8e4f46bc54f92f42f2c79432ecb3e3ec4aad20cc /dev-vcs/tortoisehg
parentMask ipmi USE flag on all arches but x86/amd64/ia64. (diff)
downloadhistorical-60cde926eb9c773b7c839bde9047e5a4f58c3a7b.tar.gz
historical-60cde926eb9c773b7c839bde9047e5a4f58c3a7b.tar.bz2
historical-60cde926eb9c773b7c839bde9047e5a4f58c3a7b.zip
Version bump for bug 432156 by polynomial-c.
Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64
Diffstat (limited to 'dev-vcs/tortoisehg')
-rw-r--r--dev-vcs/tortoisehg/ChangeLog8
-rw-r--r--dev-vcs/tortoisehg/Manifest13
-rw-r--r--dev-vcs/tortoisehg/files/tortoisehg-2.2.2-hgversion.patch19
-rw-r--r--dev-vcs/tortoisehg/tortoisehg-2.4.3.ebuild81
-rw-r--r--dev-vcs/tortoisehg/tortoisehg-9999.ebuild9
5 files changed, 99 insertions, 31 deletions
diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index cff70cb67f68..5d8228502b58 100644
--- a/dev-vcs/tortoisehg/ChangeLog
+++ b/dev-vcs/tortoisehg/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-vcs/tortoisehg
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.20 2012/07/20 16:33:42 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.21 2012/08/21 15:17:33 floppym Exp $
+
+*tortoisehg-2.4.3 (21 Aug 2012)
+
+ 21 Aug 2012; Mike Gilbert <floppym@gentoo.org> +tortoisehg-2.4.3.ebuild,
+ -files/tortoisehg-2.2.2-hgversion.patch, tortoisehg-9999.ebuild:
+ Version bump for bug 432156 by polynomial-c.
20 Jul 2012; Mike Gilbert <floppym@gentoo.org> metadata.xml:
Drop nautilus use flag from metadata.
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index c25cfac15a9c..7eb86a6b943d 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,16 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX tortoisehg-2.2.2-hgversion.patch 665 SHA256 e7fe886f98bd821e04d397183024b49d6d1a45ec9b26e2e1625440b97bc74182 SHA512 9593f4d4a2cd01b00eba1f5b3306dabf8d92805e1e35b9c2a8536d4ccf46673f67677dac1565b9aa6ac29924e495791dee26f8001cc74ba76c975e18a83e4d0f WHIRLPOOL c371a74c627a721d9e9dc39e6b127a82d41164946ac2bf6008e94ffa8254b28eaa48c859b4afcc033b62dca9ddf7217d9a305c786cf46a046380b66bab106311
DIST tortoisehg-2.4.2.tar.gz 9018020 SHA256 d30963453a9d618b04dfbfebda1641cb4742133829c25ff60735236f1399108a SHA512 433e2facd02b44a9c9ea2a20ecdf98ff4381f2c30c046f59b246c27686f2142eef944c3fc256371e7444495cb95a0291e8f4924382f8a67e2c109060a52e5b54 WHIRLPOOL 95d26511cbd502048854f846172e7fad107ae492f4d4eb9a5a6ce5ff9e9b482978ec28e693c752cf914ad6b1048e987ac3eb2ceaf79c838d0ff41f53607a2aac
+DIST tortoisehg-2.4.3.tar.gz 9025948 SHA256 6db82b51c301e8e7e83a5f7730882fdd055ba99f33ed5013d8c16b68b243f373 SHA512 5321c53750959888272d7073483025b47467de3bf9946c1e816fed5672651183d0fed2dec82ddb6975272dcb6c1cbae56aba6c256edea98e434f7533f46d7d68 WHIRLPOOL 29d8bb553af5e7fc7efb1843cdd81bcb9b077528d9767ee424869e7ccc6e0e5f7b2c5542047ddd0c061ffa419535cfb84f8f848ed7c143064771927c6d68531e
EBUILD tortoisehg-2.4.2.ebuild 1775 SHA256 bdd30abb7b82acd5b5d5a1372a3a553c551f2b5c986f030c4c679382d3361306 SHA512 27ca11c8b9c4e24efe52e61d196b64d99989a8012b2ca2570a90a2d0f1f6b9754e74603c2184dfbe5f71ec31990f6ca783b3cfe12c2ecd24944823abfc68bbb2 WHIRLPOOL 781703cbfd4f8ae4f9b816e3bcae3443b49fd0ecc8c3bfe50043aaf5068e95f1a7ee8a93e663fc5b6be61c74d716337bd75b77d8c67f8be7cc7d554fd1148d33
-EBUILD tortoisehg-9999.ebuild 1774 SHA256 8c672d152199caf625be97c278699d2a255192202815fda9ed1656e2932c0473 SHA512 f825996052744b15a99c927345a768886b3f9c93c7078c7106fae6047de4c389f7dfe9923ef4f762df852ee74e0ad9c42a98d06a48d8e54d8fa4fc459cfb6243 WHIRLPOOL 89579b34eae4df71efa7633d7b0b201d1e00cedc0019eadba9b6e7ca1ea1dd376d5fbc1061ec3f48a785572f615d57e0af2a1ccc3b4394cade41a329588db0f0
-MISC ChangeLog 3402 SHA256 474e57b590e30bb2ebcb0423f3af1bb89b3b03e95d1f54706f68f0010cae6210 SHA512 f152e759473bada90a359439ad471625c1d6171abd9b300c6b0e6714d485952b5c44860429a847185419e1413977bd309d4277d61b7d7ec0f50a40910a5e4f90 WHIRLPOOL 3a570200c5d9b714251b722e2a46ddb5f7b64d35af18d667455139c2a9fc67f43574a3c22162cb2906f03efdcb50c720dd4d4669945656b1dff28ce1b23e1272
+EBUILD tortoisehg-2.4.3.ebuild 1733 SHA256 c9ce919fd0a7302e857d9f9255cacdf6f53a3a32c41291356172b4dfa5de2ecb SHA512 fdf8f38f1e6fba5a720f411dc4c3532b10c3e82d982436c388c4e25c892c099670ff1d4c5c11599cc0b99c63fa17a15c9c0912438dd0dfe914a5fea72916c6e3 WHIRLPOOL b4f7e9c163123502d639cdcf72ae3a4f5607fba43b4b755e2895ff905f2da4b87ba790d4375ae922871b494d6dfa4f4f3bfae0cd940dc11b47b7086fb325c23d
+EBUILD tortoisehg-9999.ebuild 1733 SHA256 344fa6ceb06f3a9b6c4cf5e142d9a0887e1204fa03a1d899e70451f3d032553e SHA512 6ac84698bbb7af2c3d3512b619ac94f7ef851349d062feb6eae8c4a131d8b9db6585a8720550155cea97cd80dd9d783eb89ac69c1594b7300f1dc97d15a26693 WHIRLPOOL 5ade366293bb0d1b302f012fff17519765b6f13508ba36ca845fcb41091b9e9a11e842bb3f3f44219ce7352aa4026424f40dd598f0afb924313a95cc65e6a8df
+MISC ChangeLog 3625 SHA256 dcce9763bb4a683a5a16a4e03f4478d1260ce0088ed393faaae2d86a99b4ea5c SHA512 97aabba1ba268aa1736e8dc2fa3ce855cafa15e4fd998fa8fda7962e68b6df5041a2458ffc2103c0e7b9320d0021bff56413868c92dd68f58bf7fc7fceb601c0 WHIRLPOOL 123e1d7b2fff5910fcd280ed2280ffabcdd752413704872b59ac66b4941f577c0a019d980ba370001c1df67143865093cbd132bf88ee4169e51c6ebf5b9b5d5c
MISC metadata.xml 232 SHA256 8e0308eed9efea18755c3fc2161057faa2b438c4d31895e776d2d5cd5ff109df SHA512 0ec524315be6762228ff54bca53ec039e93672dcef379ef6ef0087656d5e11644aebabcc08663af4f18bdb1b254e71f2b2d3f91277e2867022b93f00d975ae88 WHIRLPOOL bd96dd794e9fdf37bea367be6ada6deb0cf7b98f1978c9e23746f98b1fc2fef931077dd59f6bff7d64856ed284d39f638fb8e0517c61b42f6a0605db09297047
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iF4EAREIAAYFAlAJiGwACgkQC77qH+pIQ6QJPgEAyx2XyorUi0aIV4vObLZsCpCq
-2W9J725K8UiraiuGuMkA/jdD0QD2DgP5efFQazJni7VeAwAiutc2R6l/15lhwcNi
-=rlUr
+iF4EAREIAAYFAlAzppMACgkQC77qH+pIQ6T5uwEAr4SyLI6Vx8mmK6koWDAOFKIE
+nfwklw15ZaeB7VjQj0sA/2VqcN/7Ks7cwRESAPFWks9aWVaFvM055B7vCbK07R4l
+=oIGt
-----END PGP SIGNATURE-----
diff --git a/dev-vcs/tortoisehg/files/tortoisehg-2.2.2-hgversion.patch b/dev-vcs/tortoisehg/files/tortoisehg-2.2.2-hgversion.patch
deleted file mode 100644
index f01800bf6343..000000000000
--- a/dev-vcs/tortoisehg/files/tortoisehg-2.2.2-hgversion.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User Yuya Nishihara <yuya@tcha.org>
-# Date 1327248119 -32400
-# Node ID d5dc83c7fc47f6692887f5af6bb7b1c819e7ad8e
-# Parent 54c988c2eb8442d3cb121b8ba73973bcdcbac467
-hgversion: bump required Mercurial version to 2.0
-
-diff --git a/tortoisehg/util/hgversion.py b/tortoisehg/util/hgversion.py
---- a/tortoisehg/util/hgversion.py
-+++ b/tortoisehg/util/hgversion.py
-@@ -18,7 +18,7 @@
-
- def checkhgversion(v):
- """range check the Mercurial version"""
-- reqver = ['1', '9']
-+ reqver = ['2', '0']
- v = v.split('+')[0]
- if not v or v == 'unknown' or len(v) >= 12:
- # can't make any intelligent decisions about unknown or hashes
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.4.3.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.4.3.ebuild
new file mode 100644
index 000000000000..2da30e850e19
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-2.4.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.4.3.ebuild,v 1.1 2012/08/21 15:17:33 floppym Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS=1
+PYTHON_DEPEND="2:2.5"
+RESTRICT_PYTHON_ABIS="2.4 3.* *-pypy-*"
+
+inherit distutils eutils multilib
+
+if [[ ${PV} != *9999* ]]; then
+ KEYWORDS="~amd64 ~x86"
+ SRC_URI="mirror://bitbucket/${PN}/targz/downloads/${P}.tar.gz"
+ HG_DEPEND=">=dev-vcs/mercurial-2.2 <dev-vcs/mercurial-2.4"
+else
+ inherit mercurial
+ EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+ KEYWORDS=""
+ SRC_URI=""
+ HG_DEPEND="dev-vcs/mercurial"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="http://tortoisehg.bitbucket.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="${HG_DEPEND}
+ dev-python/iniparse
+ dev-python/pygments
+ dev-python/PyQt4
+ dev-python/qscintilla-python"
+DEPEND="${RDEPEND}
+ doc? ( >=dev-python/sphinx-1.0.3 )"
+
+src_prepare() {
+ # make the install respect multilib.
+ sed -i -e "s:lib/nautilus:$(get_libdir)/nautilus:" setup.py || die
+
+ if [[ ${LINGUAS+set} ]]; then
+ pushd i18n/tortoisehg > /dev/null || die
+ local x y keep
+ for x in *.po; do
+ keep=
+ for y in ${LINGUAS}; do
+ if [[ ${y} == ${x%.po}* ]]; then
+ keep=1
+ break
+ fi
+ done
+ [[ ${keep} ]] || rm "${x}" || die
+ done
+ popd > /dev/null || die
+ fi
+
+ distutils_src_prepare
+}
+
+src_compile() {
+ distutils_src_compile
+
+ if use doc ; then
+ emake -C doc html
+ fi
+}
+
+src_install() {
+ distutils_src_install
+ dodoc doc/ReadMe*.txt doc/TODO
+
+ if use doc ; then
+ dohtml -r doc/build/html
+ fi
+
+ newicon -s scalable icons/scalable/apps/thg-logo.svg tortoisehg_logo.svg
+ domenu contrib/${PN}.desktop
+}
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index 2238be305612..ca30b4f85b25 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.9 2012/07/20 16:31:52 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.10 2012/08/21 15:17:33 floppym Exp $
EAPI=4
@@ -13,7 +13,7 @@ inherit distutils eutils multilib
if [[ ${PV} != *9999* ]]; then
KEYWORDS="~amd64 ~x86"
SRC_URI="mirror://bitbucket/${PN}/targz/downloads/${P}.tar.gz"
- HG_DEPEND=">=dev-vcs/mercurial-2.1 <dev-vcs/mercurial-2.3"
+ HG_DEPEND=">=dev-vcs/mercurial-2.2 <dev-vcs/mercurial-2.4"
else
inherit mercurial
EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
@@ -73,10 +73,9 @@ src_install() {
dodoc doc/ReadMe*.txt doc/TODO
if use doc ; then
- dohtml -r doc/build/html || die
+ dohtml -r doc/build/html
fi
- insinto /usr/share/icons/hicolor/scalable/apps
- newins icons/scalable/apps/thg-logo.svg tortoisehg_logo.svg
+ newicon -s scalable icons/scalable/apps/thg-logo.svg tortoisehg_logo.svg
domenu contrib/${PN}.desktop
}