Call python_optimize, bug 531638

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x7EF137EC935B0EAF

4 files changed, 172 insertions, 17 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index fda45a348263..a5604c3c5634 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.134 2014/11/14 19:17:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.135 2014/12/04 10:50:14 perfinion Exp $
+
+*libselinux-2.3-r2 (04 Dec 2014)
+
+  04 Dec 2014; Jason Zaman <perfinion@gentoo.org> +libselinux-2.3-r2.ebuild,
+  libselinux-2.4_rc6.ebuild:
+  Call python_optimize, bug 531638
 
 *libselinux-2.4_rc6 (14 Nov 2014)
 
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 86423fb0e704..5132b9973f0e 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -12,25 +12,28 @@ DIST patchbundle-libselinux-2.2.2-r5.tar.gz 2304 SHA256 ad77f499c05ec3b5707cb9db
 DIST patchbundle-libselinux-4.tar.gz 2631 SHA256 91bf43c84ce3d3178c8d21fdcf97380a635fa2465d1611fe4e0e3838a586c78c SHA512 bd2f9762f095e3dbc67e77ee04968cb8e87d460fdf10feff91cb1ce6027e19a660bb57617887e44608d39720e8f95500c451c4b284d58c0a756a04b08fa305c2 WHIRLPOOL 07a6a69d33c46c443907aae2ae4f3646a0360565e28d0a50cbcf81f8b5d8c259812d3e086841fc21c2a8104ce9863fc6c9c1d32e28ea08ebc7baf2d45af3509f
 EBUILD libselinux-2.2.2-r5.ebuild 2534 SHA256 a98b5b6f55cba51844b9307156d0174b5aa350092d998a7d7cb4ebef691b41ca SHA512 9c789b638cd8822cdd738906de5a0e52f2cdf5c5c88316048a790a775d9f41601ae49e971709f572dd3eca964af8ec262fcb41ed1387a6d6be1ece74ed879fe2 WHIRLPOOL 1b6800e9eb589da42f05e9d8eff6009aa4aff6e1b55bc0e81f1b8cef280726e2105a069accdf645e68f0213c02bbd610c068536a57a7e56ae42156192ef288b1
 EBUILD libselinux-2.3-r1.ebuild 3947 SHA256 ca0baaae337084e32d687b2c8d74c50b995d91e737a26ed3cddd4f51c121e68e SHA512 7e57b18370145fad0ffb13f0d121a3efe0f9bac0c51a1f5a9aa24e4bb8d8a42e25dfa2025252e43e05ac5ac020a1cff2ca2d0b842943d5746b269f0d22140f2c WHIRLPOOL 6686edc1ee477fd6495935b1038e6a0341727c2b9600098ed0deed8b8a8eced95f6b9466600b4846cf4ea78d091e3b9378daf1ddb109481e8d2c50160ff41fd7
+EBUILD libselinux-2.3-r2.ebuild 3985 SHA256 044233a7193c948555e16f133cdbc8fb75a5f674ff5bc0aed9eb267f24fe28da SHA512 b1f5e952730f7b2ed64310fec5d38d93ad8592bac713a22cf879f6d929694804aaed753ab57538f461ed246d8e7a15993d6b8e3d7f100e864af1dbb272a89ccf WHIRLPOOL 864ccf170076ef7c4e5772e6c9c645a7dda65ff290f4a2fb19c0978602636e10798658e46831cff8407349e18022eddf102e8d3b36826005410aed44a1d40f93
 EBUILD libselinux-2.4_rc2.ebuild 3846 SHA256 66c873baa7f32acfa7678b2896e7c83b16ecc8556e7ee4e40844e96af0afa653 SHA512 029b993d39c8c883caf5175014223caff857fcff391c69134a8d194c0a941118ebf7907767f8c5bc71aa80432ac482254ab1451500a3ac256ad6f779e4bf5206 WHIRLPOOL 00bf289ec7574d34bfbf572dfa178ce47b94e104ba84c8c3e29cc7a7d48516987eb8e83596e68a966bbddc63e1e849bc1a8c807639cf5812cbf36065ef7e148c
 EBUILD libselinux-2.4_rc5.ebuild 3846 SHA256 c9ef55f1c52617ddfc379b35bbb3f822eec368043a7ffa1fca11d5da0078c628 SHA512 3f7fd109c5020908f8e73456c87bd35a42a634fb0f55a4cffb1677749666c1b66451a2d695f197bacb6768c228baf2a1aa5a9e808b0c2355d017a1fde2c2a539 WHIRLPOOL 27244c8226d48370cfa18439bc907ca8dc7886b42ac12dfd4bdc00751b41f3aab451d9efc7a2e53a2806a92d0aea25f4556e906ea4fa492f971638f40126c9ed
