Stabilize SELinux userspace for amd64 and x86

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

8 files changed, 30 insertions, 353 deletions

diff --git a/dev-python/sepolgen/ChangeLog b/dev-python/sepolgen/ChangeLog
index 99ff07b163aa..430c7c9d7fcf 100644
--- a/dev-python/sepolgen/ChangeLog
+++ b/dev-python/sepolgen/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/sepolgen
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/ChangeLog,v 1.39 2013/11/04 21:57:10 swift Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/ChangeLog,v 1.40 2014/01/20 20:06:02 swift Exp $
+
+  20 Jan 2014; Sven Vermeulen <swift@gentoo.org> -sepolgen-1.1.5.ebuild,
+  -sepolgen-1.1.5-r2.ebuild, -sepolgen-1.1.5-r3.ebuild, -sepolgen-1.1.8.ebuild,
+  -sepolgen-1.1.8-r1.ebuild, sepolgen-1.2.1.ebuild:
+  Stabilize for amd64 and x86
+
+  23 Dec 2013; Sven Vermeulen <swift@gentoo.org> -sepolgen-1.1.5.ebuild,
+  -sepolgen-1.1.5-r2.ebuild, -sepolgen-1.1.5-r3.ebuild, -sepolgen-1.1.8.ebuild,
+  -sepolgen-1.1.8-r1.ebuild:
+  Cleanup old versions
 
 *sepolgen-1.2.1 (04 Nov 2013)
 
diff --git a/dev-python/sepolgen/Manifest b/dev-python/sepolgen/Manifest
index e7e79ae988c7..6ff10adb8e4f 100644
--- a/dev-python/sepolgen/Manifest
+++ b/dev-python/sepolgen/Manifest
@@ -1,45 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST patchbundle-sepolgen-1.1.8-r0.tar.gz 25163 SHA256 9d47f5d66de747d1a48a6045d61a8dd6d297b1bb39ef43976c044afadd9076b5 SHA512 f5447393c594cb77181eb3912b411a51b3c6c21713e67ec606a14db4a3a0900e76c69eab423354a7b7fbd257389ff2cfc1252e7ae748ccb83bb3d53cfacdbc09 WHIRLPOOL d15e57da75783476c20f3c03376cfe4776c07642fb04320830b36707f188d3db02710e3791da5b1f8e8ce7b6c386eb8f1552f239712968d584a8079430094d6b
-DIST patchbundle-sepolgen-1.1.8-r1.tar.gz 25518 SHA256 97e0858a3c5c946bd02c436385747340e037f247ff238e7595918f24abdbe773 SHA512 b0b8d1e314525bfbbba3c1ddffa3311a981763d7fcde863b439361b1632939a805be9912232c1b9a889efc6791f56afc963389a5fc51368e40f4cda6b92a0f64 WHIRLPOOL b29d066a69aaabf96d52c3bf7615b520c973411827170976b955cdd54d1a32b93ded9f7ec7ae883aaa0c203794adc8b2d2b45765fd424bf9a0e20195664a77c5
 DIST patchbundle-sepolgen-1.1.9-r1.tar.gz 1433 SHA256 800c6c2c17b8444e68044b3f082a4e55a125207d8eac3191e2babca1a1d74dc1 SHA512 2db7a7538793c37e43d2cad0f22f6c181f1646c73953d78010b63488c752082e82b979b46e5a20bfd7fb5295dcb8c48392567485cc8d8614166eea84dc3756d7 WHIRLPOOL 621f6f0e157e37715e77f0a1d4091ca8965b8188a024c51c27f37fbcbb84ae984cac4c501b85b13fa76b86c798851de096df40e0add5ebe3e2b32f96ee0b9f0c
 DIST patchbundle-sepolgen-1.1.9-r2.tar.gz 2175 SHA256 87afff367ce458342f6ee15d6cd149e59d09b266917dcb4afb75f5ac92004a9e SHA512 92ecf0e94a1fb1e0789b57bcdea754d1ac6840eecd4614602217da80868cbcccc54b4cdbb00c5cc44c3aa5176e3c061e296ca49aec9a149822962418e92b29e0 WHIRLPOOL 249be395ffaa4995a6ad6532ff998e8a0082f6e0910110c466227f9d3d803e44cf819057f305e8ff59a17196d5654ad3a391fd9b09a1e8a91e6429642ccce05d
 DIST patchbundle-sepolgen-1.2.1-r1.tar.gz 762 SHA256 f6c83b003df65cd2a11c689cb8a1f37e519bb706de17383fa0d9ff79e80adc11 SHA512 1eb83c118b4c6611c868213b802358c32e6863f2fc68cfed92d32f9e119de1ee9d128c3994bb1b71da1e36f1925d2fb71523498afb63cc3b5d2dd7c9290ebb8d WHIRLPOOL 37dd39a4ef28d8df3d6f2c031df556997ff836d8aa9962d69417dae2dc1ca82bd0d12d21df774231ce28b9f1ec2ecdfff710c452e69ee5de6dc0322b0b24f458
