Noved to github; also add in masked 2.4 series

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

6 files changed, 134 insertions, 19 deletions

diff --git a/dev-python/sepolgen/ChangeLog b/dev-python/sepolgen/ChangeLog
index 19f9c5f30b5e..8f90c8028b44 100644
--- a/dev-python/sepolgen/ChangeLog
+++ b/dev-python/sepolgen/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/sepolgen
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/ChangeLog,v 1.41 2014/05/10 14:07:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/ChangeLog,v 1.42 2014/09/21 10:25:53 swift Exp $
+
+*sepolgen-1.2.2_rc2 (21 Sep 2014)
+
+  21 Sep 2014; Sven Vermeulen <swift@gentoo.org>
+  +files/0030-default-path-for-tests-also-needed-bug-467264.patch,
+  +files/0040-have-test-run-with-PYTHON-variable-python-bug-467264.patch,
+  +sepolgen-1.2.2_rc2.ebuild, sepolgen-1.2.1.ebuild:
+  Noved to github; also add in masked 2.4 series
 
   10 May 2014; Sven Vermeulen <swift@gentoo.org> -sepolgen-1.1.9.ebuild,
   -sepolgen-1.1.9-r1.ebuild, -sepolgen-1.1.9-r2.ebuild,
diff --git a/dev-python/sepolgen/Manifest b/dev-python/sepolgen/Manifest
index 73c39ad0f169..eebc35b60eae 100644
--- a/dev-python/sepolgen/Manifest
+++ b/dev-python/sepolgen/Manifest
@@ -1,25 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0030-default-path-for-tests-also-needed-bug-467264.patch 891 SHA256 9e8627ca85ce1ff98933b9e8c8ab00c6ac320ecec3d082a91b790f9c1cebbf31 SHA512 d4e6cc6084bc76ac1394392a8107b2432ca885b88d8b3252507d28a192022e6252bce7d8a666edbc5a36362ceb76a2157008fc3a110a892964c40904607412b5 WHIRLPOOL b981c25dc65e63f72d7646eaff77b8de92589548c272906f73e1a729b7f54ecd57f0502ed453f95bbdf6d9e85a1a087728ec2c5ec3e2eeabc61bd36487fd4842
+AUX 0040-have-test-run-with-PYTHON-variable-python-bug-467264.patch 436 SHA256 9d83e362673c2c192f38838a5c5caa285528124a835c58b8662b5b75e6c11952 SHA512 1308fa2ffa3eb49743dfbc27d3a0696d86ab4a3e6da81953783a24d2c5b9b951d795eae628e9d42cb86b6baee4f78293ad94a09129b7ee08f6f4555d42780930 WHIRLPOOL 3cc30705a01f1850b382604019d5372da412579a057225a93b3314ca2d9e4c5b27725bc784af7d731a68882c6d770dfb3d09595d8fa2ae143bbc007cae0960d5
 DIST patchbundle-sepolgen-1.2.1-r1.tar.gz 762 SHA256 f6c83b003df65cd2a11c689cb8a1f37e519bb706de17383fa0d9ff79e80adc11 SHA512 1eb83c118b4c6611c868213b802358c32e6863f2fc68cfed92d32f9e119de1ee9d128c3994bb1b71da1e36f1925d2fb71523498afb63cc3b5d2dd7c9290ebb8d WHIRLPOOL 37dd39a4ef28d8df3d6f2c031df556997ff836d8aa9962d69417dae2dc1ca82bd0d12d21df774231ce28b9f1ec2ecdfff710c452e69ee5de6dc0322b0b24f458
 DIST sepolgen-1.2.1.tar.gz 366214 SHA256 438c246bdc6b3cf1b12116831f4c601aaae6e93decb007dddab212a3c88781b0 SHA512 ec71126eaf6ecb18d989821753c04f3325de2188bafe161deff5733ebb95c3589e06198666f0502169cfa7d3a2b8ec509ff62098dc11b66b4f0883e1d8703a6e WHIRLPOOL efdbbb9771f68921a5fd3824267c7716ca48ab1f40395aea5c27ac4f7f3b8bf71f718da5ada40eed6c1b2de5341f3d5f10c7ad6086b5ac017d4898136ded6fe0
