Sync git-2 updates between all versions, and merge KEYWORDS code paths.

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

11 files changed, 105 insertions, 55 deletions

diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index 993e07beb821..53abec49747e 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -22,15 +22,25 @@ AUX man-1.6g-fbsd.patch 366 RMD160 0b1340eac6f15befae81f5392c59e088a7ebcc89 SHA1
 AUX man-1.6g-xz.patch 1848 RMD160 222e3152d36397cc6723564d61d4e6a394239767 SHA1 e1386c99b0d39fcf7d6f3cc9889c64519d51d96e SHA256 7c11114ec34f017d0641c9a7ecd9ad8b93f6c226e9bdd54fd0fedf1313451634
 DIST man-1.6f.tar.gz 254827 RMD160 8680bb94bff9b86fb9d061f58d9acb08c934531e SHA1 c97012607ed9d75a6eee7e66d257a99a8ed86918 SHA256 9f208c7e1981371ad4481d6e6c2c566bc726a15778723f94136d220fb9375f6c
 DIST man-1.6g.tar.gz 256906 RMD160 f1a845bcf454424f49a3281a86217af0328d88e2 SHA1 ef9e1f36a1a536a31112d52c3f39340900b0d3cb SHA256 ccdcb8c3f4e0080923d7e818f0e4a202db26c46415eaef361387c20995b8959f