-DIST sepolgen-1.1.5-gentoo-r2.tar.gz 18295 SHA256 7a574486ee8d6c1f2e3df6da7cf61d2b7890b8eb2d9a130d1743090eec7f13c3 SHA512 0e70cba9250709e9448824b676194f6a0132c005a67d5d20a1f9442df3eead76f03cb82d4823757a586c15dce7de5f1293b0deeb62fdeddaa906c829a6819f59 WHIRLPOOL 3fa2cb41e54866b535b12dcbeec7d1801c2d67ba46bd2af4c1fdb8fce76e62065df065e3938a53191ad4468a887d7df7fc3503a7fc6e4b9bcc05a4efa008fbc8
-DIST sepolgen-1.1.5-gentoo-r3.tar.gz 19496 SHA256 2a7b50f40ba003d3e822d7536b2bb085279fcb37b790a4c1af369e92cdb2febf SHA512 4fc214d32d691bef225f9b8521b2ec36356e6edc2d281291dc730bcff94baf4d56813ffef0658f54d3533dd1ddbd5cbcdac92fe5cf91db6278cb93b7bacbb9ec WHIRLPOOL 282d04e237c33b927bf4890f89f5dccd09b8f716b98c0ef5059b847d771e26f8399e8a332c1c7033afab974e82533a33d49fd2641216266c2406f38f63ab16f9
-DIST sepolgen-1.1.5.tar.gz 364806 SHA256 16c2b10510be7dbb2dc0967aedb2d69c654ca52ed03d04881c17d2f8b863b3bb SHA512 2ba54deae7fc339d1af60c79a6908d6ef12581f8b1f63cce9841c3c7070d1d5ddd699464c73af2cad4b345db0a0cf9f0a3984a34dd5132db1316346dfd6f3645 WHIRLPOOL afc6107e51b94867d9e58ffbe537afd3155e25feff8f22468abf890f5cc0ad68a8b5c47728f73b055c4f898286f7625872ad89e81d8f9fdb910ad552799242c8
-DIST sepolgen-1.1.8.tar.gz 365765 SHA256 b5f56130619672b782658c0c9e32d621a1dcaaa6f7d3cffc10f47c4e5a625aeb SHA512 85bcd4c6ee52ce42e1963629873e90ce1e83f02d8b00307f03afef597358e6315d6cb487ed5ba8cdf8d9d67850e76f58dce127d3592a2dd1cb87802a2c7f1c76 WHIRLPOOL baa3644c26240b42ef5b5ace12c7897223263e8ba2a3db9cbedf2f7d211970418c0d9fd85a4b248830d36c3c49223481047616a7c086915645da5265af39d45a
 DIST sepolgen-1.1.9.tar.gz 366029 SHA256 8a1c6d3a78c9b6ad3555c74def555f65a62950bf21c111c585bfc382fec3a645 SHA512 874bc686e8ae46cd9ea34b3c5a00e085a6222f11f0741c7cb56e2f18784d064dde430f29c721710cc8c818390a0a3c6efec224ddf731230abb4d6c0a2fd67d45 WHIRLPOOL c8fc1a5c10e56e620565cbf56f53e14d269489c8b30608b1b7b30f4e71d4ef1e33a39b0144a5fd25690ecc8684d4c1c2cc988039aa2f2459dbcaf26f62ef7c1d
 DIST sepolgen-1.2.1.tar.gz 366214 SHA256 438c246bdc6b3cf1b12116831f4c601aaae6e93decb007dddab212a3c88781b0 SHA512 ec71126eaf6ecb18d989821753c04f3325de2188bafe161deff5733ebb95c3589e06198666f0502169cfa7d3a2b8ec509ff62098dc11b66b4f0883e1d8703a6e WHIRLPOOL efdbbb9771f68921a5fd3824267c7716ca48ab1f40395aea5c27ac4f7f3b8bf71f718da5ada40eed6c1b2de5341f3d5f10c7ad6086b5ac017d4898136ded6fe0