-EBUILD libselinux-2.4_rc6.ebuild 3856 SHA256 45720810331cd8fb9ef6ccf38cc97a5332c7f636690a2398a37c40b6cc786c97 SHA512 c1714217693dcd1f55e0d332aaa7cf5011547374002b7949e2303f65da366e58186eb921b6026affa33d235fb4ba9d3e42553e6ee613c41a01edd2a757f04b14 WHIRLPOOL d3cde8b99416c2a08215fef1bd732f6a9a64babfa04f430bd7203cd295348f0015152bcef23ce06d8014d709734d5c9d15dcb3aa87e6e523e963f3be0cd561d0
-MISC ChangeLog 20138 SHA256 37f239fa8cbb8b655711b4aeaea329999ebddf40f190c60de4573eab049253ef SHA512 fa7cc1c41f8d76c04a77dabece0aaaca023906d902f1af5a02e466ec4773851bdd28538a7fb6f2b2c80cd4f3d409ac5ade5952c29df1b922fd47ed0263054fb4 WHIRLPOOL 84eb961e1c62bc5a01ac2b9b63afbedf79c8c3277014fe78298fb31d34f17ff6a3012780295be287dabbfce5c6cbcd4a22d413ef30806590ed6b5c7ac361c828
+EBUILD libselinux-2.4_rc6.ebuild 3892 SHA256 f940baddb05300826f14ef9d578639349500e76a83d502823971aff2da2374a4 SHA512 6b09d884c9e1d9a01e7a3ea0ec291210fa64eccb6116d8beb5836548c29ec65b3fa165cf6ada7de87567c16922393433a25a2975d6be3ec8a69ae044aad6bf10 WHIRLPOOL de16bc05c9a6c73f507e5f5b17780203b0d82da537899bbc8a91dcd8d4ea8e8401fe0081d8333469565894fd1d7e6d5abe1061b5f976fd954adecad3ed228c7d
+MISC ChangeLog 20318 SHA256 ff87ae2099003075aea6d70dc10ebd2bf96fe872fbb2ceb82f7b41ac195dd9ed SHA512 15033fb7215cd4b9c0796a6e9e764849c09919bf3a872eac414bc2eabdb1f30251b8ffbd1a1d3c32c1fcdd72c8cce0b512cc62b9958afa6bf910cc18d25dc6a6 WHIRLPOOL 401ff71c93997ed3e5d0bc18b2cfc586b3de8248e9bd89fa02d137e5c1a62f5dbf498dc04f26859275e33ce01716e89c4258aeda1a44fc89c9a55b8f86a63154
 MISC metadata.xml 406 SHA256 934da6149d008c09754c0654dbea6c49da117923adc6fbf3fcabac58195b9c45 SHA512 5bd2b0637c4d77b6113540dff5c4253390b1fcc69b864aaf2196d2c6e8c2c10fbb06bfcb69ba73978e3a2c3ca60fc6e4eccc0ea02a818b34a66c137f993a33a0 WHIRLPOOL f34ec6f0a7f35b9c2a8f29688fc58b6228484e3ba0568d65b6d8e24cc91662b6704ea532e036cf0a6ceca83b4e118bb7c8a64c6c4ba45bd60e2fa2d73d2d2abd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUZlUxAAoJEC7dUkA7aK9H22oP/1CIDKCKDJk88XWJGV/Ep4z9
