Removing python-3 support until upstream has it

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

3 files changed, 149 insertions, 2 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index c681df90e9ac..66d05c1530b2 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.107 2012/10/13 16:46:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.108 2012/10/14 09:44:36 swift Exp $
+
+*policycoreutils-2.1.13-r4 (14 Oct 2012)
+
+  14 Oct 2012; <swift@gentoo.org> +policycoreutils-2.1.13-r4.ebuild:
+  Remove support for python3 until upstream supports it
 
   13 Oct 2012; <swift@gentoo.org> policycoreutils-2.1.13-r3.ebuild:
   Supporting user-provided patches using epatch_user
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index b9f8bec3f6fa..098d4686cde3 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -3,6 +3,7 @@ DIST patchbundle-policycoreutils-2.1.10-gentoo-r1.tar.gz 25209 SHA256 c9b18667ba
 DIST patchbundle-policycoreutils-2.1.10-gentoo-r2.tar.gz 25736 SHA256 d45a515d74b1869e28afeff773c7edc00ef5de657df79b239a988c64d2894a44 SHA512 1fd6a815c84b5fcfeb94fc1a44b3e88e5aaedeaf0595c4a1a98c18d42f6cad5b309da1fa6fb9eb3f5bd90492e7a63010b91a584174635df36660c2a203e14a0a WHIRLPOOL 599e65c94505cf519997693ce51630567e8f53c218e2779397ca81223a897763c3ed19e76dc63be9fabdafce5074de7578a2c09fd83fd54df432dae21f5cec36
 DIST patchbundle-policycoreutils-2.1.10-gentoo-r3.tar.gz 26116 SHA256 661e18c14a525d7eaccf52dc42689663a2d1cba7f26004a84371aaa558919f27 SHA512 80d98c396e39ae24705f5ea73c92c85a52a7cfd43f66c717a25e537fbe1d6912833bde1e317fefb5fe59de392abf28583baecef8b11fbb18b2eac146b117f77f WHIRLPOOL c205c3c6ac86dfc7ee6e1212bea95d3e117640b8b68d3a006b71ae87db8ad83e10d68792a0b2091d41d7a0ccfe75c23ec905c0c5c1bffea251b536b9e74dd471
 DIST patchbundle-policycoreutils-2.1.13-gentoo-r3.tar.gz 35961 SHA256 75022f9af208cbeddb770f1504a51845865ec2fac51ca1bde9c562f6af2e340e SHA512 1c81f41f7e9ea70be492bee9eafe6421d516a009f8cd4f5d5c636490acc8819bcb75bc16fac5398ea275c7336f1eb0604b725399028f12ce3c0be2190d3998e8 WHIRLPOOL 1e6a1c2a57f6d314ba2df1b42421c219748cf840d20a5e62c01acb28deb4816b4c1720a97877a7c3ae8a033f6c294c3496a633e54a9b61708fb4272bb4787831
