Version bump. Merge with live ebuild.

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

diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index d5cd99884ced4d8bd64ef2ed37b3e3a210826236..393965865f1065c0f18cd3e8a5060b89d030dd22 100644 (file)
--- a/dev-vcs/tortoisehg/ChangeLog
+++ b/dev-vcs/tortoisehg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/tortoisehg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.4 2011/11/04 19:17:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.5 2011/11/07 20:39:34 floppym Exp $
+
+*tortoisehg-2.2 (07 Nov 2011)
+
+  07 Nov 2011; Mike Gilbert <floppym@gentoo.org> +tortoisehg-2.2.ebuild,
+  tortoisehg-9999.ebuild:
+  Version bump. Merge with live ebuild.
 
 *tortoisehg-9999 (04 Nov 2011)
 

diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index a41f2fae74ef80f19c888de85235ccfe568fe727..ce3d31fd3e4a052c12b77ae1d311c7234e64ab7a 100644 (file)
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -4,16 +4,18 @@ Hash: SHA256
 AUX tortoisehg-2.1.4-mercurial-2.patch 746 RMD160 15c68fcf98e27f7c53d079c62458315f3f599267 SHA1 ce893cd3dd8bcbbe0f13b9cd9afd6cd9a8d28575 SHA256 683b02b01feabcdba64b991aab7ca33ab5f7f07b9bbf6972111f5a2f7bb0dabe
 DIST tortoisehg-2.1.3.tar.gz 8944697 RMD160 fa76dbbba6eb9868b8c0cd13756aa2c71dd5af60 SHA1 f5869bf46fc937d2a90b3362ee266083617a806f SHA256 2a186bb226da7dc93db4bd0e61cdd783d3d5f8189c76a2a2ad8a04c09f4a2912
 DIST tortoisehg-2.1.4.tar.gz 8949670 RMD160 94cff8cfa81b051607a8a4212558d790fe83919f SHA1 f70378055c3dc21421024139b384446178be09ef SHA256 ab76a54839c5177a687d2c33cfce690e15d8263119d581b9b368fb2fb1f898b5
+DIST tortoisehg-2.2.tar.gz 9773527 RMD160 877661c6bfebada54fe5f921178fd9a38ec77e94 SHA1 fac5592a82f623ee493e43d9da87f8930ffd15b6 SHA256 a3501b4296fabf883c5a1b44fe4172d2146f9c532881b32e40ecb3c5515d74a7
 EBUILD tortoisehg-2.1.3.ebuild 1410 RMD160 ad641c26b408d5aec436db14e8e36028782adb3f SHA1 b2d8c817ef939e26e7cadc4bdbfd20fe1114022c SHA256 ea96a2eae21b692ae91c0ac9768fceefdb224f999ba200c440e49e50e6d8a595
 EBUILD tortoisehg-2.1.4-r1.ebuild 1473 RMD160 99b08927c20853b855985ccd03638e228e432001 SHA1 78d568147d17c580704dcf9bd5549d92c35bd17c SHA256 19c4ba0a1cd43eedaeb8972791fb00844eeaf0ec4a17006dc9c6ae75a95733f7
 EBUILD tortoisehg-2.1.4.ebuild 1409 RMD160 3515ca740dc9a92f26e1c39d77603d0574097baf SHA1 0ddae61e81c4bc10735bd4f4767c233bfda26ae1 SHA256 94faa554e668dfa4c589103171b8f85aa33b6999a946d5c80065dfaa68b02981
-EBUILD tortoisehg-9999.ebuild 1378 RMD160 fb6e055bc170ad6f0a5f9aef21fe889e9f1820f9 SHA1 bd86479bd513ac13972c64df3be5f3d63b4de5d5 SHA256 f8800a378cd15854718ace5993dea5e556b2109a29877a662ae5c99e1c4598fb
-MISC ChangeLog 935 RMD160 e5bf2f4d5182f492efbee5ee23000fbbcb751d0b SHA1 079ec0ed49c25a48d2f6bd1c9626886d65496ab3 SHA256 82d6894876107d054c896f3d6706af52f4856fc6b5ad4758b25b977d92e858b0
+EBUILD tortoisehg-2.2.ebuild 1519 RMD160 5d64bc0039ca48ef1e2d0cc841a69c3da5c3f663 SHA1 a052f3494825fb13e3ebbfa9698118d1359e6600 SHA256 5c174bff0cdc852ae7b2b717effeafa3119e17d0fd2196867346f1a2d1be6479
+EBUILD tortoisehg-9999.ebuild 1520 RMD160 551f685f933087b3b1013d6b005bb8bba47bc0bf SHA1 716a07ef5642cfae80b74004f530cc1e49405a6c SHA256 a2bea8aaf564a7d54d554cd094e953aeb24382fb062b43f6ed0246baec2ef1cc
+MISC ChangeLog 1106 RMD160 42c0eb5abfee4be786b54d755999c31dcb32e99e SHA1 937d7514b2070e46ebd363f4f84722365cea24f2 SHA256 710fbcdd2df70541c242e6118d99e2b204d03439aeee24e5467de67ad02f727c
 MISC metadata.xml 337 RMD160 8d648546c6f6d9cfac725f1acec7c6938515a671 SHA1 719f0b6af46dbd922e9994c78fe8ba1b06cf3ef4 SHA256 819e42b8e72796ad9d65a8a5042beb1e064f675ddd20ef72bab0a4ae40bd6a8a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk60Oj0ACgkQC77qH+pIQ6T0BQD/dQaqm4Qfzi1FAtWXuty1/rrJ
-hwT+TY48s2cYj34FTmUBAL29NbPCcRKzhJm5VlgHZzu0j5Lb6gI9OrglJ3SffigJ
-=qnWE
+iF4EAREIAAYFAk64QhAACgkQC77qH+pIQ6SiBAD/X1/oj4WPmLtn/gFbz4k34DHz
+JPi0AWzUjbaKbrgGz2UBAMZlSwh6NWpX1q0YGu/g29wlpIuTuD508RtwJSMmEhr6
+=VOo7
 -----END PGP SIGNATURE-----

diff --git a/dev-vcs/tortoisehg/tortoisehg-2.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.2.ebuild
new file mode 100644 (file)
index 0000000..9fb429d
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-2.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.2.ebuild,v 1.1 2011/11/07 20:39:34 floppym Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS=1
+PYTHON_DEPEND="2:2.5"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+
+inherit distutils eutils multilib
+
+if [[ ${PV} != *9999* ]]; then
+       KEYWORDS="~amd64 ~x86"
+       SRC_URI="http://bitbucket.org/${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-1.9
+       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
+
+       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-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index 74dc8787ed442392c26270c51fbddc290b6237e2..da96f87d177119f4c38ff2e76d1d653f2b8e78f5 100644 (file)
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.1 2011/11/04 19:17:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.2 2011/11/07 20:39:34 floppym Exp $
 
 EAPI=4
 
@@ -8,16 +8,23 @@ SUPPORT_PYTHON_ABIS=1
 PYTHON_DEPEND="2:2.5"
 RESTRICT_PYTHON_ABIS="2.4 3.*"
 
-inherit distutils eutils mercurial multilib
+inherit distutils eutils multilib
+
+if [[ ${PV} != *9999* ]]; then
+       KEYWORDS="~amd64 ~x86"
+       SRC_URI="http://bitbucket.org/${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"
-SRC_URI=""
-EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="doc nautilus"
 
 RDEPEND="dev-python/iniparse