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

Package-Manager: portage-2.2.0_alpha22_p4/cvs/Linux x86_64

3 files changed, 34 insertions, 30 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/Manifest b/sys-apps/policycoreutils/Manifest
index c4807a56253f..1d01059cee45 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -8,6 +8,6 @@ EBUILD policycoreutils-2.0.55.ebuild 2627 RMD160 8c982e757ee95e1dd730bc55e57db8a
 EBUILD policycoreutils-2.0.69-r1.ebuild 2695 RMD160 970ad2a5e6cf2433e5bc07f812be18535645010a SHA1 87fff50967775798304fec77d58d6e080f203ce1 SHA256 c5e8a5df620bd57dd7dd45b40e9b0c967bd5279c539471c05668f778eddf94dd
 EBUILD policycoreutils-2.0.69-r2.ebuild 2700 RMD160 5bf8052fd4d2f6211ec676e2593776ef8c4da6f5 SHA1 f9fd4656f514b4a0594adc83436c73b8681d3acb SHA256 755f32f4d7d9ab2dbe017556f096ac64cd4808c9982cf84be122a085c61ee970
 EBUILD policycoreutils-2.0.69.ebuild 2634 RMD160 cdeeaa18d33c344b8de6becfb7ec973e6ca4f2a4 SHA1 c0ef52e0620513c5296ee665ac39ede6589ca989 SHA256 aa4d6bb9a3619085d77469747994852c8dd8c260f4079790d0392ac6c3072c87
-EBUILD policycoreutils-2.0.82.ebuild 2473 RMD160 69ff32e6b976f7f714eb1438a3d2793f8de60923 SHA1 600451e0a17a352ae6225f1cca51de3fa743ab0a SHA256 17e9a0254f278a24b3ac6c713d7be1aac002d5faf22c717e9bae441fc54d17b1
-MISC ChangeLog 12474 RMD160 1bdfee8eb723004e89ed05451c419992c41c06de SHA1 8d46762680a1fcf4257b25b07af9ce118c329990 SHA256 6faa94121dd484572759283ff5d91badd43b616e4c49ed451d6e248d44aee0c0
+EBUILD policycoreutils-2.0.82.ebuild 2646 RMD160 0eab4ef46e0e45fe888a417ef7740e5eae4d65b0 SHA1 98b7877554b65ba129a77eff57d2211b665f6b9f SHA256 9e4ddaa7349bbf6d0d108520cae86d7b9b49d2c4227001035e21504763eb3783
+MISC ChangeLog 12692 RMD160 4bc653a57652f5b2283b4812ef97f5aac29767af SHA1 883a89bf9a87b3ef57563a37f6879bbe86595254 SHA256 b970a01cb464a1c249649285a62efc71c98295094086738a240257ef0e189d26
 MISC metadata.xml 836 RMD160 421e492e89112f8436f8c5535aa2340cc8795929 SHA1 91c830f5358b9786f2b61e1967214f49212c4e3a SHA256 1d14250f52ecf63b67bed2289833d6f1ff2eba3cad9a80794b356e747917cdb7
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
 }