Fix bug #480960 (multilib). Drop ruby for now (cannot get my head around it). Bump to upstream 2.2.2 release

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

3 files changed, 103 insertions, 15 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index 3b8c3b0047df..eefbbebb7911 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libselinux
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.109 2014/02/02 09:17:09 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.110 2014/02/02 15:38:07 swift Exp $
+
+*libselinux-2.2.2-r1 (02 Feb 2014)
+
+  02 Feb 2014; Sven Vermeulen <swift@gentoo.org> +libselinux-2.2.2-r1.ebuild:
+  Fix bug #480960 (multilib support). Drop ruby eclass as it messes with
+  defaults and I do not understand it. Bump to 2.2.2 release
 
   02 Feb 2014; Sven Vermeulen <swift@gentoo.org> libselinux-2.2.1-r1.ebuild:
   Support python 3.3, see bug 499604
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 3355e429df34..ae9f1ff2a8a0 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -6,34 +6,37 @@ AUX libselinux-2.1.9-mountsys.patch 957 SHA256 ab2c728464411d3d44d19afe79ebcfa0f
 AUX libselinux-2.1.9-support_ruby19.patch 635 SHA256 095b618bdbf786545d552fbc25ab91369d4b9dbc72764c3379706b65bb6f106c SHA512 bd1150a12097ae0dfd0c34b0e1742fef3af9a8ccff921a6a64f8abe24a681db9d5a8936ecc0eb973119c5d33712834a85998dd6a057aa0cbcebdc9455b6ac217 WHIRLPOOL 7c74fff046041fd99d4c6ca66401208752bf489415807dd02f4a7a699b12741a0a838a8de8ddbc72cff8c158efc0ed02e8f2555023d9398b9e411183babcd280
 DIST libselinux-2.1.13.tar.gz 168931 SHA256 57aad47c06b7ec18a76e8d9870539277a84cb40109cfdcf70ed3260bdb04447a SHA512 e0f922a7b71e944f7cde8cc99f74654aa6d1018ebe9b6186a4f9bc2bc1a06f515ea9d2ea8b9d7718bea481e9311a47943b0bf7cd1344a739ea960f62f9cd59a6 WHIRLPOOL 8b907756719fca6038a38ca54a9d3d7571e17abf142c54349c12e072c2e0ef7f2ce020f5e92ad647d8b822c634aad09c0ef7063675ed8b2f098f877ddfec9fc4
 DIST libselinux-2.2.1.tar.gz 171057 SHA256 d720209532b77f84d4abdf55882206d10442fda5fee4e2d6cb20309fac8e789f SHA512 a0f698c5c83fb43a92f86fc8663a730d95aca390421bfa3056fb33510978f4069c5a7dcf92a377425e5d4fb1e3efdc4ce5eb5d396ba2caf36bdd81d91f28d6a5 WHIRLPOOL 223e142546442d5f0b4e1fa3fdd9eb3f01e62a07a5f8801fa4e79e376c08a1492364cc049c2d3f0735da612eaf2a162df5449c71ede3869c8e9e05f9d28e7497
