Update multilib support in libsemanage with thanks to Arfrever

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

3 files changed, 123 insertions, 15 deletions

diff --git a/sys-libs/libsemanage/ChangeLog b/sys-libs/libsemanage/ChangeLog
index 6ca13bf2bbc8..0bca3091319f 100644
--- a/sys-libs/libsemanage/ChangeLog
+++ b/sys-libs/libsemanage/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libsemanage
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/ChangeLog,v 1.69 2014/06/01 12:21:16 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/ChangeLog,v 1.70 2014/06/02 19:24:25 swift Exp $
+
+*libsemanage-2.3-r2 (02 Jun 2014)
+
+  02 Jun 2014; Sven Vermeulen <swift@gentoo.org> +libsemanage-2.3-r2.ebuild:
+  Update multilib support in libsemanage with thanks to Arfrever
 
 *libsemanage-2.3-r1 (01 Jun 2014)
 
diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest
index f218e5259084..f7bc3ed04f07 100644
--- a/sys-libs/libsemanage/Manifest
+++ b/sys-libs/libsemanage/Manifest
@@ -6,23 +6,24 @@ DIST libsemanage-2.3.tar.gz 138231 SHA256 03e09e35e611c286e446bef92b6023ef262381
 EBUILD libsemanage-2.2-r2.ebuild 3212 SHA256 71803e1e7626a67080e62c585296dbee78ce7f075d665ad41b7b90817020949d SHA512 4bcc333d9b7d74d0142a1c3745ac9bea27918c73e8e914420d2235cfbe98ce77add179abd5d186600cdc037a5f2c3fc6563625b38fab7f7d3fe2c42386f2844d WHIRLPOOL 2652895cd27e357d8d3a13a98dee82d9e341e3f756a1f3d65416c26450137060a656f55f9ad0831fc9a83f0fe6041648c4830693f01a8555485d3a3acb229772
 EBUILD libsemanage-2.2.ebuild 4121 SHA256 0df9712bd636e333e189519b56295f4c9adf5ae02a31490a9299273252fc098d SHA512 96697790366f50eb3c502618e8e38bc161df60c235f28d5a9f5a2ac6bb6c1cedf3d63111be5e30e3fe2336c056ec30f35d064a4fff096625c5e35df575d728cd WHIRLPOOL b14b75c0f62a6ff5674dcf68ad46b54d463407e3b77885e85d728a4f50792aef9446572e14f63aca5437c852d5a43a626eda4a70af7606adf3e7da08dff3b1db
 EBUILD libsemanage-2.3-r1.ebuild 3611 SHA256 ebc96fd635ffc4b3d97deecbbc355c3173b3cdbd5da25e9e65483cb6bdca2852 SHA512 960d4447259bf882b6dabd968c25d74a830c5492f297769a925d588f52845c3e8fd963ad1f2b3f16d05ee1ba6baa707891d6b1154fbda76aa13764d6581927a2 WHIRLPOOL 4ef2828faa3239290851f15448be2760356e7296841bf120e0107e2758444303babb0a6ef9d9d92ca4a9626648b9f74408b8974c8923aaab8370e19a6948a929
+EBUILD libsemanage-2.3-r2.ebuild 3402 SHA256 14d21dfbddb137d5bc98e3b0689cef1c84b834f88594f22f059c1a01b61ee9c7 SHA512 a3740d4e3cd2b2a3f2165b715465ef4f076d9213011440c1181033a96372d593bfd24e9556a04931cc09022ac8e47fb9babad36ababbfa51a6c29af74ad63659 WHIRLPOOL 4f5d74afc992625cba9f82313c54bda18114686b26ebbbba70b01c5cfe6caeb55ca33d0f71a07241f4ab19b3b58d478df2bd6f463d2433a0ea9bda7132417302
 EBUILD libsemanage-2.3.ebuild 3249 SHA256 e68a8128677922c5b4fab1f700b4144c615486fc114a0656c9c88ed548578b3c SHA512 4abc43eb01e01cfafbf33456f21ef7e73219c42b5dc57f5e957d699f27d40deae45376400d56d76a83cb8563ff10fc6b9ac6f71315d94e0dea9a95a4ee9511f4 WHIRLPOOL 1201bddddec78f48fc07cc4d23587a2081f6fb8e7b8d9d4031b94d44c29e79ed5e4e7a1bb2621380fafb6223745c0095858142197869fd45a6dfcad8a474212b