+DIST patchbundle-policycoreutils-2.1.13-gentoo-r4.tar.gz 7075 SHA256 922cc5a08e9c973957ef06dc00ee92e11df2a5f0347c9002cbff758a48407db1 SHA512 d32095869a9c10ba35b2862875dccfc4ee744d16c6a106dd9ec4b93465a7429d6f035ffc49e9dfc62a003aaa344b2353d38842f43f959c2c9f4d4a4139029383 WHIRLPOOL ab072e56aeba07066a84ebb45b27815a1b7a257e50721fa61aa558c6265261b1187b07561dd3add398360af814ccc6ab713aac0132dc8854dd3d06e2b9cc7288
 DIST policycoreutils-2.0.85-python3.tar.gz 19750 SHA256 4bc78bfd39ce43a010c4e1de3d7f4ff45fcfc7bac4bc70e28c9bdb681053fe4e SHA512 94d0352af2b25eb8ea240f21dd702a1d10a6558464785e1800291dc69308467768ad382e5d45b51c04a20e11eef60e2cbce038833baf61e09576b8095b755643 WHIRLPOOL b1123a2d116f2e47b11d1722eff0c4f65ed01ff27d588aedacdcd7e50a124c9833e501d534285ac76e7fa59b2fe63cd043c195c06ce50be7bc584c5e2083389c
 DIST policycoreutils-2.1.10-fix-makefile-pam-audit.patch.gz 1088 SHA256 9e3de8820a7f34133413c0a1b0987d20e69daf6ceb1e95da5ec70f759d85092d SHA512 7f08587c66251a18489fac62d6f21e379aa0d668aa9127ec07bfe8a71e53c7d80c275b269c7e6b70cbf69ddd9f7718f9122f3857f86a7dd9caf9a021abe19b51 WHIRLPOOL 74486a0230dc962b2f18c3aef45633c0d16e4702075fa70573fb52ae0dbca643649c5461b412039688a8e49ca28f164da8d06caf028835ca849eabbfa74bd4a5
 DIST policycoreutils-2.1.10-fix-nodbus_or_libcg.patch.gz 766 SHA256 2b98e73f02f5b0116b70b8ffd04925ede0c7939284c7453d9089cecce5094343 SHA512 377b7e25870501a306df011f26a809a9da1b92e72d1557e05a98c4fb9afdb5341fbd0f3e29c782a80dfd86fe881ebc51ad5db4ad3a65f855d1a40ef62d4a9b50 WHIRLPOOL 6ce6ed6317808e969cb4b61e1ec79ca7b35427c418a79e84d1f53ef8e1a82c9f942fc253d345eee69f25554ca3251670e455d40d5f60d1ef2db98ab1ede71ba7
@@ -18,5 +19,6 @@ EBUILD policycoreutils-2.1.10-r4.ebuild 4353 SHA256 b46e61343c552f092abd5fec8ca7
 EBUILD policycoreutils-2.1.10-r5.ebuild 4108 SHA256 c732158eb03593bd5ecd724481ba731531094b2212ab231c54cc5f1584bfce85 SHA512 2473c08430c66ec16b357dfcc5ff8b662cb156c49951109ac63130905d4172bb34cea8982e1d1b55ea99cfdf5733607c041475603628f0e2be5ceb3b2141056a WHIRLPOOL 00af6f6c70ef57d3a120ee69ba3197153485951a139a7e15a6250d0685e60c5eae3eb977922310d13fb99aaca158a529249fe90698094bfd8b488dd5f0c9903b
 EBUILD policycoreutils-2.1.10.ebuild 5458 SHA256 a24b6bde380abe3674cf0a36dce8f2d98f2926808ade1941ffa117286003743b SHA512 2d67a7c0d60a89c8d6bdb1aea89d9b2bdbf09ea2c510ca52d6858861c56dea58ddca634dba8a2b9a17d570ad355f6da443896e50f280e23a678cd31e2ac7eb14 WHIRLPOOL dc89233f6c3d6b72e3d71e2288b52761452395ae2e6d5f0b327eb1fef24b480c5afb18e161e82ade401d84301d7d2c822d14db2ee3884808fc452bc8d50ff736
 EBUILD policycoreutils-2.1.13-r3.ebuild 4244 SHA256 c5d6b0fd58a7648b980ee39ad590deafcefc18f102a52232e8f685dd1447da70 SHA512 fa76d2002c503d0286bed86992f827b56db1bfb410c667580b5fe4d3385c3500334c86058e4e25de7538c270b8b3cccc51768a8d0e4aa341d58e9f39e4d564f6 WHIRLPOOL 61800aa8b33638417c6b4fdd4f9782d157dbaa15e02f95e7edbd27ca172961cd1ad7cf5d4aabddcf0a926ac7af5036685ccdfccc2f1990aac65ecda772c8cfea