+DIST libselinux-2.2.2.tar.gz 171013 SHA256 30ab363416806da907b86b97f1d31c252473e3200358bb1570f563c8312b5a3e SHA512 1270cba11ec0795a2cea3706ac5547655d0e65dcd2141932000526f3d0c781b6ae114051b2bb53950b8ef207a318335329280b9fc9fd81796e8e4a27cf6ae841 WHIRLPOOL a444e44225ced35b126bbd2e8924aaf5c9f4da7abb9663d20a32b97babe750245c22d75e2238de0958b73295cf582b8aec39e23312886b96417120c600ed37dc
 DIST libselinux-2.2.tar.gz 171011 SHA256 e9dc64216543a7283d786f623ac28e8867f8794138e7deba474a3aa8d02dce33 SHA512 61472f0699e95cf1317b2f28a8d87a3f3298d4daa844f9894973cede2d64fb4477255a1499022e3ee5fee77561578db9f43fceee8c99339cdd64356a37d3aa1e WHIRLPOOL 3bedb3420de00e0b4af2d73d140777688c5db0b0e2b9ecde5cf2c5a1e2f310c619d9d9e3c3af5b97e6ef6d2d2e7d81b0b84f75a4ec739f72fe21877f98723a01
 DIST patchbundle-libselinux-2.1.13-r1.tar.gz 1652 SHA256 437a3de602d0df7a00b0ba5664f7f7f682b1ca69e1ce019dd7d0a41465c28d31 SHA512 b79b72d0240294462d816e1878bb99d0090da7adf1c5fb62882adad2eb1771c02da6627630fe699257c86628e7271c2965e0ce0e23911d10a3dead570b3829fd WHIRLPOOL 582afda95c80b3896256678b41e8897664c065a841ba61305816298ddc4ba05df919836846cb79aa520b39bf1a8c5dceb8ef3a8fd3f5b8beb979c80c3bc72e58
 DIST patchbundle-libselinux-2.1.13-r2.tar.gz 2771 SHA256 d71f0923c7bd7cce8d3d305865736aa56d4038de319a1d016582f1470108cb07 SHA512 38c9e0ce5c3689ef2e737f58d41ceb20085f6cfdf38cc9f8f8cca0d1c739bf3edbf21504e93e5110806a86d514deef6b1a1c69527d0bada04f293fc5db508c12 WHIRLPOOL f4c64f2dcfef2b2002fd881c5e7b2c1e39c40bfb4ae058e08bd721ea5570968a0c4c00a2b15ef0ed762382730010d779597cd046b5137e964177cad84170b4a6
 DIST patchbundle-libselinux-2.1.13-r3.tar.gz 2887 SHA256 c48b541e4ad26cdde9be9be0d71b2cf7b3ebeefde58271b69297eee40b16ff10 SHA512 5042ad656c2dd7f53ee49875ce3b5fbdd911e3b6fe9761d6f7357c087fee8d703662d803262a95e638f45a094132cef71d74456821841f2c2a29c61de86d9b6e WHIRLPOOL b9124a5bb20c3f7957d5c8561f97e4e3ad704d0960a5f4046426c1d7a9f87da7a14deb32c389930213261e926a34ebb4ead0a685ff1ca08ed9a152ad6bedfff4
 DIST patchbundle-libselinux-2.2-r1.tar.gz 499 SHA256 9540c7b27a8b6cba155b4256bcd1e12220451d92fec1a70e5119b6bdc88ae2a6 SHA512 7128b2b266c969849ba4a61bae365d4a605e13f36789c77d17416ed555e267ca7f239a44e26eb014b46083c7ad3e4a233ae2fc0efea9ea8ffc43cd652378f63f WHIRLPOOL 8f49724944772dfddffc35474dc80ff1b04ca5b941a5c64795951978af68cdb537f8ac058c6395835735514718d9d3b99060f0b0d9be337c015c68e6a6c34a72
 DIST patchbundle-libselinux-2.2.1-r1.tar.gz 508 SHA256 45a2819f2ac9b46135eaccd0395aabb2660370c06e489c969cd7dc7049346465 SHA512 81fc25984013a858758cf22f7adc5e8e47ee536041c6d1f4bd935dc60c8d761e7151e1cb13894f0933de6feeade89df6ee1531d9adfb2132b6bfa4c6c6ef0119 WHIRLPOOL 1b08953bbc6fba2fe8292357d283e44ea8a443db8ef461bad305412f03a1781d342dca6a2b11c03d76935f4aa1373bf0cd99eb95666905fea2b1796ebde402d6
