Fixed: 544240, updated dependencies

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x55265D89

4 files changed, 41 insertions, 30 deletions

diff --git a/sci-libs/Fiona/ChangeLog b/sci-libs/Fiona/ChangeLog
index 2eb06e7c2ff5..d3a5af8a05e3 100644
--- a/sci-libs/Fiona/ChangeLog
+++ b/sci-libs/Fiona/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/Fiona
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/Fiona/ChangeLog,v 1.6 2015/01/08 12:50:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/Fiona/ChangeLog,v 1.7 2015/03/27 21:09:18 slis Exp $
+
+  27 Mar 2015; Sławek Lis <slis@gentoo.org> +files/scriptname.patch,
+  Fiona-1.4.1.ebuild:
+  Fixed: 544240, updated dependencies
 
   08 Jan 2015; Justin Lecher <jlec@gentoo.org> Fiona-1.1.6.ebuild,
   Fiona-1.4.1.ebuild, Fiona-9999.ebuild:
diff --git a/sci-libs/Fiona/Fiona-1.4.1.ebuild b/sci-libs/Fiona/Fiona-1.4.1.ebuild
index d9c53c3910cd..c133a0fc9b08 100644
--- a/sci-libs/Fiona/Fiona-1.4.1.ebuild
+++ b/sci-libs/Fiona/Fiona-1.4.1.ebuild
@@ -1,32 +1,35 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/Fiona/Fiona-1.4.1.ebuild,v 1.2 2015/01/08 12:50:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/Fiona/Fiona-1.4.1.ebuild,v 1.3 2015/03/27 21:09:18 slis Exp $
 
 EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python{2_6,2_7,3_3,3_4} )
 
 inherit distutils-r1
 
 DESCRIPTION="Fiona is OGR's neat, nimble, no-nonsense API"
 HOMEPAGE="https://pypi.python.org/pypi/Fiona"
+
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
+SLOT=0
 IUSE="test"
 
-RDEPEND=">=sci-libs/gdal-1.8"
+RDEPEND=">=sci-libs/gdal-1.8
+	dev-python/click"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		)
+	test? ( dev-python/nose )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 	${PYTHON_DEPS}"
 
+src_prepare() {
+	epatch "${FILESDIR}/scriptname.patch"
+}
+
 python_test() {
 	esetup.py test
 }
diff --git a/sci-libs/Fiona/Manifest b/sci-libs/Fiona/Manifest
index 6d59a2bf9c36..66b7094f7aee 100644
--- a/sci-libs/Fiona/Manifest
+++ b/sci-libs/Fiona/Manifest
@@ -1,29 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX scriptname.patch 353 SHA256 55e64236aa613b6785f7b171c0b1afab2e1759822e3f983de4a06e3903c7c68b SHA512 22264e8d8d7f4fa263fb24ab084f77c99cc7982872603d92395eccc2c7a635a51fdb55795131147f7ff0b94dedb3c43ee5024358123c900e80e9e6e6ee9249f2 WHIRLPOOL 55a2c040796684f2790930665897367ec7c3d1ae187bbb426151c53c6daba1583adc2d5402976c758fe85bc429e565047effebb1b5228123756cd071d573e354
 DIST Fiona-1.1.6.tar.gz 261413 SHA256 9ba0d66ce0e30783904bea629a647a56cc8c47f146ec789aa6b1df1b6827156e SHA512 1976bfb951d5ccd684732357209a269bc359ab3a8118d820098be9228dd5c4c6d234ec8b6cb448ad771d50522b1f1ade782cdadacd092f108a257c16570b9a8f WHIRLPOOL b1fbdbb7a4a11389ae159ab7d517ca59f61243ec20e5e6a3997e4e541e10754ab7632b86dbfb98c8d3ff04193d6031225e845cae665e06a825a14921f2f6252c
 DIST Fiona-1.4.1.tar.gz 280799 SHA256 ca70e563c2eadf791d744084cb38d57ba6f6ece00b62857d3b1dca3f63d1fd29 SHA512 456f875b9bf0f2db7c6f6a34e33ac95ed3031d38f50d04f9af2e02282ba1e3c142a05c6af5be8097b9897083a5fcb74a9184831cb9cf755ee7700451eb005b38 WHIRLPOOL 18fd26d77132609612ba13ad8df8c90b0ff72918aad3464aeaae713b174b0cddcd6106b7d66949fd4a2e819b8157150035783d707e38a73cb81de41959913c22
 EBUILD Fiona-1.1.6.ebuild 769 SHA256 6e321cd451939b6c06cc55f346605321c9286c432c75a456f9d980d3dd98c20d SHA512 e8171fa73f44ed0fafb13e98b0e1f6341e5472e48e8e3434559f6abefa7eecdd608ada33530526325569c65c0b4a61acf451ab0b2c1929a81ffd12399fd71835 WHIRLPOOL c2cbe74fd2bb45644d066fefc60d3895055618f44d207891ca462301f90fb1dfa6aeb5bce7affe980b34bca30e3af0adca8bd746c663aa77a41f217a3cc9da2a