-MISC ChangeLog 9631 SHA256 adbf3d58bc0d1bfceaee2fe0b60ceb781b8560b7d7fb671561814ef5fc23b753 SHA512 b5ad43f857124895ae8dad915adb71e835eda2f52b3bd8092383e1466ef1c10bf2dc273566062fb91435886b5ca47d106853bdfcf17829bc388fd321ceb8212c WHIRLPOOL f3c6fbec4194ce00c05e942096a236e53731c4668b08fc34e44cec76edf933696f6775275c27e7e4546d31ffb7ee9c782ef120d8f677c9fb9e01cb239c6e5988
+MISC ChangeLog 9809 SHA256 74c47a639bba96ec41fd5ff5cfb49dcc21fa592ced23e1c5418049330e199a17 SHA512 a506343ddaefc1aa2b54584ab3baa0ac0ebafae964f016ec2991e06736c4be391277dd5f98bf5c9f8a2f2bea9a59ffdb2773fdd10f93e53ff53d8d5294aab789 WHIRLPOOL 18b0b3af8e9a0a009019aec884d5e600715c44145ca4a2da660426766ddd124781c48244b5456e8b3f7658a9c4a8f866cd917e7e1e7caaef831d58a5fc741474
 MISC metadata.xml 233 SHA256 c5a240155da9b7588e31ff668d3656486a16868654c076f7e1aea823a6b85ae9 SHA512 96a2805dfeebf2e9458e4b602da2cff381f9a3a2e05feb0b36d22b25cac15417e54c8f0572f14f3f944ca7d20377f20ef217ad51105e273a40525b1174df714a WHIRLPOOL 1e68c6d8f1f0446a8be9a001f4c89d641a2055fc9d440be286f753fbf8a216f9d0ed530694f1ff5859a1604eff125316fdcf9593cb91113e4735cc3fa8e8b9a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTixqlAAoJEC7dUkA7aK9HykEP/A9725ZP1mDoDAKzv4837Dd1