-EBUILD sepolgen-1.1.5-r2.ebuild 1619 SHA256 9747ea693afe52595c11a2c32e6f93bfcfdcfdbe2dafc6ba05502e8246fc6913 SHA512 26758ca924f4dfebdb82803b05cf7e74d9b5f66871c277261c17572186f46ad90b6c4a1827005b8a7f9703f2475cad09ec94a67227cd46250e4064f0ac589c61 WHIRLPOOL 1a13f4bf34532085f1e54c955a8ea4a0c9167e8bffed2f32d73140bb54c87c7836381d93b04f2f5b5b6ab7baac65af0f545ed61ac2a4db98a40bec13dbc95e67
-EBUILD sepolgen-1.1.5-r3.ebuild 1619 SHA256 b145900d331e040e1ea902e62c12acf815c63bd34dd02a1843f71a032de87650 SHA512 d89a0f04e928dc2f335201ea3d10ca5da97fff6e7e6eba19fe9c55d008aafd41ef530e79605e9061f70eb74b7e571496098fdb597b609ca163dfa6ccb18b8d26 WHIRLPOOL 7aff5bcf9b8c3cab6805e415c62d559818e9bd1ac60d0074c203b4a54f404d93afa972b2b1a9d0e13f447c758e1590c12846f354647b8366497d007cb7fdfed5
-EBUILD sepolgen-1.1.5.ebuild 1382 SHA256 136afd136d416394108647b956ad82b6b3144f1905910462768867be63b32ebe SHA512 96244c8ad6b69ec76b987458cc7ae8cc974a11c8ff70167bdc8b3d17d08c499c71203b9df24d75f0a8cda69c7d73228e739cfd55101c317b7cba12c9bc2b32aa WHIRLPOOL b881271a82e40631f9744173f3a258b3cbbb2fc65e91867daa658562f87536ac01d9fd24f8e80b604627d52497a25be6148fec3badeef017a0ca67823939a6f4
-EBUILD sepolgen-1.1.8-r1.ebuild 1638 SHA256 06ae14fa990d60d2cc1247df2864abda42e0a9d03618bce78004726998b1dd26 SHA512 7e5fd3eacf1cc32a0552798c01dd7773317969b51dcea58ad2c1e652019aed262abfda915e39bcd726da9fefe10099e1d04843010da67597ff8425f6fc23f52e WHIRLPOOL b4c32867fe7b4cacc87b0ff0ec74f71634a7c9e7bfac189cd4eea1c0a726c0b0b05c4e36a7b67a67133330b45081ce28d6f48b7a726f3a6c76718ff54bc53959
-EBUILD sepolgen-1.1.8.ebuild 1635 SHA256 4bbc07334755137db7fa4dbac9668745b6b1d0564064279bd24a63cae7f7e206 SHA512 99e18b4ec1395cb7497ef5086f91dc7bfe5171a907d809a2997e984fade04e6298316e07001c3ff2e0c6e4c5b5dcd74adf4d608381b76f8b22eac6919b40c878 WHIRLPOOL a6ad5c5e8bb522de41b476ea548bc036364fbed205c44b54ab5c2d8fcd22dee7b7f4377872748e6c7025f724ecaae02905da45dd603b5e757d170c98ad72f557
 EBUILD sepolgen-1.1.9-r1.ebuild 2206 SHA256 0db890de5b5de95d1179dce04ac70fb38785b6afddbe0861a166f6577b401b72 SHA512 0658b9d512bc730afd5df72178771149329fa11afb6324b8c2b655d6de1361b89e359e55fd778ed54ea5b95bb3f7dc412c5a7af33de9392eff6fcddb9a81f0df WHIRLPOOL ef80be936090f73d43ca0a2f318b3633cf82a6944976af72e2fee62bd5236d10087eb04e002afbaeb5b8185e23543690879efbb94e7397cebd2cce9262d29868
 EBUILD sepolgen-1.1.9-r2.ebuild 2216 SHA256 1c8b06fecff2fa27275b27df5bd3e84f3a680c4ec30d405592f7652d7d6ef2d3 SHA512 49559e5aa4faa41706de14cb6abe24486cf6ba4dc2e19d38f3be324512658f0868a333691fac2b7b60b7497207c39aa9dc59918a26d5e1a5271f5c432818019a WHIRLPOOL 29a9127d2f9df1ebb639e9de4cd204e0193d617147052d0a9843f9abcf35d0373ced9c7587f35c1e3c02fb326dd6eb61157ea1c6e55ce1da4884b6c4746015af
 EBUILD sepolgen-1.1.9-r3.ebuild 1992 SHA256 e494793a282a9a5a3afb321fd230a6e33884c78a0fb9596f6685e9258313d9c2 SHA512 7d79f14901c4941e04bef0931b6f038962c2e6cf9941f9b741f44a362491b9fc3f5a186bfed20705eed3cca942ac7f36c9465254ea1f1fd5127ec659bb2cee5a WHIRLPOOL bd65e9611bd5bbc78c1e1fd22c0515715439e63cebde9d1cb4223f48ee1ea952b18ebfb32f7f2709bdf1fd25d015659060f5cea0a06cedbf8f1403e1b51d9efb
 EBUILD sepolgen-1.1.9-r4.ebuild 1992 SHA256 5e17eb46ed437e77a3d4fa72dd6bf21288da8de52e31fc99395708726bdd799a SHA512 ffdc34affe3395e13509f4711a9951d128ed0f1a3a14a052add2e627255f785e78c6c34f1970725e324d84ca8f722a71616b4ba259c9fd1bab4f9a3116730aca WHIRLPOOL 102155442652990eff8d0e97e5d6746bb5d8a17f8ebacc2471df67f2a1ea2d36c440f96e98acc9babcb03ac792b9481222d7e023bd64ff87c7206037215b4dc3
 EBUILD sepolgen-1.1.9-r5.ebuild 2086 SHA256 46d1ebefa9d27e85f8873446a58f98c91a9dfbbaae9e30a05ea0b5d7af78ef73 SHA512 59c7bee4c43e6bff25c5b7e388a43ef97e0b4e36b0557fa54c32fb43d0be1ac7207ee83b91c0ec34e91b9a162e1a0eab2aa9e2e445006f8078712ad311f78ced WHIRLPOOL 0c454cfef3ce75b2e0b6c9abf4b968717eec8d3d026aced530718fc639b346d3d0ed28f0bafcd1b1a54ae55016acdd90ce625b59530ab851eeb7e5e6238b67a9
 EBUILD sepolgen-1.1.9.ebuild 1524 SHA256 9f874ab4450f745eae3ab233ace7706ed844b85028a19a060ab53ac7f18477a4 SHA512 d9321d4ee78b918289fa5fcdeb4197b2309efbeffe8d47189e49fc19092b3c073f31dc7997815beb3789ce6cbfc099617c8503c528c89c2979e07ce410938ad6 WHIRLPOOL e229a8a5e2898d9151e11f9f1489ab7df9d8f629860bbd6bab4366eb275a61e3925a9de6befb2b11836f5ee5c1a6a7544964b9801b6078e2754caa1b19e5f4a0
