Moving to python-r1, add mcstrans (bug #472912)

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xCDBA2FDB

3 files changed, 170 insertions, 5 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 3bb1dacb2029..2085aef077eb 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.121 2013/06/16 18:18:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.122 2013/07/07 16:03:07 swift Exp $
+
+*policycoreutils-2.1.14-r3 (07 Jul 2013)
+
+  07 Jul 2013; Sven Vermeulen <swift@gentoo.org>
+  +policycoreutils-2.1.14-r3.ebuild:
+  Switch to python-r1 eclass, add in mcstrans (bug #472912)
 
   16 Jun 2013; Sven Vermeulen <swift@gentoo.org>
   policycoreutils-2.1.14-r2.ebuild:
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index a2e976206265..2901edf6d962 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -8,6 +8,7 @@ DIST patchbundle-policycoreutils-2.1.13-gentoo-r4.tar.gz 7075 SHA256 922cc5a08e9
 DIST patchbundle-policycoreutils-2.1.13-gentoo-r5.tar.gz 7290 SHA256 349bd3ff7cabc91766a195b3c48b9cc5a5487fa0737036869e44f8f2e5904997 SHA512 3a30b2dbaedced8d18e0ced3c3784d9f917eb83987ba10a144283b67423ed8571d2b46fe8d5920b85fcc0b698e5b4996899f9213a94b7adea26c8fb93c790808 WHIRLPOOL 1eb224aa8e99b82eda2cfa765ad7b81b8bf38921637513d3df7191d06eeefb8eacfa2eed6ad27165bf01818bfed65eb216304a24eefea3cdd79b02fa21c69818
 DIST patchbundle-policycoreutils-2.1.14-gentoo-r1.tar.gz 7366 SHA256 47ed230f9cc416f5565e0b314de8cb7fd482ec9034a06c31aba8a1875fd4a04a SHA512 c1b6ae16118f9d61bf19c42d12baa32125833ad4ccf1a3bbdb314c6a5a870b1096de82cec5234fb5ea0a36cab15b0811d04640aeeb0cbcfb1cc5172610ffeb41 WHIRLPOOL 14aece5c402a742178771fd0c2799c800d2f80125a85e924a133304c588dc88d41db3ec0b3dc51ad296802677ce091c07a2c3acfec3e20a59931c37a3165bf77
 DIST patchbundle-policycoreutils-2.1.14-gentoo-r2.tar.gz 11496 SHA256 d2fcadd657ed892620dd6abba23686b8010f34c09948d423533286c31f402175 SHA512 87935553c07f6200722c2ce597c4c3b14378f8fba2ce613e2bf4ecfcc4f149a14486aeff2cae3f69cf348de4a5adaaf2707c418b673581f85ae827dc246c4470 WHIRLPOOL 5cf2aa7fd2320bfb2a86ec285469ad5a604fcfc87823ae6f720bbe0e95f1d997898c2f521a800ffbe8f1d727ed224caddf7d8290314671134692470e270b4027
+DIST patchbundle-policycoreutils-2.1.14-gentoo-r3.tar.gz 12124 SHA256 a9f82c56e2cf4bce16a1b13536bc708fb89f7ca57d9d812e07c2ec32b322122e SHA512 943181e20264a79eb9546eaf2904df28c19afa540f9dc66592d8b9fbf4395d84a5179b64ab2093a5f4758ea97cfac97bc07742c4d6831550213c17ed73eacde5 WHIRLPOOL 03d3a3e3a6e613d9d2c03a0bc4e3c656d07e4b14cc0d17c69f607ecff6d3f16f61ee5e3445b88319be97c6c2359b251e810d27e053a10ab4740fb688385ab846
 DIST policycoreutils-2.1.10.tar.gz 907554 SHA256 8bbbc36b7d375edff891503932da93e37553f0dd7bdceded7ce9a45c80bec3d1 SHA512 7dd06daf2094f21703c9e84b7f591a4f31a4ea8813aac7c26e2264a0c972f5b566e981b5fdcc38ae2924ec45f0d3f2c0ac08accaaa647f9e5b4e99072dc49534 WHIRLPOOL a3208af4effb2c949fce25937872b9d849cfa57e043a5b41993cfe07b5b0763571354904147e005d8e8cefbf979e228dd2310b966399d13deb2b858ba6e9930f
 DIST policycoreutils-2.1.13.tar.gz 1188940 SHA256 34040f06f3111d9ee957576e4095841d35b9ca9141ee8d80aab036cbefb28584 SHA512 901a966ee61dc0935767f2ee8e8659fca13c96b6ce464a00060a0005764c0d7a0cfce0e2b6b00850ff2b4b20675a16d9a6da427284818e93efd83864ab086c1b WHIRLPOOL e123e474830e66fec70ee850674b0767ab3e115966dc8cae9c6aa6cdd4f9297d7c22a92a41cea9a1b24c994cc44d06af23459a0184546bbd263e4f74b756419e
 DIST policycoreutils-2.1.14.tar.gz 1675951 SHA256 b6881741f9f9988346a73bfeccb0299941dc117349753f0ef3f23ee86f06c1b5 SHA512 d4d1710ff6974a829efcff87c5c33ae47a2e0bfe881e4babe6e2b2f0991c8c1d6f9101bb34f41ec11eb26c9c989c85c5fff0157a354c40c403393d75203cef45 WHIRLPOOL bf92ea6870194c68d5faf4a0e7ba158028d5449570c73abf77fcc78385857209365000121fec21b09d5944d262476dedf5d096241bc0342f814a41b2e0adf0b4
@@ -18,6 +19,7 @@ DIST policycoreutils-extra-1.25.tar.bz2 13264 SHA256 d02f267586428cb83b8159a8b48
 DIST policycoreutils-extra-1.26.tar.bz2 13245 SHA256 9ba087e43447adbc896ebfe2f9d7668702170686b96d9fcd245c7b1914bea6de SHA512 02ff66e210aec0452fa28c6cfc85059d3f1f80fbca0d6a05a4a0c7e5afbd8ed2d750962c24c3cde6bfd96a98fae95e7df01bccf098cfdc2abd6297f93313ab9c WHIRLPOOL fad441ab2beb301c9fec3bbe3cbbb1ce397ccfa9fd302b31755b170ee557c26c10f3b911b8c0250eb1763dcd676474cfa086ad95acd4491afa993b3fcf4711b5
 DIST policycoreutils-extra-1.27.tar.bz2 13250 SHA256 eee73e497e159a49e2eaecd17d7653f4f25425f2add2c0dec61f8b9caf9e59f3 SHA512 57b4012ab2a141293f52e2fb636b7072b05e7d48f823d5664cb13d60a5ae9c9112e27501f81e017219335ca8a77fceb1aed60ea3f1adc76d88facd85c6a31897 WHIRLPOOL 53f375e72a4291d99b0961a857ac6b8ca90ec23034f90385489998bdd3cd474831bbcf374d073616a1097f8907de81b4d79f0c236d31bf4fd1ed69dfe6809a9d
 DIST policycoreutils-extra-1.28.tar.bz2 15294 SHA256 cf577aa932e564de7df20dcd1a3e4353d7ecea03dfb987bb0134e09c4f76bc66 SHA512 e660f2a21b417b3f0ca7d68fd9708fda81565bb3c83f627a9b8950b208e1462fac63bc1aa458968e1c16583657e426ce699c89065fec65507685898388c30768 WHIRLPOOL da9d9a95afaf44b0f0fb717a4273c7f9faa1095f3827b39e5b60e49e493e65bc0a15f4b4505fe0c448fd7b03945f439a437e22ba0fa0165f6883d41f18dfdb19
+DIST policycoreutils-extra-1.29.tar.bz2 15427 SHA256 fc3d9e303835d5c650a3c712827b78325119dbf987e203960592f1137d58e912 SHA512 1925851f080307232e16f81e24839773de51b6668a2efd068abd325dc0433ea25b8f5fde76247d78c69876d85a6b37e55fd57336ea817deeda05b31dcc623c90 WHIRLPOOL e9194bd856a13856800cedb4bbdf529cb6406c1d7f8e8778b7abf29d8e9f7554a8b8ef320a2ebe5ef1521484d00fc63ebf1719ad74f7b59a78134b1e59644f23
 EBUILD policycoreutils-2.1.10-r5.ebuild 4108 SHA256 c732158eb03593bd5ecd724481ba731531094b2212ab231c54cc5f1584bfce85 SHA512 2473c08430c66ec16b357dfcc5ff8b662cb156c49951109ac63130905d4172bb34cea8982e1d1b55ea99cfdf5733607c041475603628f0e2be5ceb3b2141056a WHIRLPOOL 00af6f6c70ef57d3a120ee69ba3197153485951a139a7e15a6250d0685e60c5eae3eb977922310d13fb99aaca158a529249fe90698094bfd8b488dd5f0c9903b
 EBUILD policycoreutils-2.1.13-r10.ebuild 4252 SHA256 d146a7a6acf9c46d1f57625de9cec02fd7d42dd22ea8d1ad3645b43a837f42e5 SHA512 c52aa31cc1e02a6eaee54b0760b40badb941af33c3e0bcf1267299f9c6594d4654fd1d71c49c50fd32ce995f81eb08a161175960373a97a4bfe2a345c47237b4 WHIRLPOOL d82f12d4cb708db4fbcf72b14563e414fe602782b92d4561f312b3ebb62107a74557e249e121f7565756de6db7bc5ef187ca738d312564dd4f0af8d4bbc27451
 EBUILD policycoreutils-2.1.13-r11.ebuild 4252 SHA256 dc6b4fca9ed31ffdc83f590ec9f2454975e94633caf9e4ad978febc5f85e3501 SHA512 c764e3b7c13712f963800e185a2d2f1ebc52e2a5f4b6e8bfe9dd80378b370006cff5d62a82883cb1cac9c37cd24355709857c411e2ee020a23d64a3612b44fe3 WHIRLPOOL d884e5008f390fee115331eef31eb31957e9a1a2c3537508854d5e4ac7af22472b3104c6938781130dbd91632f26ed94605d658482d57a4f1485e889c64f20fa
@@ -30,12 +32,13 @@ EBUILD policycoreutils-2.1.13-r8.ebuild 4251 SHA256 603e0ae76517cc9fc7eb925de09b
 EBUILD policycoreutils-2.1.13-r9.ebuild 4249 SHA256 c421a149fd21e4d85042c336bf74a2a5d6d557b269c1b312b451cf40ef0042ea SHA512 22619dcf963571720bd8c3641be2b1d7a6d74b924b38dfc5a07852dac49e7aa58f1b8172dc00c545def3ec595d84a1320825adf889acd0644605faca3332a30a WHIRLPOOL 51ce06f2f13eb2c0b40b93113734e5b075585d1a23c40134483d39da6cee55850b6efd87106312b019ab57df7b7d0cd80beb22a0293716c6a3da40c095954bd7
 EBUILD policycoreutils-2.1.14-r1.ebuild 4255 SHA256 077b2ed1463c504972b66a42375ceb954c778be3462ce614be90d3faff42826b SHA512 b709c1f22b29510905eecd193ea11a2f82d1ca3d99abe32c94eda85e8291780f1e49cb2e557e3dc08be0ffb466748d46298c9fd8e7f6cfdc2a12f01308c81693 WHIRLPOOL e6f02dad2cdd5b3762a6f1d5cd4ef98fef08e186003e46449ec3caf85ee98f24e4b2d87a8b2b03be2a861c6508b99ced38e884adb0da0b00f1b560b065dcff2a
 EBUILD policycoreutils-2.1.14-r2.ebuild 4253 SHA256 b2174045a24bd76ed609c4236072eb1ad0ca69af8b93f621bc263cceafa54b75 SHA512 1c9f2a1e24b16f6fa00fe54abe31251d687c543274a355697c76694bc2529436d57ec1d2ec5dc9cd2ec991a7265b7ba785a9e34f9dbc3f29d9423ffb0ea1e723 WHIRLPOOL dc715c03979b9542740176c82cd279d179228ae5d1beeb31b9dc7d36cba3a972593d2ce58fc2a8429be33c88ac059ad355721c49677fa2b8b01b11593920823a
-MISC ChangeLog 19777 SHA256 579ba5c6e121fc6ce1057264c9b87a957bcd003f3511f63eceac382aaa446eaa SHA512 ed5582331ee6e8e25b244ae7248c50af535c8ccccb9c8571ee1a92b56210fdebfcca2e83c124dd086ebdd4852f8edfb68ae4f14e8fbc89219dc189797d54402b WHIRLPOOL 03ee0fec6b3da03cc0b45827a51ca32b8ef3271f2b43d1b363efff61439e9d2b92e6d33bdea121b39fb51ddee41fb1f2bdb2dec315c4eb19ad84b19ca232cc6a
+EBUILD policycoreutils-2.1.14-r3.ebuild 4657 SHA256 30566e524e646b9074e008f0137fb9fcf6000e3a28d368a27dfb55b3552a3056 SHA512 7f35041dd98220c53b0f1c4339872ef9369f2b05c4fe616af04030bca3cb551668b2b77a6b1da6f29c0dfbbbe8408ab48f42ea0a8ab7e28cae3f54583fdfaa0c WHIRLPOOL 86ac4d67c6ad054cd565394126254b86455aca879eccde53a13ae335f42439cf365f3d27395795e6b0748f380b64193444cfc4ff6e309ba07cd6d8a683ef6a7a
+MISC ChangeLog 19966 SHA256 0ae8da5ac08ed737a6e849b795384b22ea7201c2d4b0716f0999601d1bb1d323 SHA512 69ff600b5762bbe0551da09b3a9b494a92b64e50bee1ab5d282619e3fd3c9714a6a4f617e4731012bbcb225181d1418d8649911bd8ca15c006c89f81d65e1ef9 WHIRLPOOL 84f0e531a3bd56886ed316f220a6bb4118c1f084b83e8e49db960129da80dc441dbe443d30f32bc7b67882d751915f4552a50ba8b21cb489d5beb7fb75720f79
 MISC metadata.xml 1051 SHA256 d45f380d20c067422d5a8d945b7d180c85c31a55efcf9c0896e5d8fb395a45d5 SHA512 84f477edcc0879f3e3da06455d3b64bc2444a6af5a0848b8852670d697801f83f8eb61e4d4c9749d0068cf3aed3606e736570dd4b30969d7c8b4d0361768ffcf WHIRLPOOL f351d85f656b2f0512d616bdf3e901c7272dfb269ed7bf072959aa8c219ed0e534f3a8404842b726246d28d2f2decab77be7e5ed1960653b5fbb7592c01d462e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG+AQQACgkQXfqz7M26L9uXnQCghPVi+A+HT9s9+1KkUfmVMaBo
-taMAn2xe2DVkAuTsDFEbhsXsGAdOWqat
-=2E9C
+iEYEAREIAAYFAlHZkT8ACgkQXfqz7M26L9tHPQCfUBFVYC9ZyqHNrMmlBMQTipUm
+ibIAnjLnd8fq0YExvp5Waydi4iwhO9iu
+=iZyF
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/policycoreutils/policycoreutils-2.1.14-r3.ebuild b/sys-apps/policycoreutils/policycoreutils-2.1.14-r3.ebuild
new file mode 100644
index 000000000000..4164759bc68e
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-2.1.14-r3.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.1.14-r3.ebuild,v 1.1 2013/07/07 16:03:07 swift Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit multilib python-r1 toolchain-funcs eutils
+
+EXTRAS_VER="1.29"
+SEMNG_VER="2.1.10"
+SELNX_VER="2.1.13"
+SEPOL_VER="2.1.9"
+
+IUSE="audit pam dbus sesandbox"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20130423/${P}.tar.gz
+http://dev.gentoo.org/~swift/patches/policycoreutils/patchbundle-${P}-gentoo-r3.tar.gz
+	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}[python]
+	>=sys-libs/glibc-2.4
+	>=sys-libs/libcap-1.10-r10
+	>=sys-libs/libsemanage-${SEMNG_VER}[python]
+	sys-libs/libcap-ng
+	>=sys-libs/libsepol-${SEPOL_VER}
+	sys-devel/gettext
+	dev-python/ipy
+	sesandbox? ( dev-libs/libcgroup )
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	audit? ( >=sys-process/audit-1.5.1 )
+	pam? ( sys-libs/pam )
+	${PYTHON_DEPS}"
+
+### libcgroup -> seunshare
+### dbus -> restorecond
+
+# pax-utils for scanelf used by rlpkg
+RDEPEND="${COMMON_DEPS}
+	dev-python/sepolgen
+	app-misc/pax-utils"
+
+DEPEND="${COMMON_DEPS}"
+
+S1="${WORKDIR}/${P}"
+S2="${WORKDIR}/policycoreutils-extra"
+
+src_prepare() {
+	# rlpkg is more useful than fixfiles
+	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 1 failed"
+	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 2 failed"
+
+	EPATCH_MULTI_MSG="Applying policycoreutils patches ... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	# Overwrite gl.po, id.po and et.po with valid PO file
+	#cp "${S}/po/sq.po" "${S}/po/gl.po" || die "failed to copy ${S}/po/sq.po to gl.po"
+	#cp "${S}/po/sq.po" "${S}/po/id.po" || die "failed to copy ${S}/po/sq.po to id.po"
+	#cp "${S}/po/sq.po" "${S}/po/et.po" || die "failed to copy ${S}/po/sq.po to et.po"
+
+	epatch_user
+
+	python_copy_sources
+	# Our extra code is outside the regular directory, so set it to the extra
+	# directory. We really should optimize this as it is ugly, but the extra
+	# code is needed for Gentoo at the same time that policycoreutils is present
+	# (so we cannot use an additional package for now).
+	S="${S2}"
+	python_copy_sources
+}
+
+src_compile() {
+	local use_audit="n";
+	local use_pam="n";
+	local use_dbus="n";
+	local use_sesandbox="n";
+
+	use audit && use_audit="y";
+	use pam && use_pam="y";
+	use dbus && use_dbus="y";
+	use sesandbox && use_sesandbox="y";
+
+	building() {
+		emake -C "${BUILD_DIR}" AUDIT_LOG_PRIVS="y" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="${EPYTHON}" || die
+	}
+	S="${S1}" # Regular policycoreutils
+	python_foreach_impl building
+	S="${S2}" # Extra set
+	python_foreach_impl building
+}
+
+src_install() {
+	local use_audit="n";
+	local use_pam="n";
+	local use_dbus="n";
+	local use_sesandbox="n";
+
+	use audit && use_audit="y";
+	use pam && use_pam="y";
+	use dbus && use_dbus="y";
+	use sesandbox && use_sesandbox="y";
+
+	# Python scripts are present in many places. There are no extension modules.
+	installation-policycoreutils() {
+		einfo "Installing policycoreutils"
+		emake -C "${BUILD_DIR}" DESTDIR="${D}" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" AUDIT_LOG_PRIV="y" PYLIBVER="${EPYTHON}" install || return 1
+	}
+
+	installation-extras() {
+		einfo "Installing policycoreutils-extra"
+		emake -C "${S2}" DESTDIR="${D}" SHLIBDIR="${D}$(get_libdir)/rc" install || return 1
+	}
+
+	S="${S1}" # policycoreutils
+	python_foreach_impl installation-policycoreutils
+	S="${S2}" # extras
+	python_foreach_impl installation-extras
+	S="${S1}" # back for later
+
+	# remove redhat-style init script
+	rm -fR "${D}/etc/rc.d"
+
+	# compatibility symlinks
+	dosym /sbin/setfiles /usr/sbin/setfiles
+	dosym /$(get_libdir)/rc/runscript_selinux.so /$(get_libdir)/rcscripts/runscript_selinux.so
+
+	# location for permissive definitions
+	dodir /var/lib/selinux
+	keepdir /var/lib/selinux
+
+	# Set version-specific scripts
+	for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
+	  python_replicate_script "${ED}/usr/bin/${pyscript}"
+	done
+	for pyscript in semanage rlpkg; do
+	  python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+
+	dodir /usr/share/doc/${PF}/mcstrans/examples
+	cp -dR "${S1}"/mcstrans/share/examples/* "${D}/usr/share/doc/${PF}/mcstrans/examples"
+}