Fix bugs #429456 and #417303

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

3 files changed, 105 insertions, 2 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index f3d0b6c7ac85..2fb4d2361b72 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libselinux
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.83 2012/08/06 07:46:08 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.84 2012/09/08 18:44:22 swift Exp $
+
+*libselinux-2.1.9-r2 (08 Sep 2012)
+
+  08 Sep 2012; <swift@gentoo.org> +libselinux-2.1.9-r2.ebuild:
+  Fix bugs #429456 and #417303
 
   06 Aug 2012; Patrick Lauer <patrick@gentoo.org> libselinux-2.1.9-r1.ebuild:
   Restricting python ABIs that don't work
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 2d7c71905910..c81f6ec7e3ef 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,6 +1,7 @@
 AUX libselinux-2.1.9-mountsys.patch 957 SHA256 ab2c728464411d3d44d19afe79ebcfa0f7d69445245a505e330cf051ea65ed35 SHA512 c9d2df56f1513ea973d231d31ff958e419b7a64c882bfdaae0554752d847cc98885e27ef21f1a0ce821c05c376ee5d9140fc1f8f7009fd69e3b56eccfa709f0d WHIRLPOOL df27d264eafdc98e8e947c4c1d970a7dd693f465cd06163cc72de10b1433ea47b6d1e782dd38e100d7189d424d65fe81d8282423c623e89e8b1f0d99121cfc01
 DIST libselinux-2.1.9.tar.gz 155840 SHA256 749d4b39c80aa9df8247b8b3187ab72442c0dbad6e70bf312e25052bd4e7063f SHA512 5e4659360ea08928ea8bb8dee3ab64ffd3c76071d7c3a1009f1d69298c015a99ab1f1d1af2d1f8afdcdd01b8be309883a26d2c2ca05c1b528e08778f22a74c96 WHIRLPOOL 384b7c935cfd93aa2bca7ff68374925ecf9066c3b63b38325c4d53a8a20075fc003872f9f4838dc8c346edfaa5a334f49b36d4545855cfc6358410b153151926
 EBUILD libselinux-2.1.9-r1.ebuild 2086 SHA256 d3acd67150515bd6c1a6e0e410d0eb536e1e838d5aa40d1e4c86f8f434916ed2 SHA512 33e17abc071687622cb13dc30537c006568873fce5acc2bc4a60be3d832a53282077392ddb409f83cd4ada2d99a39db36efc1b3db8955c576da6b07cc43cab3d WHIRLPOOL f622eec132bbe1c14cacc0de7a71c7a894503ed8f224563ecf0a7e510fdcc98f5e0791dc3823a96d41e0aef4df4cbfb983889287a2a5492687d246fee3a073b2
+EBUILD libselinux-2.1.9-r2.ebuild 2269 SHA256 3ab1a4dac07b806ecd4d5d0e7e4f929fc442b762cbd08f909dc3e11046c487d6 SHA512 473489ecf21b7c43ea60e14590eccba93342e5d4977d38df63ab8ea6b726def11650e312c5f7150706fd68df807c81804f044f107d3c6d95dc1467104e552173 WHIRLPOOL 729d4785123debb0bcccdcf3a83d27e037db4e3c5368ab678b58b8ed8d85d80d5120f73d0a63bd232d7f6e50745d40beae6d3a819b02f85a3927a5c584b8cdb2
 EBUILD libselinux-2.1.9.ebuild 2022 SHA256 a369e589e190d7a4e96adcac6288b72ae63e79a388fbaee095a3fcecbab47683 SHA512 de836c2fd0f0266886ba5b42c44eed79cfe1748f064409d9519aab6bae9896eb8427cefce6c3eee2523832f8bb9b3e7e027676da4be4efb068e3d7786e3242b2 WHIRLPOOL ae764c8c36b3b6756f4533c22f098cf74c2587372e8eb8cb2f8bd2741aa398aafbc7802d41c06984231b7f3a1d0076b6982aea5e728ccc3ea554234d513ef823
