Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-python/sip/files/, dev-python/sip/
Date: Tue, 10 Jun 2014 08:07:06
Message-Id: 1402387601.296eff37a3f043df406c3f15094174397797a9f8.kensington@gentoo
1 commit: 296eff37a3f043df406c3f15094174397797a9f8
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 10 08:06:41 2014 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 10 08:06:41 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=296eff37
7
8 [dev-python/sip] Remove old snapshot.
9
10 Package-Manager: portage-2.2.10
11
12 ---
13 dev-python/sip/Manifest | 1 -
14 dev-python/sip/files/sip-4.9.3-darwin.patch | 41 ----------
15 dev-python/sip/sip-4.15.4_pre20131106.ebuild | 113 ---------------------------
16 3 files changed, 155 deletions(-)
17
18 diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
19 deleted file mode 100644
20 index aff1907..0000000
21 --- a/dev-python/sip/Manifest
22 +++ /dev/null
23 @@ -1 +0,0 @@
24 -DIST sip-4.15.4-snapshot-5e5fdf4cc35c.tar.gz 748656 SHA256 2fb89b164e50c7f362747e71f06afed66ca6a7c1a87a61315cdda9420a1bb477 SHA512 f83615aa60bd48e7aa2ddd487966a6354c2c46306f40205e11bfb3fd079026507a4e6ece788a894f6a053ecb9535519e8a5b05f30e829d51283ee3a941f9fc35 WHIRLPOOL e1d89e5beb70dc50c827392c7cdcb860979e10283d5489597e37a29b5d3493e2be453e70fbbf57a40629edcc911921262f51248e008a485a2f94e34e5c5c27e9
25
26 diff --git a/dev-python/sip/files/sip-4.9.3-darwin.patch b/dev-python/sip/files/sip-4.9.3-darwin.patch
27 deleted file mode 100644
28 index c82b727..0000000
29 --- a/dev-python/sip/files/sip-4.9.3-darwin.patch
30 +++ /dev/null
31 @@ -1,41 +0,0 @@
32 -Don't require a framework builds, and produce .bundle files
33 -
34 ---- siputils.py
35 -+++ siputils.py
36 -@@ -818,8 +818,6 @@
37 - """
38 - if self.generator in ("MSVC", "MSVC.NET", "BMAKE"):
39 - plib = clib + ".lib"
40 -- elif sys.platform == "darwin" and framework:
41 -- plib = "-framework " + clib
42 - else:
43 - plib = "-l" + clib
44 -
45 -@@ -836,8 +834,6 @@
46 -
47 - if self.generator in ("MSVC", "MSVC.NET", "BMAKE"):
48 - prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl")
49 -- elif sys.platform == "darwin" and framework:
50 -- prl_name = os.path.join(self.config.qt_lib_dir, clib + ".framework", clib + ".prl")
51 - else:
52 - prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl")
53 -
54 -@@ -1396,9 +1392,6 @@
55 - # 'real_prefix' exists if virtualenv is being used.
56 - dl = getattr(sys, 'real_prefix', sys.exec_prefix).split(os.sep)
57 -
58 -- if "Python.framework" not in dl:
59 -- error("SIP requires Python to be built as a framework")
60 --
61 - self.LFLAGS.append("-undefined dynamic_lookup")
62 -
63 - Makefile.finalise(self)
64 -@@ -1478,7 +1471,7 @@
65 - if sys.platform == "win32":
66 - ext = "pyd"
67 - elif sys.platform == "darwin":
68 -- ext = "so"
69 -+ ext = "bundle"
70 - elif sys.platform == "cygwin":
71 - ext = "dll"
72 - else:
73
74 diff --git a/dev-python/sip/sip-4.15.4_pre20131106.ebuild b/dev-python/sip/sip-4.15.4_pre20131106.ebuild
75 deleted file mode 100644
76 index 17f595e..0000000
77 --- a/dev-python/sip/sip-4.15.4_pre20131106.ebuild
78 +++ /dev/null
79 @@ -1,113 +0,0 @@
80 -# Copyright 1999-2014 Gentoo Foundation
81 -# Distributed under the terms of the GNU General Public License v2
82 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.15.2.ebuild,v 1.2 2013/10/22 14:25:55 grobian Exp $
83 -
84 -EAPI=5
85 -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
86 -
87 -inherit eutils python-r1 toolchain-funcs
88 -
89 -DESCRIPTION="Python extension module generator for C and C++ libraries"
90 -HOMEPAGE="http://www.riverbankcomputing.co.uk/software/sip/intro http://pypi.python.org/pypi/SIP"
91 -LICENSE="|| ( GPL-2 GPL-3 sip )"
92 -
93 -if [[ ${PV} == *9999* ]]; then
94 - # live version from mercurial repo
95 - EHG_REPO_URI="http://www.riverbankcomputing.com/hg/sip"
96 - inherit mercurial
97 -elif [[ ${PV} == *_pre* ]]; then
98 - # development snapshot
99 - HG_REVISION=5e5fdf4cc35c
100 - MY_P=${PN}-${PV%_pre*}-snapshot-${HG_REVISION}
101 - SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
102 - S=${WORKDIR}/${MY_P}
103 -else
104 - # official release
105 - SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
106 -fi
107 -
108 -# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
109 -SLOT="0/10"
110 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
111 -IUSE="debug doc"
112 -
113 -DEPEND="${PYTHON_DEPS}"
114 -RDEPEND="${DEPEND}"
115 -
116 -[[ ${PV} == *9999* ]] && DEPEND+="
117 - =dev-lang/python-2*
118 - sys-devel/bison
119 - sys-devel/flex
120 - doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )
121 -"
122 -
123 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
124 -
125 -src_prepare() {
126 - epatch "${FILESDIR}"/${PN}-4.9.3-darwin.patch
127 -
128 - if [[ ${PV} == *9999* ]]; then
129 - python2 build.py prepare || die
130 - if use doc; then
131 - python2 build.py doc || die
132 - fi
133 - fi
134 -
135 - # Sub-slot sanity check
136 - local sub_slot=${SLOT#*/}
137 - local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
138 - if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
139 - eerror
140 - eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
141 - eerror "Please update SLOT variable as follows:"
142 - eerror " SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
143 - eerror
144 - die "sub-slot sanity check failed"
145 - fi
146 -
147 - python_copy_sources
148 -}
149 -
150 -src_configure() {
151 - configuration() {
152 - local myconf=(
153 - "${PYTHON}" configure.py
154 - --bindir="${EPREFIX}/usr/bin"
155 - --destdir="$(python_get_sitedir)"
156 - --incdir="$(python_get_includedir)"
157 - --sipdir="${EPREFIX}/usr/share/sip"
158 - $(use debug && echo --debug)
159 - AR="$(tc-getAR) cqs"
160 - CC="$(tc-getCC)"
161 - CFLAGS="${CFLAGS}"
162 - CFLAGS_RELEASE=
163 - CXX="$(tc-getCXX)"
164 - CXXFLAGS="${CXXFLAGS}"
165 - CXXFLAGS_RELEASE=
166 - LINK="$(tc-getCXX)"
167 - LINK_SHLIB="$(tc-getCXX)"
168 - LFLAGS="${LDFLAGS}"
169 - LFLAGS_RELEASE=
170 - RANLIB=
171 - STRIP=
172 - )
173 - echo "${myconf[@]}"
174 - "${myconf[@]}"
175 - }
176 - python_foreach_impl run_in_build_dir configuration
177 -}
178 -
179 -src_compile() {
180 - python_foreach_impl run_in_build_dir default
181 -}
182 -
183 -src_install() {
184 - installation() {
185 - emake DESTDIR="${D}" install
186 - python_optimize
187 - }
188 - python_foreach_impl run_in_build_dir installation
189 -
190 - dodoc NEWS
191 - use doc && dohtml -r doc/html/*
192 -}