Gentoo Archives: gentoo-commits

From: Jason Zaman <perfinion@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libselinux/
Date: Thu, 26 Apr 2018 11:22:52
Message-Id: 1524741705.8b9715ea66f05aefa8240e10dde0edc7830c4a19.perfinion@gentoo
1 commit: 8b9715ea66f05aefa8240e10dde0edc7830c4a19
2 Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 25 12:18:47 2018 +0000
4 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 26 11:21:45 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b9715ea
7
8 sys-libs/libselinux: update live ebuild
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 sys-libs/libselinux/libselinux-9999.ebuild | 17 ++++++++---------
13 1 file changed, 8 insertions(+), 9 deletions(-)
14
15 diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild
16 index fdd6f7fd333..7fb1b8e7e48 100644
17 --- a/sys-libs/libselinux/libselinux-9999.ebuild
18 +++ b/sys-libs/libselinux/libselinux-9999.ebuild
19 @@ -1,4 +1,4 @@
20 -# Copyright 1999-2017 Gentoo Foundation
21 +# Copyright 1999-2018 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23
24 EAPI="6"
25 @@ -10,7 +10,7 @@ inherit multilib python-r1 toolchain-funcs multilib-minimal
26
27 MY_P="${P//_/-}"
28 SEPOL_VER="${PV}"
29 -MY_RELEASEDATE="20170804"
30 +MY_RELEASEDATE="20180419"
31
32 DESCRIPTION="SELinux userland library"
33 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
34 @@ -53,7 +53,7 @@ multilib_src_compile() {
35
36 emake \
37 LIBDIR="\$(PREFIX)/$(get_libdir)" \
38 - SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
39 + SHLIBDIR="/$(get_libdir)" \
40 LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
41 USE_PCRE2="$(usex pcre2 y n)" \
42 all
43 @@ -63,7 +63,7 @@ multilib_src_compile() {
44 emake \
45 LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
46 LIBDIR="\$(PREFIX)/$(get_libdir)" \
47 - SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
48 + SHLIBDIR="/$(get_libdir)" \
49 USE_PCRE2="$(usex pcre2 y n)" \
50 pywrap
51 }
52 @@ -79,7 +79,7 @@ multilib_src_compile() {
53 RUBY=${1} \
54 LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
55 LIBDIR="\$(PREFIX)/$(get_libdir)" \
56 - SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
57 + SHLIBDIR="/$(get_libdir)" \
58 USE_PCRE2="$(usex pcre2 y n)" \
59 rubywrap
60 }
61 @@ -94,8 +94,7 @@ multilib_src_compile() {
62 multilib_src_install() {
63 emake DESTDIR="${D}" \
64 LIBDIR="\$(PREFIX)/$(get_libdir)" \
65 - SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
66 - LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
67 + SHLIBDIR="/$(get_libdir)" \
68 USE_PCRE2="$(usex pcre2 y n)" \
69 install
70
71 @@ -103,7 +102,7 @@ multilib_src_install() {
72 installation() {
73 emake DESTDIR="${D}" \
74 LIBDIR="\$(PREFIX)/$(get_libdir)" \
75 - LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
76 + SHLIBDIR="/$(get_libdir)" \
77 USE_PCRE2="$(usex pcre2 y n)" \
78 install-pywrap
79 python_optimize # bug 531638
80 @@ -118,7 +117,7 @@ multilib_src_install() {
81 rm src/selinuxswig_ruby_wrap.lo
82 emake DESTDIR="${D}" \
83 LIBDIR="\$(PREFIX)/$(get_libdir)" \
84 - LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
85 + SHLIBDIR="/$(get_libdir)" \
86 RUBY=${1} \
87 USE_PCRE2="$(usex pcre2 y n)" \
88 install-rubywrap