-EBUILD sepolgen-1.2.1.ebuild 2083 SHA256 6580fc82e01a7d955c7e42d3ce0d8ae31c646d579e68c7920bf4975d2a2a309e SHA512 8a3b177a02b690cbd651740f3b0c81f87e650a73d3f20ec93e3233a1c8eb6673ccd0d529ac9ece16211e60cd2c58b2759953fa87d311a5b33c37e4cf0c2e5072 WHIRLPOOL 56dfcce20278d42cfd76b190efa694063ea51286d9b96795b233f23a5df40a8f80f6e0a474037a095538d640cf70f1c196c1207c27bbaefb423f5e31b891bbeb
-MISC ChangeLog 5658 SHA256 5edf6113f657ac6ae414b34a67b487585829b6178c3970e048f0f99e67cf6f55 SHA512 5b0afee378c9a5e2e4f9bc1d66f79418d76591d70a5fc305b5fafff2e1c131f71a8518d89b9328da0f43f2a949395c8dea2981cf5c3e8bcaed2fb948b4ae4c1d WHIRLPOOL 80e855bc656878078d3a3dee31228a7f0bc4cc3abd44a1a356134f7b0e36afbbab38ae6a5582fcf65a80ca7c9754aa6b29ea4f544334b569fa55ea942579e390
+EBUILD sepolgen-1.2.1.ebuild 2081 SHA256 ea87afc2f66a38d055069e39e1d757a83160ce991cad700462087bfa136cc149 SHA512 0ea03a7d4be3dfb15fbb849bd0d76c411668b8c6a6242f8ca6859bb70fd1ce4d454f75cd17693fba14617c304900f00d4d1f06b99586eee09192f95f798cd131 WHIRLPOOL 53760f5490755bbb3b877766ff0d6f38475dde9f066d340c7c6311e1401310dbd25379344756efaf7bdea84ac6ffd87580603628de82db9021b97be4598c9828
+MISC ChangeLog 6100 SHA256 176cb9307ae9627dcf69396a46fb94f1d62d4eb2442115768f055c14499c6c48 SHA512 b33ac68856e7808b79ff423a51b3b17476133c378fbc616c0b6b8a539018b2748e426bc6577e3f61318b4bfd52c1f69e90a9891c82be4efd04d85de9fd99a23a WHIRLPOOL a9f0626bbf057046c16030b5a88737751b7fa2ad0af7cb9b7d1d1f192e991a8ff3687701835bf93d647e7fa42f93cec0f82bfc87eedb27eb4fc297655fc09dc9
 MISC metadata.xml 234 SHA256 8ef796ab0656738628f6238eba20f70298c2539bf4dd24f7a6f042857176c5d2 SHA512 4d8a7927783ca9cb1a86933d5d611a1fd6194b4de9c5ecc44879b64ef289cb0d36fe7382019512b16d23bb09f94780d5a9aaa523da244928b4f50368063cb460 WHIRLPOOL 641e9b4f445fad1419f1de8fddb2667ed69e167367ae8c94fc88e3a7244fdd968b7b0f4c28e0e13fdc593973c19a0f2451548611515a1b457fdcbcd8c5fdff92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSeBgaAAoJEC7dUkA7aK9H5bcQAKfFT/22PzklhBkrT6VIKKni
