Set SUPPORT_PYTHON_ABIS (bug #353762). Fix dependencies. Fix installation with FEATURES="multilib-strict".

(Portage version: 2.2.0_alpha22_p4/cvs/Linux x86_64)

2 files changed, 32 insertions, 28 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 3c2138811b69..a5bd4bacfcd2 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.79 2011/02/05 11:25:10 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.80 2011/02/08 17:29:48 arfrever Exp $
+
+  08 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  policycoreutils-2.0.82.ebuild:
+  Set SUPPORT_PYTHON_ABIS (bug #353762). Fix dependencies. Fix installation
+  with FEATURES="multilib-strict".
 
 *policycoreutils-2.0.82 (05 Feb 2011)
 
diff --git a/sys-apps/policycoreutils/policycoreutils-2.0.82.ebuild b/sys-apps/policycoreutils/policycoreutils-2.0.82.ebuild
index 9c69bae00529..d07ef57f5e14 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.0.82.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.0.82.ebuild
@@ -1,32 +1,36 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.0.82.ebuild,v 1.1 2011/02/05 11:25:10 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.0.82.ebuild,v 1.2 2011/02/08 17:29:48 arfrever Exp $
 
-IUSE="nls"
+EAPI="2"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="xml"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit eutils python
+inherit multilib python toolchain-funcs
 
 EXTRAS_VER="1.20"
 SEMNG_VER="2.0.45"
 SELNX_VER="2.0.94"
 SEPOL_VER="2.0.41"
 
-#BUGFIX_PATCH="${FILESDIR}/policycoreutils-2.0.62-po.diff"
-
 DESCRIPTION="SELinux core utilities"
 HOMEPAGE="http://userspace.selinuxproject.org"
 SRC_URI="http://userspace.selinuxproject.org/releases/20100525/devel/${P}.tar.gz
 	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="nls"
 
-COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}
+COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}[python]
 	>=sys-libs/glibc-2.4
 	>=sys-process/audit-1.5.1
 	>=sys-libs/libcap-1.10-r10
 	sys-libs/pam
-	>=sys-libs/libsemanage-${SEMNG_VER}
+	>=sys-libs/libsemanage-${SEMNG_VER}[python]
 	sys-libs/libcap-ng
 	>=sys-libs/libsepol-${SEPOL_VER}"
 
@@ -40,10 +44,7 @@ DEPEND="${COMMON_DEPS}
 
 S2=${WORKDIR}/policycoreutils-extra
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# rlpkg is more useful than fixfiles
 	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
 		|| die "fixfiles sed 1 failed"
@@ -57,37 +58,35 @@ src_unpack() {
 
 src_compile() {
 	einfo "Compiling policycoreutils"
-	emake -C "${S}" PYLIBVER="python$(python_get_version)" AUDIT_LOG_PRIV=y || die
+	emake -C "${S}" AUDIT_LOG_PRIV="y" CC="$(tc-getCC)" || die
 	einfo "Compiling policycoreutils-extra"
-	emake -C "${S2}" || die
+	emake -C "${S2}" CC="$(tc-getCC)" || die
 }
 
 src_install() {
-	python_need_rebuild
+	# Python scripts are present in many places. There are no extension modules.
+	installation() {
+		einfo "Installing policycoreutils"
+		emake -C "${S}" DESTDIR="${T}/images/${PYTHON_ABI}" AUDIT_LOG_PRIV="y" PYLIBVER="python$(python_get_version)" install || return 1
 
-	einfo "Installing policycoreutils"
-	make DESTDIR="${D}" -C "${S}" PYLIBVER="python$(python_get_version)" AUDIT_LOG_PRIV=y install || die
-	einfo "Installing policycoreutils-extra"
-	make DESTDIR="${D}" -C "${S2}" install || die
+		einfo "Installing policycoreutils-extra"
+		emake -C "${S2}" DESTDIR="${T}/images/${PYTHON_ABI}" SHLIBDIR="${D}$(get_libdir)/rc" install || return 1
+	}
+	python_execute_function installation
+	python_merge_intermediate_installation_images "${T}/images"
 
 	# remove redhat-style init script
 	rm -fR "${D}/etc/rc.d"
 
 	# compatibility symlinks
 	dosym /sbin/setfiles /usr/sbin/setfiles
-	dosym /lib/rc/runscript_selinux.so /lib/rcscripts/runscript_selinux.so
-
-	if has_version '<sys-libs/pam-0.99'; then
-		# install compat pam.d entries
-		# for older pam
-		make DESTDIR="${D}" -C "${S2}/pam.d" install || die
-	fi
+	dosym /$(get_libdir)/rc/runscript_selinux.so /$(get_libdir)/rcscripts/runscript_selinux.so
 }
 
 pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)
+	python_mod_optimize seobject.py
 }
 
 pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)
+	python_mod_cleanup seobject.py
 }