-MISC ChangeLog 11672 SHA256 f33fb3e10dcd0879f8a8a157685187c2db7b0c9de2382fbbe3817fa527e80535 SHA512 86618b4aebbb2f31730da95ac6c6966da1710d7d7671132ca1fa84843ff4eb758612430c41228c9699f21cf29d854855899e8162279df05abab6c790b22d316a WHIRLPOOL a8dcd113fb01a46e41af41b7622a4da87285af9c6a1b26b2725c7289321a674dd8c422007d23584076d1c333e4142f0b9e7c8c2d2f1212b5a79b8f3971b4f232
+MISC ChangeLog 11801 SHA256 260881b41835552dee66953e3d0868d608ded60f8e19af9503934d78f90be2f1 SHA512 bf36e0743b7eb446ef0d09cf9b8d3f13cf1506b5611813a80be1b52f47d64cbcb2ccd45fd8b646e370dbab61f84247265b5fd3c7556f8de0e1c0acbe2c542036 WHIRLPOOL c1ca2cdeccb799d34324f9d4f778ae1bafaa29f0913e858bf80efa84b11752e28f9f019764ed097b08279a597e6a7dab9362644020bdd2fedac4355f7843f590
 MISC metadata.xml 406 SHA256 934da6149d008c09754c0654dbea6c49da117923adc6fbf3fcabac58195b9c45 SHA512 5bd2b0637c4d77b6113540dff5c4253390b1fcc69b864aaf2196d2c6e8c2c10fbb06bfcb69ba73978e3a2c3ca60fc6e4eccc0ea02a818b34a66c137f993a33a0 WHIRLPOOL f34ec6f0a7f35b9c2a8f29688fc58b6228484e3ba0568d65b6d8e24cc91662b6704ea532e036cf0a6ceca83b4e118bb7c8a64c6c4ba45bd60e2fa2d73d2d2abd
diff --git a/sys-libs/libselinux/libselinux-2.1.9-r2.ebuild b/sys-libs/libselinux/libselinux-2.1.9-r2.ebuild
new file mode 100644
index 000000000000..55c92fa6ee30
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-2.1.9-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.1.9-r2.ebuild,v 1.1 2012/09/08 18:44:22 swift Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.5 *-jython *-pypy-*"
+USE_RUBY="ruby18"
+RUBY_OPTIONAL="yes"
+
+inherit multilib python toolchain-funcs eutils ruby-ng
+
+SEPOL_VER="2.1.4"
+
+DESCRIPTION="SELinux userland library"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20120216/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python ruby"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}
+	ruby? ( $(ruby_implementations_depend) )"
+DEPEND="${RDEPEND}
+	ruby? ( dev-lang/swig )
+	python? ( dev-lang/swig )"
+
+S="${WORKDIR}/${P}"
+
+pkg_setup() {
+	if use python; then
+		python_pkg_setup
+	fi
+
+	if use ruby; then
+		ruby-ng_pkg_setup
+	fi
+}
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	# fix up paths for multilib
+	sed -i -e "/^LIBDIR/s/lib/$(get_libdir)/" "${S}/src/Makefile" \
+		|| die "Fix for multilib LIBDIR failed."
+	sed -i -e "/^SHLIBDIR/s/lib/$(get_libdir)/" "${S}/src/Makefile" \
+		|| die "Fix for multilib SHLIBDIR failed."
+	epatch "${FILESDIR}/${P}-mountsys.patch"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)" LDFLAGS="-fPIC ${LDFLAGS}" all || die
+
+	if use python; then
+		python_copy_sources src
+		building() {
+			emake CC="$(tc-getCC)" PYINC="-I$(python_get_includedir)" PYTHONLIBDIR="$(python_get_library -l)" PYPREFIX="python-$(python_get_version)" LDFLAGS="-fPIC ${LDFLAGS}" pywrap
+		}
+		python_execute_function -s --source-dir src building
+	fi
+
+	if use ruby; then
+		emake CC="$(tc-getCC)" rubywrap || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	if use python; then
+		installation() {
+			emake DESTDIR="${D}" PYLIBVER="python$(python_get_version)" PYPREFIX="python-$(python_get_version)" install-pywrap
+		}
+		python_execute_function -s --source-dir src installation
+	fi
+
+	if use ruby; then
+		emake DESTDIR="${D}" install-rubywrap || die
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize selinux
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup selinux
+	fi
+}