Fix CKV to comply with recent upstream changes

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 36 insertions, 10 deletions

diff --git a/sys-kernel/pf-sources/ChangeLog b/sys-kernel/pf-sources/ChangeLog
index 0e76989796ca..4a8e2f8d08a5 100644
--- a/sys-kernel/pf-sources/ChangeLog
+++ b/sys-kernel/pf-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/pf-sources
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pf-sources/ChangeLog,v 1.32 2011/08/18 19:07:46 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pf-sources/ChangeLog,v 1.33 2011/08/23 19:57:01 hwoarang Exp $
+
+  23 Aug 2011; Markos Chandras <hwoarang@gentoo.org> pf-sources-3.0.1.ebuild,
+  pf-sources-3.0.2.ebuild:
+  Fix CKV to comply with recent upstream changes
 
 *pf-sources-3.0.2 (18 Aug 2011)
 
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 3cc5f075ce15..5335ddfe917d 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST bfs357-penalise_fork_depth_account_threads.patch 9786 RMD160 4ff4047a717f718a211c4521e5d8c0d8af4254a6 SHA1 03fc0dbb4354103894b0cff30dc72d242d626dcc SHA256 c8ca930785b969ca24a6f8dbd63bdfbe4d07264b1c982272d50718e712d00f13
 DIST deblob-2.6.31 80819 RMD160 20972daf3852336198b5e1ac4f95a9d88f5d1d67 SHA1 41070a790894136913469bdcb3433b3d13b3e797 SHA256 4dce1f711d5098430f15ca0664ad3a1ad83a0ce6faf10d0dc8b8f53f2ab655f0
 DIST deblob-2.6.32 84094 RMD160 394f46ec5b869638a7bc2e87beb118167c9bd6cb SHA1 1a2a1efb72126609d9e3b9be99ae5be2751efd06 SHA256 de625f0bd221c9c38d4453f1b709622f222d86a0ae9350d2b7b0e17795e6de6d
@@ -41,9 +44,7 @@ DIST patch-2.6.39-pf1.bz2 243830 RMD160 09ffdf950e06c0287339b3b11bdf551d5a30a6a3
 DIST patch-2.6.39-pf3.bz2 323960 RMD160 0c6f9989cfb7e2bfa965f367f816e496ff75cee4 SHA1 d6a4eab89c5960f9a1356d5b770337da12c25454 SHA256 ba150b5216dd4f818583efd65d093cca27d10c8fb5a30340589cb73567a9b215
 DIST patch-2.6.39-pf4.bz2 351707 RMD160 6f317c3a525d8dacc475e7b0f2713a2e5604dccf SHA1 7c8bea6334eaed162c12edf0b40376094945db2e SHA256 c1e977b6b12dd5b0fc110bb2bd1dc98416e656bb95c445e0995182ad9766adbb
 DIST patch-3.0.1-pf.bz2 278965 RMD160 ce3aa4fbf67ec4e0a72d17e46714ee219580c731 SHA1 693052bfa2f551c540ac8563317d32943ed478be SHA256 a96d9fe41a5f30bfa2c1964ca3f1022db13061b92f69b0f9dc57438564b60f1b
-DIST patch-3.0.1.bz2 33588 RMD160 27473f9e0912db1a572af25ca965a655b2dce384 SHA1 6c4443ce88b29f2c9ff2f2c44ba19925298b613c SHA256 e0f60e7443ca36ed624386ca2bacf25b4e5b45eaff2ff59b81114dcf78965fbc
 DIST patch-3.0.2-pf.bz2 342009 RMD160 306c951c50bc887b270ef3b7fb16b136eba2bd9c SHA1 37ce41fd0a4c22e3dcf8233f8e7dfe5807b896b8 SHA256 1437e43f8188ae3c0418565723848c68fa6da51a7667ede904da58094ca39560
