Stabilize for amd64 and x86 #536384, remove old

Package-Manager: portage-2.2.15/cvs/Linux x86_64

4 files changed, 10 insertions, 86 deletions

diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index bfe93f50a720..d72ccdbc9447 100644
--- a/dev-vcs/tortoisehg/ChangeLog
+++ b/dev-vcs/tortoisehg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/tortoisehg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.69 2015/01/12 03:36:20 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.70 2015/01/15 06:22:13 patrick Exp $
+
+  15 Jan 2015; Patrick Lauer <patrick@gentoo.org> -tortoisehg-2.10.2.ebuild,
+  tortoisehg-3.2.2.ebuild:
+  Stabilize for amd64 and x86 #536384, remove old
 
   12 Jan 2015; Patrick Lauer <patrick@gentoo.org> -tortoisehg-2.11.2.ebuild,
   -tortoisehg-2.7.2.ebuild, -tortoisehg-3.1.2.ebuild:
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index f0715c3376fc..d653a6062605 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,9 +1,7 @@
-DIST tortoisehg-2.10.2.tar.gz 8623834 SHA256 ecced3fa86be99ce1424fe30efec1ec583f22277b5d30ac26656875e10cd82ef SHA512 0ec06af4b30a3d8ef20b554e2432a0b60c930a32afc4faaaabff16a46380af8a6581bdf2155ac933e4b3b46db5b52ae64da68429f454b662fc400076ab9afa46 WHIRLPOOL 425e58b46e93551d7ede320880855bdacd767cd16bc0f81a75d6eb6f80658e5c8e6b064726f7fd6b94bb2aa1e78dfce846ce1bdd9a919d11cfd48739f7e38835
 DIST tortoisehg-3.2.1.tar.gz 8203881 SHA256 6e03b0a71aff4bad6d5c847ff5294039d91e7085ef29bcd9dfea1a59aa01d38b SHA512 9203e4e9588c5d60f06acf87ab8911b054cae284e2f462e5174521bb76ee5a691e370394c0c3baf71f2385bbe06287fa4db7d5881856222b00dd3c937454f388 WHIRLPOOL e86a38d2461be2012419c1f77029a1ffd4a175c2c878a5b94857316ef54dae5dcc51a265a4e4b911c8b5ad40a9c5e3d7804cc21b6a0e02fbed83cd4ac858df98
 DIST tortoisehg-3.2.2.tar.gz 8212311 SHA256 ce3c9a3cd44ae071b6d44c68fd2fa78858f11dddaeef688cc4e7cb4a4fdf81a0 SHA512 9dd2c398467afea507376255125d916af36e94943678410232c5f100c7b3a56f37f89076baa2b824cdee12d4792144ff5ecba1493d28f10f23377322f0f628d1 WHIRLPOOL f0ecdc78b795e1d19b8c8321a1c8606ff0058ae56915fea6ba93c4f1e2893a69dd217f70562db922b5b68f3a3d965067f88b4a0b7e5f853245934f4fb9c88abd
-EBUILD tortoisehg-2.10.2.ebuild 1936 SHA256 631cea5100fcab705a5e6cb593543017d6757d36b99f03bae9d8c74367bc1c6e SHA512 c6b9c9e532505a8d0298bffb3e1456b7f25d806cf43a325feeab0f005abc96ae797d25e9fb4646815048c9274fcad6cdbfd43da651298a7db62f367c1ddd12e3 WHIRLPOOL eea9918742b7e50fc52f1332c3e2813dd2ec56f53188e2170f3f1d0547e699f0abfbf52135f825571b844bac14e9456461a94c6d4a25bbff5e0fc23c1c58e20c
 EBUILD tortoisehg-3.2.1.ebuild 1940 SHA256 0c143655e91d4f7e9082ffe8cbe14e5fea3cfbf446da58d2be8c496b7d7e253f SHA512 6106eac1f5543af8af04466b3b8bf4d7cd2148b8e07ed259f57986357ae946b14696cdaf4dacf8eab45dda2d87e21269ff7751b909cbd67fcfda0056c802a58d WHIRLPOOL e33695691656bac4c245a37b597174241772cb9fd0c7e210727ad6ad9b074a798846d86e07d17e97b428183c697fbcfce2c6887ea6fe3edcc699cf174f02c852