+DIST patchbundle-libselinux-2.2.2-r1.tar.gz 500 SHA256 8e6b50b03f8bf0051de179e3dc51f5fcd10c6dd61a8162a816ffb3bebe7b5c85 SHA512 8ace941a25469a68f92cab26f304a28ae93a5858ef2281c05497971726d0e9b356c72782015462db8625987b8790091a1e0d9cfa5f2cb3666074d53ce6e26eb2 WHIRLPOOL f9e2485f25160339ea39279f7188ba83c57638adf6fd5edf883ce77d68a5b398c935a6630c5957710149854c6f7cfe0dea9ec067094b70bea6f3a059ed8c6a6a
 EBUILD libselinux-2.1.13-r1.ebuild 3299 SHA256 c12efb1771f1a55efff50e0ccc29887111aae4f7e1dbb1d3150b94aeae423b64 SHA512 bb3aab781877770a901da936f3d83a230933ad947a2ef67ce39ee581a10dad5233094977f63faf5219964b16d16af8a8225fb5368e53099656e0051cd9ccfd8f WHIRLPOOL d5d2a5233e5ea94b3d741e0b112c110cfc88d87427f75cafdb5f583db8f467ddd11a15fe522b53ed0f44bcc3a1b5b353133caa21e3067034fa0ad9deea3c6f09
 EBUILD libselinux-2.1.13-r2.ebuild 3297 SHA256 5ad7f7d5e2dfbf09cbf3bda0ab5cd79362a66f39e58aec6f101a9129fbb23440 SHA512 4697645ae6d07a5732304fdf6508e767ac1dfd4448abfbfb813c99b9dfc1375822e08c6259031de6490c08921fe6bb5d0234a3bb9659f6eb763f2a395b6aee53 WHIRLPOOL 63ca300ca18566752e06af6d9fb05501101d87cc197746d60d3863045cd4b9e201c4db7865e1174c862815bc1eb1b35b7d19cc8bae6ebd577e0b3b22f1dc7bb9
 EBUILD libselinux-2.1.13-r3.ebuild 3299 SHA256 82325ab152c473ae4b546a457aef638b1830702ead9696f47571430237da7cba SHA512 53af7e037b45e77e9f6c70ec1c36b0f7521d53e0a50417e3bb8dc0ead176f3dcf7a6c03ac352bd6efc5cdfb8325e92aa4ea68475b07de90af7f55ff86f049731 WHIRLPOOL f7f1bba95a2e45c3a4b2b5f4883da9e6b3648795fc3babfff47e25e8d2c1a88dcf8c3c0324a45d85b515f598f9c1aff942811f8f6a229e4a6d07c10ab2a62611
 EBUILD libselinux-2.1.13-r4.ebuild 3316 SHA256 b412cf44b76e33a10fc81c34a07420cf2ecc150b9b4483e3a0490490ae672c10 SHA512 f6f4efc55af9e460aec0be2bae9047b5d34f275219fb8bca710211b2a93bf45623639fc27d02abb1b323ad30c92fdce981443442f6eea49a4ae13f5079e3f4de WHIRLPOOL 56614e5b63b20e24d6bae136845faca66fc4ce93e380f9fd0b0ba155f33c5a444a64e85e25d741648bd7155e2ef28796f568a194c91a610ab7207ec6aabbf35a
 EBUILD libselinux-2.2-r1.ebuild 3311 SHA256 4238a6a7ec222a1dc66cec000f7f148e2dfcc927555e6299375c825035830be4 SHA512 b493d702e83b040b62aa22d1bd9a3573906f0d42578b946896229fee3ecb9820004fa088709452e4a970f61108c6c0dce3593a61becb30aa537bfebaf963c8d4 WHIRLPOOL dec654699fe7df7194f16ea94fb8a1de16d5d9c9870a125c903a7ac7979676134dfe70aa2b1b66455b618c150b4cd3416eecaeb2143aa6072010efd11a81028c
 EBUILD libselinux-2.2.1-r1.ebuild 3323 SHA256 6822e1a6ea3869654c68e0196a1e089c8bc1d66d3e34b4b3c5c7814bc0416f63 SHA512 3451911e348714ce3c3641ee16f9ed14c7d110765c144dfa586ce58f0382998e478dd9ba7255422a2eb229a8bf4eafbfef7cfc5d037b0e3272d06e70636931ee WHIRLPOOL 350c383d42b43acd8c56ee26b70c5add1f51f2d8f544bddf86e8a7a2373f89c7c6dcea87ed053815c6b332eaee19b4a80e898adaa0f8875157d7abcad8f42df9
