version bump and ebuild clean up, drop old RC

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

3 files changed, 33 insertions, 25 deletions

diff --git a/sys-apps/checkpolicy/ChangeLog b/sys-apps/checkpolicy/ChangeLog
index 2cf0a903818f..7a13aaec1b40 100644
--- a/sys-apps/checkpolicy/ChangeLog
+++ b/sys-apps/checkpolicy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/checkpolicy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.82 2014/11/14 19:20:03 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.83 2014/12/06 23:25:46 perfinion Exp $
+
+*checkpolicy-2.4_rc7 (06 Dec 2014)
+
+  06 Dec 2014; Jason Zaman <perfinion@gentoo.org> +checkpolicy-2.4_rc7.ebuild,
+  -checkpolicy-2.4_rc5.ebuild:
+  version bump and ebuild clean up, drop old RC
 
 *checkpolicy-2.4_rc6 (14 Nov 2014)
 
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 164f850aea43..8edb5b4904d9 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -3,28 +3,30 @@ Hash: SHA256
 
 DIST checkpolicy-2.2.tar.gz 64458 SHA256 9ff6698f4d4cb59c9c916e348187d533ada4107f90c253ef7304905934e9adf8 SHA512 a6f70e1b6581673af515d7d192237e2d47c0e07bb589c64b92f90f3a450ef8c312eabc2384479faed8bb909b98c15b676cea77e7dcb5304a51314601e93bef59 WHIRLPOOL 18c13139e8b75bb5bd45a9ddbf0c17c07fa86da66e792ece4a1d1204d211766fec27f6fce7db248957e7d2b2847c91b4c9d0ef45cf64e106aee52bc29be7992c
 DIST checkpolicy-2.3.tar.gz 64970 SHA256 90632d11afecb66997971d4c5c5d70dfb02d3969ec610ee2918ba6df99c8207b SHA512 9b10cee8ec9d555c810712131eec0e7e1bf900e4675804b8f57b04988543ba784f4bf76030f196868cef91a1c4ec370f77da12ef9e79362bf7a1cc38c7cafcff WHIRLPOOL 49ca9fa1695bedf141d397ca679ba769b748dc39ec7d462718f6b90af9c31c1da64d1ff67b3b4e426f758a9d305dc9e19d755e1127bfcd5e492dccf09ac75d09
-DIST checkpolicy-2.4-rc5.tar.gz 65114 SHA256 73b416476e1ff21959589613b0e628ed28145379b71c36198f114db59b89b216 SHA512 dc4b6c2121ff97b88a5e7d8236de016f150202d34c561a6a6f74c4446fa405e624fa7179fb6f26272570f0d4772e9dc73e7ca958ac88e49d5e733dc345f064e0 WHIRLPOOL d8a9d9b8b975ff542caa09a341283ef403f6b23aa68e749d6d08c510322a8c5590ced811352037cdd40c93785b231bbeb2a6a8924f67c6fb4c19276e5fac5090
 DIST checkpolicy-2.4-rc6.tar.gz 65124 SHA256 be931814c6ac290575953f940cde38217a4855445630ac3f4d1780a88fc5008a SHA512 fc75b54002eb0a338bf63f787e52cccdc263512657d87c678225d2a8bbae7a20f16f489de7a56831106698fe9e7737ddef02df8a1d9c11c363c68787fa5a4ac7 WHIRLPOOL 18d473411899a5c349e4659de7242f624555029aff21d3a8f9ff85463ef46d2865555f8018cd307231d93846b157373756d0ff7a6e0e0c0f23f8a69951b696d9
+DIST checkpolicy-2.4-rc7.tar.gz 65125 SHA256 a7f8d44f6276b348ef99e9920c7dfd3a8409704e2fc1e993d777759478434ada SHA512 af0f73049a005f7a01de073c5e6aca17b3ecdd17e8288cc1b7e94db2a1ca0502b67ec0d03ebd10513f6b6de34c72ce55493a15c137070548e5889e9eec401521 WHIRLPOOL 94de0348af5e4f84cb18d59b9d8acec56360a82c33285d3abf12caa9d3e7b76dd6bf007017f7f4d885764f485f8e1da34ca5378e6fc9cc85bfd76fb137806ff0
 EBUILD checkpolicy-2.2.ebuild 1022 SHA256 0ec473da351b94f092f06cdfd506f97c48abb539efc3cc791fcc0b4be1d63145 SHA512 cfb60407488ee37b1844eb216b21ac1440240437cad176955b9689e4744bf23b35326159d0602c4939ffe19659614257c60fdb37eedabb4a02ecbde313eac137 WHIRLPOOL a1894e2759bde98d5bd0bf02f2c76cd78e38536a28b0d0c5f8c2b9a16d6ec1e07e02fd299128a59279ef38d1746a40c4e5100925aa1dabae3e60787d01c9cf3b
 EBUILD checkpolicy-2.3.ebuild 1099 SHA256 da1088f0cb65989b859c8269da0856e552fa0072a87dcef0ed96c024c7a5051a SHA512 f5f1e1a6be77ca36bde1ff940b717ec693a4e18289580524076b12f28614ba08b824d8bd0327e0b9bce6f98993b522f8dca88c3b54b56ce8190202707223cd78 WHIRLPOOL 89b9d09e30066fd72fb209f5cb9704f9089138f6f071884d6906fadf6f5fcb73213ad15c9e25c0858a4f80c80586276b6ec5b5cb30f88643e41ac1877eb94d2f