-O2e8YGc8HMOEt15GvCDEOtPAncKPxoeG32MTTL5cSs5y8+jX24DoQZNj9VqAEUnw
-PV0maFgLi2h5HorMsmtzuNmq4McC/rEzLsOQZE0UMx9cEFZmwU1BKa79TSHostVT
-P++Ny0tRleeTZjyib4Ts36HgM2dqxso5mVvWEipkQCP/ltFYGI0/Y03wY8aaeB25
-ncr/F9FbjrdWddFRj2xhR63gmMF6L8JIR5oH+mnz6blRjZXxllwNgICqyE+9q3KG
-u7iNs8G3O5cy246W7WvoelobbZ+Bzs5HEAAct1ULl2RHmj/E6SDITrNpjgvrYg+4
-KGp5dmyl2McxhX1oRc3+SHeYc4JQ1LBeuEHT64EMvId7TgQNR/sBciOs5HYUAfGE
-Jo6o0ZEPfBoGIKyeFAfwdyOgfQMsoDwCoVNh1pJ1tCpjW/eE4f+Pn5sZQR6iikYC
-ktIWWCmO+JLqLKiR7ZTfkMTbgFWp74ImVO5Klw2wM5kfzEV47hA022mxqRvyW1Mz
-AqGAg776O6vtWGgWrTRqao4EVFhbDZAJ/f8rnbUSXy5nw5shi+rWIsWoctiDY3Op
-zGEXBVjs1dZBIwE/ZMIOtWSaq4xn4madLL6PMbalkfCx76qNVqo8IBtO3An2ELdY
-Yp9VO8BW9L9yavzH97jK
-=T0X3
+iQIcBAEBCAAGBQJS3YGMAAoJEC7dUkA7aK9HPtcP+QEnO6gLyYRaNmuIrjs7FwVD
+BkzDEsi1XBXPI59XV+jTAWi3rqV6n8RSLBx6ZB/Op08e1ACvGEBEsXq+et0+58h2
+WZjixgIoDD3IleiimsOeukePgEyyqPDQoEp4pKAZ+wVGZdv08GdNVPZtQ3rZT2EG
+gGTNd9an2IbpsfaAu/sAzgxt49e/4jrHwfaQEB71fXX55uHUUeDxFyyYd2HinT6K
+Nsz0bT7mgL30Tkka2duP/VzitUbU6dZv8slekq/oMb7Xi5Y1mRYjKjEmB/1w/Eyt
+Ihjfjla9jm4xn3lUo1Iz7uT4Hx37sNEYOME9pTxu6bXxsn9A/8gbgLoLn03j5+eK
+zMaYMJ0PYqosastkxq7cbzUlpv5/qgKvnXLKSmrUQe1fGkI/MURdFGbCgZ5kiUKj
+1wzCowz9bSHPc/dgvfrKeqFDNQCL380OIhaMsJHujOdc7Kl9H8aeC1wbRtuXlbWw
+eCmEQg1PR/xKFOXihAJCfXW1aQtMEQ6XhglzUKUWujobycBlGj1EEbvgs28mqAr1
+imfh7wJTF22aWbYItPL7N3Bk9Sew/XDituYBET5vDRzxZvaCCkTKYe1/XD1Labwl
+r3ieOjqyX2G/CcP+MV2IuTZwL7TnlWLluVyOtBDlzwb5C2HjUkFsTaO7Spx8JKdP
+ECpH1iYlp/Vej42lfpp5
+=BM/w
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sepolgen/sepolgen-1.1.5-r2.ebuild b/dev-python/sepolgen/sepolgen-1.1.5-r2.ebuild
deleted file mode 100644
index 3edee7359d6b..000000000000
--- a/dev-python/sepolgen/sepolgen-1.1.5-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.5-r2.ebuild,v 1.3 2012/07/10 20:05:44 swift Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit python eutils
-
-DESCRIPTION="SELinux policy generation library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120216/${P}.tar.gz
-	http://dev.gentoo.org/~swift/patches/sepolgen/sepolgen-1.1.5-gentoo-r2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=sys-libs/libselinux-2.0[python]
-		app-admin/setools[python]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# fix up default paths to not be RH specific
-	sed -i -e 's:/usr/share/selinux/devel:/usr/share/selinux/strict:' \
-		"${S}/src/sepolgen/defaults.py" || die
-	sed -i -e 's:/usr/share/selinux/devel:/usr/share/selinux/strict/include:' \
-		"${S}/src/sepolgen/module.py" || die
-
-	EPATCH_MULTI_MSG="Applying sepolgen patches ... " \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
-	EPATCH_FORCE="yes" \
-	epatch
-}
-
-src_compile() {
-	:
-}
-
-src_test() {
-	if has_version sec-policy/selinux-base-policy; then
-		python_src_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_execute_function installation
-}
-
-pkg_postinst() {
-	python_mod_optimize sepolgen
-}
-
-pkg_postrm() {
-	python_mod_cleanup sepolgen
-}
diff --git a/dev-python/sepolgen/sepolgen-1.1.5-r3.ebuild b/dev-python/sepolgen/sepolgen-1.1.5-r3.ebuild
deleted file mode 100644
index 8f62d50cf60f..000000000000
--- a/dev-python/sepolgen/sepolgen-1.1.5-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.5-r3.ebuild,v 1.2 2012/09/29 07:41:37 swift Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit python eutils
-
-DESCRIPTION="SELinux policy generation library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120216/${P}.tar.gz
-	http://dev.gentoo.org/~swift/patches/sepolgen/sepolgen-1.1.5-gentoo-r3.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=sys-libs/libselinux-2.0[python]
-		app-admin/setools[python]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# fix up default paths to not be RH specific
-	sed -i -e 's:/usr/share/selinux/devel:/usr/share/selinux/strict:' \
-		"${S}/src/sepolgen/defaults.py" || die
-	sed -i -e 's:/usr/share/selinux/devel:/usr/share/selinux/strict/include:' \
-		"${S}/src/sepolgen/module.py" || die
-
-	EPATCH_MULTI_MSG="Applying sepolgen patches ... " \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
-	EPATCH_FORCE="yes" \
-	epatch
-}
-
-src_compile() {
-	:
-}
-
-src_test() {
-	if has_version sec-policy/selinux-base-policy; then
-		python_src_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_execute_function installation
-}
-
-pkg_postinst() {
-	python_mod_optimize sepolgen
-}
-
-pkg_postrm() {
-	python_mod_cleanup sepolgen
-}
diff --git a/dev-python/sepolgen/sepolgen-1.1.5.ebuild b/dev-python/sepolgen/sepolgen-1.1.5.ebuild
deleted file mode 100644
index 0c3a426d3ea3..000000000000
--- a/dev-python/sepolgen/sepolgen-1.1.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.5.ebuild,v 1.4 2012/06/26 05:00:43 floppym Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
-
-inherit python
-
-DESCRIPTION="SELinux policy generation library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120216/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=sys-libs/libselinux-2.0[python]
-		app-admin/setools[python]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# fix up default paths to not be RH specific
-	sed -i -e 's:/usr/share/selinux/devel:/usr/share/selinux/strict:' \
-		"${S}/src/sepolgen/defaults.py" || die
-	sed -i -e 's:/usr/share/selinux/devel:/usr/share/selinux/strict/include:' \
-		"${S}/src/sepolgen/module.py" || die
-}
-
-src_compile() {
-	:
-}
-
-src_test() {
-	if has_version sec-policy/selinux-base-policy; then
-		python_src_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_execute_function installation
-}
-
-pkg_postinst() {
-	python_mod_optimize sepolgen
-}
-
-pkg_postrm() {
-	python_mod_cleanup sepolgen
-}
diff --git a/dev-python/sepolgen/sepolgen-1.1.8-r1.ebuild b/dev-python/sepolgen/sepolgen-1.1.8-r1.ebuild
deleted file mode 100644
index 4074fbcb510c..000000000000
--- a/dev-python/sepolgen/sepolgen-1.1.8-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.8-r1.ebuild,v 1.2 2013/04/11 17:52:00 swift Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit python eutils
-
-DESCRIPTION="SELinux policy generation library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120924/${P}.tar.gz
-	http://dev.gentoo.org/~swift/patches/sepolgen/patchbundle-sepolgen-1.1.8-r1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=sys-libs/libselinux-2.0[python]
-		app-admin/setools[python]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# fix up default paths to not be RH specific
-	sed -i -e 's:/usr/share/selinux/devel:/usr/share/selinux/strict:' \
-		"${S}/src/sepolgen/defaults.py" || die
-	sed -i -e 's:/usr/share/selinux/devel:/usr/share/selinux/strict/include:' \
-		"${S}/src/sepolgen/module.py" || die
-
-	EPATCH_MULTI_MSG="Applying sepolgen patches ... " \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
-	EPATCH_FORCE="yes" \
-	epatch
-
-	epatch_user
-}
-
-src_compile() {
-	:
-}
-
-src_test() {
-	if has_version sec-policy/selinux-base-policy; then
-		python_src_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_execute_function installation
-}
-
-pkg_postinst() {
-	python_mod_optimize sepolgen
-}
-
-pkg_postrm() {
-	python_mod_cleanup sepolgen
-}
diff --git a/dev-python/sepolgen/sepolgen-1.1.8.ebuild b/dev-python/sepolgen/sepolgen-1.1.8.ebuild
deleted file mode 100644
index 904f751291d1..000000000000
--- a/dev-python/sepolgen/sepolgen-1.1.8.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.8.ebuild,v 1.3 2012/11/17 16:52:06 swift Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit python eutils
-
-DESCRIPTION="SELinux policy generation library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120924/${P}.tar.gz
-	http://dev.gentoo.org/~swift/patches/sepolgen/patchbundle-sepolgen-1.1.8-r0.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=sys-libs/libselinux-2.0[python]
-		app-admin/setools[python]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# fix up default paths to not be RH specific
-	sed -i -e 's:/usr/share/selinux/devel:/usr/share/selinux/strict:' \
-		"${S}/src/sepolgen/defaults.py" || die
-	sed -i -e 's:/usr/share/selinux/devel:/usr/share/selinux/strict/include:' \
-		"${S}/src/sepolgen/module.py" || die
-
-	EPATCH_MULTI_MSG="Applying sepolgen patches ... " \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
-	EPATCH_FORCE="yes" \
-	epatch
-
-	epatch_user
-}
-
-src_compile() {
-	:
-}
-
-src_test() {
-	if has_version sec-policy/selinux-base-policy; then
-		python_src_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_execute_function installation
-}
-
-pkg_postinst() {
-	python_mod_optimize sepolgen
-}
-
-pkg_postrm() {
-	python_mod_cleanup sepolgen
-}
diff --git a/dev-python/sepolgen/sepolgen-1.2.1.ebuild b/dev-python/sepolgen/sepolgen-1.2.1.ebuild
index 4fd68be4a4a6..67384aaded80 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-2013 Gentoo Foundation
+# 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.1 2013/11/04 21:57:10 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.2.1.ebuild,v 1.2 2014/01/20 20:06:02 swift Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="http://userspace.selinuxproject.org/releases/20131030/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=sys-libs/libselinux-2.0[python]