commit:     86445f360079224b43ba28d5a2c1f2267eee7a59
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 14:11:48 2016 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 16:28:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86445f36

sys-apps/policycoreutils: Drop old

Package-Manager: portage-2.2.28

 sys-apps/policycoreutils/Manifest                  |   7 -
 .../policycoreutils-2.2.5-r4.ebuild                | 156 -----------------
 .../policycoreutils/policycoreutils-2.3-r3.ebuild  | 154 -----------------
 .../policycoreutils/policycoreutils-2.4-r1.ebuild  | 159 -----------------
 .../policycoreutils/policycoreutils-2.4-r2.ebuild  | 190 ---------------------
 .../policycoreutils/policycoreutils-2.4.ebuild     | 147 ----------------
 6 files changed, 813 deletions(-)

diff --git a/sys-apps/policycoreutils/Manifest 
b/sys-apps/policycoreutils/Manifest
index 604d0be..7f322b1 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,9 +1,2 @@
-DIST patchbundle-policycoreutils-2.2.5-gentoo-r1.tar.gz 7287 SHA256 
cb6915c46a5e6789f95ac254d34b1d890055b31ded61596ffb5bf925aa8c446a SHA512 
be6eeaf4927d80f2c198ecc4fbe88a3e960380a0de532155eff3a12157df0615e7b3ffbc09e984df08fb32ce5b62f75147559a093b620a98d9ff836ad07b18b0
 WHIRLPOOL 
de7e0348abc45713ede926d79f26bb8590c41db6f984ff8f29a01b933f6e3c38531682f10a0d7de73f8b26994ac9a476bd9d54fc36fb45689f7ad9eca5206f09
-DIST patchbundle-policycoreutils-3.tar.gz 7294 SHA256 
44db261c87f583a7620690fc5041d8a21b1c935e741fe7b594aa2cc958e3deb7 SHA512 
24e4c73e97441a1042618f6a4179d71672c81f821ffc2f97a54116bf6b33a93bd7f3e2030dbdb362da5e2a7d8936604e5b0283261c7b2447cc4f7594966c73bc
 WHIRLPOOL 
d38416ff9707d7d2bbf04f5d582944a87d27de06f3d70677341d38dacc6501dd78ef01fd8a7bb044d49b1f2a8c95181e2cb1b4b81dae49819409dbcf9d7abcb7
-DIST policycoreutils-2.2.5.tar.gz 4948944 SHA256 
bbf850a8c3c2f371f439d6525663eecdd3a737acd594d2f27f8d8f3a07830cc4 SHA512 
88a32fbbede56f3e717394f134212ed9df9b06cbb5532168ccc03ef2a465f4320b54a561348ea5c319b5b641f7661565ad29fbdc5aae50190a6d21d076cf2c3f
 WHIRLPOOL 
0eb0e0c7e1fc1514cb28bbda7a10066ad23a9ccfecc92dee606e3f0e71632e07fe1c4ba7ac89993adf15e9520fc9e527e16d623d56b4e96cc882bf82dea4cb14
-DIST policycoreutils-2.3.tar.gz 4984980 SHA256 
864cfaee58b5d2f15b140c354e59666e57143293c89f2b2e85bc0d0e4beefcd2 SHA512 
3256849d13856ec47ac85470632a57e26952c5dafffb51df4eb8e32467196ff3ef725cc582798727fe45fd6284c1893d12eae2c89088ae1758ad39faec385659
 WHIRLPOOL 
1dd9bfd67ebb744b8c47144966f09d8361e9018e8d941355080c274b9ac891c18eb95771f3dc8b136683224bc5f12f3fb58fa00666b5815d65e7141c31d9293d
-DIST policycoreutils-2.4.tar.gz 5004280 SHA256 
b819f876f12473783ccce9f63b9a79cd77177477cd6d46818441f808cc4c3479 SHA512 
0eb0ea569c1699ed78e5e9798d9f182b3a8bfa6dcd387bcc78923755b3a1cad982673db88857745154d3769d44402b87e52d5fe3024874001f61f783aa25cce6
 WHIRLPOOL 
d101080973ef6248617b5bca9d8b76e59008061b3411aec4ed95343af09b941a34acb3bb0001da5468595c4c37684ab6f34204e18ccb3cbbd5b3d31df0cb5e7f
 DIST policycoreutils-2.5.tar.gz 4986066 SHA256 
329382cfe9fa977678abf541dcd8fe3847cf0c83b24654c8f7322343907078a1 SHA512 
0eabf046cf44c6fe2e28492f53862f4302551d602e9b678b923f34f35bfc48f03a73b62962ac71465b9d99b411016b2cfc976f3baf113133a6c0adab1e1f6f8b
 WHIRLPOOL 