-EBUILD checkpolicy-2.4_rc5.ebuild 1113 SHA256 51ae3ca2a98ef7043629c7b54fc94c33111ca552714e9a9f8d89bc88cb2bf3e9 SHA512 fa5661bbc10cc181a37d683e477fbb7311d8c0b82071b98096e1d0a58903650c147b6e82e312e0828650c2dfc9d21fb159e25123fc52cb8ac0309fdb56f348bf WHIRLPOOL 45e712a5a9ad345264a81df238f8a74c3a4d70b128b01124d870e2e4386f06a308fa2b48c7012600f868dcd744bcc74ab099240919b1c4cb46dd6d3964867faa
 EBUILD checkpolicy-2.4_rc6.ebuild 1113 SHA256 88c51abd56ecb7bbcfdbbd83f9a2078fc1b745064b0e473b61d3c126bef963fb SHA512 1c0b64218885d0dc97404bb147228f48b05c7b2278259b7d6042f722591920e7cd5521aeca2a77b394397a29a7eea8a42475ff742efb4307bd3453bad97ed019 WHIRLPOOL 41db078139022b3f6bf89300070a5bad2d6b66013ecff1b5c94ba799a1e9e8b046b302db356f342879405a4fca061493f2e34f16a0eead2441cb3e074e9e3434
-MISC ChangeLog 10599 SHA256 e2657ffaaca970aecbc64ca165553bbe6ad0d3c781aa351d1fb00b38ac732582 SHA512 f7d1841f2662ceb3c53394b607942bfd8f66d93a6b0c0a0bc1bc1ba3b9cc9914aa024ad12dd499c63ea0ae6de8bee6c0cfedd268a60899cd105587080e5a5d36 WHIRLPOOL 1853cb47fb02238a6d3eefa947e908f98bf0f7f6398963ad846c9ed056d138e1ca0bb0b3501db69bb20d6688966d6c965d92da69fdc99ba9eccdf3e842ffba41
+EBUILD checkpolicy-2.4_rc7.ebuild 1099 SHA256 942e0c9bf461eddbc1bf7ef66c8e86fa71f35527bca8d8f56dd47436e9a09bbe SHA512 293e99f28a8ec7f3c5ea6c26a111429a6b8f7578a660bd022fd59cdab5b1ab796ba5bf2eba50b1c098d585311beb2ea7c388158bedc2b77430aab62f1b6de1c3 WHIRLPOOL b13b0b3dd63e91c3e799842403e47e9d4359ef914b328f5e321e10cc2eed405fbc0e62937ccf00b9bf03cb809521e4a0024bf57c4b6dfa234ba7069437edd440
+MISC ChangeLog 10798 SHA256 0604315f7401859c13562a1bf6510bf5df8260873423bf7dfa50cf72a2635f29 SHA512 5ef9793ab57ba0f09559d0b80648b49bd55847996c684c6bf1634124be064f37b868aa16e6655b42f23d9c04856ceaf26abb714565b12b3e57f5e1db7c79ec81 WHIRLPOOL 2f975318ebd600e0e11d42283a2679710ced10d8daaa42f1a0adbf7272a96cb014125a105cef92c5135ef5c7f998ac5ea016ff87cdf58c7e30c94ea89d81ec3d
 MISC metadata.xml 222 SHA256 b469c6bbb142dd5bab69af655d21fdddef8cec44c97750747e14649e0e5c2098 SHA512 6f61c65cfc7902e6439446cde64c83860a90d95be8494b8d16ae895ccc9eef0fd78c7fdbb0c17650967a1235d761245bb8cada1ab6aa19fa746f0ccf2ae68830 WHIRLPOOL 87cec6bffd811035d71e73d15fa753087731f704360ec53343c08e84682bab0a4f83546380cc1969abd93364ac7e1a2b5a448d531840a9f2dfbb5f987de5761e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUZlXNAAoJEC7dUkA7aK9HZRYQAJM/sfjV9YYN4LGsQ/TNmLz8
