Set SUPPORT_PYTHON_ABIS (bug #353763). Respect AR and CC.

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

3 files changed, 30 insertions, 18 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index 3d07916a0b20..a72df2c4f333 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libselinux
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.67 2011/02/05 11:13:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.68 2011/02/05 22:07:40 arfrever Exp $
+
+  05 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  libselinux-2.0.94.ebuild:
+  Set SUPPORT_PYTHON_ABIS (bug #353763). Respect AR and CC.
 
 *libselinux-2.0.94 (05 Feb 2011)
 
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 4c6d6135a911..8c081f2e2338 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -5,6 +5,6 @@ DIST libselinux-2.0.85.tar.gz 175396 RMD160 ce27fc9c5baf23d9f1c2eeda24357abc4d61
 DIST libselinux-2.0.94.tar.gz 205804 RMD160 38964fc55ac8d0eb0995b962a4d56e7765485396 SHA1 66764b19fe94cc8a1d5fceefde2383af0d554d76 SHA256 b8312852306650e9720de5a20fe7560d935d3c90ffedca1cac25bf3f283d8a36
 EBUILD libselinux-2.0.71.ebuild 1720 RMD160 909dea1395089d168e6026294f05ca1a317fb618 SHA1 ceeeb20679fe9501afe1e6237eb7f17330273306 SHA256 aaaee7532de60599310f0622205af04efb3e424362e5462242498bda56e69f8d
 EBUILD libselinux-2.0.85.ebuild 1769 RMD160 abd36bae31043afba07c1548bcecb668c4e7c60f SHA1 8066bdcc799d989de8f47002bf9d7220fbb37d4b SHA256 a749d9182f72825f48defcc6ca8beea9910916bb8c172db8644be32002bc6106
-EBUILD libselinux-2.0.94.ebuild 1532 RMD160 dc7b38425918e169f2029b2d556bfbe23948b12b SHA1 a23c520046eb164b7c1731cadd693bda176a5c48 SHA256 f84abed163d3bd23303d3645baa0f196601c2bfb4f8336ed87a5f0a8c0d30f0f
-MISC ChangeLog 9564 RMD160 e33762233f246bb6b9096496b7de2a222bc17227 SHA1 c689fefa436546f8690ce27ddb2d9d117e16c5a4 SHA256 b5dc4168504b2c3bf4a3963687c406966e77dcacbe3d8318e8de16f63f155a05
+EBUILD libselinux-2.0.94.ebuild 1792 RMD160 f6a8b623d763c7bb13b3232aeb5ba160507d965b SHA1 baeb088634b845065eeb5d307283295f24340310 SHA256 92e97feb7c97eff09d100d2ff503d44a148103cae35927049ca99b1a9c1d4686
+MISC ChangeLog 9726 RMD160 3e1a65dc5ca357d7ca56a7283df011904e4392bb SHA1 5b301cc9eaa98ea298a65fd803fdad9762604eb9 SHA256 e609297f1f09f48844a5386cc984e8e10a78379d6d4909f05bf4cf8529b18847
 MISC metadata.xml 537 RMD160 6adcd5fc653db8ad7780299214875297beb9c931 SHA1 9eccef643426b27d5e8c445ab25113c1c44542b1 SHA256 e691ecff0c45ccbd6cf813fbd7f23e489dabad664e89e6b21b8c7c1785550f9e
diff --git a/sys-libs/libselinux/libselinux-2.0.94.ebuild b/sys-libs/libselinux/libselinux-2.0.94.ebuild
index 64c4f34df16b..2ff6a6898950 100644
--- a/sys-libs/libselinux/libselinux-2.0.94.ebuild
+++ b/sys-libs/libselinux/libselinux-2.0.94.ebuild
@@ -1,21 +1,25 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.0.94.ebuild,v 1.1 2011/02/05 11:13:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.0.94.ebuild,v 1.2 2011/02/05 22:07:40 arfrever Exp $
 
 EAPI="2"
-IUSE="ruby"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 RUBY_OPTIONAL="yes"
 
-inherit eutils multilib python
+inherit multilib python toolchain-funcs
 
 SEPOL_VER="2.0.41"
 
 DESCRIPTION="SELinux userland library"
 HOMEPAGE="http://userspace.selinuxproject.org"
 SRC_URI="http://userspace.selinuxproject.org/releases/20100525/devel/${P}.tar.gz"
+
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="ruby"
 
 DEPEND=">=sys-libs/libsepol-${SEPOL_VER}
 	dev-lang/swig
@@ -24,11 +28,6 @@ DEPEND=">=sys-libs/libsepol-${SEPOL_VER}
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}
 	ruby? ( dev-lang/ruby )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-}
-
 src_prepare() {
 	# fix up paths for multilib
 	sed -i -e "/^LIBDIR/s/lib/$(get_libdir)/" "${S}/src/Makefile" \
@@ -38,17 +37,26 @@ src_prepare() {
 }
 
 src_compile() {
-	emake LDFLAGS="-fPIC ${LDFLAGS}" all || die
-	emake PYLIBVER="python$(python_get_version)" LDFLAGS="-fPIC ${LDFLAGS}" pywrap || die
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)" LDFLAGS="-fPIC ${LDFLAGS}" all || die
+
+	python_copy_sources src
+	building() {
+		emake CC="$(tc-getCC)" PYLIBVER="python$(python_get_version)" LDFLAGS="-fPIC ${LDFLAGS}" pywrap
+	}
+	python_execute_function -s --source-dir src building
 
 	if use ruby; then
-		emake rubywrap || die
+		emake CC="$(tc-getCC)" rubywrap || die
 	fi
 }
 
 src_install() {
-	python_need_rebuild
-	make DESTDIR="${D}" PYLIBVER="python$(python_get_version)" install install-pywrap || die
+	emake DESTDIR="${D}" install || die
+
+	installation() {
+		emake DESTDIR="${D}" PYLIBVER="python$(python_get_version)" install-pywrap
+	}
+	python_execute_function -s --source-dir src installation
 
 	if use ruby; then
 		emake DESTDIR="${D}" install-rubywrap || die
@@ -56,9 +64,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)
+	python_mod_optimize selinux
 }
 
 pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)
+	python_mod_cleanup selinux
 }