Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/dynd-python/
Date: Thu, 30 Jan 2020 21:26:21
Message-Id: 1580419560.e02bde266118baee69989e87472db01bccf9df23.mgorny@gentoo
1 commit: e02bde266118baee69989e87472db01bccf9df23
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 30 21:04:27 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 30 21:26:00 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e02bde26
7
8 dev-python/dynd-python: Combine both ebuilds (remove py2)
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/dynd-python/dynd-python-0.7.2-r1.ebuild | 60 ----------------------
13 dev-python/dynd-python/dynd-python-0.7.2-r2.ebuild | 2 +-
14 2 files changed, 1 insertion(+), 61 deletions(-)
15
16 diff --git a/dev-python/dynd-python/dynd-python-0.7.2-r1.ebuild b/dev-python/dynd-python/dynd-python-0.7.2-r1.ebuild
17 deleted file mode 100644
18 index 019d4022e49..00000000000
19 --- a/dev-python/dynd-python/dynd-python-0.7.2-r1.ebuild
20 +++ /dev/null
21 @@ -1,60 +0,0 @@
22 -# Copyright 1999-2020 Gentoo Authors
23 -# Distributed under the terms of the GNU General Public License v2
24 -
25 -EAPI=6
26 -
27 -PYTHON_COMPAT=( python2_7 python3_6 )
28 -
29 -inherit distutils-r1
30 -
31 -# change each new dynd version, to avoid git in tree dependency
32 -DYND_PYTHON_GIT_SHA1=8cdef57e71c784d7fe1f3f97a2ce2ce5727a89f1
33 -
34 -DESCRIPTION="Python exposure of multidimensionnal array library libdynd"
35 -HOMEPAGE="http://libdynd.org/"
36 -SRC_URI="https://github.com/libdynd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
37 -
38 -LICENSE="BSD"
39 -SLOT="0"
40 -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
41 -IUSE="doc test"
42 -RESTRICT="!test? ( test )"
43 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
44 -
45 -RDEPEND="
46 - ${PYTHON_DEPS}
47 - ~dev-libs/libdynd-${PV}
48 - dev-python/numpy[${PYTHON_USEDEP}]
49 -"
50 -DEPEND="${RDEPEND}
51 - dev-python/cython[${PYTHON_USEDEP}]
52 - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
53 - test? ( dev-python/nose[${PYTHON_USEDEP}] )
54 -"
55 -
56 -python_prepare_all() {
57 - # remove the version mangling from git stuff it requires a git clone
58 - # rather force set it a configure time
59 - sed -e "/--dirty/s/ver =.*/ver = 'v${PV}'/" \
60 - -e '/--always/d' \
61 - -i setup.py || die
62 - sed -e "s/get_git.*/set(DYND_PYTHON_GIT_SHA1 ${DYND_PYTHON_GIT_SHA1})/" \
63 - -e "s/git_describe.*/set(DYND_PYTHON_VERSION_STRING v${PV})/" \
64 - -e 's|-g -fomit-frame-pointer||' \
65 - -e 's|-Werror||g' \
66 - -i CMakeLists.txt || die
67 -
68 - distutils-r1_python_prepare_all
69 -}
70 -
71 -python_compile_all() {
72 - if use doc; then
73 - emake -C docs html
74 - HTML_DOCS=( docs/build/html/. )
75 - fi
76 -}
77 -
78 -python_test() {
79 - cd "${BUILD_DIR}/lib" || die
80 - PYTHONPATH=${BUILD_DIR}/lib nosetests -v || die
81 -}
82
83 diff --git a/dev-python/dynd-python/dynd-python-0.7.2-r2.ebuild b/dev-python/dynd-python/dynd-python-0.7.2-r2.ebuild
84 index 190b19a824e..7fe6afddb27 100644
85 --- a/dev-python/dynd-python/dynd-python-0.7.2-r2.ebuild
86 +++ b/dev-python/dynd-python/dynd-python-0.7.2-r2.ebuild
87 @@ -15,7 +15,7 @@ SRC_URI="https://github.com/libdynd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
88
89 LICENSE="BSD"
90 SLOT="0"
91 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
92 +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
93 IUSE="doc test"
94 RESTRICT="!test? ( test )"
95 REQUIRED_USE="${PYTHON_REQUIRED_USE}"