27a6810d611f50ac1292f614c9936f0b73b7334be80685f1eda6fd72ec7e85fc0f7b4ff930a48c08a61ade84fd46bd9e7285f5a135ea6db6e4fe88e38d73bd16
-DIST policycoreutils-extra-1.31.tar.bz2 16080 SHA256 
ad0a78d96fd01aa51fe774e1701bd23934cd72182b2bad68112006f0ea17cc7b SHA512 
520f93f1a2ce3c60a1d192b09cb9a968d207fbc6ab1f01861be95a50b65264f706335620ccbca48ce38f81581a4cf5128e5db9e5b0564460c9f05f04038abfba
 WHIRLPOOL 
56e713b9bd8f1af1496f383f45f1ef8d373b3f45148237bfd28c016f4becaa87d932b363d165b46c657ea3a08503e7bc60b1c5a5a2a814a659770bedf33d4202
-DIST policycoreutils-extra-1.33.tar.bz2 16191 SHA256 
743c3930277102f5545907314b21e98955e88be7972e30264c6cb5dca370b788 SHA512 
3f6f19ae33d5b1043f2979fb3e79bc061767f7051cbd0981e5c5663b4391fa29544b2184b384c9fce7b4100623bc776748d77a01865dcee78b0756d73ee10886
 WHIRLPOOL 
e74b9c3a6dff563b81bf3ce85119fbdfc658191ac063763f2916a7dcd90584f98cbccd1d6cd5ef3aecb00366a82c949c62ab9b907cb98800cb53d3e9ab63b492
 DIST policycoreutils-extra-1.34.tar.bz2 12107 SHA256 
56ae2aac57bf104d6a8a7837b25de7978b25e0642744ef95e6e6d483201aa4ca SHA512 
b1db6d70cf864023f22583e5bd24c85e796f1541f9c1bc878dd55309464b27346e05e414db3ef81bef2dfe8c8d7d7063ee7e0422878f38a3db56c67d9468b89d
 WHIRLPOOL 
8b094818bed0e438ce4258428afa054cb561f53e303d84e171881add5952cfc0fa577bce2765294905dac8ddd5560906904958f35c96afce0f357feb5333646d

