Version bump. Drop nautilus use flag for bug 427174.

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

5 files changed, 27 insertions, 110 deletions

diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index e75df0c95d7f..ccb8cfbd2f38 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.18 2012/05/07 18:09:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.19 2012/07/20 16:31:52 floppym Exp $
+
+*tortoisehg-2.4.2 (20 Jul 2012)
+
+  20 Jul 2012; Mike Gilbert <floppym@gentoo.org> +tortoisehg-2.4.2.ebuild,
+  -tortoisehg-2.3.1.ebuild, -tortoisehg-2.4.ebuild, tortoisehg-9999.ebuild:
+  Version bump. Drop nautilus use flag for bug 427174.
 
   07 May 2012; Mike Gilbert <floppym@gentoo.org> tortoisehg-2.4.ebuild,
   tortoisehg-9999.ebuild:
@@ -91,4 +97,3 @@
   +metadata.xml:
   New package, resolves bug 277383 by manny15. Thanks also to Arne
   Babenhauserheide, Denilson Sá, and Alphat-PC.
-
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index ed5ea64185dd..7650d6421c82 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,8 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX tortoisehg-2.2.2-hgversion.patch 665 SHA256 e7fe886f98bd821e04d397183024b49d6d1a45ec9b26e2e1625440b97bc74182 SHA512 9593f4d4a2cd01b00eba1f5b3306dabf8d92805e1e35b9c2a8536d4ccf46673f67677dac1565b9aa6ac29924e495791dee26f8001cc74ba76c975e18a83e4d0f WHIRLPOOL c371a74c627a721d9e9dc39e6b127a82d41164946ac2bf6008e94ffa8254b28eaa48c859b4afcc033b62dca9ddf7217d9a305c786cf46a046380b66bab106311
-DIST tortoisehg-2.3.1.tar.gz 9970047 SHA256 06701807fcab987f4d9ce22a77fbfc5ef7d641df986d1618c44b7938cb70c6c0 SHA512 0ee774ae8758f28d87c6daf12761343b5ada3952371fa642d405f6f966f69bde23b0ad3976c1c5f1f8bfa3c69c50d598a7271d15f2539155783e61f6fcb47d38 WHIRLPOOL 77e5b5a0f9370ae803c604bf4d5ec51e4cbf935b8da7da844e09fed464d446d7cb8e2ac58e8143e6634b73bc2df2710dbfc98491460376ad8f005ee2253b3e08
-DIST tortoisehg-2.4.tar.gz 8978194 SHA256 117029ff1912b98c52cd89ebc6ee6aa5d4375bff67bbc1d2ee9f2bd636d06233 SHA512 cc3208bc8bbc6f81d8df842eac23db81025632cde9b25610bb77b3c37d123f2da669d50a6261d89f9d773187dcf33797cf8b644b33b5b71cc427e68f51795448 WHIRLPOOL bbaa90aefb7bc8ef22ba927d63c9c366b25a683ff0d58169a84728d39212784c7e67130f47131ba42cd933dbcfa892f64e06d7fbc35f3780fc810d065964e936
-EBUILD tortoisehg-2.3.1.ebuild 1849 SHA256 58066e4a1f48034a202b9be01624980fb2831a08d21578e1921f7276edb1b126 SHA512 e5f8f5354e64510fd1749274afd02008c6fb185e77af37baa611423731515b86d94e9011f47f51d5e4b0b41398b3ddf8c2634ac2f3932ff87e3bc5a15203e329 WHIRLPOOL 6ea78f21316ec5a7ae3674d543cdbe11384acce11b2a04b700fa4fed3222411b99aad9dfeaa03488b2a3a33d42c7b5b15fdea456f58e8425066fc0cd732a8ffa
-EBUILD tortoisehg-2.4.ebuild 1903 SHA256 0653595d39f119ea7384c0400d835a906d3cb20a89d2adb43e957501f6bd7746 SHA512 a9789493f05bb197e1fc439da19af3bc74ed7cf5a1ccf55f689ab5ededcd8dc8a6421770618be4f95867693b1446fe3ab4a83a7747c15cb0c7b8e9f4603fcbd2 WHIRLPOOL e68a7119bf9af32275db05f3a4e324e997cddae347c520ce5ba1e7b9c537e12bca7125ac55e2e7c4006d765cc783fe6f107ec3dc5e05cd3af7df86af4e5165e6
-EBUILD tortoisehg-9999.ebuild 1904 SHA256 1faa50c6095105eb74da102699074db50c2eeeba38054bc3318d290934d41db2 SHA512 3bdd2131f4349b06ea48b514c32bce0cb7aef25d46af3af0e4ae0d8ea8276e72b3eff68d914646d4310c154c967d4494d3e46106e058982aaeed586eb6a8544e WHIRLPOOL 5dae8b51fbce5d7bdf62fc2eb08d2176e70f228ee51c1f289691390728a8e1a6ce154877335164e269be7949524207c9d38fdcadfdf99c6cc8edf6827163e4b7
-MISC ChangeLog 3059 SHA256 d13656d33d85ac18cbe9fe76939312d9428278b2a276d8e484cd475913a897e9 SHA512 b431e7f666040e82bae513d228ffaea1e99b6d45e2b493c51957619cea26d540a3c0dd445aa0549cbacdd7a1c970b963891ef0eaa4fcd032cdbe34845cfc238e WHIRLPOOL 3e68a2aa88987cc89e5a6d9a5e44dfa81ae6cba6e744fabd6729c04f8774767c7c2fde38d390471e71b6f035ec8f3956d582ff55fd906a9bcbb871ac2f4c4a6c
+DIST tortoisehg-2.4.2.tar.gz 9018020 SHA256 d30963453a9d618b04dfbfebda1641cb4742133829c25ff60735236f1399108a SHA512 433e2facd02b44a9c9ea2a20ecdf98ff4381f2c30c046f59b246c27686f2142eef944c3fc256371e7444495cb95a0291e8f4924382f8a67e2c109060a52e5b54 WHIRLPOOL 95d26511cbd502048854f846172e7fad107ae492f4d4eb9a5a6ce5ff9e9b482978ec28e693c752cf914ad6b1048e987ac3eb2ceaf79c838d0ff41f53607a2aac
+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 3298 SHA256 ea16c52cced945f56d82a6d2ab77e16df337714a0867d8f9ba55a2ac2ae031c7 SHA512 b617be918f7a271c745e26482cf88081f585a378f5ba4acb9279d6c6454606348f70bd7b18950bc8a5de2a9aefd04c4a8f7f39acc118a90dfb640fb24a5bcf95 WHIRLPOOL ed87ac7846d811d2348404d7af829cfa73dd266c2bf5a442dffef0b1bfbd54c06bf6cce5e0e53fa1fd211dfc1500045ec9da5312e976ce678df26f2ea3eec8cf
 MISC metadata.xml 337 SHA256 819e42b8e72796ad9d65a8a5042beb1e064f675ddd20ef72bab0a4ae40bd6a8a SHA512 93768ea6e9df7a92ca5638266a528f9a0cbcf17c719802130ec279a442ce0e043369634c315bac1a0ced49cc5f17d4d22cab74a574d0062c8af1bc861afbee2f WHIRLPOOL d06163548a6129f728652f3cd2abaf42794a0559e718b7ff9036158ecc8a4f2e7971c11f2cdce7be0aacaca8a5a3bda09280a329b20c0191e6ee9d4ff4acbc0e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlAJh/8ACgkQC77qH+pIQ6RLlQD+IefQUDaZYZA3JQM0eKbvdzQb
