[gentoo-commits] repo/gentoo:master commit in: sys-libs/libsemanage/files/, sys-libs/libsemanage/

[Jason Zaman]

commit:     ea01f1ae5c4cdf80bb0b748825661114afa67388
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 07:23:47 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 11:14:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea01f1ae

sys-libs/libsemanage: 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/libsemanage/files/libsemanage-2.7-build-paths.patch |  4 ++--
 sys-libs/libsemanage/libsemanage-9999.ebuild                 | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/sys-libs/libsemanage/files/libsemanage-2.7-build-paths.patch 
b/sys-libs/libsemanage/files/libsemanage-2.7-build-paths.patch
index 0069c96ebd..4c2ad0d946 100644
--- a/sys-libs/libsemanage/files/libsemanage-2.7-build-paths.patch
+++ b/sys-libs/libsemanage/files/libsemanage-2.7-build-paths.patch
@@ -30,8 +30,8 @@ index ef25902..7aad334 100644
        $(RANLIB) $@
  
  $(LIBSO): $(LOBJS)
--      $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux 
-lbz2 -lustr -L$(LIBDIR) 
-Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
-+      $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux 
-lbz2 -lustr -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
+-      $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux 
-lbz2 -L$(LIBDIR) -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
++      $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux 
-lbz2 -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
        ln -sf $@ $(TARGET)
  
  $(LIBPC): $(LIBPC).in ../VERSION

diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild 
b/sys-libs/libsemanage/libsemanage-9999.ebuild
index 5fdf0a04c9..53094b8c6e 100644
--- a/sys-libs/libsemanage/libsemanage-9999.ebuild
+++ b/sys-libs/libsemanage/libsemanage-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$
 
@@ -88,8 +88,7 @@ multilib_src_compile() {
 
        if multilib_is_native_abi && use python; then
                building_py() {
-                       python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
-                       emake CC="$(tc-getCC)" PYINC="-I${PYTHON_INCLUDEDIR}" 
PYTHONLBIDIR="${PYTHON_LIBPATH}" PYPREFIX="${EPYTHON##*/}" "$@"
+                       emake "$@"
                }
                python_foreach_impl building_py swigify
                python_foreach_impl building_py pywrap
@@ -104,8 +103,11 @@ multilib_src_install() {
 
        if multilib_is_native_abi && use python; then
                installation_py() {
-                       emake DESTDIR="${ED}" LIBDIR="${ED}/usr/$(get_libdir)" \
-                               SHLIBDIR="${ED}/usr/$(get_libdir)" 
install-pywrap
+                       emake DESTDIR="${ED}" \
+                               LIBDIR="${ED}/usr/$(get_libdir)" \
+                               SHLIBDIR="${ED}/usr/$(get_libdir)" \
+                               
LIBSEPOLA="${EPREFIX%/}/usr/$(get_libdir)/libsepol.a" \
+                               install-pywrap
                        python_optimize # bug 531638
                }
                python_foreach_impl installation_py