-MISC ChangeLog 15665 SHA256 fa1b6499627a94b880228d99913bff58c3fb882dccb7e0a944ca1a622a847418 SHA512 9ca85f29d0239343b810f441a1253c0373f8ffceb5f22ae745a7dbd63389b8047cb8d19a9b4e1ecbdeaf789e00ed87f2480a77cce6785ca4795d74efea4f45b1 WHIRLPOOL 381c63c94034269110cd2ff33a908a463656f9fab85f528226a32d4cd17ed1a3d22e65c3d04907e5103b004b5e233c83fdeb0a6af38b24146d8f374b1d83904f
+EBUILD libselinux-2.2.2-r1.ebuild 2140 SHA256 deff00397bb716ad79f3993bd80f978cb61cff7c1333320921369a324d3b334e SHA512 09a4b0ae46f95018ab53eaed1bda97b7d811afdb1d1d8565465e959ec27a5acee3a8eef77b30a566ee97fd5cd12672dfe4cdf67912ee0d86511fe7563082eb25 WHIRLPOOL f09eb9ab689657d7148e4acef7707186fce95510a81a1d4c9e191b2cbaf8d99b4af47918239cebf94e5ed591786a7a6ab9b269e46b2119b95ac6a60011cf6625
+MISC ChangeLog 15914 SHA256 0a2491041e7e1eca1473fa7e81b79621d0a7c15ac61227dcdc4469e581c060af SHA512 15c00d2affb82265b05c7af6c9fd99a489776b773f725e41eb1633e1da739d64e7453f2f1ee17ddea798f79e9557df53fce9ded14bcce20ccf05b328dac2b97d WHIRLPOOL 8f622d4baa21d26cb22961242fdf7c87c646c6f00df3c9651ab60c1897aadbb3afe96a911966fb65d3c8c3ed5173b621888674a5e69514476b5f38e6758d8cfd
 MISC metadata.xml 406 SHA256 934da6149d008c09754c0654dbea6c49da117923adc6fbf3fcabac58195b9c45 SHA512 5bd2b0637c4d77b6113540dff5c4253390b1fcc69b864aaf2196d2c6e8c2c10fbb06bfcb69ba73978e3a2c3ca60fc6e4eccc0ea02a818b34a66c137f993a33a0 WHIRLPOOL f34ec6f0a7f35b9c2a8f29688fc58b6228484e3ba0568d65b6d8e24cc91662b6704ea532e036cf0a6ceca83b4e118bb7c8a64c6c4ba45bd60e2fa2d73d2d2abd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS7gzrAAoJEC7dUkA7aK9HF5YQAIoQxuqHTo9uK9pOE2hLxMcj