-NHaYTlDSz2rHMluaBQf74hQhb28k9xZgCjL/BJYxD7GAtIOm1go1WQ693z4hziNB
-k8rO0G9u6ztZ5PZAWiUQUHrdqOivKDFvG0LSSaObvrcGjFD0nBg9rRwDbBWJdkNc
-wPchMqqiivtSrka31E9GFMpCEvCDci2YAqf9b1n7Ihz8kRuiDTArwzAsxgt5BdC8
-5wstzsWD/akDCv/QUySPQsffRwicLinY6An/5pMOfcNOxgtcukVIRfgXM7vXvtM2
-UjGZskAMA2eKuNjVdNRAlox545uFXlKSBcLvslXhRGeX8LmUHfmas9Xs+FhMGhMV
-qzMoHcSCU4qdWoeLodG7V/6mXabjEhidB3gZUcd9RcDb6T7n6oubkFadhffZ4CEQ
-m+ykr+ZwhxYt1+1JXCuqSD+NNkYHa0VterPWR/i3KWd6MxFlKczBjqyXU1h+b7Hg
-GK5Ki6CqlExwMMS5q9kIylbJJSskd+4FYy8U8/oCrqEryYNHDC0xCjk+oQRuABRI
-8UgtIyIc2ftTSe8PNsfFI+Xz2YwB6/T7RgPaIp8mAcZtka28WgA/RY/jjGykPIvX
-vTEp2NMtA7vZ+n30K0m/AC0ASNH+oTivc0rt9uFguOW13i3ntjVdPB/dphDyPXET
-dCZZQfz/zh9vhj/EkjlA
-=ZaQ3
+iQJ8BAEBCABmBQJUg5B7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9ViYkP/2nnt/9OeboUHisyfxJCJiJb
+5Le7hwxgEh5o16sXsBdmbpBqIhLyvrhYsW8UvPvod9nc5lg9OAFl5FuAyRWnLgK6
+wzF9525bhAaXn3UFeh0yzJ68EdDEbBrEN3VlLhEQhjnxUu7HTsWYhavYCWBvygj1
+TFzhsY1uHDh3e/8w+PlY56xG4RkFoPOrjBVRF/rOSksifzy40yrSlvpAQzEBkbKD
+lhm7dgMz5185/8EqYGs3jzbRXmkXg1vi27VbQ7q3fghUR3fNspdu1PcDEUtu9D9M
+aWrrXRi00ux4eP4cnoSbmSUUayDJ4VfQAVNBw0+NWFeCU2cHQ/QFBXKhDcrUMpVq
+wxNXxbf2lC45RIM43rrI0s04nGDE/Eh2hGu2tELuoKgdk/ZpoEd+erP6tp2vIEpH
+Ex5QLkuBKy5ia+ExeOP1zg5xINjVappiCYm+dgsJONw5k8KhAt+RlQUR3F0/+Tms
+Z08BUm0/YW1+frwN5KWZp4FWrtP8q8MDRLLTb0Heo5pIUYnyZhpT42rmis8p/TlN
+QaiSPKMFcQAo4tbRtCWFC+uCUZUQrbahGAQUZqhgh1/lJP9i0cpdwY+qb3b8+mAD
+iAHqq7tYLudk4suEqBz8it7w/bJ92pCb81IxZBE+vnrvDL/MVnGzzWE99WGCIHzu
+nQnGBzQJzvxFw1L57aC7
+=nJWC
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/checkpolicy/checkpolicy-2.4_rc5.ebuild b/sys-apps/checkpolicy/checkpolicy-2.4_rc7.ebuild
index 28ce08794d3b..8ab6f4cbda6a 100644
--- a/sys-apps/checkpolicy/checkpolicy-2.4_rc5.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-2.4_rc7.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-apps/checkpolicy/checkpolicy-2.4_rc5.ebuild,v 1.1 2014/10/29 17:28:15 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-2.4_rc7.ebuild,v 1.1 2014/12/06 23:25:46 perfinion Exp $
 
 EAPI="5"
 
@@ -8,8 +8,8 @@ inherit toolchain-funcs eutils
 
 MY_P="${P//_/-}"
 
-SEPOL_VER="2.4_rc4"
-SEMNG_VER="2.4_rc4"
+SEPOL_VER="${PV}"
+SEMNG_VER="${PV}"
 
 DESCRIPTION="SELinux policy compiler"
 HOMEPAGE="http://userspace.selinuxproject.org"
@@ -29,16 +29,16 @@ RDEPEND=">=sys-libs/libsemanage-${SEMNG_VER}"
 
 S="${WORKDIR}/${MY_P}"
 
-src_compile() {
-	emake CC="$(tc-getCC)" YACC="bison -y" || die
-}
-
 src_prepare() {
 	epatch_user
 }
 
+src_compile() {
+	emake CC="$(tc-getCC)" YACC="bison -y"
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	if use debug; then
 		dobin "${S}/test/dismod"