-EBUILD tortoisehg-3.2.2.ebuild 1940 SHA256 c47cd546bf3e378deb17def6e0d81069f00341b8f290bce3ec95bd4337c91ec2 SHA512 38d52fcf77e7e15a877706dfb25e8643038faffa3e53d74a764ee217b6e1d8ace788fc2cabe39c7302463fe6f377ee028945b153e1f1d40b70f871cf4216e189 WHIRLPOOL 66a5273afe58bebd5d96ec94a3fb496ed1d8e95f37aab502659f6c99661b3121a33996b65668431121f2b9c0ba6172f17ed4a4d0090088d7320c6605c7029bfd
+EBUILD tortoisehg-3.2.2.ebuild 1933 SHA256 1cfe02102d659542db5f9d618c691578a9a994612678c570b6e8e23665fb8485 SHA512 35f6d51f6f3493cac7ae187d5abd6f2b5f9932501b4941f18c3de0aa10bf4f49a7e393d142f32bb79736658c5853e2ebd239283e03b106db6dba618d59814ed9 WHIRLPOOL 9035ef6621cf25933b5f7374637154fe7e0ab8ca8ce342e594a82249631fc3c0e0c251ef6e58e4f5f9d58e0480f2a0a498e88c036871e412f55433a147d8481c
 EBUILD tortoisehg-9999.ebuild 1936 SHA256 6d4acb5a853a5797a04ffa02808da1e42268309f201188eefa11d3d0a5fdd888 SHA512 db0ce9158fa707d4b9f87ccbf6be748ef85eb274cada0fcd687fc92d318c7fe08ea6fae3f8457a4109281fc77b3f264fca5ef1442f3f912af787817b64eac82e WHIRLPOOL 495e8d4ec84a4033db497d4e88d9ff833adc7d25a382516ff55c8eaed5103889f2d8627e1c1a20adf56d2117bcb08eefedbec60caab89ddc8866f7387e8ccce0
-MISC ChangeLog 11617 SHA256 23370bde9a5b4cbba4be857cabef1bbf03c63f024722b0f24d8b58bdf546f191 SHA512 e6e02a08e6f13ef3f99ce314c2d253cff1ded426b5c6faff0c0cd892521ddd774f0f14034cfad6d3c2df6c2adb61ec4aa39dcf1badd00872ad0d3fe6f809f1e1 WHIRLPOOL f627ec9123f10435fe2b2848929c66e71f427f37e1c669ec6d5f9851093ca5ab3ce776ff21da0d2030794fccd8f2833c5ccb5034608d31a8e7c0544f3131cfa1
+MISC ChangeLog 11772 SHA256 1a60a20c1c0568fd27e6a72b136126be25d76fb01a33a52b5ecbf8f386b04ae6 SHA512 3d28430cca9351b2f720d48739c7968063580b1f77bd5973c1e9cf5aa62a5c59f879af37612061f1f99f04e5f58ede39fb3408d6ed72c6dad67e78d17edc9e64 WHIRLPOOL b299664da9a223ddd0abca4ba7a8d60092518daa2a4ad8825c7c8e215f5b6192fac252347b6ff01a1e5d842d632cc2bf641bb74ae84244a74a37cb7ae00bee48
 MISC metadata.xml 330 SHA256 3a426c0792eb862bd697f0e6a2afb37621a1a5ea3a5ef4ddaaf748bb94e9eda0 SHA512 83d0c23820847cac4ca7e298392581051ac4fe45c88ee36b23ee20634f62e38b3a6a6c7df17952cf685213fb8755e358a6f7b602ac46aaebbdec8e71bbcbaedf WHIRLPOOL 53b2b3929cdd21719c8389cca2fe646b6549608ae0fa381ac1a228175c4aef7295acc6b1da4ebe5c9f11c91f6e0a5343b0268993afbbc5a2e5348617b740baf2
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.10.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.10.2.ebuild
deleted file mode 100644
index 9984853b32c3..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-2.10.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.10.2.ebuild,v 1.4 2014/08/12 06:41:33 nativemad Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1 eutils
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-2.7 <dev-vcs/mercurial-2.9"
-else
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
-	EHG_REVISION="stable"
-	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[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt4[svg,${PYTHON_USEDEP}]
-	dev-python/qscintilla-python[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-1.0.3 )"
-
-# Workaround race condition in build_qt
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	if [[ ${LINGUAS+set} ]]; then
-		cd i18n/tortoisehg || die
-		local x y keep
-		for x in *.po; do
-			keep=false
-			for y in ${LINGUAS}; do
-				if [[ ${y} == ${x%.po}* ]]; then
-					keep=true
-					break
-				fi
-			done
-			${keep} || rm "${x}" || die
-		done
-		cd "${S}" || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
-	if use doc ; then
-		dohtml -r doc/build/html/
-	fi
-	newicon -s scalable icons/scalable/apps/thg-logo.svg thg_logo.svg
-	domenu contrib/thg.desktop
-}
-
-pkg_postinst() {
-	elog "When startup of ${PN} fails with an API version mismatch error"
-	elog "between dev-python/sip and dev-python/PyQt4 please rebuild"
-	elog "dev-python/qscintilla-python."
-}
diff --git a/dev-vcs/tortoisehg/tortoisehg-3.2.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-3.2.2.ebuild
index 993824f5fc2c..9c1688f91a52 100644
--- a/dev-vcs/tortoisehg/tortoisehg-3.2.2.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-3.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-3.2.2.ebuild,v 1.1 2014/12/19 11:33:45 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-3.2.2.ebuild,v 1.2 2015/01/15 06:22:13 patrick Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_6,2_7} )
 inherit distutils-r1 eutils
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
 	HG_DEPEND=">=dev-vcs/mercurial-3.0 <dev-vcs/mercurial-3.3"
 else