Sync live ebuild.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 37 insertions, 14 deletions

diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index 9e771b99f309..e75df0c95d7f 100644
--- a/dev-vcs/tortoisehg/ChangeLog
+++ b/dev-vcs/tortoisehg/ChangeLog
@@ -1,6 +1,10 @@
 # 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.17 2012/05/07 18:04:45 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.18 2012/05/07 18:09:13 floppym Exp $
+
+  07 May 2012; Mike Gilbert <floppym@gentoo.org> tortoisehg-2.4.ebuild,
+  tortoisehg-9999.ebuild:
+  Sync live ebuild.
 
 *tortoisehg-2.4 (07 May 2012)
 
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index d725b1dd1840..f28b3cf46053 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -5,14 +5,14 @@ AUX tortoisehg-2.2.2-hgversion.patch 665 RMD160 628aa3e0c54d110151cccff5dc8fd1ea
 DIST tortoisehg-2.3.1.tar.gz 9970047 RMD160 6a22abe62369100ec905b7e7485241cf7799501e SHA1 03fdf7cc9ed3e1cf75dab285112ac04c38a6974d SHA256 06701807fcab987f4d9ce22a77fbfc5ef7d641df986d1618c44b7938cb70c6c0
 DIST tortoisehg-2.4.tar.gz 8978194 RMD160 368295eeff289599c30562ad84fb0bfd6a16fc0d SHA1 cde776dc9eb29ed9fca0d67e027adcbd4841e6c6 SHA256 117029ff1912b98c52cd89ebc6ee6aa5d4375bff67bbc1d2ee9f2bd636d06233
 EBUILD tortoisehg-2.3.1.ebuild 1849 RMD160 21ea2387c5db07f5e36282264f8039f44a25a5d1 SHA1 1852e94a9fe01da436abb19113d8dc8698c3ce1d SHA256 58066e4a1f48034a202b9be01624980fb2831a08d21578e1921f7276edb1b126
-EBUILD tortoisehg-2.4.ebuild 1847 RMD160 a35286820a53a90079b4dfe1165ddcadd798bbaf SHA1 6912ec5f52e617b4cb2adb93c063a9f7ebeaec4a SHA256 90939928b057417d01b7f6eb24473e62c7849478ed7280acc9dc77effe613912
-EBUILD tortoisehg-9999.ebuild 1521 RMD160 1a8aaa7c0c8134988b1cb39c4299f8ecdb096edd SHA1 6ab38949d6a9eafba4b483f07b709fefa851e6b0 SHA256 bcfa292f41e5f1e733df719ef36dd66cf0d145a6181cd776a239edf68a8a97f9
-MISC ChangeLog 2940 RMD160 ed55b2a3aaaae5d88457d4ba9befd72cc1acafab SHA1 f441e4513bb8f21579b3b379d4c2de012fff0320 SHA256 4b1cf3412863f5bcc68648bb965c1cdac890b58228d2e3ac3bee650015bb0ed7
+EBUILD tortoisehg-2.4.ebuild 1903 RMD160 6a15a4a625b615b136b899427aa43e2fb3c1e1ee SHA1 928c5d7a9290c13147f7c5e647b0067fbff365e0 SHA256 0653595d39f119ea7384c0400d835a906d3cb20a89d2adb43e957501f6bd7746
+EBUILD tortoisehg-9999.ebuild 1904 RMD160 0562c6c5049d55e8462fd84c203184be95600fe4 SHA1 8c068264d15a1295d2a51a147a87d515f59fa525 SHA256 1faa50c6095105eb74da102699074db50c2eeeba38054bc3318d290934d41db2
+MISC ChangeLog 3059 RMD160 1d3a5f7ca2cb374a668a82b1c00a8ca2b9ff4852 SHA1 24f6a24a5d5c6a2dd26b18937426a071922e1fee SHA256 d13656d33d85ac18cbe9fe76939312d9428278b2a276d8e484cd475913a897e9
 MISC metadata.xml 337 RMD160 8d648546c6f6d9cfac725f1acec7c6938515a671 SHA1 719f0b6af46dbd922e9994c78fe8ba1b06cf3ef4 SHA256 819e42b8e72796ad9d65a8a5042beb1e064f675ddd20ef72bab0a4ae40bd6a8a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk+oDsQACgkQC77qH+pIQ6R4kAD/cqLvsi482BvM3n18rvxJz2JI
-+//dpVMDwYE3nRCUfQwA/1DDS2dYblR0aiHc+aPkZqTYuANzXPIfNg6DMC4E8iNq
-=t75V
+iF4EAREIAAYFAk+oD88ACgkQC77qH+pIQ6T9GwD/SmV32lMPArVYnkYsh7FTFY+q
+CanfkJmuSbLpBJunK3YA/3+bZEjRPq7iY9FlISF1L7f2TQVdz0KXTcDMoNkMfm9f
+=F1NA
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.4.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.4.ebuild
index 5b243caa7b6e..daa3e06c729a 100644
--- a/dev-vcs/tortoisehg/tortoisehg-2.4.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-2.4.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-2.4.ebuild,v 1.1 2012/05/07 18:04:45 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.4.ebuild,v 1.2 2012/05/07 18:09:13 floppym Exp $
 
 EAPI=4
 
@@ -13,11 +13,13 @@ 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"
 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"
@@ -27,12 +29,11 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc nautilus"
 
-RDEPEND="dev-python/iniparse
+RDEPEND="${HG_DEPEND}
+	dev-python/iniparse
 	dev-python/pygments
 	dev-python/PyQt4
 	dev-python/qscintilla-python
-	>=dev-vcs/mercurial-2.1
-	<dev-vcs/mercurial-2.3
 	nautilus? ( dev-python/nautilus-python )"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.3 )"
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index c52687fcadff..b15fe40ee16d 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.7 2012/05/07 18:04:45 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.8 2012/05/07 18:09:13 floppym Exp $
 
 EAPI=4
 
@@ -13,11 +13,13 @@ 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"
 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"
@@ -27,11 +29,11 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc nautilus"
 
-RDEPEND="dev-python/iniparse
+RDEPEND="${HG_DEPEND}
+	dev-python/iniparse
 	dev-python/pygments
 	dev-python/PyQt4
 	dev-python/qscintilla-python
-	dev-vcs/mercurial
 	nautilus? ( dev-python/nautilus-python )"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.3 )"
@@ -40,6 +42,22 @@ 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
 }