-EBUILD Fiona-1.4.1.ebuild 769 SHA256 2762318aa65b9c9a657f16229a1e98c1fa8e3864d5c308f7c112fa43bad88a59 SHA512 44627b1c498287f0f8360d00505378be1f4474317a4d939681562083090e685abec09a95fe71d07f5b7fdc42b0d2527caa78963d4a3e61545cc195a7a7bfe612 WHIRLPOOL 626ef51b89234bd0020ec6271eff4aa3ff170e21e30e81baaf3003dce9c27ec19d9977aea1df15fee5a32ac4b4e29faa79f6eeb17bbb084668fec0ba2bebd2c9
+EBUILD Fiona-1.4.1.ebuild 830 SHA256 36349983a86e283f96b9cbc53bcfeee09aefa332bd60f9206222f85d7edd6cf2 SHA512 50ef1958b8f761b386ceda3010bb3a005287553128016db02f7e9eb9975f8ca85d040e3695e03d5e428f8718c7ddd6b7bdd5c215b00f54351b3964ef9d199b20 WHIRLPOOL a8893d97d1fa4c146f07db8922257ce85ea7091fadf19cb04f43c0d9c2e5a4b43e65682e86209430e5560e1d9929d778c286d564d5dba75b573a5ce3e18227c3
 EBUILD Fiona-9999.ebuild 777 SHA256 2e783c4915b1fe3b3962f59249359c79e7e85795badab841885ba890688a9cb9 SHA512 ddd5e8b0be90984b107ce0d057aa1b39ec8bd37ba99228aeeb6ce1cd37c403b63c1e66743d6064eacbf0ed4452342355422c31f3ecd64d13a49e7d439f8df899 WHIRLPOOL b1960bb84aa4570df95869c8c3236311632e38ed9f87ab0a9f3d5983380ba84f489be7f2db7171d9b434b73b2d454e23812434df6d3113510c88adc941794b79
-MISC ChangeLog 1120 SHA256 b585173262c2a7115d4d63e88b94ab186b3ade063ac6b5c7636d187d0f53e98d SHA512 e00d64303a71ac9ee736320a4bd110deca6c59b315fb5cb016cf7f9bc606728379d7884cfedb3a4a8089ccd8a112a3b05a0bfacefc7ac9dea3b2a5edeaad56d8 WHIRLPOOL 2ef8074af18e624b9108eb7baef28b0008e795fa27bf23c73402eef1f253ac17da6f071b3397e4be71b4f662c9c2a2dd7e180c1a3f0c9946ae254a064ca03a56
+MISC ChangeLog 1251 SHA256 f93fd9deb1d47dd2b61fcc3aea9bde576d6c520d5fa12ffc0dc7e233edf0da0b SHA512 fc41791392649de64194f308248905d665c766788ff8ef36f1cac923e3fbd3d6221b83cf0d142ab138876274d6975ff8e6679a6fb947bb4ef33a2b18f87342c5 WHIRLPOOL 8ca1d8d8d96ce66f0eb8807b12123d79886207f51aa1bf06141aa5a82cc9f862ecc2640871549f1f821e7c444cbb47d675d64e8b0c5741530c8a7ccc499154b2
 MISC metadata.xml 205 SHA256 132e3db1188fcdf8aa6467bde8677e24fc63015666de6104a656a5b074932454 SHA512 e53c51c47b6f2ba5302d5fe6ee9524fe49c69d2b03d66aa0a3054185c7c0a83dedeec75ea15424afe22f1423d72c5bbc1c1e07c6bdbdd1912d8eb8e046a4ef58 WHIRLPOOL 5f4c6dfd2f9dae15971877f2eb53c1d9f6196a42dc62b2d95ffd2060f119d7e0794541b3d8ca565f9ca48479325d19864f74a85289c83d5a5e2396f9144d161c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJUrn0HXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirQEMP/1Z6tcn0WjTT2l99TDnQ+zj/