-EBUILD man-1.6f-r4.ebuild 3719 RMD160 d7086b4282b0fd5a7b930cac9cf6db7d662c5b36 SHA1 7c452edfc060718a4c545934c746b485eccebbcc SHA256 557b81f1846bf7323770bc4915e6400796047690f042d6be224ffc2ec0a45218
-EBUILD man-1.6f-r5.ebuild 3809 RMD160 1d9be50062a2145e976245dbeadbdd91aecf2dcf SHA1 6188ee8000ee7426df0d6b1e94489d2bff2b4b0d SHA256 d3d3f4d76bf96d36dc112bdc89f74391c87be122913364e050e88acd83d3a09a
-EBUILD man-1.6g.ebuild 3675 RMD160 629b8e237376f7ccf433b06181fc2ec5d34c7edf SHA1 a9eea442580fc83bd55f876efab71c42700f7613 SHA256 69612fcab0eb51cab34123cb2ead2a4bb2c2a125532e8759046aab25d9a23e92
-MISC ChangeLog 23678 RMD160 c5cddfa33ebf1a2b8013188085422f1903fb448f SHA1 01e91d53f7215a340f92ce2ee7c9b7f392eaeaf9 SHA256 aeb4ea369a9678ed5f27f0f690992c26cfdbcdfbf8998e5e209946fc03780016
+EBUILD man-1.6f-r4.ebuild 3728 RMD160 8ab36f38481b23c4dca88cd32824992a3974247d SHA1 212f0ff98868a52f00cf1fa31de91f96dea0679a SHA256 54fbc80343001876826e43b5c612b2ee1c64cc210ed47ebcb1071f030412c0ad
+EBUILD man-1.6f-r5.ebuild 3817 RMD160 c378d153e3bdfe5b8f65f0152d12cb447791537b SHA1 03634bbf4c68875ca8b12eab8eb9a6f89268d1c4 SHA256 b6c8c7f62c7b47fba4c66a32a76f88f39c763c9cc3882416f361807fcde1fd3a
+EBUILD man-1.6g.ebuild 3679 RMD160 04c986ad3b86a6011463230b626c146a14a6d7eb SHA1 2b0c026c6dab9c5e9540c9aa2e4abdc2ba1c6832 SHA256 6e966af531be10c68322ab8abc85bc4efd36310c88b3bbd720e6c4580710cd8c
+MISC ChangeLog 23821 RMD160 4571cfcd91bbdd414b4b69edbd7adcbe8645097a SHA1 d0b43e287196247b29c0a25b9355714b1d9d1677 SHA256 d77c87bc424e4da4a3b4f6bd4a790d0d64fa528013c0f26fa2ad29cd334e8c96
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+ZZh8ACgkQvFcC4BYPU0qn6wCgntKWQNOLhrZ4r54f+b3b0DT7
-ZI0AoIzy7EFLeaYW/pRJTw6+xdZX4QXD
-=E+ly
+iQIcBAEBAgAGBQJPvaNwAAoJELEHsLL7fEFWW0sP/3VBQ0xrLeeT7i6ZjAIGGCCw
+7ZnFSAN/CpoZFVJjdgWigLDxkdmwsi5CoiAcgoFQw54woeCcmxSZcYrz396T/rXF
+/U32OLWGT1LMsEtZ/gvsrzBQ5Lb4fhN+OuHhlfenZGtw7kbCDp94qfeHYvvJAUb7
+ZuOXmTy9xTHd22yk3KPRehk2z6pgQGQCgg7IRSd+p66V1AAKElnOMoBtDf5xP3t1
+ykaYi1yYmeMHLRFjeZpwBvJQTBY+MGNEKqb2UbmcN52fXa0poXaVu3ERv9rOJ/2g
+7bCJ3wZXxUi9NHF/vZVux8gS6VCmIHj2zsGBc75DgVJbKiFVaHSKJDie+G/1gYni
+o1n6iuFb+JOPXYM+qBgkw75zbLsu+/zXkH2RkxnwW5UcXE1YEwIO/ZZp83utEJ1D
+6fZRjJaK6sV2JQ8IoTSv2JU2B0f15LVI8DGsbM2i5yVUfwHxMg2g3K9RaNwWQqdR
+Rt2kTJY4M67q9X8+lHV7MRQsj5grjuurrLUntQ850Ln3hkL1KSDMQ3L+hQU+JDZo
+0gSfG6c613ECdyehNjLrX1DXYWvGyYvllK6geZbvku01AIxOfosjY3FfeRo5k806
+caxtrCimTWRFFFK/b7xrtGe+3xoePe04EAxtB+OO49L0HONtR8cBFHlo416Y28Ap
+lCRlnGbI0xiaOk2skXG9
+=4Iqf
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 8828a9edb2e6..2dd19baacda1 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.383 2012/05/12 15:56:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.384 2012/05/24 02:52:39 vapier Exp $
+
+  24 May 2012; Mike Frysinger <vapier@gentoo.org> util-linux-2.19.1-r1.ebuild,
+  util-linux-2.20-r1.ebuild, util-linux-2.20.1-r1.ebuild,
+  util-linux-2.20.1-r2.ebuild, util-linux-2.20.1.ebuild,
+  util-linux-2.21.1.ebuild, util-linux-2.21.ebuild, util-linux-9999.ebuild:
+  Sync git-2 updates between all versions, and merge KEYWORDS code paths.
 
   12 May 2012; Raúl Porcel <armin76@gentoo.org> util-linux-2.20.1-r1.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #404179
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 84171f399ca6..af128ae459eb 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -19,20 +19,30 @@ DIST util-linux-2.20.1.tar.bz2 4614302 RMD160 4ab3435dbd8b83a0c353301b6e0f89a91a
 DIST util-linux-2.20.tar.bz2 4615091 RMD160 c293bee7d9b6b03c0f3981c2020de1471d37b560 SHA1 e8cd2c8e968cdbdc097d82cceaf15d536e0254c1 SHA256 c1cffbf5a1a7a32965f2e8e9ce76336310031e10b87c418d0679075724271d4c
 DIST util-linux-2.21.1.tar.xz 2975120 RMD160 877752a63a0eae362d439b04db06a7be726469ae SHA1 49e130a456516e15c6bb0238f370f2125ad1cfe2 SHA256 6ffaffb46bfb1aa403f83f0c8d2700e5ec35ffcb35a0573adb10404ed16c9004
 DIST util-linux-2.21.tar.xz 2954504 RMD160 0e0a5b16ef13fb2e0f238e1332dc31e14e358ea6 SHA1 0ee465519bbe6aad3a22f83bf92221e85c4e2e51 SHA256 5192e8ba7dcf3cf0dc447f07b3d177f6cb3fb49dfae54ac45d6c8c7d86eeab0f