diff --git a/sys-apps/policycoreutils/policycoreutils-2.2.5-r4.ebuild 
b/sys-apps/policycoreutils/policycoreutils-2.2.5-r4.ebuild
deleted file mode 100644
index 477789b..00000000
--- a/sys-apps/policycoreutils/policycoreutils-2.2.5-r4.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit multilib python-r1 toolchain-funcs eutils
-
-EXTRAS_VER="1.31"
-SEMNG_VER="2.2"
-SELNX_VER="2.2"
-SEPOL_VER="2.2"
-
-IUSE="audit pam dbus"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="http://userspace.selinuxproject.org";
-SRC_URI="http://userspace.selinuxproject.org/releases/20131030/${P}.tar.gz
-https://dev.gentoo.org/~swift/patches/policycoreutils/patchbundle-${P}-gentoo-r1.tar.gz
-       mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}[python]
-       >=sys-libs/glibc-2.4
-       >=sys-libs/libcap-1.10-r10
-       >=sys-libs/libsemanage-${SEMNG_VER}[python]
-       sys-libs/libcap-ng
-       >=sys-libs/libsepol-${SEPOL_VER}
-       sys-devel/gettext
-       dev-python/ipy
-       dbus? (
-               sys-apps/dbus
-               dev-libs/dbus-glib
-       )
-       audit? ( >=sys-process/audit-1.5.1 )
-       pam? ( sys-libs/pam )
-       ${PYTHON_DEPS}"
-
-### libcgroup -> seunshare
-### dbus -> restorecond
-
-# pax-utils for scanelf used by rlpkg
-RDEPEND="${COMMON_DEPS}
-       dev-python/sepolgen
-       app-misc/pax-utils"
-
-DEPEND="${COMMON_DEPS}"
-
-S1="${WORKDIR}/${P}"
-S2="${WORKDIR}/policycoreutils-extra"
-
-src_prepare() {
-       # rlpkg is more useful than fixfiles
-       sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
-               || die "fixfiles sed 1 failed"
-       sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
-               || die "fixfiles sed 2 failed"
-
-       EPATCH_MULTI_MSG="Applying policycoreutils patches ... " \
-       EPATCH_SUFFIX="patch" \
-       EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
-       EPATCH_FORCE="yes" \
-       epatch
-
-       epatch_user
-
-       python_copy_sources
-       # Our extra code is outside the regular directory, so set it to the 
extra
-       # directory. We really should optimize this as it is ugly, but the extra
-       # code is needed for Gentoo at the same time that policycoreutils is 
present
-       # (so we cannot use an additional package for now).
-       S="${S2}"
-       python_copy_sources
-}
-
-src_compile() {
-       local use_audit="n";
-       local use_pam="n";
-       local use_dbus="n";
-       local use_sesandbox="n";
-
-       use audit && use_audit="y";
-       use pam && use_pam="y";
-       use dbus && use_dbus="y";
-
-       building() {
-               emake -C "${BUILD_DIR}" AUDIT_LOG_PRIVS="y" 
AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" 
SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="${EPYTHON}" || die
-       }
-       S="${S1}" # Regular policycoreutils
-       python_foreach_impl building
-       S="${S2}" # Extra set
-       python_foreach_impl building
-}
-
-src_install() {
-       local use_audit="n";
-       local use_pam="n";
-       local use_dbus="n";
-       local use_sesandbox="n";
-
-       use audit && use_audit="y";
-       use pam && use_pam="y";
-       use dbus && use_dbus="y";
-
-       # Python scripts are present in many places. There are no extension 
modules.
-       installation-policycoreutils() {
-               einfo "Installing policycoreutils"
-               emake -C "${BUILD_DIR}" DESTDIR="${D}" AUDITH="${use_audit}" 
PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" 
AUDIT_LOG_PRIV="y" PYLIBVER="${EPYTHON}" install || return 1
-       }
-
-       installation-extras() {
-               einfo "Installing policycoreutils-extra"
-               emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="${use_dbus}" 
SHLIBDIR="${D}$(get_libdir)/rc" install || return 1
-       }
-
-       S="${S1}" # policycoreutils
-       python_foreach_impl installation-policycoreutils
-       S="${S2}" # extras
-       python_foreach_impl installation-extras
-       S="${S1}" # back for later
-
-       # remove redhat-style init script
-       rm -fR "${D}/etc/rc.d"
-
-       # compatibility symlinks
-       dosym /sbin/setfiles /usr/sbin/setfiles
-       dosym /$(get_libdir)/rc/runscript_selinux.so 
/$(get_libdir)/rcscripts/runscript_selinux.so
-
-       # location for permissive definitions
-       dodir /var/lib/selinux
-       keepdir /var/lib/selinux
-
-       # Set version-specific scripts
-       for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
-         python_replicate_script "${ED}/usr/bin/${pyscript}"
-       done
-       for pyscript in semanage rlpkg; do
-         python_replicate_script "${ED}/usr/sbin/${pyscript}"
-       done
-
-       dodir /usr/share/doc/${PF}/mcstrans/examples
-       cp -dR "${S1}"/mcstrans/share/examples/* 
"${D}/usr/share/doc/${PF}/mcstrans/examples"
-}
-
-pkg_postinst() {
-       elog "Previous versions of policycoreutils optionally installed 
sesandbox support."
-       elog "However, due to the possible unsafe state of seunshare 
(CVE-2014-3215) and the"
-       elog "fact that sesandbox (called 'sandbox' upstream but collides with 
Portage sandbox)"
-       elog "has not been supported in Gentoo for a while (for one, our 
policies do not provide"
-       elog "sandboxing support) we have discontinued providing the sandbox 
related files."
-}

diff --git a/sys-apps/policycoreutils/policycoreutils-2.3-r3.ebuild 
b/sys-apps/policycoreutils/policycoreutils-2.3-r3.ebuild
deleted file mode 100644
index c1cde9b..00000000
--- a/sys-apps/policycoreutils/policycoreutils-2.3-r3.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit multilib python-r1 toolchain-funcs eutils
-
-MY_P="${P//_/-}"
-
-EXTRAS_VER="1.33"
-SEMNG_VER="2.3"
-SELNX_VER="2.3"
-SEPOL_VER="2.3"
-PATCHBUNDLE="3"
-
-IUSE="audit pam dbus"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="http://userspace.selinuxproject.org";
-SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/${MY_P}.tar.gz
-https://dev.gentoo.org/~swift/patches/policycoreutils/patchbundle-${PN}-${PATCHBUNDLE}.tar.gz
-       mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}[python]
-       >=sys-libs/glibc-2.4
-       >=sys-libs/libcap-1.10-r10
-       >=sys-libs/libsemanage-${SEMNG_VER}[python]
-       sys-libs/libcap-ng
-       >=sys-libs/libsepol-${SEPOL_VER}
-       sys-devel/gettext
-       dev-python/ipy
-       dbus? (
-               sys-apps/dbus
-               dev-libs/dbus-glib
-       )
-       audit? ( >=sys-process/audit-1.5.1 )
-       pam? ( sys-libs/pam )
-       ${PYTHON_DEPS}"
-
-### libcgroup -> seunshare
-### dbus -> restorecond
-
-# pax-utils for scanelf used by rlpkg
-RDEPEND="${COMMON_DEPS}
-       dev-python/sepolgen
-       app-misc/pax-utils"
-
-DEPEND="${COMMON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-S1="${WORKDIR}/${MY_P}"
-S2="${WORKDIR}/policycoreutils-extra"
-
-src_prepare() {
-       # rlpkg is more useful than fixfiles
-       sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
-               || die "fixfiles sed 1 failed"
-       sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
-               || die "fixfiles sed 2 failed"
-
-       EPATCH_MULTI_MSG="Applying policycoreutils patches ... " \
-       EPATCH_SUFFIX="patch" \
-       EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
-       EPATCH_FORCE="yes" \
-       epatch
-
-       epatch_user
-
-       python_copy_sources
-       # Our extra code is outside the regular directory, so set it to the 
extra
-       # directory. We really should optimize this as it is ugly, but the extra
-       # code is needed for Gentoo at the same time that policycoreutils is 
present
-       # (so we cannot use an additional package for now).
-       S="${S2}"
-       python_copy_sources
-}
-
-src_compile() {
-       local use_audit="n";
-       local use_pam="n";
-       local use_dbus="n";
-       local use_sesandbox="n";
-
-       use audit && use_audit="y";
-       use pam && use_pam="y";
-       use dbus && use_dbus="y";
-
-       building() {
-               emake -C "${BUILD_DIR}" AUDIT_LOG_PRIVS="y" 
AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" 
SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="${EPYTHON}" || die
-       }
-       S="${S1}" # Regular policycoreutils
-       python_foreach_impl building
-       S="${S2}" # Extra set
-       python_foreach_impl building
-}
-
-src_install() {
-       local use_audit="n";
-       local use_pam="n";
-       local use_dbus="n";
-       local use_sesandbox="n";
-
-       use audit && use_audit="y";
-       use pam && use_pam="y";
-       use dbus && use_dbus="y";
-
-       # Python scripts are present in many places. There are no extension 
modules.
-       installation-policycoreutils() {
-               einfo "Installing policycoreutils"
-               emake -C "${BUILD_DIR}" DESTDIR="${D}" AUDITH="${use_audit}" 
PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" 
AUDIT_LOG_PRIV="y" PYLIBVER="${EPYTHON}" install || return 1
-               python_optimize
-       }
-
-       installation-extras() {
-               einfo "Installing policycoreutils-extra"
-               emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="${use_dbus}" 
SHLIBDIR="${D}$(get_libdir)/rc" install || return 1
-               python_optimize
-       }
-
-       S="${S1}" # policycoreutils
-       python_foreach_impl installation-policycoreutils
-       S="${S2}" # extras
-       python_foreach_impl installation-extras
-       S="${S1}" # back for later
-
-       # remove redhat-style init script
-       rm -fR "${D}/etc/rc.d"
-
-       # compatibility symlinks
-       dosym /sbin/setfiles /usr/sbin/setfiles
-       dosym /$(get_libdir)/rc/runscript_selinux.so 
/$(get_libdir)/rcscripts/runscript_selinux.so
-
-       # location for permissive definitions
-       dodir /var/lib/selinux
-       keepdir /var/lib/selinux
-
-       # Set version-specific scripts
-       for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
-         python_replicate_script "${ED}/usr/bin/${pyscript}"
-       done
-       for pyscript in semanage rlpkg; do
-         python_replicate_script "${ED}/usr/sbin/${pyscript}"
-       done
-
-       dodir /usr/share/doc/${PF}/mcstrans/examples
-       cp -dR "${S1}"/mcstrans/share/examples/* 
"${D}/usr/share/doc/${PF}/mcstrans/examples"
-}

diff --git a/sys-apps/policycoreutils/policycoreutils-2.4-r1.ebuild 
b/sys-apps/policycoreutils/policycoreutils-2.4-r1.ebuild
deleted file mode 100644
index 0da6cda..00000000
--- a/sys-apps/policycoreutils/policycoreutils-2.4-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit multilib python-r1 toolchain-funcs eutils bash-completion-r1
-
-MY_P="${P//_/-}"
-
-MY_RELEASEDATE="20150202"
-EXTRAS_VER="1.34"
-SEMNG_VER="${PV}"
-SELNX_VER="${PV}"
-SEPOL_VER="${PV}"
-
-IUSE="audit pam dbus"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki";
-SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz
-       
https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python]
-       >=sys-libs/glibc-2.4
-       >=sys-libs/libcap-1.10-r10:=
-       >=sys-libs/libsemanage-${SEMNG_VER}:=[python]
-       sys-libs/libcap-ng:=
-       >=sys-libs/libsepol-${SEPOL_VER}:=
-       sys-devel/gettext
-       dev-python/ipy[${PYTHON_USEDEP}]
-       dbus? (
-               sys-apps/dbus
-               dev-libs/dbus-glib:=
-       )
-       audit? ( >=sys-process/audit-1.5.1 )
-       pam? ( sys-libs/pam:= )
-       ${PYTHON_DEPS}"
-
-### libcgroup -> seunshare
-### dbus -> restorecond
-
-# pax-utils for scanelf used by rlpkg
-RDEPEND="${DEPEND}
-       dev-python/sepolgen
-       app-misc/pax-utils
-       !<sys-apps/openrc-0.14"
-
-S1="${WORKDIR}/${MY_P}"
-S2="${WORKDIR}/policycoreutils-extra"
-S="${S1}"
-
-src_prepare() {
-       epatch "${FILESDIR}/0010-remove-sesandbox-support.patch"
-       epatch "${FILESDIR}/0020-disable-autodetection-of-pam-and-audit.patch"
-       epatch "${FILESDIR}/0030-make-inotify-check-use-flag-triggered.patch"
-       epatch "${FILESDIR}/0040-reverse-access-check-in-run_init.patch"
-       epatch 
"${FILESDIR}/0070-remove-symlink-attempt-fails-with-gentoo-sandbox-approach.patch"
-       epatch "${FILESDIR}/0110-build-mcstrans-bug-472912.patch"
-       epatch 
"${FILESDIR}/0120-build-failure-for-mcscolor-for-CONTEXT__CONTAINS.patch"
-
-       # rlpkg is more useful than fixfiles
-       sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
-               || die "fixfiles sed 1 failed"
-       sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
-               || die "fixfiles sed 2 failed"
-
-       epatch_user
-
-       sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove 
Werror"
-
-       python_copy_sources
-       # Our extra code is outside the regular directory, so set it to the 
extra
-       # directory. We really should optimize this as it is ugly, but the extra
-       # code is needed for Gentoo at the same time that policycoreutils is 
present
-       # (so we cannot use an additional package for now).
-       S="${S2}"
-       python_copy_sources
-}
-
-src_compile() {
-       building() {
-               emake -C "${BUILD_DIR}" \
-                       AUDIT_LOG_PRIVS="y" \
-                       AUDITH="$(usex audit)" \
-                       PAMH="$(usex pam)" \
-                       INOTIFYH="$(usex dbus)" \
-                       SESANDBOX="n" \
-                       CC="$(tc-getCC)" \
-                       PYLIBVER="${EPYTHON}" \
-                       LIBDIR="\$(PREFIX)/$(get_libdir)"
-       }
-       S="${S1}" # Regular policycoreutils
-       python_foreach_impl building
-       S="${S2}" # Extra set
-       python_foreach_impl building
-}
-
-src_install() {
-       # Python scripts are present in many places. There are no extension 
modules.
-       installation-policycoreutils() {
-               einfo "Installing policycoreutils"
-               emake -C "${BUILD_DIR}" DESTDIR="${D}" \
-                       AUDITH="$(usex audit)" \
-                       PAMH="$(usex pam)" \
-                       INOTIFYH="$(usex dbus)" \
-                       SESANDBOX="n" \
-                       AUDIT_LOG_PRIV="y" \
-                       PYLIBVER="${EPYTHON}" \
-                       LIBDIR="\$(PREFIX)/$(get_libdir)" \
-                       install
-               python_optimize
-       }
-
-       installation-extras() {
-               einfo "Installing policycoreutils-extra"
-               emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="$(usex dbus)" 
SHLIBDIR="${D}$(get_libdir)/rc" install
-               python_optimize
-       }
-
-       S="${S1}" # policycoreutils
-       python_foreach_impl installation-policycoreutils
-       S="${S2}" # extras
-       python_foreach_impl installation-extras
-       S="${S1}" # back for later
-
-       # remove redhat-style init script
-       rm -fR "${D}/etc/rc.d" || die
-
-       # compatibility symlinks
-       dosym /sbin/setfiles /usr/sbin/setfiles
-       bashcomp_alias setsebool getsebool
-
-       # location for policy definitions
-       dodir /var/lib/selinux
-       keepdir /var/lib/selinux
-
-       # Set version-specific scripts
-       for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
-         python_replicate_script "${ED}/usr/bin/${pyscript}"
-       done
-       for pyscript in semanage rlpkg; do
-         python_replicate_script "${ED}/usr/sbin/${pyscript}"
-       done
-
-       dodir /usr/share/doc/${PF}/mcstrans/examples
-       cp -dR "${S1}"/mcstrans/share/examples/* 
"${D}/usr/share/doc/${PF}/mcstrans/examples" || die
-}
-
-pkg_postinst() {
-       # The selinux_gentoo init script is no longer needed with recent OpenRC
-       elog "The selinux_gentoo init script has been removed in this version 
as it is not required after OpenRC 0.13."
-}

diff --git a/sys-apps/policycoreutils/policycoreutils-2.4-r2.ebuild 
b/sys-apps/policycoreutils/policycoreutils-2.4-r2.ebuild
deleted file mode 100644
index 8102025..00000000
--- a/sys-apps/policycoreutils/policycoreutils-2.4-r2.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit multilib python-r1 toolchain-funcs eutils bash-completion-r1
-
-MY_P="${P//_/-}"
-
-MY_RELEASEDATE="20150202"
-EXTRAS_VER="1.34"
-SEMNG_VER="${PV}"
-SELNX_VER="${PV}"
-SEPOL_VER="${PV}"
-
-IUSE="audit pam dbus"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki";
-
-if [[ ${PV} == 9999 ]] ; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git";
-       
SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2";
-       S1="${WORKDIR}/${MY_P}/${PN}"
-       S2="${WORKDIR}/policycoreutils-extra"
-       S="${S1}"
-else
-       
SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz
-               
https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2";
-       KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-       S1="${WORKDIR}/${MY_P}"
-       S2="${WORKDIR}/policycoreutils-extra"
-       S="${S1}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python]
-       >=sys-libs/glibc-2.4
-       >=sys-libs/libcap-1.10-r10:=
-       >=sys-libs/libsemanage-${SEMNG_VER}:=[python]
-       sys-libs/libcap-ng:=
-       >=sys-libs/libsepol-${SEPOL_VER}:=
-       sys-devel/gettext
-       dev-python/ipy[${PYTHON_USEDEP}]
-       dbus? (
-               sys-apps/dbus
-               dev-libs/dbus-glib:=
-       )
-       audit? ( >=sys-process/audit-1.5.1 )
-       pam? ( sys-libs/pam:= )
-       ${PYTHON_DEPS}"
-
-### libcgroup -> seunshare
-### dbus -> restorecond
-
-# pax-utils for scanelf used by rlpkg
-RDEPEND="${DEPEND}
-       dev-python/sepolgen
-       app-misc/pax-utils
-       !<sys-apps/openrc-0.14"
-
-src_unpack() {
-       # Override default one because we need the SRC_URI ones even in case of 
9999 ebuilds
-       default
-       if [[ ${PV} == 9999 ]] ; then
-               git-r3_src_unpack
-       fi
-}
-
-src_prepare() {
-       S="${S1}"
-       cd "${S}" || die "Failed to switch to ${S}"
-       if [[ ${PV} != 9999 ]] ; then
-               # If needed for live ebuilds please use /etc/portage/patches
-               epatch "${FILESDIR}/0010-remove-sesandbox-support.patch"
-               epatch 
"${FILESDIR}/0020-disable-autodetection-of-pam-and-audit.patch"
-               epatch 
"${FILESDIR}/0030-make-inotify-check-use-flag-triggered.patch"
-               epatch "${FILESDIR}/0040-reverse-access-check-in-run_init.patch"
-               epatch 
"${FILESDIR}/0070-remove-symlink-attempt-fails-with-gentoo-sandbox-approach.patch"
-               epatch "${FILESDIR}/0110-build-mcstrans-bug-472912.patch"
-               epatch 
"${FILESDIR}/0120-build-failure-for-mcscolor-for-CONTEXT__CONTAINS.patch"
-               epatch 
"${FILESDIR}/0130-Only-invoke-RPM-on-RPM-enabled-Linux-distributions-bug-534682.patch"
-               epatch 
"${FILESDIR}/0140-Set-self.sename-to-sename-after-calling-semanage-bug-557370.patch"
-       fi
-
-       # rlpkg is more useful than fixfiles
-       sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
-               || die "fixfiles sed 1 failed"
-       sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
-               || die "fixfiles sed 2 failed"
-
-       epatch_user
-
-       sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove 
Werror"
-
-       python_copy_sources
-       # Our extra code is outside the regular directory, so set it to the 
extra
-       # directory. We really should optimize this as it is ugly, but the extra
-       # code is needed for Gentoo at the same time that policycoreutils is 
present
-       # (so we cannot use an additional package for now).
-       S="${S2}"
-       python_copy_sources
-}
-
-src_compile() {
-       building() {
-               emake -C "${BUILD_DIR}" \
-                       AUDIT_LOG_PRIVS="y" \
-                       AUDITH="$(usex audit)" \
-                       PAMH="$(usex pam)" \
-                       INOTIFYH="$(usex dbus)" \
-                       SESANDBOX="n" \
-                       CC="$(tc-getCC)" \
-                       PYLIBVER="${EPYTHON}" \
-                       LIBDIR="\$(PREFIX)/$(get_libdir)"
-       }
-       S="${S1}" # Regular policycoreutils
-       python_foreach_impl building
-       S="${S2}" # Extra set
-       python_foreach_impl building
-}
-
-src_install() {
-       # Python scripts are present in many places. There are no extension 
modules.
-       installation-policycoreutils() {
-               einfo "Installing policycoreutils"
-               emake -C "${BUILD_DIR}" DESTDIR="${D}" \
-                       AUDITH="$(usex audit)" \
-                       PAMH="$(usex pam)" \
-                       INOTIFYH="$(usex dbus)" \
-                       SESANDBOX="n" \
-                       AUDIT_LOG_PRIV="y" \
-                       PYLIBVER="${EPYTHON}" \
-                       LIBDIR="\$(PREFIX)/$(get_libdir)" \
-                       install
-               python_optimize
-       }
-
-       installation-extras() {
-               einfo "Installing policycoreutils-extra"
-               emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="$(usex dbus)" 
SHLIBDIR="${D}$(get_libdir)/rc" install
-               python_optimize
-       }
-
-       S="${S1}" # policycoreutils
-       python_foreach_impl installation-policycoreutils
-       S="${S2}" # extras
-       python_foreach_impl installation-extras
-       S="${S1}" # back for later
-
-       # remove redhat-style init script
-       rm -fR "${D}/etc/rc.d" || die
-
-       # compatibility symlinks
-       dosym /sbin/setfiles /usr/sbin/setfiles
-       bashcomp_alias setsebool getsebool
-
-       # location for policy definitions
-       dodir /var/lib/selinux
-       keepdir /var/lib/selinux
-
-       # Set version-specific scripts
-       for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
-         python_replicate_script "${ED}/usr/bin/${pyscript}"
-       done
-       for pyscript in semanage rlpkg; do
-         python_replicate_script "${ED}/usr/sbin/${pyscript}"
-       done
-
-       dodir /usr/share/doc/${PF}/mcstrans/examples
-       cp -dR "${S1}"/mcstrans/share/examples/* 
"${D}/usr/share/doc/${PF}/mcstrans/examples" || die
-}
-
-pkg_postinst() {
-       # The selinux_gentoo init script is no longer needed with recent OpenRC
-       elog "The selinux_gentoo init script has been removed in this version 
as it is not required after OpenRC 0.13."
-
-       for POLICY_TYPE in ${POLICY_TYPES} ; do
-               # There have been some changes to the policy store, rebuilding 
now.
-               # https://marc.info/?l=selinux&m=143757277819717&w=2
-               einfo "Rebuilding store ${POLICY_TYPE} (without re-loading)."
-               semodule -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild 
policy store ${POLICY_TYPE}"
-       done
-}

diff --git a/sys-apps/policycoreutils/policycoreutils-2.4.ebuild 
b/sys-apps/policycoreutils/policycoreutils-2.4.ebuild
deleted file mode 100644
index 642ddd9..00000000
--- a/sys-apps/policycoreutils/policycoreutils-2.4.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit multilib python-r1 toolchain-funcs eutils
-
-MY_P="${P//_/-}"
-
-EXTRAS_VER="1.33"
-SEMNG_VER="${PV}"
-SELNX_VER="${PV}"
-SEPOL_VER="${PV}"
-
-IUSE="audit pam dbus"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki";
-SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/${MY_P}.tar.gz
-       mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=sys-libs/libselinux-${SELNX_VER}[python]
-       >=sys-libs/glibc-2.4
-       >=sys-libs/libcap-1.10-r10
-       >=sys-libs/libsemanage-${SEMNG_VER}[python]
-       sys-libs/libcap-ng
-       >=sys-libs/libsepol-${SEPOL_VER}
-       sys-devel/gettext
-       dev-python/ipy[${PYTHON_USEDEP}]
-       dbus? (
-               sys-apps/dbus
-               dev-libs/dbus-glib
-       )
-       audit? ( >=sys-process/audit-1.5.1 )
-       pam? ( sys-libs/pam )
-       ${PYTHON_DEPS}"
-
-### libcgroup -> seunshare
-### dbus -> restorecond
-
-# pax-utils for scanelf used by rlpkg
-RDEPEND="${DEPEND}
-       dev-python/sepolgen
-       app-misc/pax-utils"
-
-S="${WORKDIR}/${MY_P}"
-S1="${WORKDIR}/${MY_P}"
-S2="${WORKDIR}/policycoreutils-extra"
-
-src_prepare() {
-       epatch "${FILESDIR}/0010-remove-sesandbox-support.patch"
-       epatch "${FILESDIR}/0020-disable-autodetection-of-pam-and-audit.patch"
-       epatch "${FILESDIR}/0030-make-inotify-check-use-flag-triggered.patch"
-       epatch "${FILESDIR}/0040-reverse-access-check-in-run_init.patch"
-       epatch 
"${FILESDIR}/0070-remove-symlink-attempt-fails-with-gentoo-sandbox-approach.patch"
-       epatch "${FILESDIR}/0110-build-mcstrans-bug-472912.patch"
-       epatch 
"${FILESDIR}/0120-build-failure-for-mcscolor-for-CONTEXT__CONTAINS.patch"
-
-       # rlpkg is more useful than fixfiles
-       sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
-               || die "fixfiles sed 1 failed"
-       sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
-               || die "fixfiles sed 2 failed"
-
-       epatch_user
-
-       python_copy_sources
-       # Our extra code is outside the regular directory, so set it to the 
extra
-       # directory. We really should optimize this as it is ugly, but the extra
-       # code is needed for Gentoo at the same time that policycoreutils is 
present
-       # (so we cannot use an additional package for now).
-       S="${S2}"
-       python_copy_sources
-}
-
-src_compile() {
-       building() {
-               emake -C "${BUILD_DIR}" \
-                       AUDIT_LOG_PRIVS="y" \
-                       AUDITH="$(usex audit)" \
-                       PAMH="$(usex pam)" \
-                       INOTIFYH="$(usex dbus)" \
-                       SESANDBOX="n" \
-                       CC="$(tc-getCC)" \
-                       PYLIBVER="${EPYTHON}" \
-                       LIBDIR="\$(PREFIX)/$(get_libdir)"
-       }
-       S="${S1}" # Regular policycoreutils
-       python_foreach_impl building
-       S="${S2}" # Extra set
-       python_foreach_impl building
-}
-
-src_install() {
-       # Python scripts are present in many places. There are no extension 
modules.
-       installation-policycoreutils() {
-               einfo "Installing policycoreutils"
-               emake -C "${BUILD_DIR}" DESTDIR="${D}" AUDITH="$(usex audit)" 
PAMH="$(usex pam)" INOTIFYH="$(usex dbus)" SESANDBOX="n" AUDIT_LOG_PRIV="y" 
PYLIBVER="${EPYTHON}" install
-               python_optimize
-       }
-
-       installation-extras() {
-               einfo "Installing policycoreutils-extra"
-               emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="$(usex dbus)" 
SHLIBDIR="${D}$(get_libdir)/rc" install
-               python_optimize
-       }
-
-       S="${S1}" # policycoreutils
-       python_foreach_impl installation-policycoreutils
-       S="${S2}" # extras
-       python_foreach_impl installation-extras
-       S="${S1}" # back for later
-
-       # remove redhat-style init script
-       rm -fR "${D}/etc/rc.d"
-
-       # compatibility symlinks
-       dosym /sbin/setfiles /usr/sbin/setfiles
-       dosym /$(get_libdir)/rc/runscript_selinux.so 
/$(get_libdir)/rcscripts/runscript_selinux.so
-
-       # location for policy definitions
-       dodir /var/lib/selinux
-       keepdir /var/lib/selinux
-
-       # Set version-specific scripts
-       for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
-         python_replicate_script "${ED}/usr/bin/${pyscript}"
-       done
-       for pyscript in semanage rlpkg; do
-         python_replicate_script "${ED}/usr/sbin/${pyscript}"
-       done
-
-       dodir /usr/share/doc/${PF}/mcstrans/examples
-       cp -dR "${S1}"/mcstrans/share/examples/* 
"${D}/usr/share/doc/${PF}/mcstrans/examples"
-}
-
-pkg_postinst() {
-       # The selinux_gentoo init script is no longer needed with recent OpenRC
-       elog "The selinux_gentoo init script will be removed in future versions 
since it is not needed with OpenRC 0.13."
-}

Reply via email to