Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/sip/
Date: Sat, 16 Nov 2019 19:28:07
Message-Id: 1573932475.ef08b35309527204ad3db45bc23abc3cdbaa4a10.pesa@gentoo
1 commit: ef08b35309527204ad3db45bc23abc3cdbaa4a10
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 16 18:30:52 2019 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 16 19:27:55 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef08b353
7
8 dev-python/sip: remove 4.19.13 and 4.19.18
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.18
11 Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
12
13 dev-python/sip/Manifest | 2 -
14 dev-python/sip/sip-4.19.13.ebuild | 116 --------------------------------------
15 dev-python/sip/sip-4.19.18.ebuild | 98 --------------------------------
16 3 files changed, 216 deletions(-)
17
18 diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
19 index 31ae5386cf6..32a7a27c781 100644
20 --- a/dev-python/sip/Manifest
21 +++ b/dev-python/sip/Manifest
22 @@ -1,4 +1,2 @@
23 -DIST sip-4.19.13.tar.gz 1038815 BLAKE2B 0b6f2941140a535cfdfb51db71cf9a55e5f65be85961e304496fded7781da42b0ab7d01045b8802468a3ce3b57e7f571851fc7713fd47a03c8344017982d6632 SHA512 eb456e1f7efa463f859047acc5301e19279e1627629d0bad3ac7a0a52b77575126bc3f2c64bb4278ae11d415c13d2731dfc8c816bba71307173d393a414aae98
24 DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
25 -DIST sip-4.19.18.tar.gz 1056840 BLAKE2B 6c674405e28a64c9db635deca8a00ed78bf52d2551ed578a57d31ae96071ca77ba49e3fc92329942ca61de78bc98049694cc48ef54ea645819fc48f2fae56060 SHA512 e3c58cc6c38b277b3b9fd7adf33df91b47e0385e59d52c543e630a194d73d04d91e0a3845cb3973d1955f77049e75246fa7e6f544e02e1efe0086a297cf1d887
26 DIST sip-4.19.19.tar.gz 1058422 BLAKE2B 9c27e636a55699e8bf9c9caba9227e3ff9c8476dfd86d4bb8b0b53c9db95d28441d1ac03a0d20a71468d39e5f21066475018cff93b96281b3904f6a619304f92 SHA512 396c625f59ccef67c2e94221b26dd4ed5d536652a9b63a9f23b340ddf16adf34c6bdb0fbd7c0c1cc403e1d59e8ebf716b478a24bade66a2703fcc5f00b62533d
27
28 diff --git a/dev-python/sip/sip-4.19.13.ebuild b/dev-python/sip/sip-4.19.13.ebuild
29 deleted file mode 100644
30 index 6a061b393ff..00000000000
31 --- a/dev-python/sip/sip-4.19.13.ebuild
32 +++ /dev/null
33 @@ -1,116 +0,0 @@
34 -# Copyright 1999-2019 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
40 -
41 -inherit python-r1 toolchain-funcs
42 -
43 -DESCRIPTION="Python extension module generator for C and C++ libraries"
44 -HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
45 -
46 -if [[ ${PV} == *9999 ]]; then
47 - inherit mercurial
48 - EHG_REPO_URI="https://www.riverbankcomputing.com/hg/sip"
49 -elif [[ ${PV} == *_pre* ]]; then
50 - MY_P=${P/_pre/.dev}
51 - SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
52 - S=${WORKDIR}/${MY_P}
53 -else
54 - SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${PN}/${PV}/${P}.tar.gz"
55 -fi
56 -
57 -# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
58 -SLOT="0/12"
59 -LICENSE="|| ( GPL-2 GPL-3 SIP )"
60 -KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
61 -IUSE="debug doc"
62 -
63 -RDEPEND="${PYTHON_DEPS}"
64 -DEPEND="${RDEPEND}"
65 -if [[ ${PV} == *9999 ]]; then
66 - DEPEND+="
67 - sys-devel/bison
68 - sys-devel/flex
69 - doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )"
70 -fi
71 -
72 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
73 -if [[ ${PV} == *9999 ]]; then
74 - REQUIRED_USE+=" || ( $(python_gen_useflags 'python2*') )"
75 -fi
76 -
77 -PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
78 -
79 -src_prepare() {
80 - if [[ ${PV} == *9999 ]]; then
81 - python_setup 'python2*'
82 - "${PYTHON}" build.py prepare || die
83 - if use doc; then
84 - "${PYTHON}" build.py doc || die
85 - fi
86 - fi
87 -
88 - # Sub-slot sanity check
89 - local sub_slot=${SLOT#*/}
90 - local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
91 - if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
92 - eerror
93 - eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
94 - eerror "Please update SLOT variable as follows:"
95 - eerror " SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
96 - eerror
97 - die "sub-slot sanity check failed"
98 - fi
99 -
100 - default
101 -}
102 -
103 -src_configure() {
104 - configuration() {
105 - if ! python_is_python3; then
106 - local CFLAGS="${CFLAGS} -fno-strict-aliasing"
107 - fi
108 -
109 - local myconf=(
110 - "${PYTHON}"
111 - "${S}"/configure.py
112 - --bindir="${EPREFIX}/usr/bin"
113 - --destdir="$(python_get_sitedir)"
114 - --incdir="$(python_get_includedir)"
115 - $(usex debug --debug '')
116 - AR="$(tc-getAR) cqs"
117 - CC="$(tc-getCC)"
118 - CFLAGS="${CFLAGS}"
119 - CFLAGS_RELEASE=
120 - CXX="$(tc-getCXX)"
121 - CXXFLAGS="${CXXFLAGS}"
122 - CXXFLAGS_RELEASE=
123 - LINK="$(tc-getCXX)"
124 - LINK_SHLIB="$(tc-getCXX)"
125 - LFLAGS="${LDFLAGS}"
126 - LFLAGS_RELEASE=
127 - RANLIB=
128 - STRIP=
129 - )
130 - echo "${myconf[@]}"
131 - "${myconf[@]}" || die
132 - }
133 - python_foreach_impl run_in_build_dir configuration
134 -}
135 -
136 -src_compile() {
137 - python_foreach_impl run_in_build_dir default
138 -}
139 -
140 -src_install() {
141 - installation() {
142 - emake DESTDIR="${D}" install
143 - python_optimize
144 - }
145 - python_foreach_impl run_in_build_dir installation
146 -
147 - einstalldocs
148 - use doc && dodoc -r doc/html
149 -}
150
151 diff --git a/dev-python/sip/sip-4.19.18.ebuild b/dev-python/sip/sip-4.19.18.ebuild
152 deleted file mode 100644
153 index dc7d5ca70d8..00000000000
154 --- a/dev-python/sip/sip-4.19.18.ebuild
155 +++ /dev/null
156 @@ -1,98 +0,0 @@
157 -# Copyright 1999-2019 Gentoo Authors
158 -# Distributed under the terms of the GNU General Public License v2
159 -
160 -EAPI=7
161 -
162 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
163 -inherit python-r1 toolchain-funcs
164 -
165 -DESCRIPTION="Python extension module generator for C and C++ libraries"
166 -HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
167 -
168 -MY_PN=sip
169 -MY_P=${MY_PN}-${PV/_pre/.dev}
170 -if [[ ${PV} == *_pre* ]]; then
171 - SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
172 -else
173 - SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
174 -fi
175 -
176 -# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
177 -SLOT="0/12"
178 -LICENSE="|| ( GPL-2 GPL-3 SIP )"
179 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
180 -IUSE="doc"
181 -
182 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
183 -
184 -DEPEND="${PYTHON_DEPS}"
185 -RDEPEND="${DEPEND}"
186 -
187 -S=${WORKDIR}/${MY_P}
188 -
189 -PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
190 -
191 -src_prepare() {
192 - # Sub-slot sanity check
193 - local sub_slot=${SLOT#*/}
194 - local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
195 - if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
196 - eerror
197 - eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
198 - eerror "Please update SLOT variable as follows:"
199 - eerror " SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
200 - eerror
201 - die "sub-slot sanity check failed"
202 - fi
203 -
204 - default
205 -}
206 -
207 -src_configure() {
208 - configuration() {
209 - if ! python_is_python3; then
210 - local CFLAGS="${CFLAGS} -fno-strict-aliasing"
211 - fi
212 -
213 - local incdir=$(python_get_includedir)
214 - local myconf=(
215 - "${PYTHON}"
216 - "${S}"/configure.py
217 - --sysroot="${ESYSROOT}/usr"
218 - --bindir="${EPREFIX}/usr/bin"
219 - --destdir="$(python_get_sitedir)"
220 - --incdir="${incdir#${SYSROOT}}"
221 - AR="$(tc-getAR) cqs"
222 - CC="$(tc-getCC)"
223 - CFLAGS="${CFLAGS}"
224 - CFLAGS_RELEASE=
225 - CXX="$(tc-getCXX)"
226 - CXXFLAGS="${CXXFLAGS}"
227 - CXXFLAGS_RELEASE=
228 - LINK="$(tc-getCXX)"
229 - LINK_SHLIB="$(tc-getCXX)"
230 - LFLAGS="${LDFLAGS}"
231 - LFLAGS_RELEASE=
232 - RANLIB=
233 - STRIP=
234 - )
235 - echo "${myconf[@]}"
236 - "${myconf[@]}" || die
237 - }
238 - python_foreach_impl run_in_build_dir configuration
239 -}
240 -
241 -src_compile() {
242 - python_foreach_impl run_in_build_dir default
243 -}
244 -
245 -src_install() {
246 - installation() {
247 - emake DESTDIR="${D}" install
248 - python_optimize
249 - }
250 - python_foreach_impl run_in_build_dir installation
251 -
252 - einstalldocs
253 - use doc && dodoc -r doc/html
254 -}