-EBUILD util-linux-2.19.1-r1.ebuild 3558 RMD160 b6024990e9501090a22fa40548aa70e54a061bfa SHA1 966efb8292b03a9a4280941587f7d2b8a90c9b5e SHA256 c1993f3f5e30ea1d30c9331f21e040dac54fd470789a7b059b91488ab54e7f8d
-EBUILD util-linux-2.20-r1.ebuild 3639 RMD160 8dad7cbdd3c818084c42cbbe49a37fbf179a6d41 SHA1 a5046f99c84b287513ff0a21ede079f809b444a5 SHA256 bcc4068e636e22caf5ed3b2736a4925b91f692afdb93bf5f241833b97f6adfe1
-EBUILD util-linux-2.20.1-r1.ebuild 3620 RMD160 b1bc87f5d9c8c4511f04e4bcde1ab7bc98415be0 SHA1 67d129374f3662e4a0e9dc9823430535e26ad6a5 SHA256 002cb9143538c0baf53d3375f41ab8a5fb912784e8f50343ea5d47610b368f8a
-EBUILD util-linux-2.20.1-r2.ebuild 3751 RMD160 1bcb990d8421da73ba03af0e99877d77ea3eb441 SHA1 2ee0bf14f974a613528a7d0035f32cbb715f187c SHA256 f1216450a8275cca660430b02c2c38b63ea34e1e9b92466dc6710fb5d34f92c6
-EBUILD util-linux-2.20.1.ebuild 3547 RMD160 4a1bbfca3a9ef92434a97c67f60a713169b65f8b SHA1 f4dda0c5897a41db10cd99cf05d21c398ec04d94 SHA256 e243573ddec8195c5ce78caba20995751e51fa50cf73166064937bb5456d1e63
-EBUILD util-linux-2.21.1.ebuild 3538 RMD160 1b7529e9c34fdf70dbfcf5312c344f64a4d26e6e SHA1 92165ce00df5034a80c1808e7e4d53ffe04581dd SHA256 59f29efbede30f176e03b62965cb178bb9612406ba6a0e3e38242d737f42fe4f
-EBUILD util-linux-2.21.ebuild 3608 RMD160 8f40b519ec0a7bc5d95d00f71dc7042d99614947 SHA1 fa91be772698974568e3a7d9ec7ff873c9f829c2 SHA256 aec386a2c0a8acf1e5ed3ebb2de308bcb384d8df58c0971c431880fd8aa37225
-EBUILD util-linux-9999.ebuild 3340 RMD160 874e76030a36f8d574ea4ae1078bd9854d417665 SHA1 acfadc52030822ac78311d1d29009609fffbde84 SHA256 ffef8ca212e7cfadea498bcd0e69949b41861cd399dbcaadecbdd20e7b851d38
-MISC ChangeLog 59168 RMD160 6305e9d7af2b7069de2876feb0086926e58e80ca SHA1 6e40a68543b60757724ba50545bf0817dbb52c64 SHA256 93d5ac5fb6c6854bd66a6630ea81aa6c5f3a283d909d32cac4dc13b4adc01f15
+EBUILD util-linux-2.19.1-r1.ebuild 3576 RMD160 f956145c03b7150f178ba9b6ab9976d11ed7554b SHA1 e17be1b8ececc4d7c24330652d9fd70ac956891a SHA256 3c2a9ac9cb13d9c482dee747b30807adedce7b3190352ac541b59ddfd3409913
+EBUILD util-linux-2.20-r1.ebuild 3660 RMD160 f96e1330ee8f7576e1915bfe7b397c8e8f6b357d SHA1 f3966b016ead3842657d042ae2f41c07206b7fdd SHA256 dde41b4f74295112027ce2fd633e41b4b22f310ba4f4052d9b980e810853a354
+EBUILD util-linux-2.20.1-r1.ebuild 3638 RMD160 2b53da69e9ba138021459011720ca26f3cb63e36 SHA1 52b81f9b6202fa9a5878159870d35ae49836f66c SHA256 e32cc2840620cbea4a938e1ae59c472e9340ed1c61ee4aaab79a638c1fee6aa8
+EBUILD util-linux-2.20.1-r2.ebuild 3769 RMD160 7b1fdaaa88ca8b68dc1076ac33fbea6a83324147 SHA1 2a7593a87c6488eff87357be07e49afc17e35b06 SHA256 1654ce32516a7445f8753543a6183c6d10996bb8da27023a6d68a3ed1dc8480e
+EBUILD util-linux-2.20.1.ebuild 3568 RMD160 66d7c2256b856b80a5e7ee40b5d8ad826ed26d69 SHA1 813811ca633ec87f004352af6dbe860c43498279 SHA256 7d05102c92b2a29f9244bf329e57476bd27d657fe63a499b4d0b78e88c53744a
+EBUILD util-linux-2.21.1.ebuild 3554 RMD160 4209678e82f723e9d8f8aca8200e67b7a5ffc518 SHA1 3088f2bb8d36793e734a8a5d78586eda5cb3a65b SHA256 0c8bfb3d96c931d75d6334b628a494ceff213e1a5c2bb0776d281a7151ce18a1
+EBUILD util-linux-2.21.ebuild 3624 RMD160 831a86c7a6ebfa911ebf6b802f6c9fb36e3ece00 SHA1 c3f2ca9bb654fc3d0625d4e57ae5a623a4e27854 SHA256 3a037c6f463a83352cc4582b997141ba48d584fc1f640ec6e2a7f9d0c06acb19
+EBUILD util-linux-9999.ebuild 3356 RMD160 faa3e55b62e84ad0111dde729c566167e850e78b SHA1 309af3510ab1d0dba3159eeea16b74318c045067 SHA256 e5bbb2a53a5ce26d0b51c58b590aaf661731d9a104e9aa0ab32d760213fd2bd4
+MISC ChangeLog 59512 RMD160 0366c48af3287d0929abb894d54f3d20f3ac4de1 SHA1 62a9d88254c1b6c48cff1f470716ecf4fd9410bc SHA256 f023d2e4aa86644bd71b5c339ae4c71bec34ce6ca829cd42025993afbfd8e911
 MISC metadata.xml 581 RMD160 0177cde9a7c9906f5d14fbefec5d689b0271a95e SHA1 9275f30ed4bc6a340dfa3b5d88e1ab1715e23a42 SHA256 869450d739d36b4731860f8fa357276b3f9f30be37cbecd1aec0048f667d643f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+uiDwACgkQuQc30/atMkDBxwCeOq315/0LIbe/QBOtTg5Py34d
