sys-libs/libselinux: update ruby versions

Signed-off-by: Jason Zaman <perfinion@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

diff --git a/sys-libs/libselinux/libselinux-2.8-r1.ebuild b/sys-libs/libselinux/libselinux-2.8-r1.ebuild
new file mode 100644 (file)
index 0000000..7ff5559
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-2.8-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 python3_7 )
+USE_RUBY="ruby24 ruby25"
+
+# No, I am not calling ruby-ng
+inherit multilib python-r1 toolchain-funcs multilib-minimal
+
+MY_P="${P//_/-}"
+SEPOL_VER="${PV}"
+MY_RELEASEDATE="20180524"
+
+DESCRIPTION="SELinux userland library"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+       S="${WORKDIR}/${MY_P}/${PN}"
+else
+       SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+       KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+       S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby24 ruby_targets_ruby25"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
+       !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] )
+       pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
+       python? ( ${PYTHON_DEPS} )
+       ruby? (
+               ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+               ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+       )
+       elibc_musl? ( sys-libs/fts-standalone )"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+       python? ( >=dev-lang/swig-2.0.9 )
+       ruby? ( >=dev-lang/swig-2.0.9 )"
+
+src_prepare() {
+       eapply_user
+
+       multilib_copy_sources
+}
+
+multilib_src_compile() {
+       tc-export AR CC PKG_CONFIG RANLIB
+
+       emake \
+               LIBDIR="\$(PREFIX)/$(get_libdir)" \
+               SHLIBDIR="/$(get_libdir)" \
+               LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
+               USE_PCRE2="$(usex pcre2 y n)" \
+               FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
+               all
+
+       if multilib_is_native_abi && use python; then
+               building() {
+                       emake \
+                               LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
+                               LIBDIR="\$(PREFIX)/$(get_libdir)" \
+                               SHLIBDIR="/$(get_libdir)" \
+                               USE_PCRE2="$(usex pcre2 y n)" \
+                               FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
+                               pywrap
+               }
+               python_foreach_impl building
+       fi
+
+       if multilib_is_native_abi && use ruby; then
+               building() {
+                       einfo "Calling rubywrap for ${1}"
+                       # Clean up .lo file to force rebuild
+                       rm -f src/selinuxswig_ruby_wrap.lo || die
+                       emake \
+                               RUBY=${1} \
+                               LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
+                               LIBDIR="\$(PREFIX)/$(get_libdir)" \
+                               SHLIBDIR="/$(get_libdir)" \
+                               USE_PCRE2="$(usex pcre2 y n)" \
+                               FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
+                               rubywrap
+               }
+               for RUBYTARGET in ${USE_RUBY}; do
+                       use ruby_targets_${RUBYTARGET} || continue
+
+                       building ${RUBYTARGET}
+               done
+       fi
+}
+
+multilib_src_install() {
+       emake DESTDIR="${D}" \
+               LIBDIR="\$(PREFIX)/$(get_libdir)" \
+               SHLIBDIR="/$(get_libdir)" \
+               USE_PCRE2="$(usex pcre2 y n)" \
+               install
+
+       if multilib_is_native_abi && use python; then
+               installation() {
+                       emake DESTDIR="${D}" \
+                               LIBDIR="\$(PREFIX)/$(get_libdir)" \
+                               SHLIBDIR="/$(get_libdir)" \
+                               USE_PCRE2="$(usex pcre2 y n)" \
+                               install-pywrap
+                       python_optimize # bug 531638
+               }
+               python_foreach_impl installation
+       fi
+
+       if multilib_is_native_abi && use ruby; then
+               installation() {
+                       einfo "Calling install-rubywrap for ${1}"
+                       # Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions
+                       rm src/selinuxswig_ruby_wrap.lo
+                       emake DESTDIR="${D}" \
+                               LIBDIR="\$(PREFIX)/$(get_libdir)" \
+                               SHLIBDIR="/$(get_libdir)" \
+                               RUBY=${1} \
+                               USE_PCRE2="$(usex pcre2 y n)" \
+                               install-rubywrap
+               }
+               for RUBYTARGET in ${USE_RUBY}; do
+                       use ruby_targets_${RUBYTARGET} || continue
+
+                       installation ${RUBYTARGET}
+               done
+       fi
+
+       use static-libs || rm "${D}"/usr/lib*/*.a || die
+}
+
+pkg_postinst() {
+       # Fix bug 473502
+       for POLTYPE in ${POLICY_TYPES};
+       do
+               mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
+               touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
+               # Fix bug 516608
+               for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
+                       if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then
+                               sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \
+                               || die "Failed to recompile contexts"
+                       fi
+               done
+       done
+}

diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild
index 848b2bf473970d9b047e1178e7b322656e51080d..7ff555999a09d3870c2230754015e02ece5eba2d 100644 (file)
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 python3_7 )
-USE_RUBY="ruby23"
+USE_RUBY="ruby24 ruby25"
 
 # No, I am not calling ruby-ng
 inherit multilib python-r1 toolchain-funcs multilib-minimal
@@ -27,7 +27,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby23"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby24 ruby_targets_ruby25"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
@@ -35,7 +35,8 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
        pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
        python? ( ${PYTHON_DEPS} )
        ruby? (
-               ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+               ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+               ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
        )
        elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}