Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Sven Vermeulen (swift)" <swift@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-libs/libselinux: libselinux-2.2.2-r5.ebuild libselinux-2.3_rc1-r1.ebuild ChangeLog
Date: Tue, 29 Apr 2014 19:13:20
Message-Id: 20140429191315.4BBF82004B@flycatcher.gentoo.org
1 swift 14/04/29 19:13:15
2
3 Modified: ChangeLog
4 Added: libselinux-2.2.2-r5.ebuild
5 libselinux-2.3_rc1-r1.ebuild
6 Log:
7 Add USE=ruby support, now without ruby-ng eclass calls, fixes bug #509004
8
9 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47)
10
11 Revision Changes Path
12 1.118 sys-libs/libselinux/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/ChangeLog?rev=1.118&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/ChangeLog?rev=1.118&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/ChangeLog?r1=1.117&r2=1.118
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v
21 retrieving revision 1.117
22 retrieving revision 1.118
23 diff -u -r1.117 -r1.118
24 --- ChangeLog 28 Apr 2014 19:39:01 -0000 1.117
25 +++ ChangeLog 29 Apr 2014 19:13:15 -0000 1.118
26 @@ -1,6 +1,13 @@
27 # ChangeLog for sys-libs/libselinux
28 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.117 2014/04/28 19:39:01 swift Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.118 2014/04/29 19:13:15 swift Exp $
31 +
32 +*libselinux-2.2.2-r5 (29 Apr 2014)
33 +*libselinux-2.3_rc1-r1 (29 Apr 2014)
34 +
35 + 29 Apr 2014; Sven Vermeulen <swift@g.o> +libselinux-2.2.2-r5.ebuild,
36 + +libselinux-2.3_rc1-r1.ebuild:
37 + Add USE=ruby support, now without ruby-ng eclass calls, fixes bug #509004
38
39 *libselinux-2.3_rc1 (28 Apr 2014)
40
41
42
43
44 1.1 sys-libs/libselinux/libselinux-2.2.2-r5.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/libselinux-2.2.2-r5.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/libselinux-2.2.2-r5.ebuild?rev=1.1&content-type=text/plain
48
49 Index: libselinux-2.2.2-r5.ebuild
50 ===================================================================
51 # Copyright 1999-2014 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.2.2-r5.ebuild,v 1.1 2014/04/29 19:13:15 swift Exp $
54
55 EAPI="5"
56 PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
57 USE_RUBY="ruby18 ruby19 ruby20"
58
59 # No, I am not calling ruby-ng
60 inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
61
62 SEPOL_VER="2.2"
63
64 DESCRIPTION="SELinux userland library"
65 HOMEPAGE="http://userspace.selinuxproject.org"
66 SRC_URI="http://userspace.selinuxproject.org/releases/20131030/${P}.tar.gz
67 http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${P}-r4.tar.gz"
68
69 LICENSE="public-domain"
70 SLOT="0"
71 KEYWORDS="~amd64 ~x86"
72 IUSE="python ruby static-libs ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20"
73
74 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}
75 >=dev-libs/libpcre-8.30-r2[static-libs?]
76 python? ( ${PYTHON_DEPS} )"
77 DEPEND="${RDEPEND}
78 virtual/pkgconfig
79 python? ( >=dev-lang/swig-2.0.9 )"
80
81 src_prepare() {
82 EPATCH_MULTI_MSG="Applying libselinux patches ... " \
83 EPATCH_SUFFIX="patch" \
84 EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
85 EPATCH_FORCE="yes" \
86 epatch
87
88 epatch_user
89
90 multilib_copy_sources
91 }
92
93 multilib_src_compile() {
94 tc-export PKG_CONFIG RANLIB
95 local PCRE_CFLAGS=$(${PKG_CONFIG} libpcre --cflags)
96 local PCRE_LIBS=$(${PKG_CONFIG} libpcre --libs)
97 export PCRE_{CFLAGS,LIBS}
98
99 emake \
100 AR="$(tc-getAR)" \
101 CC="$(tc-getCC)" \
102 LIBDIR="\$(PREFIX)/$(get_libdir)" \
103 SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
104 LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
105 all
106
107 if multilib_is_native_abi && use python; then
108 building() {
109 python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
110 emake \
111 CC="$(tc-getCC)" \
112 PYINC="-I${PYTHON_INCLUDEDIR}" \
113 PYTHONLIBDIR="${PYTHON_LIBPATH}" \
114 PYPREFIX="${EPYTHON##*/}" \
115 LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
116 pywrap
117 }
118 python_foreach_impl building
119 fi
120
121 if multilib_is_native_abi && use ruby; then
122 building() {
123 einfo "Calling rubywrap for ${1}"
124 # Clean up .lo file to force rebuild
125 test -f src/selinuxswig_ruby_wrap.lo && rm src/selinuxswig_ruby_wrap.lo
126 emake \
127 CC="$(tc-getCC)" \
128 RUBY=${1} \
129 RUBYINSTALL=$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]') \
130 LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
131 rubywrap
132 }
133 for RUBYTARGET in ${USE_RUBY}; do
134 use ruby_targets_${RUBYTARGET} || continue
135
136 building ${RUBYTARGET}
137 done
138 fi
139 }
140
141 multilib_src_install() {
142 LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
143 emake DESTDIR="${D}" install
144
145 if multilib_is_native_abi && use python; then
146 installation() {
147 LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" install-pywrap
148 }
149 python_foreach_impl installation
150 fi
151
152 if multilib_is_native_abi && use ruby; then
153 installation() {
154 einfo "Calling install-rubywrap for ${1}"
155 # Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions
156 rm src/selinuxswig_ruby_wrap.lo
157 LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" \
158 RUBY=${1} \
159 RUBYINSTALL="${D}/$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]')" \
160 install-rubywrap
161 }
162 for RUBYTARGET in ${USE_RUBY}; do
163 use ruby_targets_${RUBYTARGET} || continue
164
165 installation ${RUBYTARGET}
166 done
167 fi
168
169 use static-libs || rm "${D}"/usr/lib*/*.a
170 }
171
172 pkg_postinst() {
173 # Fix bug 473502
174 for POLTYPE in ${POLICY_TYPES};
175 do
176 mkdir -p /etc/selinux/${POLTYPE}/contexts/files
177 touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local
178 done
179 }
180
181
182
183 1.1 sys-libs/libselinux/libselinux-2.3_rc1-r1.ebuild
184
185 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/libselinux-2.3_rc1-r1.ebuild?rev=1.1&view=markup
186 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/libselinux-2.3_rc1-r1.ebuild?rev=1.1&content-type=text/plain
187
188 Index: libselinux-2.3_rc1-r1.ebuild
189 ===================================================================
190 # Copyright 1999-2014 Gentoo Foundation
191 # Distributed under the terms of the GNU General Public License v2
192 # $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.3_rc1-r1.ebuild,v 1.1 2014/04/29 19:13:15 swift Exp $
193
194 EAPI="5"
195 PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
196 USE_RUBY="ruby18 ruby19 ruby20"
197
198 # No, I am not calling ruby-ng
199 inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
200
201 MY_P="${P//_/-}"
202
203 SEPOL_VER="2.3_rc1"
204
205 DESCRIPTION="SELinux userland library"
206 HOMEPAGE="http://userspace.selinuxproject.org"
207 SRC_URI="http://userspace.selinuxproject.org/releases/2.3-rc1/${MY_P}.tar.gz
208 http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${P}.tar.gz"
209
210 LICENSE="public-domain"
211 SLOT="0"
212 KEYWORDS="~amd64 ~x86"
213
214 IUSE="python ruby static-libs ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20"
215
216 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}
217 >=dev-libs/libpcre-8.30-r2[static-libs?]
218 python? ( ${PYTHON_DEPS} )"
219 DEPEND="${RDEPEND}
220 virtual/pkgconfig
221 python? ( >=dev-lang/swig-2.0.9 )"
222
223 S="${WORKDIR}/${MY_P}"
224
225 src_prepare() {
226 EPATCH_MULTI_MSG="Applying libselinux patches ... " \
227 EPATCH_SUFFIX="patch" \
228 EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
229 EPATCH_FORCE="yes" \
230 epatch
231
232 epatch_user
233
234 multilib_copy_sources
235 }
236
237 multilib_src_compile() {
238 tc-export PKG_CONFIG RANLIB
239 local PCRE_CFLAGS=$(${PKG_CONFIG} libpcre --cflags)
240 local PCRE_LIBS=$(${PKG_CONFIG} libpcre --libs)
241 export PCRE_{CFLAGS,LIBS}
242
243 emake \
244 AR="$(tc-getAR)" \
245 CC="$(tc-getCC)" \
246 LIBDIR="\$(PREFIX)/$(get_libdir)" \
247 SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
248 LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
249 all
250
251 if multilib_is_native_abi && use python; then
252 building() {
253 python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
254 emake \
255 CC="$(tc-getCC)" \
256 PYINC="-I${PYTHON_INCLUDEDIR}" \
257 PYTHONLIBDIR="${PYTHON_LIBPATH}" \
258 PYPREFIX="${EPYTHON##*/}" \
259 LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
260 pywrap
261 }
262 python_foreach_impl building
263 fi
264
265 if multilib_is_native_abi && use ruby; then
266 building() {
267 einfo "Calling rubywrap for ${1}"
268 # Clean up .lo file to force rebuild
269 test -f src/selinuxswig_ruby_wrap.lo && rm src/selinuxswig_ruby_wrap.lo
270 emake \
271 CC="$(tc-getCC)" \
272 RUBY=${1} \
273 RUBYINSTALL=$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]') \
274 LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
275 rubywrap
276 }
277 for RUBYTARGET in ${USE_RUBY}; do
278 use ruby_targets_${RUBYTARGET} || continue
279
280 building ${RUBYTARGET}
281 done
282 fi
283 }
284
285 multilib_src_install() {
286 LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
287 emake DESTDIR="${D}" install
288
289 if multilib_is_native_abi && use python; then
290 installation() {
291 LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" install-pywrap
292 }
293 python_foreach_impl installation
294 fi
295
296 if multilib_is_native_abi && use ruby; then
297 installation() {
298 einfo "Calling install-rubywrap for ${1}"
299 # Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions
300 rm src/selinuxswig_ruby_wrap.lo
301 LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" \
302 RUBY=${1} \
303 RUBYINSTALL="${D}/$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]')" \
304 install-rubywrap
305 }
306 for RUBYTARGET in ${USE_RUBY}; do
307 use ruby_targets_${RUBYTARGET} || continue
308
309 installation ${RUBYTARGET}
310 done
311 fi
312
313 use static-libs || rm "${D}"/usr/lib*/*.a
314 }
315
316 pkg_postinst() {
317 # Fix bug 473502
318 for POLTYPE in ${POLICY_TYPES};
319 do
320 mkdir -p /etc/selinux/${POLTYPE}/contexts/files
321 touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local
322 done
323 }
Report Message
Find on MARC Find on Google Groups