-ResAn2r+uz40s60mUEme9Z7t4Ed1La5p
-=12zO
+iQIcBAEBAgAGBQJPvaLMAAoJELEHsLL7fEFWmS8P/3I8BHoyM33GFR4/pjqkF7W+
+Czdefh86sNNyNPq3eDg2XoUUX0oIyA90CRPCOGFFIdBCllMa+cGYqKF5FqYG4zfq
+xheXcXM30pv4E7TG0jjzFV8X8IEp/8lVVLoE/Pnw/290jxUrOZuAYoz+hLbxOXdk
+ELCIcTJFf8yLSh8Tdrp+vlOJvq0XSK6EYK4VzgC/Rah8PGqvvyob4ZdqBJyNmMgA
+38TP5tc5F130XQB0dTe7M9j1OLzT1+eRHlNr2ZOkIlfaJnCoG9r+vQQDSOm7IZ+I
+4JoVORINoKaDElWAIH59WjQ0epH+scZUvlkyvlF5BkU/PzBH8+rAz2MNihgm3GT1
+gxRZ6xMOL+6SfBuaZWKHgCuQe71ThBmzlzkYbb4f+2XJeiRTKDcl5ToyplXnULP8
+qhuHkKNtJrF2GIatj1EypQ5vlqfHHJ1LgbvdMq0ZtII9W+b4gtmgGuTgD3Qpzh3y
+uiPfQ72QwP+dRGy5AT1OVD5Va7/fqLJHSkDW3ohiV1RlXn+LMDE6nAubgD+7hto2
+cH8Yyv/rS7VGmIn7YaHCiEtfeV6DZdKsFMzOtv6ohbjV2HXgKW+kT42rlMweGrMk
+OqgrFH7APZkRW9ovBt3Y+Q/78fU6/ktEIAhNeHP+17CjeM1+yW7KLLWJ1+gli6Tu
+O53vPGvMDNKbS3pHbhb8
+=hzSx
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild
index e4c713eedb6b..5d794c80c341 100644
--- a/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild
@@ -1,12 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild,v 1.12 2012/01/07 20:54:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.19.1-r1.ebuild,v 1.13 2012/05/24 02:52:39 vapier Exp $
 
 EAPI="3"
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 inherit eutils toolchain-funcs libtool flag-o-matic
-[[ ${PV} == "9999" ]] && inherit git autotools
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-2 autotools
+	#KEYWORDS=""
+else
+	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
+fi
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
@@ -16,11 +21,9 @@ DESCRIPTION="Various useful Linux utilities"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
 if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.bz2
 		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.19.1-20110510.diff.bz2 )"