+/Xi1VbGFGtU8HRLDkrIA/Ao8cwP/6i0+SZbv9SL4y+Dr0QhX3nG9cTkK93Vz+UzP
+=mViX
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.3.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.3.1.ebuild
deleted file mode 100644
index f202bae03d3e..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-2.3.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.3.1.ebuild,v 1.4 2012/05/03 02:25:52 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"
-else
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
-	KEYWORDS=""
-	SRC_URI=""
-fi
-
-DESCRIPTION="Set of graphical tools for Mercurial"
-HOMEPAGE="http://tortoisehg.bitbucket.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc nautilus"
-
-RDEPEND="dev-python/iniparse
-	dev-python/pygments
-	dev-python/PyQt4
-	dev-python/qscintilla-python
-	>=dev-vcs/mercurial-2.0
-	<dev-vcs/mercurial-2.2
-	nautilus? ( dev-python/nautilus-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 || die
-	fi
-
-	insinto /usr/share/icons/hicolor/scalable/apps
-	newins icons/scalable/apps/thg-logo.svg tortoisehg_logo.svg
-	domenu contrib/${PN}.desktop
-
-	if ! use nautilus; then
-		rm -r "${ED}usr/$(get_libdir)/nautilus" || die
-	fi
-}
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.4.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.4.2.ebuild
index daa3e06c729a..2d3576e78311 100644
--- a/dev-vcs/tortoisehg/tortoisehg-2.4.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-2.4.2.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.2 2012/05/07 18:09:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.4.2.ebuild,v 1.1 2012/07/20 16:31:52 floppym Exp $
 
 EAPI=4
 
@@ -27,14 +27,13 @@ HOMEPAGE="http://tortoisehg.bitbucket.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc nautilus"
+IUSE="doc"
 
 RDEPEND="${HG_DEPEND}
 	dev-python/iniparse
 	dev-python/pygments
 	dev-python/PyQt4
-	dev-python/qscintilla-python
-	nautilus? ( dev-python/nautilus-python )"
+	dev-python/qscintilla-python"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.3 )"
 
@@ -80,8 +79,4 @@ src_install() {
 	insinto /usr/share/icons/hicolor/scalable/apps
 	newins icons/scalable/apps/thg-logo.svg tortoisehg_logo.svg
 	domenu contrib/${PN}.desktop
-
-	if ! use nautilus; then
-		rm -r "${ED}usr/$(get_libdir)/nautilus" || die
-	fi
 }
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index b15fe40ee16d..2238be305612 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.8 2012/05/07 18:09:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.9 2012/07/20 16:31:52 floppym Exp $
 
 EAPI=4
 
@@ -27,14 +27,13 @@ HOMEPAGE="http://tortoisehg.bitbucket.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc nautilus"
+IUSE="doc"
 
 RDEPEND="${HG_DEPEND}
 	dev-python/iniparse
 	dev-python/pygments
 	dev-python/PyQt4
-	dev-python/qscintilla-python
-	nautilus? ( dev-python/nautilus-python )"
+	dev-python/qscintilla-python"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.3 )"
 
@@ -80,8 +79,4 @@ src_install() {
 	insinto /usr/share/icons/hicolor/scalable/apps
 	newins icons/scalable/apps/thg-logo.svg tortoisehg_logo.svg
 	domenu contrib/${PN}.desktop
-
-	if ! use nautilus; then
-		rm -r "${ED}usr/$(get_libdir)/nautilus" || die
-	fi
 }