-EBUILD sepolgen-1.2.1.ebuild 2081 SHA256 ea87afc2f66a38d055069e39e1d757a83160ce991cad700462087bfa136cc149 SHA512 0ea03a7d4be3dfb15fbb849bd0d76c411668b8c6a6242f8ca6859bb70fd1ce4d454f75cd17693fba14617c304900f00d4d1f06b99586eee09192f95f798cd131 WHIRLPOOL 53760f5490755bbb3b877766ff0d6f38475dde9f066d340c7c6311e1401310dbd25379344756efaf7bdea84ac6ffd87580603628de82db9021b97be4598c9828
-MISC ChangeLog 6332 SHA256 9a0ba8293d1185e3a11c12b7fbfb914350cdcf4af7d9454d68bf90f01336afe4 SHA512 3606b7e3c960ca0d114da4a0de6ebf5a1742aa756b356e4e3ba50959ef1993db0e94b5a4a63a6e01dcb847a84b031e47078392b8bc302b7b529f703fa14fdf32 WHIRLPOOL e12599f4d0dceb80acd90876c8c64ce2eb74bbcbf5884528559829b7d949a6e341086aba7e6d4854e07b8f932f138da9853d6cec57a8fd213201a39928b60913
+DIST sepolgen-1.2.2-rc2.tar.gz 366300 SHA256 5b1a64c6cac3746638949acdffa3fb858725ecec5671cc9d71e38e36f566d604 SHA512 e940db8cd0327d87ce42d65f4e2f6d409c79847e93753a34358d5db8d1538b0bc6b3310f83be89d77cf8942666ea747cd3dc4092784fad329618049b3d879963 WHIRLPOOL 622d1fdc4dfc083e59008d0ed422bd81cf04a73db50b91c9f4dfc5dbb77ba6e90359a8c9747f08876540d29395a16b4c6576b0789ad658bf16b73f6305613e14
+EBUILD sepolgen-1.2.1.ebuild 2113 SHA256 6ee52f7ddf1565b09c6ed0944628c57cadb0981e7528c9d6a0d8d99769523a69 SHA512 50861b1a0372e2b6a63d312ba08ca41fb71e79830ad3ba296ed343563356661eb2586a320b3e001269de20a5941d98c0356a4f7fafc593c799877ea4e87e7362 WHIRLPOOL 92c0f2dbb27d03ed1ac3a323a1bf76a1bf2387a34a31fffcce8f31afef2e9d55c26a7903f4c7b009fa02827376d650ec6b00d1b872b268691d6ea66a4f5458b5
+EBUILD sepolgen-1.2.2_rc2.ebuild 2130 SHA256 c850b59f457f0ba9f3f66354658a095b9a0bcbef971cf6407cdc08beb4ba3406 SHA512 94363a05d8db24a8a33ded428df9c847ca77605694f1070e9f0751ffe63e4f6018887edf124012d592c8c2fe03b9738c9412fe243b9988eaadb70e521e7dcd02 WHIRLPOOL 80f280b416dc2d59c103db3fdc4d090475b247f02ad2b91da06ba5593e5e2861d4a6dfeba74d205f2591079f3e0f0635750fd11ce34b6d6ed89259f7edc3a9d1
+MISC ChangeLog 6660 SHA256 7137e252db70677248f918eec1283ae0ee11ecf05637c0376526b5bef84a70fd SHA512 bfc50e90407109d5900083e7f0aa6c4873a25915aa229a34931ba1f81204a48d939e00f4e0d383536fddc79a2c708cec9e7e2904810c9020c23db72586544697 WHIRLPOOL 69058abe2c79136e4c8ad04552f76a83447749abaad69856220ad4aee6e141d1cb74b9731f6d0b541af7b327cc2926f337c193ace67ff38872e8878a9c030a2a
 MISC metadata.xml 234 SHA256 8ef796ab0656738628f6238eba20f70298c2539bf4dd24f7a6f042857176c5d2 SHA512 4d8a7927783ca9cb1a86933d5d611a1fd6194b4de9c5ecc44879b64ef289cb0d36fe7382019512b16d23bb09f94780d5a9aaa523da244928b4f50368063cb460 WHIRLPOOL 641e9b4f445fad1419f1de8fddb2667ed69e167367ae8c94fc88e3a7244fdd968b7b0f4c28e0e13fdc593973c19a0f2451548611515a1b457fdcbcd8c5fdff92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTbjKlAAoJEC7dUkA7aK9HFmgP/ReZJxQ1ZhYZiAJdpEtlTtVR
