diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2014-12-07 09:25:08 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2014-12-07 09:25:08 +0000 |
| commit | 1c1694a91a5bb87365829d97da50b50b4db9a040 (patch) | |
| tree | 8c33e31a7862e3164dae2f3682b69c22eee87303 /dev-python/uritemplate | |
| parent | version bump (diff) | |
| download | historical-1c1694a91a5bb87365829d97da50b50b4db9a040.tar.gz historical-1c1694a91a5bb87365829d97da50b50b4db9a040.tar.bz2 historical-1c1694a91a5bb87365829d97da50b50b4db9a040.zip | |
dev-python/uritemplate: Add blocker due to filecollision
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!
Diffstat (limited to 'dev-python/uritemplate')
| -rw-r--r-- | dev-python/uritemplate/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/uritemplate/Manifest | 4 | ||||
| -rw-r--r-- | dev-python/uritemplate/uritemplate-0.6.ebuild | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/dev-python/uritemplate/ChangeLog b/dev-python/uritemplate/ChangeLog index 0ac49c9fcccf..2d095142a66d 100644 --- a/dev-python/uritemplate/ChangeLog +++ b/dev-python/uritemplate/ChangeLog @@ -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 <jlec@gentoo.org> uritemplate-0.6.ebuild: + Add blocker due to filecollision *uritemplate-0.6 (06 Dec 2014) diff --git a/dev-python/uritemplate/Manifest b/dev-python/uritemplate/Manifest index db178f93f964..67dc9850b3c9 100644 --- a/dev-python/uritemplate/Manifest +++ b/dev-python/uritemplate/Manifest @@ -1,4 +1,4 @@ DIST uritemplate-0.6.tar.gz 3508 SHA256 a30e230aeb7ebedbcb5da9999a17fa8a30e512e6d5b06f73d47c6e03c8e357fd SHA512 19e9d2f7cb6275c1a3bc6e287d9d3bdbed4391541f29765130a8e33825321e33fe3220adc349794d179354bcb9d77571ae20ba7836034962f3713994c7cdbfbd WHIRLPOOL 9b1b11e7da17f39f8fb6cba5ec36dd16ddef34aa29aa0fc8cd29a03fece359baffde056b9bbe29d859cac2d2ba13ccd2d112be9b07022e6f036ffadcb8acef2e -EBUILD uritemplate-0.6.ebuild 632 SHA256 c78bef4334136534d9359b2d2068b7c8c8e90c3ee8c8076ece918d5eec5ad8c0 SHA512 e2bb97ec106ad9fd7c5afadde9ea2da75b20774cdab6d73f7bd39f6bdb4a0612ccc9d59cce4925487de436651bb00ce7de150063670b46ce0cab5f0eb57f0ee5 WHIRLPOOL 8990b5599f077d9e09d38e2d459df15079f3bd01ad6fcf1a3b93e19175d1ce16341d4ebdaf8f533f76e4fac59af79b4eed30e63e5c250221db3f6eba0f6ac889 -MISC ChangeLog 367 SHA256 b2297f76991efd15e974db5ebb1de7918fcc8e0d3d9cc32afbcdd85636741ca5 SHA512 9b37db26d788d1ee7cfc4144d4b8254af35de5ab6ff1d91ef9c03cc8a7de6056e0f57177b1fd60323e9b62deb30f293d0669010714fe2b333549f17df2d5a584 WHIRLPOOL 9356dc08865ab5e251094fc32a52623d94394562e669c3cf932a480e5161fbf936e7ffa950bc093531a8e8ac419750667362b02a215f46a1873e3503f72493da +EBUILD uritemplate-0.6.ebuild 678 SHA256 13e13f0a507fde00010f306b0a31f17fb30ac63549a84d1fddbc62187b2ce1c5 SHA512 75c48a545dc3910fbd8085f7df94599c98c4c6bddf012c207b7d60f5878b4a78dee3421b0fe41a9771ee24f1f30fa4e6f8448a7af1e6a539d25126aad2ebd8d7 WHIRLPOOL bd322bb5399d35ca61f0a5ac7661f31bc2bdd2453386e7e118366e335aae3f87298ea1d2b9842f517c9792be927db8d9eaf76ad12c1f78431c5921e90255e87c +MISC ChangeLog 474 SHA256 80457eea015b2d8c94919c3e5c7d596a08b9e4e736fcc214a38c60fc3e7cc869 SHA512 f3cc5b98bd7558fb418cb21673edbe32372f3c22315667bc9d986fd12bd3251e897c6047c6fd183f42db554485462e7429e38799f89ce37e47c27dabb66db09f WHIRLPOOL 1f68c70527c342cd0044aaa5c44c7c490fc46ba18fe012a7e68c00adbbb52ed6803f6aa0b0765efce8f1fb2451c08d2e9474539986f26de36066652b190d1fd0 MISC metadata.xml 161 SHA256 54c4e6d783f2571466c7b03622195c255b95cf06209e59ab6653a6366cdfde6e SHA512 b306d222517e4eae525f6a79634f26eff2068f85911b7904c52c485a004d1d5401300808da67f9a1e3f102d65aebd1e0d21cd18145ea0bfec156f2aa3785b104 WHIRLPOOL f9c8e8d23bde25f4b14031f83dcc09e8437fdbcbb27199c1e9d8109fb2ccc7589cabf8240256dbbe6e080d04d2c444d115c66f82fc9b479e1e70d1ef0fe60fe2 diff --git a/dev-python/uritemplate/uritemplate-0.6.ebuild b/dev-python/uritemplate/uritemplate-0.6.ebuild index 13ca4825170c..178d7984ae2d 100644 --- a/dev-python/uritemplate/uritemplate-0.6.ebuild +++ b/dev-python/uritemplate/uritemplate-0.6.ebuild @@ -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 @@ LICENSE="Apache-2.0" 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}" |