-	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
 fi
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
diff --git a/sys-apps/util-linux/util-linux-2.20-r1.ebuild b/sys-apps/util-linux/util-linux-2.20-r1.ebuild
index 3a62c1945e56..99256168c819 100644
--- a/sys-apps/util-linux/util-linux-2.20-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.20-r1.ebuild
@@ -1,12 +1,17 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.20-r1.ebuild,v 1.3 2011/12/30 19:30:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.20-r1.ebuild,v 1.4 2012/05/24 02:52:39 vapier Exp $
 
 EAPI="3"
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 inherit eutils toolchain-funcs libtool flag-o-matic
-[[ ${PV} == "9999" ]] && inherit git autotools
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-2 autotools
+	#KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+fi
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
@@ -16,11 +21,9 @@ DESCRIPTION="Various useful Linux utilities"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
 if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.bz2
 		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
 fi
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
diff --git a/sys-apps/util-linux/util-linux-2.20.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.20.1-r1.ebuild
index 75379a8bcf5c..3993cc35f94c 100644
--- a/sys-apps/util-linux/util-linux-2.20.1-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.20.1-r1.ebuild
@@ -1,13 +1,18 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.20.1-r1.ebuild,v 1.9 2012/05/12 15:56:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.20.1-r1.ebuild,v 1.10 2012/05/24 02:52:39 vapier Exp $
 
 EAPI="3"
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 AUTOTOOLS_AUTO_DEPEND="no"
 inherit eutils toolchain-funcs libtool flag-o-matic autotools
-[[ ${PV} == "9999" ]] && inherit git autotools
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-2 autotools
+	#KEYWORDS=""
+else
+	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
+fi
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
@@ -17,11 +22,9 @@ DESCRIPTION="Various useful Linux utilities"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
 if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.bz2
 		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )"
