From 72fed738ea231c870dc893947cf6380382f8cd85 Mon Sep 17 00:00:00 2001 From: Jason Zaman Date: Sat, 6 Dec 2014 23:21:06 +0000 Subject: version bump and ebuild clean up, drop old RC (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x7EF137EC935B0EAF) --- sys-libs/libselinux/ChangeLog | 8 +- sys-libs/libselinux/libselinux-2.4_rc2.ebuild | 140 -------------------------- sys-libs/libselinux/libselinux-2.4_rc5.ebuild | 140 -------------------------- sys-libs/libselinux/libselinux-2.4_rc7.ebuild | 138 +++++++++++++++++++++++++ 4 files changed, 145 insertions(+), 281 deletions(-) delete mode 100644 sys-libs/libselinux/libselinux-2.4_rc2.ebuild delete mode 100644 sys-libs/libselinux/libselinux-2.4_rc5.ebuild create mode 100644 sys-libs/libselinux/libselinux-2.4_rc7.ebuild (limited to 'sys-libs/libselinux') diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog index a5604c3c5634..56f4d9b600a7 100644 --- a/sys-libs/libselinux/ChangeLog +++ b/sys-libs/libselinux/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/libselinux # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.135 2014/12/04 10:50:14 perfinion Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.136 2014/12/06 23:21:06 perfinion Exp $ + +*libselinux-2.4_rc7 (06 Dec 2014) + + 06 Dec 2014; Jason Zaman +libselinux-2.4_rc7.ebuild, + -libselinux-2.4_rc2.ebuild, -libselinux-2.4_rc5.ebuild: + version bump and ebuild clean up, drop old RC *libselinux-2.3-r2 (04 Dec 2014) diff --git a/sys-libs/libselinux/libselinux-2.4_rc2.ebuild b/sys-libs/libselinux/libselinux-2.4_rc2.ebuild deleted file mode 100644 index 8e7599f06705..000000000000 --- a/sys-libs/libselinux/libselinux-2.4_rc2.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.4_rc2.ebuild,v 1.1 2014/09/21 10:17:04 swift Exp $ - -EAPI="5" -PYTHON_COMPAT=( python2_7 python3_2 python3_3 ) -USE_RUBY="ruby19 ruby20" - -PATCHBUNDLE="5" - -# No, I am not calling ruby-ng -inherit multilib python-r1 toolchain-funcs eutils multilib-minimal - -MY_P="${P//_/-}" - -SEPOL_VER="2.4_rc2" - -DESCRIPTION="SELinux userland library" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" -SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="python ruby static-libs ruby_targets_ruby19 ruby_targets_ruby20" - -RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}] - >=dev-libs/libpcre-8.33-r1[static-libs?,${MULTILIB_USEDEP}] - python? ( ${PYTHON_DEPS} ) - ruby? ( - ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) - ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - python? ( >=dev-lang/swig-2.0.9 )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}/0005-use-ruby-include-with-rubylibver.patch" - epatch "${FILESDIR}/0006-build-related-fixes-bug-500674.patch" - - epatch_user - - multilib_copy_sources -} - -multilib_src_compile() { - tc-export PKG_CONFIG RANLIB - local PCRE_CFLAGS=$(${PKG_CONFIG} libpcre --cflags) - local PCRE_LIBS=$(${PKG_CONFIG} libpcre --libs) - export PCRE_{CFLAGS,LIBS} - - emake \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ - LDFLAGS="-fPIC ${LDFLAGS} -pthread" \ - all - - if multilib_is_native_abi && use python; then - building() { - python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH - emake \ - CC="$(tc-getCC)" \ - PYINC="-I${PYTHON_INCLUDEDIR}" \ - PYTHONLIBDIR="${PYTHON_LIBPATH}" \ - PYPREFIX="${EPYTHON##*/}" \ - LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ - 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 - test -f src/selinuxswig_ruby_wrap.lo && rm src/selinuxswig_ruby_wrap.lo - emake \ - CC="$(tc-getCC)" \ - RUBY=${1} \ - RUBYINSTALL=$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]') \ - LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ - rubywrap - } - for RUBYTARGET in ${USE_RUBY}; do - use ruby_targets_${RUBYTARGET} || continue - - building ${RUBYTARGET} - done - fi -} - -multilib_src_install() { - LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use python; then - installation() { - LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" install-pywrap - } - 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 - LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" \ - RUBY=${1} \ - RUBYINSTALL="${D}/$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]')" \ - 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 -} - -pkg_postinst() { - # Fix bug 473502 - for POLTYPE in ${POLICY_TYPES}; - do - mkdir -p /etc/selinux/${POLTYPE}/contexts/files - touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local - # Fix bug 516608 - for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do - sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}; - done - done -} diff --git a/sys-libs/libselinux/libselinux-2.4_rc5.ebuild b/sys-libs/libselinux/libselinux-2.4_rc5.ebuild deleted file mode 100644 index cb21fa0b263d..000000000000 --- a/sys-libs/libselinux/libselinux-2.4_rc5.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.4_rc5.ebuild,v 1.1 2014/10/29 17:30:23 swift Exp $ - -EAPI="5" -PYTHON_COMPAT=( python2_7 python3_2 python3_3 ) -USE_RUBY="ruby19 ruby20" - -PATCHBUNDLE="5" - -# No, I am not calling ruby-ng -inherit multilib python-r1 toolchain-funcs eutils multilib-minimal - -MY_P="${P//_/-}" - -SEPOL_VER="2.4_rc4" - -DESCRIPTION="SELinux userland library" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" -SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="python ruby static-libs ruby_targets_ruby19 ruby_targets_ruby20" - -RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}] - >=dev-libs/libpcre-8.33-r1[static-libs?,${MULTILIB_USEDEP}] - python? ( ${PYTHON_DEPS} ) - ruby? ( - ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) - ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - python? ( >=dev-lang/swig-2.0.9 )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}/0005-use-ruby-include-with-rubylibver.patch" - epatch "${FILESDIR}/0006-build-related-fixes-bug-500674.patch" - - epatch_user - - multilib_copy_sources -} - -multilib_src_compile() { - tc-export PKG_CONFIG RANLIB - local PCRE_CFLAGS=$(${PKG_CONFIG} libpcre --cflags) - local PCRE_LIBS=$(${PKG_CONFIG} libpcre --libs) - export PCRE_{CFLAGS,LIBS} - - emake \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ - LDFLAGS="-fPIC ${LDFLAGS} -pthread" \ - all - - if multilib_is_native_abi && use python; then - building() { - python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH - emake \ - CC="$(tc-getCC)" \ - PYINC="-I${PYTHON_INCLUDEDIR}" \ - PYTHONLIBDIR="${PYTHON_LIBPATH}" \ - PYPREFIX="${EPYTHON##*/}" \ - LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ - 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 - test -f src/selinuxswig_ruby_wrap.lo && rm src/selinuxswig_ruby_wrap.lo - emake \ - CC="$(tc-getCC)" \ - RUBY=${1} \ - RUBYINSTALL=$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]') \ - LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ - rubywrap - } - for RUBYTARGET in ${USE_RUBY}; do - use ruby_targets_${RUBYTARGET} || continue - - building ${RUBYTARGET} - done - fi -} - -multilib_src_install() { - LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use python; then - installation() { - LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" install-pywrap - } - 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 - LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" \ - RUBY=${1} \ - RUBYINSTALL="${D}/$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]')" \ - 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 -} - -pkg_postinst() { - # Fix bug 473502 - for POLTYPE in ${POLICY_TYPES}; - do - mkdir -p /etc/selinux/${POLTYPE}/contexts/files - touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local - # Fix bug 516608 - for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do - sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}; - done - done -} diff --git a/sys-libs/libselinux/libselinux-2.4_rc7.ebuild b/sys-libs/libselinux/libselinux-2.4_rc7.ebuild new file mode 100644 index 000000000000..d11d2bf1d27e --- /dev/null +++ b/sys-libs/libselinux/libselinux-2.4_rc7.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.4_rc7.ebuild,v 1.1 2014/12/06 23:21:06 perfinion Exp $ + +EAPI="5" +PYTHON_COMPAT=( python2_7 python3_2 python3_3 python3_4 ) +USE_RUBY="ruby19 ruby20" + +# No, I am not calling ruby-ng +inherit multilib python-r1 toolchain-funcs eutils multilib-minimal + +MY_P="${P//_/-}" +SEPOL_VER="${PV}" + +DESCRIPTION="SELinux userland library" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" +SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="python ruby static-libs ruby_targets_ruby19 ruby_targets_ruby20" + +RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}] + >=dev-libs/libpcre-8.33-r1[static-libs?,${MULTILIB_USEDEP}] + python? ( ${PYTHON_DEPS} ) + ruby? ( + ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) + ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) + )" +DEPEND="${RDEPEND} + virtual/pkgconfig + python? ( >=dev-lang/swig-2.0.9 )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + epatch "${FILESDIR}/0005-use-ruby-include-with-rubylibver.patch" + epatch "${FILESDIR}/0006-build-related-fixes-bug-500674.patch" + + epatch_user + + multilib_copy_sources +} + +multilib_src_compile() { + tc-export PKG_CONFIG RANLIB + local PCRE_CFLAGS=$(${PKG_CONFIG} libpcre --cflags) + local PCRE_LIBS=$(${PKG_CONFIG} libpcre --libs) + export PCRE_{CFLAGS,LIBS} + + emake \ + AR="$(tc-getAR)" \ + CC="$(tc-getCC)" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ + LDFLAGS="-fPIC ${LDFLAGS} -pthread" \ + all + + if multilib_is_native_abi && use python; then + building() { + python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH + emake \ + CC="$(tc-getCC)" \ + PYINC="-I${PYTHON_INCLUDEDIR}" \ + PYTHONLIBDIR="${PYTHON_LIBPATH}" \ + PYPREFIX="${EPYTHON##*/}" \ + LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ + 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 + test -f src/selinuxswig_ruby_wrap.lo && rm src/selinuxswig_ruby_wrap.lo + emake \ + CC="$(tc-getCC)" \ + RUBY=${1} \ + RUBYINSTALL=$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]') \ + LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ + rubywrap + } + for RUBYTARGET in ${USE_RUBY}; do + use ruby_targets_${RUBYTARGET} || continue + + building ${RUBYTARGET} + done + fi +} + +multilib_src_install() { + LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use python; then + installation() { + LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" 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 + LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" \ + RUBY=${1} \ + RUBYINSTALL="${D}/$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]')" \ + 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 +} + +pkg_postinst() { + # Fix bug 473502 + for POLTYPE in ${POLICY_TYPES}; + do + mkdir -p /etc/selinux/${POLTYPE}/contexts/files + touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local + # Fix bug 516608 + for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do + sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}; + done + done +} -- cgit v1.2.3-65-gdbad