-1xYSRlkXqI0uf2MEh/88CnJEEeFkPRezjxHa9voLCWKXo1VDPxOtT2h9k3NoMBv+
-9mVfZb1GRt0kMoYV+v83aRQ9W9nWWTbbaJnECWTioxz9ojzlN60eh+2rZOWXGn3x
-Qodhzp/dNk/qyjHv6vUuNLcKBN5HM7sO/j0hiZszoi5Rrq630RaDVbn47sWMYnF1
-8FFgbdihIyffBEk9weCbPO9E3P1waOeXL2uhKXxOlKea9mr5MW2sraMYLcRShPji
-YrOEFRczJ31QSZI3g1ocy+He8xFk8MmboxVt1lyHOX7opK4PbNFgeDiv419Bh6Ha
-ew06dRXCHIMF47halPl8iH1FDV7d3VKyq/rxsFzOMAb+mDh1DuIaznGYBqFoqwOe
-E/kG7aKFum/ORVsg0a5ELI67LAkvH07GAX9kCgdZN9CEtXYoRS3XMih/6IXjfA7G
-Ucg2aOxE/h1TJZ3hEAXMxIx47pUx2y5RYCvhbb84GY3oxc0owTPJoSeIehvyiAfc
-iY7SjwrwXcAx1z5OOmsjghfEIji5jiUF9h8oxNNxZe94OGQmUhn5Aa2G/wZrMg2F
-XW3HcUnbvqO4phcyFf+HDBhceu6y+h/H03Y9beTYP9yv1UQyUFZKWHCfU2MNxNp9
-/r0EHuUiEGHavMhgfW1+
-=aXwh
+iQEcBAEBCAAGBQJVFcYPAAoJEO1RxJ84ipLkO3MIAKkeZGKcVZ6dxSlALh1tZZJK
+OKjBnMAKqS6jN1hWzA4YHLTZ/ousR2LiAJS/WRHlXab9YSofb3fIscFTGPk/oBlw
+YcaYn73KyQpeWV/5Tmbtm0/aiN6o2a786rVswukd5FMsjBnF3Igol68NosT27CHS
+N/H9Jo3Lqki8QGSUjw+JZ989RzvVKThuswCYOLzVRkJIKEJQFIho+1I6kS1JNHsR
+IOBZEzbvQ7Urkt4l5WnsNeHSqBHT9sLDxO+UNbk0+crsV1I61qoXiO/c63OAr/cO
+FTQ8eGWJlwAPIwy4URLM0nMxfN+ihY5OG+6Z6ZkiPxXUFKIylhsRStbsJwdvB2Q=
+=Mldj
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/Fiona/files/scriptname.patch b/sci-libs/Fiona/files/scriptname.patch
new file mode 100644
index 000000000000..511c14555720
--- /dev/null
+++ b/sci-libs/Fiona/files/scriptname.patch
@@ -0,0 +1,11 @@
+--- setup.py.orig	2015-03-27 21:34:22.790592037 +0100
++++ setup.py	2015-03-27 21:34:54.247259049 +0100
+@@ -150,7 +150,7 @@
+     packages=['fiona', 'fiona.fio'],
+     entry_points='''
+         [console_scripts]
+-        fio=fiona.fio.fio:cli
++        fiona=fiona.fio.fio:cli
+         ''',
+     install_requires=requirements,
+     tests_require=['nose'],