-sHSYvLWkRrftLDbY6zG/Ijr8xwW+KrsaKQnj3OcbJtUCr+iyYILMWH6BqAlpKpcQ
-z6BVUW9RCQbCYyIApZvQ2yfLXDE/IV9g/B90+/6o0L6m9Qg7iq1PNMovAY9cVutX
-DJdtdjPUDS/CODboOLnhEcooYUTZ+J96KFaS/VMO5uQ0GFvAXXfKl08a78dPQJxG
-33Lh1u6bBuhsZSI3uzJLKko3el5coo3ynM5YBveKFnknbA0utSoIIeVrNn0K3VwJ
-tX1ex9GN931XBtxXg0h4wPFjDkGCQE1bPa3GU0RmWxr90Izpe3y+mD1Qh2+boWF4
-yjJIYIOo0amiz2AwvcXkLHGglMYbuN0ou1daDyRMdZJVPd5rN1+f5RaeyRhGNDlY
-vZB401ZWxM+Aos8p3SH1dTayYVewytb7Nd4wNjLbDbbRQ8X98jYdWgz8SiWbQQWm
-cEj50+geG3gAE1V4mluXY+jjpO5wa3CpZ8ITTtTq47haqnz6EaUgJriM2KMJNWRD
-ZWTm7SiwiLAPEaKaUxKmHGeslHxHa5Padph78MP3et7DBVSSgL5zvV2N2JVQcM+h
-Dv8+bo1nXl+hN2JgMXrdBnOrPsyuhy/nYqdv6eBMCPDTqWBqkVtqtynNJ5ijVBKi
-qR25IPTHCBAqCY2F2MqR
-=oWm0
+iQIcBAEBCAAGBQJTjM9KAAoJEC7dUkA7aK9HXuAQAJ0SVumyErR0B0m33/Pi3xGM
+ebhR+IF2PVe0w2TYiy+zACpwHGVfkWnVe2DBEjFxI8d/AXaqPSL84RBaKVqxKQLa
+v0YVP+Z2be5iPRZYH7oLBi5D2g8vvLExbk8mgjVxc+g/2W3nxBWfX8TIewno2zlN
+ER3S2KgrA5BI+mAKjJVZp5x2RX5/KRr/JUAH1+MnEC+UyNueilQZflUczkgw7BEM
+bLCc0BKVJzbLDtY3kYsR4HcC/PnxakUjR66iQIwXJNJyHOCFqpyJDg9agYbwRHMC
+IlwDHnIe1Qb6hL/7Cqyd/Mb6aTECCDEF6oTkmAteRAS8AxDph7+JPYc55o11zYdp
+/GaaRRB4k7a1VNaozI0kYWZrwkTVabmlC1CJct4HaStrB3jrvaAvjDbW63J0gHhQ
+YvdbhcKzMxhc8tWwykxPZ/8Cm2PKiJa478iBIr6JwZE9GaZYfUgqORePz+m+RaSC
+BEhcxrzquh1D+8zSZBxTwIbxe9IV47PUzgTZHldM2wsRj4PfTLQgndB/TDbx8nNv
+PAeeS8OyyZNkUrGidYLwR/whyO3T6C3Lib7uu+zKoqjYgw+8varMEK/u+GCUjRch
+l+/vc82IWnznxSdpFAEYZwfRNzRj93dbIp6x5eLZ3XT7++K03VJkTjUYqbNrbNJr
+7oeVeeL3Dh2KYH88PAih
+=VIIq
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libsemanage/libsemanage-2.3-r2.ebuild b/sys-libs/libsemanage/libsemanage-2.3-r2.ebuild
new file mode 100644
index 000000000000..16719cf96eb0
--- /dev/null
+++ b/sys-libs/libsemanage/libsemanage-2.3-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.3-r2.ebuild,v 1.1 2014/06/02 19:24:25 swift Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
+
+inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
+
+MY_P="${P//_/-}"
+
+SEPOL_VER="2.3"
+SELNX_VER="2.3"
+
+DESCRIPTION="SELinux kernel and policy management library"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20140506/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
+	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
+	sys-process/audit[${MULTILIB_USEDEP}]
+	dev-libs/ustr[${MULTILIB_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	python? (
+		>=dev-lang/swig-2.0.4-r1
+		virtual/pkgconfig
+		${PYTHON_DEPS}
+	)"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf"
+	echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf"
+	echo "# or debugging of policy." >> "${S}/src/semanage.conf"
+	echo "save-linked=false" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Set this to 0 to disable assertion checking." >> "${S}/src/semanage.conf"
+	echo "# This should speed up building the kernel policy" >> "${S}/src/semanage.conf"
+	echo "# from policy modules, but may leave you open to" >> "${S}/src/semanage.conf"
+	echo "# dangerous rules which assertion checking" >> "${S}/src/semanage.conf"
+	echo "# would catch." >> "${S}/src/semanage.conf"
+	echo "expand-check=1" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Modules in the module store can be compressed" >> "${S}/src/semanage.conf"
+	echo "# with bzip2.  Set this to the bzip2 blocksize" >> "${S}/src/semanage.conf"
+	echo "# 1-9 when compressing.  The higher the number," >> "${S}/src/semanage.conf"
+	echo "# the more memory is traded off for disk space." >> "${S}/src/semanage.conf"
+	echo "# Set to 0 to disable bzip2 compression." >> "${S}/src/semanage.conf"
+	echo "bzip-blocksize=0" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Reduce memory usage for bzip2 compression and" >> "${S}/src/semanage.conf"
+	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
+	echo "bzip-small=true" >> "${S}/src/semanage.conf"
+
+	epatch_user
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		all
+
+	if multilib_is_native_abi && use python; then
+		building_py() {
+			python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
+			emake CC="$(tc-getCC)" PYINC="-I${PYTHON_INCLUDEDIR}" PYTHONLBIDIR="${PYTHON_LIBPATH}" PYPREFIX="${EPYTHON##*/}" "$@"
+		}
+		python_foreach_impl building_py swigify
+		python_foreach_impl building_py pywrap
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		LIBDIR="${ED}/usr/$(get_libdir)" \
+		SHLIBDIR="${ED}/usr/$(get_libdir)" \
+		DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use python; then
+		installation_py() {
+			emake DESTDIR="${D}" install-pywrap
+		}
+		python_foreach_impl installation_py
+	fi
+}