From: Mike Gilbert Date: Sat, 10 Dec 2011 04:41:55 +0000 (+0000) Subject: Version bump. Remove old. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=52d11ee935ed7402331ceb6bac65cad454458715;p=gentoo.git Version bump. Remove old. Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog index 393965865f10..aa1fa0405ba8 100644 --- a/dev-vcs/tortoisehg/ChangeLog +++ b/dev-vcs/tortoisehg/ChangeLog @@ -1,6 +1,13 @@ # 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.5 2011/11/07 20:39:34 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.6 2011/12/10 04:41:55 floppym Exp $ + +*tortoisehg-2.2.1 (10 Dec 2011) + + 10 Dec 2011; Mike Gilbert +tortoisehg-2.2.1.ebuild, + -tortoisehg-2.1.3.ebuild, -tortoisehg-2.1.4-r1.ebuild, + -tortoisehg-2.1.4.ebuild: + Version bump. Remove old. *tortoisehg-2.2 (07 Nov 2011) diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest index ce3d31fd3e4a..9c51ea03258e 100644 --- a/dev-vcs/tortoisehg/Manifest +++ b/dev-vcs/tortoisehg/Manifest @@ -2,20 +2,17 @@ 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.1.tar.gz 9822761 RMD160 9542ae1b4958381c62d573243bb3c060f2166753 SHA1 1b30a4de2a7285f02ef71c9432f19b1c5d9ba8b3 SHA256 7cc7c788308352627780e03059db377f1842d06c03665f7e68b8ad035510d70c 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-2.2.1.ebuild 1522 RMD160 810ffa0fa96f8bfcec91278916adf1fa953d3886 SHA1 e7d599a487e0455a80de99ec5792e9db6bb7231b SHA256 5561a912bf130c5a8ba672f46f80d7da54f5748431386a98f988d3d4b856c47f 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 ChangeLog 1328 RMD160 3b6cfe050920fb50960c52c221b60852728af1ee SHA1 4f11b8cf0906311f638b4f1f909a1080585f974b SHA256 0a872850c7cfa46c17d3ae683b3e7ed40237539a1affca87fcb0574659421d3a MISC metadata.xml 337 RMD160 8d648546c6f6d9cfac725f1acec7c6938515a671 SHA1 719f0b6af46dbd922e9994c78fe8ba1b06cf3ef4 SHA256 819e42b8e72796ad9d65a8a5042beb1e064f675ddd20ef72bab0a4ae40bd6a8a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk64QhAACgkQC77qH+pIQ6SiBAD/X1/oj4WPmLtn/gFbz4k34DHz -JPi0AWzUjbaKbrgGz2UBAMZlSwh6NWpX1q0YGu/g29wlpIuTuD508RtwJSMmEhr6 -=VOo7 +iF4EAREIAAYFAk7i4xwACgkQC77qH+pIQ6Q9yQEAvPH3f3zzn1BUUkEP1vIeBzKR +uApxoQ8MoybvVGDDoEYBAJtrvAEwmol5UhzA03p1+I7JsaGhAEEg+l+2Lr6+V+m1 +=L3XH -----END PGP SIGNATURE----- diff --git a/dev-vcs/tortoisehg/tortoisehg-2.1.3.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.1.3.ebuild deleted file mode 100644 index 13fb7774bce2..000000000000 --- a/dev-vcs/tortoisehg/tortoisehg-2.1.3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# 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.1.3.ebuild,v 1.1 2011/09/07 02:33:42 floppym Exp $ - -EAPI=3 - -SUPPORT_PYTHON_ABIS=1 -PYTHON_DEPEND="2:2.5" -RESTRICT_PYTHON_ABIS="2.4 3.*" - -inherit distutils eutils multilib - -DESCRIPTION="Set of graphical tools for Mercurial" -HOMEPAGE="http://tortoisehg.bitbucket.org" -SRC_URI="http://bitbucket.org/${PN}/targz/downloads/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -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 || die - fi -} - -src_install() { - distutils_src_install - dodoc doc/ReadMe*.txt doc/TODO || die - - 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 || die - domenu contrib/${PN}.desktop || die - - if ! use nautilus; then - rm -rf "${ED}usr/$(get_libdir)/nautilus" || die - fi -} diff --git a/dev-vcs/tortoisehg/tortoisehg-2.1.4.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.1.4.ebuild deleted file mode 100644 index 0208d5cbf974..000000000000 --- a/dev-vcs/tortoisehg/tortoisehg-2.1.4.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# 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.1.4.ebuild,v 1.1 2011/10/11 15:23:59 floppym Exp $ - -EAPI=3 - -SUPPORT_PYTHON_ABIS=1 -PYTHON_DEPEND="2:2.5" -RESTRICT_PYTHON_ABIS="2.4 3.*" - -inherit distutils eutils multilib - -DESCRIPTION="Set of graphical tools for Mercurial" -HOMEPAGE="http://tortoisehg.bitbucket.org" -SRC_URI="http://bitbucket.org/${PN}/targz/downloads/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -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 || die - fi -} - -src_install() { - distutils_src_install - dodoc doc/ReadMe*.txt doc/TODO || die - - 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 || die - domenu contrib/${PN}.desktop || die - - if ! use nautilus; then - rm -r "${ED}usr/$(get_libdir)/nautilus" || die - fi -} diff --git a/dev-vcs/tortoisehg/tortoisehg-2.1.4-r1.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.2.1.ebuild similarity index 81% rename from dev-vcs/tortoisehg/tortoisehg-2.1.4-r1.ebuild rename to dev-vcs/tortoisehg/tortoisehg-2.2.1.ebuild index 92465770eaf7..70313bce94e1 100644 --- a/dev-vcs/tortoisehg/tortoisehg-2.1.4-r1.ebuild +++ b/dev-vcs/tortoisehg/tortoisehg-2.2.1.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-2.1.4-r1.ebuild,v 1.1 2011/11/04 17:44:04 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.2.1.ebuild,v 1.1 2011/12/10 04:41:55 floppym Exp $ EAPI=4 @@ -10,13 +10,21 @@ RESTRICT_PYTHON_ABIS="2.4 3.*" inherit distutils eutils multilib +if [[ ${PV} != *9999* ]]; then + KEYWORDS="~amd64 ~x86" + SRC_URI="https://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="http://bitbucket.org/${PN}/targz/downloads/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" IUSE="doc nautilus" RDEPEND="dev-python/iniparse @@ -29,9 +37,6 @@ DEPEND="${RDEPEND} doc? ( >=dev-python/sphinx-1.0.3 )" src_prepare() { - # Bug 389513: Mercurial 2 compatibility. - epatch "${FILESDIR}/${P}-mercurial-2.patch" - # make the install respect multilib. sed -i -e "s:lib/nautilus:$(get_libdir)/nautilus:" setup.py || die