public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-vcs/tortoisehg: tortoisehg-9999.ebuild tortoisehg-2.5.ebuild ChangeLog
@ 2012-09-10 20:12 Mike Gilbert (floppym)
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert (floppym) @ 2012-09-10 20:12 UTC (permalink / raw
  To: gentoo-commits

floppym     12/09/10 20:12:33

  Modified:             tortoisehg-9999.ebuild ChangeLog
  Added:                tortoisehg-2.5.ebuild
  Log:
  Version bump for bug 434562.
  
  (Portage version: 2.2.0_alpha124/cvs/Linux x86_64)

Revision  Changes    Path
1.11                 dev-vcs/tortoisehg/tortoisehg-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild?r1=1.10&r2=1.11

Index: tortoisehg-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tortoisehg-9999.ebuild	21 Aug 2012 15:17:33 -0000	1.10
+++ tortoisehg-9999.ebuild	10 Sep 2012 20:12:33 -0000	1.11
@@ -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.10 2012/08/21 15:17:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.11 2012/09/10 20:12:33 floppym Exp $
 
 EAPI=4
 
@@ -38,21 +38,18 @@
 	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=
+			keep=false
 			for y in ${LINGUAS}; do
 				if [[ ${y} == ${x%.po}* ]]; then
-					keep=1
+					keep=true
 					break
 				fi
 			done
-			[[ ${keep} ]] || rm "${x}" || die
+			${keep} || rm "${x}" || die
 		done
 		popd > /dev/null || die
 	fi



1.22                 dev-vcs/tortoisehg/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/tortoisehg/ChangeLog?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/tortoisehg/ChangeLog?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/tortoisehg/ChangeLog?r1=1.21&r2=1.22

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ChangeLog	21 Aug 2012 15:17:33 -0000	1.21
+++ ChangeLog	10 Sep 2012 20:12:33 -0000	1.22
@@ -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.21 2012/08/21 15:17:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.22 2012/09/10 20:12:33 floppym Exp $
+
+*tortoisehg-2.5 (10 Sep 2012)
+
+  10 Sep 2012; Mike Gilbert <floppym@gentoo.org> +tortoisehg-2.5.ebuild,
+  tortoisehg-9999.ebuild:
+  Version bump for bug 434562.
 
 *tortoisehg-2.4.3 (21 Aug 2012)
 



1.1                  dev-vcs/tortoisehg/tortoisehg-2.5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.5.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.5.ebuild?rev=1.1&content-type=text/plain

Index: tortoisehg-2.5.ebuild
===================================================================
# 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.5.ebuild,v 1.1 2012/09/10 20:12:33 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"
	HG_DEPEND=">=dev-vcs/mercurial-2.2 <dev-vcs/mercurial-2.4"
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"
HOMEPAGE="http://tortoisehg.bitbucket.org"

LICENSE="GPL-2"
SLOT="0"
IUSE="doc"

RDEPEND="${HG_DEPEND}
	dev-python/iniparse
	dev-python/pygments
	dev-python/PyQt4
	dev-python/qscintilla-python"
DEPEND="${RDEPEND}
	doc? ( >=dev-python/sphinx-1.0.3 )"

src_prepare() {
	if [[ ${LINGUAS+set} ]]; then
		pushd i18n/tortoisehg > /dev/null || 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
		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
	fi

	newicon -s scalable icons/scalable/apps/thg-logo.svg tortoisehg_logo.svg
	domenu contrib/${PN}.desktop
}





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-vcs/tortoisehg: tortoisehg-9999.ebuild tortoisehg-2.5.ebuild ChangeLog
@ 2012-09-10 20:14 Mike Gilbert (floppym)
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert (floppym) @ 2012-09-10 20:14 UTC (permalink / raw
  To: gentoo-commits

floppym     12/09/10 20:14:10

  Modified:             tortoisehg-9999.ebuild tortoisehg-2.5.ebuild
                        ChangeLog
  Log:
  Drop multilib.
  
  (Portage version: 2.2.0_alpha124/cvs/Linux x86_64)

Revision  Changes    Path
1.12                 dev-vcs/tortoisehg/tortoisehg-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild?r1=1.11&r2=1.12

Index: tortoisehg-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tortoisehg-9999.ebuild	10 Sep 2012 20:12:33 -0000	1.11
+++ tortoisehg-9999.ebuild	10 Sep 2012 20:14:10 -0000	1.12
@@ -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.11 2012/09/10 20:12:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.12 2012/09/10 20:14:10 floppym Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@
 PYTHON_DEPEND="2:2.5"
 RESTRICT_PYTHON_ABIS="2.4 3.* *-pypy-*"
 
-inherit distutils eutils multilib
+inherit distutils eutils
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86"



1.2                  dev-vcs/tortoisehg/tortoisehg-2.5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.5.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.5.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.5.ebuild?r1=1.1&r2=1.2

Index: tortoisehg-2.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tortoisehg-2.5.ebuild	10 Sep 2012 20:12:33 -0000	1.1
+++ tortoisehg-2.5.ebuild	10 Sep 2012 20:14:10 -0000	1.2
@@ -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.5.ebuild,v 1.1 2012/09/10 20:12:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.5.ebuild,v 1.2 2012/09/10 20:14:10 floppym Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@
 PYTHON_DEPEND="2:2.5"
 RESTRICT_PYTHON_ABIS="2.4 3.* *-pypy-*"
 
-inherit distutils eutils multilib
+inherit distutils eutils
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86"



1.23                 dev-vcs/tortoisehg/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/tortoisehg/ChangeLog?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/tortoisehg/ChangeLog?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/tortoisehg/ChangeLog?r1=1.22&r2=1.23

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ChangeLog	10 Sep 2012 20:12:33 -0000	1.22
+++ ChangeLog	10 Sep 2012 20:14:10 -0000	1.23
@@ -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.22 2012/09/10 20:12:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.23 2012/09/10 20:14:10 floppym Exp $
+
+  10 Sep 2012; Mike Gilbert <floppym@gentoo.org> tortoisehg-2.5.ebuild,
+  tortoisehg-9999.ebuild:
+  Drop multilib.
 
 *tortoisehg-2.5 (10 Sep 2012)
 





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-09-10 20:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-10 20:12 [gentoo-commits] gentoo-x86 commit in dev-vcs/tortoisehg: tortoisehg-9999.ebuild tortoisehg-2.5.ebuild ChangeLog Mike Gilbert (floppym)
  -- strict thread matches above, loose matches on Subject: below --
2012-09-10 20:14 Mike Gilbert (floppym)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox