summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-01-08 12:50:15 +0000
committerJustin Lecher <jlec@gentoo.org>2015-01-08 12:50:15 +0000
commit18b7a59b139fa06aa7278a7fb97ab6a77d02548d (patch)
treed8461ef0d4305e6de74d19fe333e13280fd0736f /sci-libs
parentResolve file collision for sci-libs/Fiona between SLOTs (diff)
downloadhistorical-18b7a59b139fa06aa7278a7fb97ab6a77d02548d.tar.gz
historical-18b7a59b139fa06aa7278a7fb97ab6a77d02548d.tar.bz2
historical-18b7a59b139fa06aa7278a7fb97ab6a77d02548d.zip
sci-libs/Fiona: Fix SLOTs and dependencies
Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB!
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/Fiona/ChangeLog8
-rw-r--r--sci-libs/Fiona/Fiona-1.1.6.ebuild20
-rw-r--r--sci-libs/Fiona/Fiona-1.4.1.ebuild20
-rw-r--r--sci-libs/Fiona/Fiona-9999.ebuild28
-rw-r--r--sci-libs/Fiona/Manifest30
5 files changed, 62 insertions, 44 deletions
diff --git a/sci-libs/Fiona/ChangeLog b/sci-libs/Fiona/ChangeLog
index 19a0271bb768..2eb06e7c2ff5 100644
--- a/sci-libs/Fiona/ChangeLog
+++ b/sci-libs/Fiona/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/Fiona
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/Fiona/ChangeLog,v 1.5 2014/11/28 14:51:24 pacho Exp $
+# 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 $
+
+ 08 Jan 2015; Justin Lecher <jlec@gentoo.org> Fiona-1.1.6.ebuild,
+ Fiona-1.4.1.ebuild, Fiona-9999.ebuild:
+ Fix SLOTs and dependencies
28 Nov 2014; Pacho Ramos <pacho@gentoo.org> Fiona-1.1.6.ebuild,
Fiona-9999.ebuild:
diff --git a/sci-libs/Fiona/Fiona-1.1.6.ebuild b/sci-libs/Fiona/Fiona-1.1.6.ebuild
index c7c1771f5e0c..f6c98b70d10b 100644
--- a/sci-libs/Fiona/Fiona-1.1.6.ebuild
+++ b/sci-libs/Fiona/Fiona-1.1.6.ebuild
@@ -1,30 +1,32 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.1.6.ebuild,v 1.2 2014/11/28 14:51:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/Fiona/Fiona-1.1.6.ebuild,v 1.3 2015/01/08 12:50:14 jlec Exp $
EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{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="1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
IUSE="test"
RDEPEND=">=sci-libs/gdal-1.8"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
- test? ( dev-python/nose )
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )
${PYTHON_DEPS}"
python_test() {
esetup.py test
-} \ No newline at end of file
+}
diff --git a/sci-libs/Fiona/Fiona-1.4.1.ebuild b/sci-libs/Fiona/Fiona-1.4.1.ebuild
index f1d9fa6ee901..d9c53c3910cd 100644
--- a/sci-libs/Fiona/Fiona-1.4.1.ebuild
+++ b/sci-libs/Fiona/Fiona-1.4.1.ebuild
@@ -1,30 +1,32 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.1 2014/10/07 08:14:10 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/Fiona/Fiona-1.4.1.ebuild,v 1.2 2015/01/08 12:50:14 jlec Exp $
EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{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="1.4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
IUSE="test"
RDEPEND=">=sci-libs/gdal-1.8"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
- test? ( dev-python/nose )
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )
${PYTHON_DEPS}"
python_test() {
esetup.py test
-} \ No newline at end of file
+}
diff --git a/sci-libs/Fiona/Fiona-9999.ebuild b/sci-libs/Fiona/Fiona-9999.ebuild
index 6ec8fe88fcbd..0557b7123c76 100644
--- a/sci-libs/Fiona/Fiona-9999.ebuild
+++ b/sci-libs/Fiona/Fiona-9999.ebuild
@@ -1,34 +1,32 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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-9999.ebuild,v 1.3 2014/11/28 14:51:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/Fiona/Fiona-9999.ebuild,v 1.4 2015/01/08 12:50:14 jlec Exp $
EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_3,3_4} )
-inherit distutils-r1
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 git-r3
DESCRIPTION="Fiona is OGR's neat, nimble, no-nonsense API"
HOMEPAGE="https://pypi.python.org/pypi/Fiona"
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- SRC_URI=""
- EGIT_REPO_URI="http://github.com/Toblerity/${PN}.git"
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
+SRC_URI=""
+EGIT_REPO_URI="http://github.com/Toblerity/${PN}.git"
LICENSE="BSD"
SLOT="0"
+KEYWORDS=""
IUSE="test"
RDEPEND=">=sci-libs/gdal-1.8"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
- test? ( dev-python/nose )
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )
+ ${PYTHON_DEPS}"
python_test() {
esetup.py test
diff --git a/sci-libs/Fiona/Manifest b/sci-libs/Fiona/Manifest
index 4774f0959911..6d59a2bf9c36 100644
--- a/sci-libs/Fiona/Manifest
+++ b/sci-libs/Fiona/Manifest
@@ -1,17 +1,29 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
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 758 SHA256 2dc5be637356a8443a3792dd213e99b94b53afd5090c3bcad00f87acb106df5f SHA512 ee874a7a95ef6d9c0d0b4d72d8f54bc18ce6a52223582aa7e582313a223bc4bc4f58670bd69f747cfe912779a0ecfd59d62ef2a4cf8246617c9b8fb1debc6576 WHIRLPOOL 262e8765488e3b159e80471b1db56c30d6491ad351900ca71b024d65f72fbb046a8cb385eef5bb8938cb02f59cdfc304fe13192c4c142caabe17c6cf62d1d5cc
-EBUILD Fiona-1.4.1.ebuild 757 SHA256 f572b42417602b27fea23f82cebccaa5c2b256952426fdd2eab96e4ae9664c73 SHA512 1930c10b2eef342e4e288b36ed19df51de73793946ac345cd973248a2d2bfa4916fbc0ba2ddd9cd6cbd1de51a29556c2f9cbb18fbbaf52e833c0a7f7bc269b4f WHIRLPOOL 7df80ce983c41952e7f18565bc792c824ba2ea9253cd197919656aa565bc5dc9e33e7dde571f688e0abc4c0501dfb19814268c7ee8bae5e9c10b410253cae606
-EBUILD Fiona-9999.ebuild 865 SHA256 be16c8e7710e4fe411e0a2c52a520763d3b1ebed9fd3445707c6fd5ba715b3ba SHA512 0070e8e4b93cdd0ecdf7954fe157b08491c1cb35ea5e16b8065b65a831c8063a5ed61a4a4fffcb2b1d3784c39d5fca6b04960f42d05708f8349da81f8455b74a WHIRLPOOL 7fc53db86dba46d4d6ee577f570002fd8a4c57fcfff499324d5e02732c9b33f9cfe09633a2fa98cca1ad1bc929dba8d7bdc45f2651006e4c93e140781a2ec52f
-MISC ChangeLog 983 SHA256 def798f266d1466ef27a229089b7bfa7107b8073b29597a089e690ae83047b8d SHA512 524decbd9faf39ae4aaedc466d76414b14b416cfa8b5364e2d552ea1b0bb815826b8e576d6335f278f2e7cddfaa27bfb653396910cad5e92ec15c44c32486324 WHIRLPOOL a20c1cb318e7996a4aa07a8fc2701cd5b6646c0e72a67255f70ebeee71e78f51eb1e4b171155b7495868937967d6e5932a731deb9b397dd5ccd53ccecf9c7745
+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-9999.ebuild 777 SHA256 2e783c4915b1fe3b3962f59249359c79e7e85795badab841885ba890688a9cb9 SHA512 ddd5e8b0be90984b107ce0d057aa1b39ec8bd37ba99228aeeb6ce1cd37c403b63c1e66743d6064eacbf0ed4452342355422c31f3ecd64d13a49e7d439f8df899 WHIRLPOOL b1960bb84aa4570df95869c8c3236311632e38ed9f87ab0a9f3d5983380ba84f489be7f2db7171d9b434b73b2d454e23812434df6d3113510c88adc941794b79
+MISC ChangeLog 1120 SHA256 b585173262c2a7115d4d63e88b94ab186b3ade063ac6b5c7636d187d0f53e98d SHA512 e00d64303a71ac9ee736320a4bd110deca6c59b315fb5cb016cf7f9bc606728379d7884cfedb3a4a8089ccd8a112a3b05a0bfacefc7ac9dea3b2a5edeaad56d8 WHIRLPOOL 2ef8074af18e624b9108eb7baef28b0008e795fa27bf23c73402eef1f253ac17da6f071b3397e4be71b4f662c9c2a2dd7e180c1a3f0c9946ae254a064ca03a56
MISC metadata.xml 205 SHA256 132e3db1188fcdf8aa6467bde8677e24fc63015666de6104a656a5b074932454 SHA512 e53c51c47b6f2ba5302d5fe6ee9524fe49c69d2b03d66aa0a3054185c7c0a83dedeec75ea15424afe22f1423d72c5bbc1c1e07c6bdbdd1912d8eb8e046a4ef58 WHIRLPOOL 5f4c6dfd2f9dae15971877f2eb53c1d9f6196a42dc62b2d95ffd2060f119d7e0794541b3d8ca565f9ca48479325d19864f74a85289c83d5a5e2396f9144d161c
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
-iEYEAREIAAYFAlR4i+0ACgkQCaWpQKGI+9RJtACeKEa3YqnGJBx4M3snRNVo6TuE
-j8IAn2RCJT+h5lNt7ZtyUb2HyPsnNOmb
-=zHlf
+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
-----END PGP SIGNATURE-----