Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/sip/, dev-python/sip/files/
Date: Sun, 01 Jan 2017 14:20:44
Message-Id: 1483280428.652f805fcb91f5115757bd9519cb7a18233e8abd.kensington@gentoo
1 commit: 652f805fcb91f5115757bd9519cb7a18233e8abd
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 1 14:15:12 2017 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 1 14:20:28 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=652f805f
7
8 dev-python/sip: remove old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-python/sip/Manifest | 2 -
13 dev-python/sip/files/sip-4.15.5-darwin.patch | 30 -------
14 dev-python/sip/sip-4.16.2.ebuild | 113 ---------------------------
15 dev-python/sip/sip-4.16.9.ebuild | 85 --------------------
16 4 files changed, 230 deletions(-)
17
18 diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
19 index dc68b0f..e835051 100644
20 --- a/dev-python/sip/Manifest
21 +++ b/dev-python/sip/Manifest
22 @@ -1,5 +1,3 @@
23 -DIST sip-4.16.2.tar.gz 793663 SHA256 a55a2324a46ab42e42ae57c52ef06583b17d25c987973fe2e7ff2e8a649294ce SHA512 07ced0188bd4dc897ddacbce226b33ac9d236455a95018e900fd5f652439c905ddd56688f8bb29f704fcf201a8e668d5cc89ba887065826653087cf0a9f6dbfb WHIRLPOOL 47c741f1b787ba147e7a299e3c93a7537f14f1b192726e39f3679d0b0e0a991df603509c5674f262311259d9ad2e1e845746d215d5ef70eb7b827c1557eb8b82
24 -DIST sip-4.16.9.tar.gz 957858 SHA256 dbe173aa566e26ca0bb5bcbc1d30ef780f416267bb3b5df48149a737ea6b0555 SHA512 f9e7deac3462f71e809fce29aea4b7e7e3d1acb7600252178459cfb9e09d1543e9a189bdc66c946c9d11c4a6f3175a6d6b306481cadab70ed7f17f6e7c328ddc WHIRLPOOL f4cfcb5ecc945332683bdcbd6913b87fc975f8e268e02e6bdeaadebf578e40f1e94a3c76cdb1ea3890ec969d1454560d58df01ba4ad507d914a300076365ade0
25 DIST sip-4.18.1.tar.gz 992624 SHA256 9bce7a2dbf7f105bf68ad1bab58eebc0ce33087ec40396da756463f086ffa290 SHA512 c4277fa113bf5e28d8a19388f160456654e4ccbbc2adc1209677e95e1efad427ce641ef09875ec0a59e555578986671261dd4c3ac52c673b5803f188fc311222 WHIRLPOOL 6250081ffda585dda7c7728fe1253a1791ef63d4798d02c752e1c5b58837d2c55dd87306c83202be03f96bd644bd5b17b3b1e28b5c06b28bb8a69dd23da2ee09
26 DIST sip-4.18.tar.gz 991980 SHA256 f1dc5c81c07a9ad97edcd4a0af964a41e420024ba7ca165afd2b351efd249cb6 SHA512 365fb51b8c833ebc923b87a961fac83976b653ebcec8fe7ad1543ee5a406471eb9309c8efbee6662c7b622f36771cd3ac31ede10208f23d2531a45af906d383d WHIRLPOOL 3cf3516483e62ed26fca1de6bc90e58a2bd04d3d66214b0f62eb4338c2b7a8a595d46952ef86cd7fa61e50b160a06b484a7d4f5997be2f2a7714b1edabaef2a4
27 DIST sip-4.19.tar.gz 1009474 SHA256 014bf55f653e0d8bcc582705ef4fbd61e0859a36e959ab46d8fa060cdf0b5e27 SHA512 0df39c2e004f5077439bdb4b4e463cdf0c141ce4e5dc65a957123801c122d6e3a30e238c0a77559d7202002a396d521be5517a8417b34c4092ab8319fa1d054c WHIRLPOOL b86f55750bc971d57420b24e1988f42e6974f7b222b1291c4def4ceb557c75e1c9cc15bbba27c7b99693fa0307aa171de6271acd7648cc6917cc0dc7b7486deb
28
29 diff --git a/dev-python/sip/files/sip-4.15.5-darwin.patch b/dev-python/sip/files/sip-4.15.5-darwin.patch
30 deleted file mode 100644
31 index b625d15..00000000
32 --- a/dev-python/sip/files/sip-4.15.5-darwin.patch
33 +++ /dev/null
34 @@ -1,30 +0,0 @@
35 -diff -ur sip-4.15.5.orig/siputils.py sip-4.15.5/siputils.py
36 ---- siputils.py 2014-02-21 18:31:35.000000000 +0800
37 -+++ siputils.py 2014-04-01 23:21:41.895036589 +0800
38 -@@ -945,8 +945,6 @@
39 - """
40 - if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
41 - plib = clib + ".lib"
42 -- elif sys.platform == "darwin" and framework:
43 -- plib = "-framework " + clib
44 - else:
45 - plib = "-l" + clib
46 -
47 -@@ -961,8 +959,6 @@
48 - """
49 - if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
50 - prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl")
51 -- elif sys.platform == "darwin" and framework:
52 -- prl_name = os.path.join(self.config.qt_lib_dir, clib + ".framework", clib + ".prl")
53 - else:
54 - prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl")
55 -
56 -@@ -1633,7 +1629,7 @@
57 - if sys.platform == "win32":
58 - ext = "pyd"
59 - elif sys.platform == "darwin":
60 -- ext = "so"
61 -+ ext = "bundle"
62 - elif sys.platform == "cygwin":
63 - ext = "dll"
64 - else:
65
66 diff --git a/dev-python/sip/sip-4.16.2.ebuild b/dev-python/sip/sip-4.16.2.ebuild
67 deleted file mode 100644
68 index 9298751..00000000
69 --- a/dev-python/sip/sip-4.16.2.ebuild
70 +++ /dev/null
71 @@ -1,113 +0,0 @@
72 -# Copyright 1999-2015 Gentoo Foundation
73 -# Distributed under the terms of the GNU General Public License v2
74 -# $Id$
75 -
76 -EAPI=5
77 -PYTHON_COMPAT=( python{2_7,3_4} )
78 -
79 -inherit eutils python-r1 toolchain-funcs
80 -
81 -DESCRIPTION="Python extension module generator for C and C++ libraries"
82 -HOMEPAGE="http://www.riverbankcomputing.co.uk/software/sip/intro https://pypi.python.org/pypi/SIP"
83 -LICENSE="|| ( GPL-2 GPL-3 SIP )"
84 -
85 -if [[ ${PV} == *9999* ]]; then
86 - # live version from mercurial repo
87 - EHG_REPO_URI="http://www.riverbankcomputing.com/hg/sip"
88 - inherit mercurial
89 -elif [[ ${PV} == *_pre* ]]; then
90 - # development snapshot
91 - HG_REVISION=
92 - MY_P=${PN}-${PV%_pre*}-snapshot-${HG_REVISION}
93 - SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
94 - S=${WORKDIR}/${MY_P}
95 -else
96 - # official release
97 - SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
98 -fi
99 -
100 -# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
101 -SLOT="0/11"
102 -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
103 -IUSE="debug doc"
104 -
105 -DEPEND="${PYTHON_DEPS}"
106 -RDEPEND="${DEPEND}"
107 -
108 -[[ ${PV} == *9999* ]] && DEPEND+="
109 - =dev-lang/python-2*
110 - sys-devel/bison
111 - sys-devel/flex
112 - doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )
113 -"
114 -
115 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
116 -
117 -src_prepare() {
118 - epatch "${FILESDIR}"/${PN}-4.15.5-darwin.patch
119 -
120 - if [[ ${PV} == *9999* ]]; then
121 - python2 build.py prepare || die
122 - if use doc; then
123 - python2 build.py doc || die
124 - fi
125 - fi
126 -
127 - # Sub-slot sanity check
128 - local sub_slot=${SLOT#*/}
129 - local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
130 - if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
131 - eerror
132 - eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
133 - eerror "Please update SLOT variable as follows:"
134 - eerror " SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
135 - eerror
136 - die "sub-slot sanity check failed"
137 - fi
138 -
139 - python_copy_sources
140 -}
141 -
142 -src_configure() {
143 - configuration() {
144 - local myconf=(
145 - "${PYTHON}" configure.py
146 - --bindir="${EPREFIX}/usr/bin"
147 - --destdir="$(python_get_sitedir)"
148 - --incdir="$(python_get_includedir)"
149 - --sipdir="${EPREFIX}/usr/share/sip"
150 - $(use debug && echo --debug)
151 - AR="$(tc-getAR) cqs"
152 - CC="$(tc-getCC)"
153 - CFLAGS="${CFLAGS}"
154 - CFLAGS_RELEASE=
155 - CXX="$(tc-getCXX)"
156 - CXXFLAGS="${CXXFLAGS}"
157 - CXXFLAGS_RELEASE=
158 - LINK="$(tc-getCXX)"
159 - LINK_SHLIB="$(tc-getCXX)"
160 - LFLAGS="${LDFLAGS}"
161 - LFLAGS_RELEASE=
162 - RANLIB=
163 - STRIP=
164 - )
165 - echo "${myconf[@]}"
166 - "${myconf[@]}"
167 - }
168 - python_foreach_impl run_in_build_dir configuration
169 -}
170 -
171 -src_compile() {
172 - python_foreach_impl run_in_build_dir default
173 -}
174 -
175 -src_install() {
176 - installation() {
177 - emake DESTDIR="${D}" install
178 - python_optimize
179 - }
180 - python_foreach_impl run_in_build_dir installation
181 -
182 - dodoc NEWS
183 - use doc && dohtml -r doc/html/*
184 -}
185
186 diff --git a/dev-python/sip/sip-4.16.9.ebuild b/dev-python/sip/sip-4.16.9.ebuild
187 deleted file mode 100644
188 index db18ecb..00000000
189 --- a/dev-python/sip/sip-4.16.9.ebuild
190 +++ /dev/null
191 @@ -1,85 +0,0 @@
192 -# Copyright 1999-2015 Gentoo Foundation
193 -# Distributed under the terms of the GNU General Public License v2
194 -# $Id$
195 -
196 -EAPI=5
197 -
198 -PYTHON_COMPAT=( python2_7 python3_{4,5} )
199 -
200 -inherit eutils python-r1 toolchain-funcs
201 -
202 -DESCRIPTION="Python extension module generator for C and C++ libraries"
203 -HOMEPAGE="http://www.riverbankcomputing.com/software/sip/intro https://pypi.python.org/pypi/SIP"
204 -SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
205 -
206 -# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
207 -SLOT="0/11"
208 -LICENSE="|| ( GPL-2 GPL-3 SIP )"
209 -KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
210 -IUSE="debug doc"
211 -
212 -RDEPEND="${PYTHON_DEPS}"
213 -DEPEND="${RDEPEND}"
214 -
215 -REQUIRED_USE="
216 - ${PYTHON_REQUIRED_USE}
217 -"
218 -
219 -src_prepare() {
220 - epatch "${FILESDIR}"/${PN}-4.15.5-darwin.patch
221 -
222 - # Sub-slot sanity check
223 - local sub_slot=${SLOT#*/}
224 - local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
225 - if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
226 - eerror
227 - eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
228 - eerror "Please update SLOT variable as follows:"
229 - eerror " SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
230 - eerror
231 - die "sub-slot sanity check failed"
232 - fi
233 -}
234 -
235 -src_configure() {
236 - configuration() {
237 - local myconf=(
238 - "${PYTHON}"
239 - "${S}"/configure.py
240 - --destdir="$(python_get_sitedir)"
241 - --incdir="$(python_get_includedir)"
242 - $(use debug && echo --debug)
243 - AR="$(tc-getAR) cqs"
244 - CC="$(tc-getCC)"
245 - CFLAGS="${CFLAGS}"
246 - CFLAGS_RELEASE=
247 - CXX="$(tc-getCXX)"
248 - CXXFLAGS="${CXXFLAGS}"
249 - CXXFLAGS_RELEASE=
250 - LINK="$(tc-getCXX)"
251 - LINK_SHLIB="$(tc-getCXX)"
252 - LFLAGS="${LDFLAGS}"
253 - LFLAGS_RELEASE=
254 - RANLIB=
255 - STRIP=
256 - )
257 - echo "${myconf[@]}"
258 - "${myconf[@]}" || die
259 - }
260 - python_foreach_impl run_in_build_dir configuration
261 -}
262 -
263 -src_compile() {
264 - python_foreach_impl run_in_build_dir default
265 -}
266 -
267 -src_install() {
268 - installation() {
269 - emake DESTDIR="${D}" install
270 - python_optimize
271 - }
272 - python_foreach_impl run_in_build_dir installation
273 -
274 - dodoc ChangeLog NEWS
275 - use doc && dodoc -r doc/html
276 -}