-	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
 fi
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
diff --git a/sys-apps/util-linux/util-linux-2.20.1-r2.ebuild b/sys-apps/util-linux/util-linux-2.20.1-r2.ebuild
index a5008a339f43..efa57ffc7703 100644
--- a/sys-apps/util-linux/util-linux-2.20.1-r2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.20.1-r2.ebuild
@@ -1,13 +1,18 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.20.1-r2.ebuild,v 1.3 2012/05/06 23:47:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.20.1-r2.ebuild,v 1.4 2012/05/24 02:52:39 vapier Exp $
 
 EAPI="3"
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 AUTOTOOLS_AUTO_DEPEND="no"
 inherit eutils toolchain-funcs libtool flag-o-matic autotools
-[[ ${PV} == "9999" ]] && inherit git autotools
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-2 autotools
+	#KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+fi
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
@@ -17,11 +22,9 @@ DESCRIPTION="Various useful Linux utilities"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
 if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.bz2
 		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
 fi
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
diff --git a/sys-apps/util-linux/util-linux-2.20.1.ebuild b/sys-apps/util-linux/util-linux-2.20.1.ebuild
index 2dbaefba3b7a..216c70048f05 100644
--- a/sys-apps/util-linux/util-linux-2.20.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.20.1.ebuild
@@ -1,12 +1,17 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.20.1.ebuild,v 1.2 2011/12/30 19:30:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.20.1.ebuild,v 1.3 2012/05/24 02:52:39 vapier Exp $
 
 EAPI="3"
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 inherit eutils toolchain-funcs libtool flag-o-matic
-[[ ${PV} == "9999" ]] && inherit git autotools
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-2 autotools
+	#KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+fi
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
@@ -16,11 +21,9 @@ DESCRIPTION="Various useful Linux utilities"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
 if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.bz2
 		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
 fi
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
diff --git a/sys-apps/util-linux/util-linux-2.21.1.ebuild b/sys-apps/util-linux/util-linux-2.21.1.ebuild
index b689506102dc..3effee27e74b 100644
--- a/sys-apps/util-linux/util-linux-2.21.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.21.1.ebuild
@@ -1,13 +1,18 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.21.1.ebuild,v 1.7 2012/05/06 23:47:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.21.1.ebuild,v 1.8 2012/05/24 02:52:39 vapier Exp $
 
 EAPI="3"
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 AUTOTOOLS_AUTO_DEPEND="no"
 inherit eutils toolchain-funcs libtool flag-o-matic autotools
-[[ ${PV} == "9999" ]] && inherit git-2 autotools
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-2 autotools
+	#KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
@@ -17,11 +22,9 @@ DESCRIPTION="Various useful Linux utilities"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
 if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
 		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
diff --git a/sys-apps/util-linux/util-linux-2.21.ebuild b/sys-apps/util-linux/util-linux-2.21.ebuild
index 518bcf0b356a..1e3afd86301e 100644
--- a/sys-apps/util-linux/util-linux-2.21.ebuild
+++ b/sys-apps/util-linux/util-linux-2.21.ebuild
@@ -1,12 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.21.ebuild,v 1.3 2012/03/30 20:31:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.21.ebuild,v 1.4 2012/05/24 02:52:39 vapier Exp $
 
 EAPI="3"
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 inherit eutils toolchain-funcs libtool flag-o-matic
-[[ ${PV} == "9999" ]] && inherit git-2 autotools
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-2 autotools
+	#KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+fi
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
@@ -16,11 +21,9 @@ DESCRIPTION="Various useful Linux utilities"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
 if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
 		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
 fi
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 7ea753a052e2..d1461bf67e42 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -1,12 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.31 2012/04/21 06:24:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.32 2012/05/24 02:52:39 vapier Exp $
 
 EAPI="3"
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 inherit eutils toolchain-funcs libtool flag-o-matic
-[[ ${PV} == "9999" ]] && inherit git-2 autotools
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-2 autotools
+	#KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
@@ -16,11 +21,9 @@ DESCRIPTION="Various useful Linux utilities"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
 if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
 		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"