jlec 14/12/07 09:25:07 Modified: ChangeLog uritemplate-0.6.ebuild Log: dev-python/uritemplate: Add blocker due to filecollision (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.2 dev-python/uritemplate/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/uritemplate/ChangeLog?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/uritemplate/ChangeLog?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/uritemplate/ChangeLog?r1=1.1&r2=1.2 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/uritemplate/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ChangeLog 6 Dec 2014 15:10:59 -0000 1.1 +++ ChangeLog 7 Dec 2014 09:25:07 -0000 1.2 @@ -1,6 +1,9 @@ # ChangeLog for dev-python/uritemplate # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/uritemplate/ChangeLog,v 1.1 2014/12/06 15:10:59 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/uritemplate/ChangeLog,v 1.2 2014/12/07 09:25:07 jlec Exp $ + + 07 Dec 2014; Justin Lecher <j...@gentoo.org> uritemplate-0.6.ebuild: + Add blocker due to filecollision *uritemplate-0.6 (06 Dec 2014) 1.2 dev-python/uritemplate/uritemplate-0.6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/uritemplate/uritemplate-0.6.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/uritemplate/uritemplate-0.6.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/uritemplate/uritemplate-0.6.ebuild?r1=1.1&r2=1.2 Index: uritemplate-0.6.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/uritemplate/uritemplate-0.6.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- uritemplate-0.6.ebuild 6 Dec 2014 15:10:59 -0000 1.1 +++ uritemplate-0.6.ebuild 7 Dec 2014 09:25:07 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/uritemplate/uritemplate-0.6.ebuild,v 1.1 2014/12/06 15:10:59 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/uritemplate/uritemplate-0.6.ebuild,v 1.2 2014/12/07 09:25:07 jlec Exp $ EAPI=5 @@ -17,5 +17,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="" -RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]" +RDEPEND=" + dev-python/simplejson[${PYTHON_USEDEP}] + !<=dev-python/google-api-python-client-1.3" DEPEND="${RDEPEND}"