-MISC ChangeLog 17183 SHA256 2881ea90469dee44880aae98db757a814fbbd18ec0d6d0032b24b705a5467f91 SHA512 c0f04f2d1543d224b0516a34bee5e03c079c4c2e8fda6628dd944fce88822c40879d294b62b56e6fb97236345848ce93d040cea46208628eff58a88adb550bf4 WHIRLPOOL e4e7ea1eb49310e7a097050a7e204b117d14e5e1b879f6b265c66d51804281e1db77fa78c60872217ea290096a8790e52bee78cfba0baf0e3c12655f2efd4d7f
+EBUILD policycoreutils-2.1.13-r4.ebuild 4251 SHA256 0bb3a8c4767d35ca866d792d48748a68083ed8b15cae17aafae22eedb304c4cc SHA512 c46e12a296e2acbee43aa63c2c55234b93be8dd5f37a90b5612d60e77920ffb0c09e54776349cb75232d82e649c5846f69b9b1f1323909bd7a6ead563a900a36 WHIRLPOOL 5ae1922054de3b8b623ee049152764005fa4d95de3201601a328eddd354e1db94687de83a08e7d591bc028384cf937a7bf2d9f02d4390f3a6ae27ac93ac1e5ca
+MISC ChangeLog 17351 SHA256 a2355c3865fff4640a028867a28de53fba3c4d0bbb6580d5bfed34f427f7d698 SHA512 a463375b62afd9b8af8e2454ebcb23b6eeaebf6401004ad6c66d6831c49db8f90f0ffc6e7ce47c9fa30850cfb54ed1cc0bc4214547cea56733cc636258fbd179 WHIRLPOOL 85086795b36235b17d77a5ad2aac67dcbd0a99a7533478c175a6395bed10842892a22b782ccf2934affc98c235e9a4bf256fc1f05ed6037ba32a8d5b68b803cc
 MISC metadata.xml 959 SHA256 6683014987dd67dfbeb80ad329550fc20a0b09f5eaa7828054be62fff6aee391 SHA512 d44168511571036289259b0709fcb12f934bd789d872e256bf00b7b88247f08b5c5f6bbcf60e0ed654f391606f6c41baca92aa7208a80526ef01c2c34f06b962 WHIRLPOOL 59c9757a028d1731dac9abd05ee768fd153c303257a14acf4d53290e4108eecc45abbb879ef2143141b9d03cf3dc94e0ba1bdc8ed7b01f0d2ad84db5fb9f347e
diff --git a/sys-apps/policycoreutils/policycoreutils-2.1.13-r4.ebuild b/sys-apps/policycoreutils/policycoreutils-2.1.13-r4.ebuild
new file mode 100644
index 000000000000..6fe5d9e18a49
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-2.1.13-r4.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.1.13-r4.ebuild,v 1.1 2012/10/14 09:44:36 swift Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.7"
+PYTHON_USE_WITH="xml"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-* 3.*"
+
+inherit multilib python toolchain-funcs eutils
+
+EXTRAS_VER="1.22"
+SEMNG_VER="2.1.9"
+SELNX_VER="2.1.12"
+SEPOL_VER="2.1.8"
+
+IUSE="audit pam dbus sesandbox"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20120924/${P}.tar.gz
+http://dev.gentoo.org/~swift/patches/policycoreutils/patchbundle-${P}-gentoo-r4.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 )"
+
+### libcgroup -> seunshare
+### dbus -> restorecond
+
+# pax-utils for scanelf used by rlpkg
+RDEPEND="${COMMON_DEPS}
+	dev-python/sepolgen
+	app-misc/pax-utils"
+
+DEPEND="${COMMON_DEPS}"
+
+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
+}
+
+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";
+
+	python_copy_sources semanage sandbox
+	building() {
+		einfo "Compiling policycoreutils"
+		emake -C "${S}" AUDIT_LOG_PRIVS="y" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="python$(python_get_version)" || die
+		einfo "Compiling policycoreutils-extra "
+		emake -C "${S2}" AUDIT_LOG_PRIVS="y" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="python$(python_get_version)" || die
+	}
+	python_execute_function -s --source-dir semanage 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() {
+		einfo "Installing policycoreutils"
+		emake -C "${S}" DESTDIR="${T}/images/${PYTHON_ABI}" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" AUDIT_LOG_PRIV="y" PYLIBVER="python$(python_get_version)" install || return 1
+
+		einfo "Installing policycoreutils-extra"
+		emake -C "${S2}" DESTDIR="${T}/images/${PYTHON_ABI}" SHLIBDIR="${D}$(get_libdir)/rc" install || return 1
+	}
+	python_execute_function installation
+	python_merge_intermediate_installation_images "${T}/images"
+
+	# 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
+}
+
+pkg_postinst() {
+	python_mod_optimize seobject.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup seobject.py
+}