-eQicOme3k0+TzqfBMlT3moiAOhopZGVqKyXC0zVRjn1V+zcl0VhNS9ERDvrgWVkw
-6mhMIZl0k2RQD3DG9ZDg3oIuh/0NIaZ+WGW8zJwCVFriv4fGLwjuuIFF//Pat4fp
-XG73b/uurDa0285U+XcugiRVUzN/Ix6Dvgfo/j6DdkHuzgTONGwv6QpjwlmJYV51
-QVohkhlDsuSW/DdOfxkPzYywf6QVAECt/A7JlzqUeGrtfbim7A8atGv/w3UagKmy
-5+2c5JDWfFO5hSs/tnlg6RoDELTsPzuBUkcOFN5kyQoU3gkkiqq8SlLyp3XHIbXh
-/H54UIsdiNdqZwm15qugDBVWsLjgHwVNZiuQ8r1s704BkEQDJpGYy2cZQpIbksXr
-1Y50OwO4ODO5LrL0WIz3T472ZpLqmR8KTgKUnnnwExIuj1rwh//V36Uo1mnuhuim
-ComRoIQ5RaHvNf6UW9CxIIuGcrXuEfM06SQ3KQk3G8Nuf9ey7lJCuOXpApNgNtXg
-nD5pU24aiVtQ+/1AP31PlI7q4c1p9WgI86KkS2oEkYcmLImV/z+iffrXHZ2co+z8
-bRCUvNMQHoql4TcJmcYZL4vvsuhEL7i1/JBgjY3nEoGcZrGfwIP0Kna44umt1Hli
-C+e8gVdJSv8f9HtTsc/o
-=rBG8
+iQIcBAEBCAAGBQJS7mYyAAoJEC7dUkA7aK9HQb0P+wauJ7qxciD38DT4xSdyTnBy
+LO4nkv5QY++BLrIzE5m40748Kog9Dpc0MiwuiyqMdhB0AYGbmBVkAfaiDqVmHLcy
+ziaVGOdn70nU+y0jPPt/d1UAIlq2biMzVTChlzXRg5B+OYnhByH7WP/Q6VDTpmVT
+RGhjOIptKlEf9KMqZN1H69dpQB1/RIYEAtpVhcF3z/sPJ4PEg1mWIwpfJdIoMLe/
+B+1uWuAqpnOkcaaeuZQauAnIYm6CxQnPeglmzNGCAnAZRFYdw5N03wS84DpRhRy3
+6pbPuwgkAcT33WaQkJ1OsZHHuU4fZ+R7YI1jVc97A7m+crHxfq2LwTCaBbhNjfkh
+lyFBkLJopFiZorwAWQHOjODfm9JSabOm+A0+0CiQY7B6iKX/3rDPemEdojCPhpFt
+Zk6JdDjb88oIzEyj40fQG3lOAmwdn9OW9NWASth67+/dzcKzQ2d20U9TO2lf3LJP
+cv6j/3CAB8fng+7P3iAf60OHZEuQ0y0aktrqeSIaQRVSqcTt4buEADEt1pIgrNyu
+y7pbtgwlenBNxGY3vTUlKXEYa4+WqdGfR00X1OpeehYhBmJDSpLqufcZUGqvy8k6
+vlPS3CRqdJ3vLojxWAmWWwPsNuNQPCW9jwDXyFP0/2pf9FEzJVmnkZzdkOyLnZGS
+mE6tu7EmCgXOudeIiK9G
+=n2/T
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libselinux/libselinux-2.2.2-r1.ebuild b/sys-libs/libselinux/libselinux-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..d2245d4a30ec
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-2.2.2-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.2.2-r1.ebuild,v 1.1 2014/02/02 15:38:07 swift Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
+
+inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
+
+SEPOL_VER="2.2"
+
+DESCRIPTION="SELinux userland library"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20131030/${P}.tar.gz
+	http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${P}-r1.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python static-libs"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}
+	>=dev-libs/libpcre-8.30-r2[static-libs?]
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-2.0.9 )"
+
+src_prepare() {
+	EPATCH_MULTI_MSG="Applying libselinux patches ... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	epatch_user
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export RANLIB
+
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		LDFLAGS="-fPIC $($(tc-getPKG_CONFIG) libpcre --libs) ${LDFLAGS} -lpthread" all
+
+	if multilib_is_native_abi && use python; then
+		building() {
+			python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
+			emake CC="$(tc-getCC)" PYINC="-I${PYTHON_INCLUDEDIR}" PYTHONLIBDIR="${PYTHON_LIBPATH}" PYPREFIX="${EPYTHON##*/}" LDFLAGS="-fPIC $($(tc-getPKG_CONFIG) libpcre --libs) ${LDFLAGS} -lpthread" pywrap
+		}
+		python_foreach_impl building
+	fi
+}
+
+multilib_src_install() {
+	LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+		emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use python; then
+		installation() {
+			emake DESTDIR="${D}" install-pywrap
+		}
+		python_foreach_impl installation
+	fi
+
+	use static-libs || rm "${D}"/usr/lib*/*.a
+}
+
+pkg_postinst() {
+	# Fix bug 473502
+	for POLTYPE in ${POLICY_TYPES};
+	do
+		mkdir -p /etc/selinux/${POLTYPE}/contexts/files
+		touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local
+	done
+}