-DIST patch-3.0.2.bz2 80853 RMD160 94674336970749d451d787151722907cda117c30 SHA1 e7047085882d21181f566a5099a9c8f39a3eff35 SHA256 27805b0454ab41749b43f4a2673fab296f2134795366ff5bed2d743a06231c8f
 EBUILD pf-sources-2.6.31_p9.ebuild 1426 RMD160 f463b33f7313e94810efa0d36025cca30fea993d SHA1 ec89e31caa1c8c12806c1a275f0d99c6b7d41b3f SHA256 8948cd971b922eefb4839abe2af9123f0882ac8de99140cfe63355dd3bd23339
 EBUILD pf-sources-2.6.32_p16.ebuild 1427 RMD160 1e32f053e98df9976f5ed7ef758e1db6c03b9f6b SHA1 cd417bd4a85b13afdda7aeae44797b87956f742b SHA256 de96551962fca91398bc3ef1442bf6781b6f9da819d909fdba05b6445aff6c33
 EBUILD pf-sources-2.6.33_p4.ebuild 1426 RMD160 532cc46ef2708ff714eb68dbe92fbc4b7ba60492 SHA1 d8e503fa742dbacf0308efb10b840456cea975da SHA256 d8aedff62d1be226ef56e8118e9e7b5f3356e40071bdd1e85e12e097e9cafb3f
@@ -59,7 +60,24 @@ EBUILD pf-sources-2.6.38_p8.ebuild 1844 RMD160 5ced551deed5c61fe613d4e76740ba614
 EBUILD pf-sources-2.6.39_p1.ebuild 1841 RMD160 10bc87de516d6a89ec8b8687c198522745724c60 SHA1 3648d254072aa8e37a2f028489c521a23fed54bd SHA256 d584d362f8b19cd7a1d286965db2f9c2ffed61e07bd2d48d56d5f4346662f125
 EBUILD pf-sources-2.6.39_p3.ebuild 1844 RMD160 40a547b4c64a3437946dfb6d0d0889547425c9a8 SHA1 5b7e9372ff1c0669d4c62346f3ba4fc7b96c2690 SHA256 669d2704cfa68b3df901385efc873677a2eecba7fbe3acb9f0c92bcc28fcb248
 EBUILD pf-sources-2.6.39_p4.ebuild 1841 RMD160 60cf7a1f8eaaf9b15cb3c4ef9c0dbe115d72c22c SHA1 51d100d434a05ddc6bcd22e34227f82fdbe4f529 SHA256 07d2414edcf61e268051d9ee9b8d38bbb34940e76453f148480280efd2781e13