-ojiRz7OYfi0AXcxehzX23f4MmsfYbvfsfBTKlpemSSHmNntf3gVF3FvyWZdEN9Lv
-FDAS6sJv7tiahxvzQGegoxdrn/2lK71OyGTHA+tD8E9e9w1l/3W38OvcKqLJ1DYX
-AkPUKtJawfFVJnktPf0OMxVbH6M6332rCmZnjlFbJNmOm35ujs+LBfpqVyA/DKiL
-IqoeUo91y6y+TPyXA2T4mqy6uyPy4Prsecok6Yu8nvb/BYA9nriSpmVsnaHRYccX
-QpgnnVkitNVrSQKyYdRFH2kg85hyEjgHdoQEpd2WUI0KwFiitbZ0X+tEDLA6adSG
-IpB8Ur+kkqYUkfiBQZyKCCZuDl4afw5SYAvqR1CCF54DcCV1DTz/dZM0hyHRBrMy
-TROcw2R+8Fazemtrwjcp25Ot/UkSIBlNfDVtqO3VhLFayimPvRcgCgeCmmxmt1Qn
-XeL8+5RN8btPyykqRDPHxa5BQWowmNTuJ4wyu4oS+fyJLdMMG5e9uxddmSuneS8k
-qbRvcKCl0eQ7LgUe7C63gqrZypiZFq7cjuEpkVfF7G+RM63X+tdXJk59cA44DiQe
-4IOgNMRL59ND212072ywcPBDVcd+wzCrOsNhNcSYZGau+JH0z88fxpCp+jieDw7e
-oolxcBZJEYRNQ4wJkZ5u
-=0NE4
+iQJ8BAEBCABmBQJUgDxvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VoZQQAJyg3v8djwoFrk8c8sRFZX/5
+H37utLXv8g0MQsU7Ja0oBGune5f8rw3hJrK/g9CVkMGMtyzfpXN0YTdHpWjymdhH
+tUdQ3npkWXmy6/Oo9tzDSiqzZOKte7pmIxnA0BKzhfJJQOKYhzx4BqQXO2op14Vf
+ettMnx+hbREMPyLSAWxId+JWCqNDx/fPdGmIv8yZIEgoYROB6zvfaFx/L9K3+g/G
+4hGUvJ8aoaLU3Ow3U0eEd8DzPHkwCG46HIYkELm13v9fFsp+H1LIwZugFDN8sTha
+rM6Yra6O1JV8a/4F9fJBs7nvmxvM020Hj62p9t15JKQXm/Ta4UcZnrq6iClAjak5
+I8Gp2ywxezjbuHCcnLzEiqXbPBgBNoUHuxluzV4sV6duyY6zoC8roJEUOe7bF7qH
+phZ7KY40R123dPy7dSLLV32/TvhMz88Kjd+ZR/cPGeTYQckRIfstnOpDgw75dRmT
+nX9kGugZmy+h1CFuXx8ltTG8YWEKC6dn1gjnJfT/vSK3u0VYxqNw81+UU+8dg9dh
+WgBEbMygE1tUaHA4i8JjcdB+eBsByJtV8EJo9FBeoppQVMAMWIVOvV/b4zaqO2pS
+cdunt+/R9N7mp2zLAxFHRoIY55dN5WriovaDaFldrbdt/ZRMbQEL/+WFaOow0UFc
+v+USDP0BDTyat+WBIkYZ
+=pvJQ
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libselinux/libselinux-2.3-r2.ebuild b/sys-libs/libselinux/libselinux-2.3-r2.ebuild
new file mode 100644
index 000000000000..3649af98a3a7
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-2.3-r2.ebuild
@@ -0,0 +1,145 @@
+# 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.3-r2.ebuild,v 1.1 2014/12/04 10:50:14 perfinion Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 python3_2 python3_3 python3_4 )
+USE_RUBY="ruby19 ruby20"
+
+PATCHBUNDLE="4"
+
+# No, I am not calling ruby-ng
+inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
+
+MY_P="${P//_/-}"
+
+SEPOL_VER="2.3"
+
+DESCRIPTION="SELinux userland library"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/${MY_P}.tar.gz
+	http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PATCHBUNDLE}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="python ruby static-libs ruby_targets_ruby19 ruby_targets_ruby20"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
+	>=dev-libs/libpcre-8.33-r1[static-libs?,${MULTILIB_USEDEP}]
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+		ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-2.0.9 )"
+
+S="${WORKDIR}/${MY_P}"
+
+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 PKG_CONFIG RANLIB
+	local PCRE_CFLAGS=$(${PKG_CONFIG} libpcre --cflags)
+	local PCRE_LIBS=$(${PKG_CONFIG} libpcre --libs)
+	export PCRE_{CFLAGS,LIBS}
+
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
+		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 ${LDFLAGS} -lpthread" \
+				pywrap
+		}
+		python_foreach_impl building
+	fi
+
+	if multilib_is_native_abi && use ruby; then
+		building() {
+			einfo "Calling rubywrap for ${1}"
+			# Clean up .lo file to force rebuild
+			test -f src/selinuxswig_ruby_wrap.lo && rm src/selinuxswig_ruby_wrap.lo
+			emake \
+				CC="$(tc-getCC)" \
+				RUBY=${1} \
+				RUBYINSTALL=$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]') \
+				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
+				rubywrap
+		}
+		for RUBYTARGET in ${USE_RUBY}; do
+			use ruby_targets_${RUBYTARGET} || continue
+
+			building ${RUBYTARGET}
+		done
+	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() {
+			LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" install-pywrap
+			python_optimize # bug 531638
+		}
+		python_foreach_impl installation
+	fi
+
+	if multilib_is_native_abi && use ruby; then
+		installation() {
+			einfo "Calling install-rubywrap for ${1}"
+			# Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions
+			rm src/selinuxswig_ruby_wrap.lo
+			LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" \
+				RUBY=${1} \
+				RUBYINSTALL="${D}/$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]')" \
+				install-rubywrap
+		}
+		for RUBYTARGET in ${USE_RUBY}; do
+			use ruby_targets_${RUBYTARGET} || continue
+
+			installation ${RUBYTARGET}
+		done
+	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
+		# Fix bug 516608
+		for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
+			sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE};
+		done
+	done
+}
diff --git a/sys-libs/libselinux/libselinux-2.4_rc6.ebuild b/sys-libs/libselinux/libselinux-2.4_rc6.ebuild
index ccd45b8848e1..f6f58ca74804 100644
--- a/sys-libs/libselinux/libselinux-2.4_rc6.ebuild
+++ b/sys-libs/libselinux/libselinux-2.4_rc6.ebuild
@@ -1,6 +1,6 @@
 # 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.4_rc6.ebuild,v 1.1 2014/11/14 19:17:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.4_rc6.ebuild,v 1.2 2014/12/04 10:50:14 perfinion Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 python3_2 python3_3 python3_4 )
@@ -102,6 +102,7 @@ multilib_src_install() {
 	if multilib_is_native_abi && use python; then
 		installation() {
 			LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" install-pywrap
+			python_optimize # bug 531638
 		}
 		python_foreach_impl installation
 	fi