-HjqXb6ytXkmcVytqpuTo/o3ZDaI776mVgmHqbhcmaT5ARiYGJq7hlNBk1Sz5aIpR
-s75g5Qv6pftuvxdz1C8rMT4DWUd4ELogcB4/5tovY/xqAWeRJDtXZ/M2PZNhq6bD
-x7ETEA6ywlKPhaZlmvwWRGBOzEaJOXv1yw1HboerQ9bY8n9Ox4RFKS0H781Evdf4
-uxkVvpjP8DGxTEEmw6W+vP/FCoULfQ4vD+8EFKwMeJLyjty3yFWoc3yTj7xJApNA
-IwZbpoPNFOiHBbl42JgpZNHcmyTd1CLSFuqctinq8Kr1QRpqL/2ZUxwjcDDg9PA5
-QUD6H3oWsT3eQ/nROyBOhBGWcQxAmPen9HJFmO623XZkHbWf7O6gQDcco2D/qOfD
-9fpAzFMjdoJns4Us5/Zy7d17uO6+1KX21nUMLqNRjEEdx5WlTs9XK4y1CBXSKg7d
-M4PqugOc2XYvVTCFNeUUzqPxZX6MdxJ4iBBqDK96YR+U1rJtzg5WEtsAmh8Obz9s
-w1pvlsUJqpyKM9HKj7yk9I2O/rdTNM6Q/5GKNmYGziLCc31Y7deuo06Rg5GuHaI5
-ZwdbEMv40syrRoEAQLNSXetrKaKJZQhD0di7XII4MMNUD9/JoMKpBXRl2n8ar9Qt
-u0WzxzVaYj+pWGlPMvi+
-=080K
+iQIcBAEBCAAGBQJUHqdyAAoJEC7dUkA7aK9HiakP/Akyplf0+GjVxkPk2V4fo7US
+dnheoRQkZ4qhtaN9Xa517opfrud+42CtWTjhvt7JLnixD1afrQmV9to9Jzl2qp4U
+agqPPKDVxbDpehY36vGYG4NaQ8sJJUn2LitqOzeDmi0xCdOS+DegnjdjqNwI1MTF
+OTdd4W0j7bZ7Z5U8Zc4rw0Y2mcS5+hIJSDHLIZIvIIPADa+JZmdPytYQv/BibGn4
+1hXM2mOL0OKwm+Y8ZpLoPlllqyS0fP2bPgYW7puKnRY/Vj9Xqdsk+wMK2rDckFoe
+TySjF+/QiTkjoCRACHL6/uL3t0h8SE7+WD6wnbyCAX2WLTceis3GLCEh7DKXjzp1
+ei+B0ncKVPPw2rdUueLjLVGI/6J0kRWnQyi06c6yYxhT4uojbCLIOcUiDZ/zHhwB
+TKw1f0V1UkpBVIhZtGFdmjHD8itw7clrhrJBGYvPVts3aaIMZ+pB6Ae0OIRUh6F9
+r57+pYFPNYfrLvhl/fFvk57df9/mThly7foq440UWs1T27DKluV/X/0vI1UrVlD5
+90OwhNxcS1jPpKrDWT8Izf9g5da+iXheRnPfuMbsXUUhASX3Mh16bx9+BgVC4vMj
+Fj8FoEZInNHd0t40ekjKVKUv+d033BaRYv+eFgzKFhaSIQl/lCAI9WQoMv0h3pCi
+XSn3eGMzUWPuR7Ipd232
+=ici0
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sepolgen/files/0030-default-path-for-tests-also-needed-bug-467264.patch b/dev-python/sepolgen/files/0030-default-path-for-tests-also-needed-bug-467264.patch
new file mode 100644
index 000000000000..c8678604c4fd
--- /dev/null
+++ b/dev-python/sepolgen/files/0030-default-path-for-tests-also-needed-bug-467264.patch
@@ -0,0 +1,12 @@
+diff -uNr sepolgen-1.2.1.orig/src/sepolgen/defaults.py sepolgen-1.2.1/src/sepolgen/defaults.py
+--- sepolgen-1.2.1.orig/src/sepolgen/defaults.py	2013-11-04 22:24:13.620024022 +0100
++++ sepolgen-1.2.1/src/sepolgen/defaults.py	2013-11-04 22:25:05.619024133 +0100
+@@ -27,7 +27,7 @@
+         self.config = dict()
+         if not os.path.exists(pathname):
+             self.config_pathname = "(defaults)"
+-            self.config["SELINUX_DEVEL_PATH"] = "/usr/share/selinux/default:/usr/share/selinux/mls:/usr/share/selinux/devel"
++            self.config["SELINUX_DEVEL_PATH"] = "/usr/share/selinux/strict/include:/usr/share/selinux/mcs/include:/usr/share/selinux/targeted/include:/usr/share/selinux/mls/include:/usr/share/selinux/default:/usr/share/selinux/mls:/usr/share/selinux/devel"
+             return
+         self.config_pathname = pathname
+         ignore = re.compile(r"^\s*(?:#.+)?$")
diff --git a/dev-python/sepolgen/files/0040-have-test-run-with-PYTHON-variable-python-bug-467264.patch b/dev-python/sepolgen/files/0040-have-test-run-with-PYTHON-variable-python-bug-467264.patch
new file mode 100644
index 000000000000..a039236bf8c9
--- /dev/null
+++ b/dev-python/sepolgen/files/0040-have-test-run-with-PYTHON-variable-python-bug-467264.patch
@@ -0,0 +1,16 @@
+diff -uNr sepolgen-1.2.1.orig/tests/Makefile sepolgen-1.2.1/tests/Makefile
+--- sepolgen-1.2.1.orig/tests/Makefile	2013-11-04 22:25:44.704024216 +0100
++++ sepolgen-1.2.1/tests/Makefile	2013-11-04 22:26:09.718024270 +0100
+@@ -1,3 +1,5 @@
++PYTHON ?= /usr/bin/python
++
+ clean:
+ 	rm -f *~ *.pyc
+ 	rm -f parser.out parsetab.py
+@@ -6,4 +8,4 @@
+ 	rm -f output
+ 
+ test:
+-	python run-tests.py
+\ No newline at end of file
++	$(PYTHON) run-tests.py
diff --git a/dev-python/sepolgen/sepolgen-1.2.1.ebuild b/dev-python/sepolgen/sepolgen-1.2.1.ebuild
index 67384aaded80..c1e7227fcef0 100644
--- a/dev-python/sepolgen/sepolgen-1.2.1.ebuild
+++ b/dev-python/sepolgen/sepolgen-1.2.1.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/dev-python/sepolgen/sepolgen-1.2.1.ebuild,v 1.2 2014/01/20 20:06:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.2.1.ebuild,v 1.3 2014/09/21 10:25:53 swift Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -9,7 +9,7 @@ inherit python-r1 eutils
 
 DESCRIPTION="SELinux policy generation library"
 HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20131030/${P}.tar.gz
+SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/${P}.tar.gz
 	http://dev.gentoo.org/~swift/patches/sepolgen/patchbundle-${P}-r1.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/sepolgen/sepolgen-1.2.2_rc2.ebuild b/dev-python/sepolgen/sepolgen-1.2.2_rc2.ebuild
new file mode 100644
index 000000000000..5e51413f7bfc
--- /dev/null
+++ b/dev-python/sepolgen/sepolgen-1.2.2_rc2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.2.2_rc2.ebuild,v 1.1 2014/09/21 10:25:53 swift Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1 eutils
+
+MY_P="${P//_/-}"
+
+PATCHBUNDLE="1"
+
+DESCRIPTION="SELinux policy generation library"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=sys-libs/libselinux-2.0[python]
+		app-admin/setools[python]
+		${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/0030-default-path-for-tests-also-needed-bug-467264.patch"
+	epatch "${FILESDIR}/0040-have-test-run-with-PYTHON-variable-python-bug-467264.patch"
+
+	epatch_user
+
+	python_copy_sources
+}
+
+src_compile() {
+	:
+}
+
+src_test() {
+	if has_version sec-policy/selinux-base-policy; then
+		invoke_sepolgen_test() {
+			emake test
+		}
+		python_foreach_impl invoke_sepolgen_test
+	else
+		ewarn "Sepolgen requires sec-policy/selinux-base-policy to run tests."
+	fi
+}
+
+src_install() {
+	installation() {
+		emake DESTDIR="${D}" PYTHONLIBDIR="$(python_get_sitedir)" install
+	}
+	python_foreach_impl installation
+
+	# Create sepolgen.conf with different devel location definition
+	if [[ -f /etc/selinux/config ]];
+	then
+		local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
+		mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
+		echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+	else
+		local selinuxtype="${POLICY_TYPES%% *}";
+		if [[ -n "${selinuxtype}" ]];
+		then
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+		else
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
+		fi
+	fi
+}