-EBUILD pf-sources-3.0.1.ebuild 1732 RMD160 4b0648da9e861aab182778b6e7851e2ca42434aa SHA1 16097c83dc0a03a2c099dc0ce4bbf079245de7ac SHA256 992fb05a9bb952c6885326b9274a9061d2b8292fb99748ff4f3f23545c6fa8e6
-EBUILD pf-sources-3.0.2.ebuild 1735 RMD160 80b4522467d3e9cccbe23fbfc718dfcb600165b4 SHA1 d824b2dfde37765e6cd09b97c32138cb9d4cd298 SHA256 f985081c64dc1ab77b6a6f9055b737bb538edb34c20b2a6e866a4a48fe6f6367
-MISC ChangeLog 6119 RMD160 1d6a58b89c6af19b3adda82e425e3261e70aeb02 SHA1 fe164cf5b0a8f2fb32b826255cb68dacf9432e44 SHA256 eaca5801014a9012ad49a6b7f9c4f09653e56d219805ba261dfddd71611a3c9e
+EBUILD pf-sources-3.0.1.ebuild 1776 RMD160 92aeed3056219fd4f74aaded16a4d34ae6a56aa6 SHA1 b0f26bb686e7b46d7eef5529dcaa20f5777c9f81 SHA256 88ee6443f72e2b9797aef7eab7973cd3493f800b0f275c3d3cc1c1f99e54f718
+EBUILD pf-sources-3.0.2.ebuild 1776 RMD160 5edb3a5857f9c48aecd4c180517f63edab7b6637 SHA1 36459a0c7b5a6006b80b0ff025049b044f0b591c SHA256 bac873f33089c7157592b14574fd616ba4ff2d9a2c952ba502778b4d3532cf67
+MISC ChangeLog 6274 RMD160 368fdd5830a62257c72216c07a7409babfe7ae88 SHA1 3499c0d704f24c46774e9415232a338d003f0ad0 SHA256 44ed1c41f3248192f1aea8ce3f98c502801c74ba076acd32ab8377d37630ec07
 MISC metadata.xml 639 RMD160 66491ffb8f63de4c2280660539b9511da00d6c06 SHA1 95130297611287e074688def020cb1d9a585165a SHA256 ffdfe973ba8a5673cfc8f68c85438d7c0129d85930b48013e6901a37b936bb15
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOVAYAAAoJEPqDWhW0r/LCcAYP/RYL1JGTa2I5KUtdl2PwHMyb
+IBOOR2qIwHs2XpWvt3q6CqvrEzxdPg3wTYx3awIZ+EIndt52/ImgrcZSSqG9WagA
+7hR/+ocGbFtWAITf91X8nhDSYhY18/TGegct/T11W6OJtfIbvd2je5LXwUfszdGf
+5+XcPLNeOPBA9/Tw4aayk1FeF5y1W57NSVMpcrU8gpntj/qhzTWkwPnGikf4V+j8
+H7VYDrOh3uJZaVrjbGgGD+xzNSb1/eK3//qAPTQ4eVb9EHGLCsjoy3ORchVP31zu
+SWh9cdX9A2myV/MJ0UsU2MQ8gEnz3sMIrrg3r2RR0V8Hbj6t1Df/jNElsOQRrarU
+89/4mRSy1o2/aClaNUxqsv3Ge9WujtYp9ksYzaerCQWNyUkR49W302hpaj1la+CZ
+O+v4qzbUUaoKZuZtQ7gE2vFlAabnel2Z3zhlSJ0X5K8lKD+hnvYaNssLPGu+Ys2t
+nLUEG27kAZnx9WeN8ev+SxiK/PK2MKDpPIaVu6yDOKAcNXOodcuh5RvhsDUDLgp2
+pCFTyLvhnO6LiumQ9/Kz2pTFPd6UublWufkbGlT+ny7YvjMfK+w6iisoOTIUJ2yV
+fPpNQpNFObSsPIVdTif6f4MtTrO0DwADf3VKcThLkhwfBg4sajDwO53SxNCfMy75
+8V8FSj/4Ax1RicPHu6Pl
+=vZBn
+-----END PGP SIGNATURE-----
diff --git a/sys-kernel/pf-sources/pf-sources-3.0.1.ebuild b/sys-kernel/pf-sources/pf-sources-3.0.1.ebuild
index a0bcbeea7968..42bf92b6e5c0 100644
--- a/sys-kernel/pf-sources/pf-sources-3.0.1.ebuild
+++ b/sys-kernel/pf-sources/pf-sources-3.0.1.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pf-sources/pf-sources-3.0.1.ebuild,v 1.1 2011/08/12 15:42:01 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pf-sources/pf-sources-3.0.1.ebuild,v 1.2 2011/08/23 19:57:01 hwoarang Exp $
 
 EAPI="2"
 
+inherit versionator
+
 COMPRESSTYPE=".bz2"
 K_USEPV="yes"
 UNIPATCH_STRICTORDER="yes"
 K_SECURITY_UNSUPPORTED="1"
 
-CKV="${PV/_p[0-9]*}"
+CKV="$(get_version_component_range 1-2)"
 ETYPE="sources"
 inherit kernel-2
 detect_version
diff --git a/sys-kernel/pf-sources/pf-sources-3.0.2.ebuild b/sys-kernel/pf-sources/pf-sources-3.0.2.ebuild
index cc8fb8f1748d..ac26c98a95eb 100644
--- a/sys-kernel/pf-sources/pf-sources-3.0.2.ebuild
+++ b/sys-kernel/pf-sources/pf-sources-3.0.2.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pf-sources/pf-sources-3.0.2.ebuild,v 1.1 2011/08/18 19:07:46 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pf-sources/pf-sources-3.0.2.ebuild,v 1.2 2011/08/23 19:57:01 hwoarang Exp $
 
 EAPI="2"
 
+inherit versionator
+
 COMPRESSTYPE=".bz2"
 K_USEPV="yes"
 UNIPATCH_STRICTORDER="yes"
 K_SECURITY_UNSUPPORTED="1"
 
-CKV="${PV/_p[0-9]*}"
+CKV="$(get_version_component_range 1-2)"
 ETYPE="sources"
 inherit kernel-2
 detect_version