From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ABC95138334 for ; Sun, 29 Dec 2019 08:53:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8032FE0C38; Sun, 29 Dec 2019 08:53:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 572CAE0C38 for ; Sun, 29 Dec 2019 08:53:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C74E634DCB5 for ; Sun, 29 Dec 2019 08:53:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A2F0B0 for ; Sun, 29 Dec 2019 08:53:26 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1577609593.9775c9b0099272ca62b7cdf062b2902c96dd873e.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/Shapely/files/, sci-libs/Shapely/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/Shapely/Manifest sci-libs/Shapely/Shapely-1.3.0.ebuild sci-libs/Shapely/Shapely-1.3.2.ebuild sci-libs/Shapely/Shapely-1.5.17.ebuild sci-libs/Shapely/Shapely-1.6.4_p2.ebuild sci-libs/Shapely/files/setup_unicode.patch X-VCS-Directories: sci-libs/Shapely/ sci-libs/Shapely/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 9775c9b0099272ca62b7cdf062b2902c96dd873e X-VCS-Branch: master Date: Sun, 29 Dec 2019 08:53:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a9d6888a-862b-41c5-925b-134f170e5e37 X-Archives-Hash: 3dfd61ccde7a6f291e598952d84ce9ac commit: 9775c9b0099272ca62b7cdf062b2902c96dd873e Author: David Seifert gentoo org> AuthorDate: Sun Dec 29 08:53:13 2019 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Dec 29 08:53:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9775c9b0 sci-libs/Shapely: Remove old Package-Manager: Portage-2.3.83, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> sci-libs/Shapely/Manifest | 2 -- sci-libs/Shapely/Shapely-1.3.0.ebuild | 29 ---------------- sci-libs/Shapely/Shapely-1.3.2.ebuild | 29 ---------------- sci-libs/Shapely/Shapely-1.5.17.ebuild | 33 ------------------ sci-libs/Shapely/Shapely-1.6.4_p2.ebuild | 54 ------------------------------ sci-libs/Shapely/files/setup_unicode.patch | 23 ------------- 6 files changed, 170 deletions(-) diff --git a/sci-libs/Shapely/Manifest b/sci-libs/Shapely/Manifest index ab1a676fbf8..b64bd533a44 100644 --- a/sci-libs/Shapely/Manifest +++ b/sci-libs/Shapely/Manifest @@ -1,4 +1,2 @@ -DIST Shapely-1.3.0.tar.gz 118863 BLAKE2B 6a35060b6593519b62b479fdb21047e0a44976109e27a55dbdf7583952666c8cfecf775975be54701696d57d3c5b1082110dd474df265ccf5b467acddcd2a629 SHA512 106f9773a5b00e7269a84c760f3a2b867c48139c48eebeecd524c8216d75c28daaf46eff45c118c1809999e33a317e9aca278a8d83605dc7273877a7ed3edd82 -DIST Shapely-1.3.2.tar.gz 120179 BLAKE2B bc10e017a546e715c05c4edb1aab4f86cb0fd6f1f35ab23f1d8dcdf402c96bbbbaca92668cf9bc788387dac8cabd958cfa3ffff5a90045f2f2a7a6798383cb2d SHA512 23d65c5a7137726e05e0399dc49f05e5ad9b582d4adcdf30215f72ae75989e85daf30ea2a5010d6a5a086cb6bbb5b4599b5065080b845c833776812f6e46566d DIST Shapely-1.5.17.tar.gz 180663 BLAKE2B 1a41de8c264989abeac27fe9b63abd81ad6f03f0eecd313131d04190b8bbebc6c6bd6b45b1782fbfd163025cda4977b7e93a24a711c76fddfaedb0fe880cea53 SHA512 eea241942ffbf377001445fab4017c9a2746d6bc0baa6c801a08ca95e608bbdaea7ad9568f00cbecdb559e634402bc6d213ebccb4074e59325e1cc4b3771626d DIST Shapely-1.6.4.post2.tar.gz 225745 BLAKE2B 96e995db6dd1464bac7c2562efdc7f298a5f23c388e44f334db685b1cfa1025ff403db870e11328977a267483726504e03b6d7c47fe4234a3a5966a13b2b7311 SHA512 027c816ef2104f654569ca658b52b87c60e5ba6a45927fcc51c23dd1922f3f9f7fdcea3601160b0a999e39611617142833ccac790777093be8b96a0d9083f78f diff --git a/sci-libs/Shapely/Shapely-1.3.0.ebuild b/sci-libs/Shapely/Shapely-1.3.0.ebuild deleted file mode 100644 index 4ea83ff68b9..00000000000 --- a/sci-libs/Shapely/Shapely-1.3.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Geometric objects, predicates, and operations" -HOMEPAGE="https://pypi.org/project/Shapely/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=sci-libs/geos-3.1" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pytest[${PYTHON_USEDEP}] )" - -PATCHES=( "${FILESDIR}"/setup_unicode.patch ) - -python_test() { - esetup.py test -} diff --git a/sci-libs/Shapely/Shapely-1.3.2.ebuild b/sci-libs/Shapely/Shapely-1.3.2.ebuild deleted file mode 100644 index 4ea83ff68b9..00000000000 --- a/sci-libs/Shapely/Shapely-1.3.2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Geometric objects, predicates, and operations" -HOMEPAGE="https://pypi.org/project/Shapely/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=sci-libs/geos-3.1" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pytest[${PYTHON_USEDEP}] )" - -PATCHES=( "${FILESDIR}"/setup_unicode.patch ) - -python_test() { - esetup.py test -} diff --git a/sci-libs/Shapely/Shapely-1.5.17.ebuild b/sci-libs/Shapely/Shapely-1.5.17.ebuild deleted file mode 100644 index a6993a3d6fc..00000000000 --- a/sci-libs/Shapely/Shapely-1.5.17.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_5} ) - -inherit distutils-r1 - -DESCRIPTION="Geometric objects, predicates, and operations" -HOMEPAGE="https://pypi.org/project/Shapely/" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=sci-libs/geos-3.1" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pytest[${PYTHON_USEDEP}] )" - -python_test() { - esetup.py test -} diff --git a/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild b/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild deleted file mode 100644 index 7b76620b730..00000000000 --- a/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) - -inherit distutils-r1 eapi7-ver - -DESCRIPTION="Geometric objects, predicates, and operations" -HOMEPAGE="https://pypi.org/project/Shapely/" - -MY_PV="$(ver_cut 1-3).post$(ver_cut 5)" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=sci-libs/geos-3.3 - dev-python/numpy[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/cython[${PYTHON_USEDEP}] - test? ( dev-python/pytest[${PYTHON_USEDEP}] )" - -PATCHES=( "${FILESDIR}/${P}-test_operations.patch" ) # bug 701624 - -S="${WORKDIR}/${PN}-${MY_PV}" - -python_prepare_all() { - # fix install path for Cython definition file - sed -i \ - -e "s|\(data_files.*\)'shapely'|\1'share/shapely'|" \ - setup.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - distutils_install_for_testing - cd "${TEST_DIR}/lib" || die - cp -r "${S}/tests" . || die - py.test tests || die -} diff --git a/sci-libs/Shapely/files/setup_unicode.patch b/sci-libs/Shapely/files/setup_unicode.patch deleted file mode 100644 index 89e1b058f0f..00000000000 --- a/sci-libs/Shapely/files/setup_unicode.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- setup.py.orig 2014-06-20 10:27:26.638779565 +0200 -+++ setup.py 2014-06-20 10:27:29.885446151 +0200 -@@ -1,4 +1,5 @@ - #!/usr/bin/env python -+# -*- coding: utf-8 -*- - - from __future__ import print_function - -@@ -74,8 +75,12 @@ - readme_text = fp.read() - readme_text = readme_text.replace(".. include:: CREDITS.txt", "") - --with open('CREDITS.txt', 'r') as fp: -- credits = fp.read() -+if sys.version_info[0] == 3: -+ with open('CREDITS.txt', 'r', encoding='utf-8') as fp: -+ credits = fp.read() -+elif sys.version_info[0] == 2: -+ with open('CREDITS.txt', 'r') as fp: -+ credits = fp.read().decode('utf-8') - - with open('CHANGES.txt', 'r') as fp: - changes_text = fp.read()