[gentoo-commits] repo/gentoo:master commit in: sys-libs/libselinux/

[Jason Zaman]

commit:     0357e16dcdd8deafbf949de3faf97f195e0b4bc3
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 03:48:39 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 11:14:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0357e16d

sys-libs/libselinux: update live ebuild

python libs and include dir are now properly detected so dont need to pass in
need to pass the path to libsepol.a

Package-Manager: portage-2.3.3

 sys-libs/libselinux/libselinux-9999.ebuild | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/sys-libs/libselinux/libselinux-9999.ebuild 
b/sys-libs/libselinux/libselinux-9999.ebuild
index cc82d24f77..c7b8377eaf 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -67,9 +67,7 @@ multilib_src_compile() {
 
        if multilib_is_native_abi && use python; then
                building() {
-                       python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
                        emake \
-                               PYINC="-I${PYTHON_INCLUDEDIR}" \
                                LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
                                LIBDIR="\$(PREFIX)/$(get_libdir)" \
                                SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
@@ -101,16 +99,18 @@ multilib_src_compile() {
 }
 
 multilib_src_install() {
-               emake DESTDIR="${D}" \
-                       LIBDIR="\$(PREFIX)/$(get_libdir)" \
-                       SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-                       USE_PCRE2="$(usex pcre2 y n)" \
-                       install
+       emake DESTDIR="${D}" \
+               LIBDIR="\$(PREFIX)/$(get_libdir)" \
+               SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+               LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
+               USE_PCRE2="$(usex pcre2 y n)" \
+               install
 
        if multilib_is_native_abi && use python; then
                installation() {
                        emake DESTDIR="${D}" \
                                LIBDIR="\$(PREFIX)/$(get_libdir)" \
+                               LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
                                USE_PCRE2="$(usex pcre2 y n)" \
                                install-pywrap
                        python_optimize # bug 531638
@@ -125,6 +125,7 @@ multilib_src_install() {
                        rm src/selinuxswig_ruby_wrap.lo
                        emake DESTDIR="${D}" \
                                LIBDIR="\$(PREFIX)/$(get_libdir)" \
+                               LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
                                RUBY=${1} \
                                USE_PCRE2="$(usex pcre2 y n)" \
                                install-rubywrap