Version bump.

Package-Manager: portage-2.1.4_rc12

6 files changed, 189 insertions, 83 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 8b97647bad62..f5d4e779a2b0 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/e2fsprogs
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.126 2007/12/24 12:49:52 vapier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.127 2008/01/01 13:13:07 vapier Exp $
+
+*e2fsprogs-1.40.4 (01 Jan 2008)
+
+  01 Jan 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/e2fsprogs-1.40.4-prototypes.patch, files/e2fsprogs-1.40-fbsd.patch,
+  +e2fsprogs-1.40.4.ebuild:
+  Version bump.
 
 *e2fsprogs-1.40.3-r1 (24 Dec 2007)
 
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 7fc19acb86ab..c8db43628a6b 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,50 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX e2fsprogs-1.32-mk_cmds-cosmetic.patch 316 RMD160 42dae53c318fb52b39c8e1d357974111bf8712bf SHA1 2515d77050072bcd1ae7defa90f32fb101ac01c5 SHA256 182da8741b852fdaf2d17a485da0451ec0c665adb83327b29b3372e2e43f712a
-MD5 1a896f2697b055d4b8b4139c3482ac9e files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316
-RMD160 42dae53c318fb52b39c8e1d357974111bf8712bf files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316
-SHA256 182da8741b852fdaf2d17a485da0451ec0c665adb83327b29b3372e2e43f712a files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316
-AUX e2fsprogs-1.36-makefile.patch 3546 RMD160 e3192ce562e534f75fd22679b7d222611f7d031d SHA1 55605d34186ef626816f1754faf607eea960a154 SHA256 6c6880203317d881cec66a8862baf998b0a8f8e0d62ea45e2efc1ba867ccca6c
-MD5 c5e6ed46f8a6b9f75273863110887b22 files/e2fsprogs-1.36-makefile.patch 3546
-RMD160 e3192ce562e534f75fd22679b7d222611f7d031d files/e2fsprogs-1.36-makefile.patch 3546
-SHA256 6c6880203317d881cec66a8862baf998b0a8f8e0d62ea45e2efc1ba867ccca6c files/e2fsprogs-1.36-makefile.patch 3546
-AUX e2fsprogs-1.38-locale.patch 550 RMD160 0c31fce2f16fa8057fa2d2d11797483876afbfb0 SHA1 15a2d3759f6309a188d82b21282ca50f738ebc27 SHA256 49909ebdaa316687c97c8b78d7485f0868167021f4c07f3d25fd984be2b0c600
-MD5 1a4c6e9e6476e4ed8c419a0a98e1a97c files/e2fsprogs-1.38-locale.patch 550
-RMD160 0c31fce2f16fa8057fa2d2d11797483876afbfb0 files/e2fsprogs-1.38-locale.patch 550
-SHA256 49909ebdaa316687c97c8b78d7485f0868167021f4c07f3d25fd984be2b0c600 files/e2fsprogs-1.38-locale.patch 550
 AUX e2fsprogs-1.38-tests-locale.patch 656 RMD160 16c625c16144ed16942fa19988524b7b5727c583 SHA1 debd15eba41a392cf0336e694bebf0c2409b18e3 SHA256 7d12df7c4f00f1c1c81dcbd74cc0f8c1cffaa3b5089fbaa40222a7a9f2fbe598
 MD5 f199f07604566fda4f2a4dabac83a535 files/e2fsprogs-1.38-tests-locale.patch 656
 RMD160 16c625c16144ed16942fa19988524b7b5727c583 files/e2fsprogs-1.38-tests-locale.patch 656
 SHA256 7d12df7c4f00f1c1c81dcbd74cc0f8c1cffaa3b5089fbaa40222a7a9f2fbe598 files/e2fsprogs-1.38-tests-locale.patch 656
-AUX e2fsprogs-1.39-blkid-memleak.patch 1194 RMD160 48b7c5f74118c82610b3cedb4e1d22b8bcc3fea6 SHA1 84c6543ecbf2b9992816033d4ab16f9d3b9eb29e SHA256 b05fd802386247651efae2d91cdab1be510d941e98040bee2518aafae01d27b7
-MD5 7146ec2dedb6817a0c2ff80d1555a82d files/e2fsprogs-1.39-blkid-memleak.patch 1194
-RMD160 48b7c5f74118c82610b3cedb4e1d22b8bcc3fea6 files/e2fsprogs-1.39-blkid-memleak.patch 1194
-SHA256 b05fd802386247651efae2d91cdab1be510d941e98040bee2518aafae01d27b7 files/e2fsprogs-1.39-blkid-memleak.patch 1194
-AUX e2fsprogs-1.39-ext4-prototypes.patch 521 RMD160 b758e8bcbb18d5dd7f0a7523eaea740cf9726a38 SHA1 c88b916bac7ed73d095243cec81894294f8cae78 SHA256 bc9201eeba2ee65ada8721cbd58992e09d35c60c8e672985853769e79a552c60
-MD5 f8a337df3326ec8bf51fd27197d0e1cb files/e2fsprogs-1.39-ext4-prototypes.patch 521
-RMD160 b758e8bcbb18d5dd7f0a7523eaea740cf9726a38 files/e2fsprogs-1.39-ext4-prototypes.patch 521
-SHA256 bc9201eeba2ee65ada8721cbd58992e09d35c60c8e672985853769e79a552c60 files/e2fsprogs-1.39-ext4-prototypes.patch 521
-AUX e2fsprogs-1.39-libintl.patch 349 RMD160 af61d02d49ca9653c01c3b318a22adcff5202746 SHA1 93d8272d21c9afc7629243cf46660e67aefdda58 SHA256 d78ef6bc941230136b5b8e877364e7d8c5cdfa476b27d2931798bdfd485125f2
-MD5 f2055563a3d07e89731cb194126c6d66 files/e2fsprogs-1.39-libintl.patch 349
-RMD160 af61d02d49ca9653c01c3b318a22adcff5202746 files/e2fsprogs-1.39-libintl.patch 349
-SHA256 d78ef6bc941230136b5b8e877364e7d8c5cdfa476b27d2931798bdfd485125f2 files/e2fsprogs-1.39-libintl.patch 349
 AUX e2fsprogs-1.39-makefile.patch 2646 RMD160 5e5dca19f977c56d516ab1df3bf65700d870425a SHA1 9e6e7f5228dc15b458af0346827474376ea89f3a SHA256 b9d6876b76f36e873295e1ad7301d86dc00d7f2adab0743de57be9adf1578f9a
 MD5 563afe8d7066693b54647bc3c82eaee0 files/e2fsprogs-1.39-makefile.patch 2646
 RMD160 5e5dca19f977c56d516ab1df3bf65700d870425a files/e2fsprogs-1.39-makefile.patch 2646
 SHA256 b9d6876b76f36e873295e1ad7301d86dc00d7f2adab0743de57be9adf1578f9a files/e2fsprogs-1.39-makefile.patch 2646
-AUX e2fsprogs-1.39-parse-types.patch 1117 RMD160 5858224739c494ae2e31507b217594cd1bf0440f SHA1 fa6ff6f281dca7d14e946df39c9b30a9faa14565 SHA256 f5741d617739d3e04e516bb0c22f385bdc01f598d181c50247f30cb4442d4fdd
-MD5 29853daadd9ea0d27abcc57e46d48e25 files/e2fsprogs-1.39-parse-types.patch 1117
-RMD160 5858224739c494ae2e31507b217594cd1bf0440f files/e2fsprogs-1.39-parse-types.patch 1117
-SHA256 f5741d617739d3e04e516bb0c22f385bdc01f598d181c50247f30cb4442d4fdd files/e2fsprogs-1.39-parse-types.patch 1117
 AUX e2fsprogs-1.39-util-strptime.patch 178 RMD160 04d8e04d5e04f9a927a76b36a072c50fb80eae84 SHA1 95d1dd6b457c374a801bfbdddbf8603cbaeeecf3 SHA256 fa300c80bbd679967ff74c361b63a9610f911b0916eff38fd491b797c0ff99c5
 MD5 1fafebe6571f92773e2773deef654d16 files/e2fsprogs-1.39-util-strptime.patch 178
 RMD160 04d8e04d5e04f9a927a76b36a072c50fb80eae84 files/e2fsprogs-1.39-util-strptime.patch 178
 SHA256 fa300c80bbd679967ff74c361b63a9610f911b0916eff38fd491b797c0ff99c5 files/e2fsprogs-1.39-util-strptime.patch 178
-AUX e2fsprogs-1.40-fbsd.patch 646 RMD160 c0cf25c094ecad52464716f4031d9d43a1496ce1 SHA1 b6b1140b5877fafe4b03e0b7215f6fa62899055e SHA256 9320846955a3f258d888af0181bb0ee74d32cd3cc6ab8bcb31531447479bb72f
-MD5 cc8abe69b45243ddd16a9ef3912734be files/e2fsprogs-1.40-fbsd.patch 646
-RMD160 c0cf25c094ecad52464716f4031d9d43a1496ce1 files/e2fsprogs-1.40-fbsd.patch 646
-SHA256 9320846955a3f258d888af0181bb0ee74d32cd3cc6ab8bcb31531447479bb72f files/e2fsprogs-1.40-fbsd.patch 646
+AUX e2fsprogs-1.40-fbsd.patch 407 RMD160 6bbfde16337a957a21343a05ab9cbe9f6878d1fe SHA1 8b4f61190850fbffef1e351946ea22bc48849dc1 SHA256 fa95b52353f0976d7b83b789208860cb04397c16413624180fcb223306bd5181
+MD5 e2a24b79440e8f72aa7bc3d93faf70d2 files/e2fsprogs-1.40-fbsd.patch 407
+RMD160 6bbfde16337a957a21343a05ab9cbe9f6878d1fe files/e2fsprogs-1.40-fbsd.patch 407
+SHA256 fa95b52353f0976d7b83b789208860cb04397c16413624180fcb223306bd5181 files/e2fsprogs-1.40-fbsd.patch 407
 AUX e2fsprogs-1.40-libintl.patch 395 RMD160 dc4216ba03bc4e530b499198838f5c5625d7f245 SHA1 59c50cc94f27537bc7e93094b919faf82b6512b7 SHA256 fb56042fde8e1cb0a22e3c76c3381ba39449ee151c95d437a267c5188dfdd6b1
 MD5 2b3e72dc3791ae92ec98b5c937f88942 files/e2fsprogs-1.40-libintl.patch 395
 RMD160 dc4216ba03bc4e530b499198838f5c5625d7f245 files/e2fsprogs-1.40-libintl.patch 395
@@ -53,6 +25,10 @@ AUX e2fsprogs-1.40.3-fsck-fuse.patch 1385 RMD160 a8bfab6141133c01f35839d388e9e22
 MD5 4a995d526fbd41e9f227fb80855191ab files/e2fsprogs-1.40.3-fsck-fuse.patch 1385
 RMD160 a8bfab6141133c01f35839d388e9e22cd317c1dc files/e2fsprogs-1.40.3-fsck-fuse.patch 1385
 SHA256 9924d991d7f8fa40e0d17d56b3a505066751fa4ac7b8a2f6ad3ab84ed5a91aa7 files/e2fsprogs-1.40.3-fsck-fuse.patch 1385
+AUX e2fsprogs-1.40.4-prototypes.patch 622 RMD160 5aa9ec39ebaff23ba5a42f9458d073db088ade13 SHA1 577fd2ba81685a1c3192c8b90820e6ead0f3985b SHA256 8efad16b0c9dde8f50869c4d663706cc0c3650d7c97c4fcc33c9ab96d33ea7f9
+MD5 e0d031bfe97c39c042196e518fd4347f files/e2fsprogs-1.40.4-prototypes.patch 622
+RMD160 5aa9ec39ebaff23ba5a42f9458d073db088ade13 files/e2fsprogs-1.40.4-prototypes.patch 622
+SHA256 8efad16b0c9dde8f50869c4d663706cc0c3650d7c97c4fcc33c9ab96d33ea7f9 files/e2fsprogs-1.40.4-prototypes.patch 622
 AUX fsck_ext2fs.8 3806 RMD160 193e4e01508ad363c28c8d5feb124f65d59a76eb SHA1 dff54a3149f8d6187f6481c428d4b980c3abfb97 SHA256 fc1155e67f17aebc8762d75a25d25511a1463be3da05baf7a322d0b5f91938e0
 MD5 a689cd9a4217895c01c91c9e697f8416 files/fsck_ext2fs.8 3806
 RMD160 193e4e01508ad363c28c8d5feb124f65d59a76eb files/fsck_ext2fs.8 3806
@@ -61,24 +37,9 @@ AUX fsck_ext2fs.c 2797 RMD160 b5a58058b90876d11286ffb12de75bdbf6a064e3 SHA1 c002
 MD5 5afe4af9fb6c7069c01e66e282fec576 files/fsck_ext2fs.c 2797
 RMD160 b5a58058b90876d11286ffb12de75bdbf6a064e3 files/fsck_ext2fs.c 2797
 SHA256 a7c3614e76c89ab7882191c14a469789d4b5b54f3c61c5888e5bd72840816e22 files/fsck_ext2fs.c 2797
-DIST e2fsprogs-1.39.tar.gz 3695111 RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b SHA1 c2dad0c9bd76701eafe3804e2a7d072aa198f046 SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3
-DIST e2fsprogs-1.40.1.tar.gz 3957193 RMD160 5b468a143ac73da34601ad2d2f358e60091b4f08 SHA1 86e4d29accdd2a5d439940bd5c0551cfcbe875b7 SHA256 5db8bd0d4af126a112e784d40f81187a1d111d36e7b86a6ef993806a6ee02d39
 DIST e2fsprogs-1.40.2.tar.gz 3965919 RMD160 6e4ec42d50fa6f0762b5c4f58c09a0fa71a9af79 SHA1 65519d66bd15550d0bcd32ec72481ff0dbe737e2 SHA256 8bbdfd8866b60edec27fee58611d98ef841892c4e2cd0f0dacf194f20a716a63
 DIST e2fsprogs-1.40.3.tar.gz 4064408 RMD160 a49813cfaa5dc972c64119628a016b5857b7a74d SHA1 46cf38d469812f0ed4fa2ab35998f73bd40bc4d3 SHA256 1d4bc00e2759b29ca3051da1154bcc53d817a4190b2a7130b3241f50ee6cb00f
-DIST e2fsprogs-1.40.tar.gz 4160254 RMD160 50b80f50c8565514a241a8dbef012139bb5d8313 SHA1 9a8c0d76313f2061228dbc6ee51d4bc054efcd2a SHA256 3a506f345e5da098c6c37239eb99e92d11a4100490245e102b13c446d1124296
-DIST ext4-e2fsprogs-1.39.patch.tar 716800 RMD160 5b20e7f2133e7339d22ee85d39c92cd7af920bb9 SHA1 fce15f60164a6c067c0d5a50cf00d4716e9a4f92 SHA256 0472210d002808f1505f96b1ca0e667f3cc2a6d585bca7d9a00130d6fe0ca38e
-EBUILD e2fsprogs-1.39-r1.ebuild 4095 RMD160 fa68994a8a76d0a347174ccff537bd8df9d5b3af SHA1 17a61b9ea081ab179d2257f31a8b118775577447 SHA256 def7cc0344233fb99a40bf9d9273cbf880a16b5868db4101825bb639e4f3eb46
-MD5 645b7b874a75ac7dec80fc4d2f3306b5 e2fsprogs-1.39-r1.ebuild 4095
-RMD160 fa68994a8a76d0a347174ccff537bd8df9d5b3af e2fsprogs-1.39-r1.ebuild 4095
-SHA256 def7cc0344233fb99a40bf9d9273cbf880a16b5868db4101825bb639e4f3eb46 e2fsprogs-1.39-r1.ebuild 4095
-EBUILD e2fsprogs-1.39-r2.ebuild 3908 RMD160 d7ed3e38706c65aa57a45637a69f7c8e0d6e5ff3 SHA1 d7f44188246c00a5315c00469a01f00697ba50af SHA256 adc0d578e01129f482ec31f23fc7183e89ccd8e39ec11a3524bf192341b83a6d
-MD5 7084d04b242902a52f72c82c76499fbb e2fsprogs-1.39-r2.ebuild 3908
-RMD160 d7ed3e38706c65aa57a45637a69f7c8e0d6e5ff3 e2fsprogs-1.39-r2.ebuild 3908
-SHA256 adc0d578e01129f482ec31f23fc7183e89ccd8e39ec11a3524bf192341b83a6d e2fsprogs-1.39-r2.ebuild 3908
-EBUILD e2fsprogs-1.40.1.ebuild 3599 RMD160 fc246bd28a367af4deda74c4316c8bef54b5f3da SHA1 7413235d292fadb2bfb682b4d77bb6dce1b2fefd SHA256 d3afb17ab40fb7f14eae0944be2855ec895141252f060a51ed98e2622658d05d
-MD5 64da91c07c111cdcc367e731b9484f14 e2fsprogs-1.40.1.ebuild 3599
-RMD160 fc246bd28a367af4deda74c4316c8bef54b5f3da e2fsprogs-1.40.1.ebuild 3599
-SHA256 d3afb17ab40fb7f14eae0944be2855ec895141252f060a51ed98e2622658d05d e2fsprogs-1.40.1.ebuild 3599
+DIST e2fsprogs-1.40.4.tar.gz 4048867 RMD160 053556aab3de6ffffe5ab5981f436d4cdf9d9dae SHA1 c9268104027d22418e164346624cf726fa27efaa SHA256 2e1ece31b004ff1f4a26e5633e884eda11457b489bc854edaa0d7f024bc06564
 EBUILD e2fsprogs-1.40.2.ebuild 4030 RMD160 4927cad50f46478bf45961460aa86d23f3385a89 SHA1 bb87a66be02c5fd5d63093c4b374bf21fd65aed4 SHA256 683a883d38e6595b584a9174267767854fb52c24faa55958349457e4a3c57e58
 MD5 8213fbb91cd0c8e68174118477cc86fa e2fsprogs-1.40.2.ebuild 4030
 RMD160 4927cad50f46478bf45961460aa86d23f3385a89 e2fsprogs-1.40.2.ebuild 4030
@@ -91,30 +52,18 @@ EBUILD e2fsprogs-1.40.3.ebuild 3957 RMD160 12ce3e2b1862aee056896db5f6c8e5b2d8463
 MD5 7eb6322d8d27535fb83a4b90f37aa11c e2fsprogs-1.40.3.ebuild 3957
 RMD160 12ce3e2b1862aee056896db5f6c8e5b2d8463509 e2fsprogs-1.40.3.ebuild 3957
 SHA256 868d9884c2ed83d07be84fdf37914f3d53afd97f7f59cc2f099748bc5896d0c9 e2fsprogs-1.40.3.ebuild 3957
-EBUILD e2fsprogs-1.40.ebuild 3770 RMD160 9be884e5dc9c2310b26add4e148c42c4643b39aa SHA1 ed69e81d2a6761f7982ee5c7ae2b40d023bd604b SHA256 92ddaf954231c2a82c4286dc94e1255e3911c29fa9ab545f984e343d635e17b2
-MD5 3d5746cff0bfe3d4ab2a65e6b42626df e2fsprogs-1.40.ebuild 3770
-RMD160 9be884e5dc9c2310b26add4e148c42c4643b39aa e2fsprogs-1.40.ebuild 3770
-SHA256 92ddaf954231c2a82c4286dc94e1255e3911c29fa9ab545f984e343d635e17b2 e2fsprogs-1.40.ebuild 3770
-MISC ChangeLog 19876 RMD160 842fde845edd294d441fe4db2529440422c64439 SHA1 7b36c8fb0496b06c1e9a8575daa4abdc0c503e4b SHA256 788bba09919ca2561f1fd7c3aa880a1707d1d47563ad127446bbba7d931f402a
-MD5 61636f1c5444c9b748a1a0fcd0b48e5a ChangeLog 19876
-RMD160 842fde845edd294d441fe4db2529440422c64439 ChangeLog 19876
-SHA256 788bba09919ca2561f1fd7c3aa880a1707d1d47563ad127446bbba7d931f402a ChangeLog 19876
+EBUILD e2fsprogs-1.40.4.ebuild 3889 RMD160 dcb7ce239e1006fda078e77e15aada10aafeca5b SHA1 25b9a5dbe28054dcfb763da1e576384a7d45a67c SHA256 27c19703edc521fb5245fde1d278181206c433f0ad38ee99eac47e714086662a
+MD5 855c5857591b34fdd1a7890552b4f91d e2fsprogs-1.40.4.ebuild 3889
+RMD160 dcb7ce239e1006fda078e77e15aada10aafeca5b e2fsprogs-1.40.4.ebuild 3889
+SHA256 27c19703edc521fb5245fde1d278181206c433f0ad38ee99eac47e714086662a e2fsprogs-1.40.4.ebuild 3889
+MISC ChangeLog 20081 RMD160 53a7814525b706abb463d9ac4459dde668278ab4 SHA1 7e9a9a52ba5209e0bb9412fb728e992212bcb974 SHA256 89fbca2d3982b990fd2d754e0bb1d29d6921b251b538164d99a31ce3c063b0f3
+MD5 fb6eb0e04aaec9d7314564b3b186c35c ChangeLog 20081
+RMD160 53a7814525b706abb463d9ac4459dde668278ab4 ChangeLog 20081
+SHA256 89fbca2d3982b990fd2d754e0bb1d29d6921b251b538164d99a31ce3c063b0f3 ChangeLog 20081
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 b9dfcbb27ee58be28e401b8a17bccc0d files/digest-e2fsprogs-1.39-r1 515
-RMD160 7b999a2cd6bb72521fedc467433e23f7d9bde740 files/digest-e2fsprogs-1.39-r1 515
-SHA256 031d234c293c7df0edc6d603c55f54ee8880a322532f0a2c7f98877e2eae189a files/digest-e2fsprogs-1.39-r1 515
-MD5 fc00317ae73d9c2807fd61dff454474c files/digest-e2fsprogs-1.39-r2 247
-RMD160 7fc0216dd2eb0963650054e763b94a26a3214c6a files/digest-e2fsprogs-1.39-r2 247
-SHA256 7f2869196368e8285912d8cc8ebe8d2ad3f08d07abad83f1011f753f3f824762 files/digest-e2fsprogs-1.39-r2 247
-MD5 d015e3a177ccf541d355ca62a4876347 files/digest-e2fsprogs-1.40 247
-RMD160 9c8bdca620a22cc5f9e09f6b4a73dddf9f806b69 files/digest-e2fsprogs-1.40 247
-SHA256 4d06e2187b0ece696260dd7b90af6c1c4c009247d48a014807d1b445e6cc73f2 files/digest-e2fsprogs-1.40 247
-MD5 f3146cef2366c9ce69b16a47c0975e0a files/digest-e2fsprogs-1.40.1 253
-RMD160 b75016e9af7c1cec280f95c4ff39a59db8a3ac12 files/digest-e2fsprogs-1.40.1 253
-SHA256 34fc9d99ddb2ac1455d1eb05a649862baa502d24becbd4d952389d34498b1fe9 files/digest-e2fsprogs-1.40.1 253
 MD5 4dfbb4dfcdb81f785ddc91f3307408ed files/digest-e2fsprogs-1.40.2 253
 RMD160 e4d75313507a8be6e01cfffe25055b77f885bc86 files/digest-e2fsprogs-1.40.2 253
 SHA256 68110f35f1b48f57c5da0f660ab454bc56debab94691022394ab4722f698b992 files/digest-e2fsprogs-1.40.2 253
@@ -124,10 +73,13 @@ SHA256 4b67dff555415a64a37dcd04b3195c487f77ed3b4c4649a61f27b3b4a3f867d7 files/di
 MD5 39514f3775b7a460db1c9ab0808b7b1c files/digest-e2fsprogs-1.40.3-r1 253
 RMD160 d7c691d3c672cce47d5514661866a62aab0a9e53 files/digest-e2fsprogs-1.40.3-r1 253
 SHA256 4b67dff555415a64a37dcd04b3195c487f77ed3b4c4649a61f27b3b4a3f867d7 files/digest-e2fsprogs-1.40.3-r1 253
+MD5 e4af75aa3da03473fa7660b3c429ef4f files/digest-e2fsprogs-1.40.4 253
+RMD160 379f55b752888b1055efc79b3b97ac29ace3de05 files/digest-e2fsprogs-1.40.4 253
+SHA256 2693aa7f92eea89a473e92977b9e7c806a7f8c878947fc5453492604545feb32 files/digest-e2fsprogs-1.40.4 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkd6M+AACgkQj9hvisErhMJAgQCfVtM+uCjhvR3JD6acmFxhcB6q
-xXoAoOy28Fpi1t1K8I3P6thD5Y1iHO7s
-=evCM
+iEYEARECAAYFAkd6PGkACgkQj9hvisErhMLgIQCePyCseS7UvoNlgEmYEHOUZjsA
+AIUAmgNBsGFhk2DX2hMijUnt7WsEP2fj
+=F8wu
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.40.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.40.4.ebuild
new file mode 100644
index 000000000000..e258c0b37c2a
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.40.4.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.40.4.ebuild,v 1.1 2008/01/01 13:13:07 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="nls static elibc_FreeBSD"
+
+RDEPEND="~sys-libs/com_err-${PV}
+	~sys-libs/ss-${PV}
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	sys-apps/texinfo"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.40.4-prototypes.patch
+	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766
+	chmod u+w po/*.po # Userpriv fix #27348
+	# Clean up makefile to suck less
+	epatch "${FILESDIR}"/e2fsprogs-1.39-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.40-libintl.patch #122368
+	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
+
+	# kernel headers use the same defines as e2fsprogs and can cause issues #48829
+	sed -i \
+		-e 's:CONFIG_JBD_DEBUG:__CONFIG_JBD_DEBUG__E2FS:g' \
+		$(grep -rl CONFIG_JBD_DEBUG *) \
+		|| die "sed jbd debug failed"
+
+	# fake out files we forked into sep packages
+	sed -i \
+		-e '/^LIB_SUBDIRS/s:lib/et::' \
+		-e '/^LIB_SUBDIRS/s:lib/ss::' \
+		Makefile.in || die "remove subdirs"
+
+	ln -s "${ROOT}"/usr/$(get_libdir)/libcom_err.a lib/libcom_err.a
+	ln -s "${ROOT}"/$(get_libdir)/libcom_err.so lib/libcom_err.so
+	ln -s /usr/bin/mk_cmds lib/ss/mk_cmds
+	ln -s "${ROOT}"/usr/include/ss/ss_err.h lib/ss/
+	ln -s "${ROOT}"/$(get_libdir)/libss.so lib/libss.so
+
+	# sanity check for Bug 105304
+	if [[ -z ${USERLAND} ]] ; then
+		eerror "You just hit Bug 105304, please post your 'emerge info' here:"
+		eerror "http://bugs.gentoo.org/105304"
+		die "Aborting to prevent screwing your system"
+	fi
+}
+
+src_compile() {
+	# Keep the package from doing silly things
+	export LDCONFIG=:
+	export CC=$(tc-getCC)
+	export STRIP=:
+
+	econf \
+		--bindir=/bin \
+		--sbindir=/sbin \
+		--enable-elf-shlibs \
+		--with-ldopts="${LDFLAGS}" \
+		$(use_enable !static dynamic-e2fsck) \
+		--without-included-gettext \
+		$(use_enable nls) \
+		$(use_enable userland_GNU fsck) \
+		|| die
+	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
+		eerror "INTL sanity check failed, aborting build."
+		eerror "Please post your ${S}/config.log file as an"
+		eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"
+		die "Preventing included intl cruft from building"
+	fi
+	# Parallel make sometimes fails
+	emake -j1 COMPILE_ET=compile_et || die
+
+	# Build the FreeBSD helper
+	if use elibc_FreeBSD ; then
+		cp "${FILESDIR}"/fsck_ext2fs.c .
+		emake fsck_ext2fs || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README RELEASE-NOTES
+
+	# Move shared libraries to /lib/, install static libraries to /usr/lib/,
+	# and install linker scripts to /usr/lib/.
+	dodir /$(get_libdir)
+	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)/
+	dolib.a lib/*.a || die "dolib.a"
+	rm -f "${D}"/usr/$(get_libdir)/libcom_err.a #125146
+	local x
+	cd "${D}"/$(get_libdir)
+	for x in *.so ; do
+		gen_usr_ldscript ${x} || die "gen ldscript ${x}"
+	done
+
+	# move 'useless' stuff to /usr/
+	dosbin "${D}"/sbin/mklost+found
+	rm -f "${D}"/sbin/mklost+found
+
+	if use elibc_FreeBSD ; then
+		# Install helpers for us
+		into /
+		dosbin "${S}"/fsck_ext2fs || die
+		doman "${FILESDIR}"/fsck_ext2fs.8
+
+		# these manpages are already provided by FreeBSD libc
+		# and filefrag is linux only
+		rm -f \
+			"${D}"/sbin/filefrag \
+			"${D}"/usr/share/man/man8/filefrag.8 \
+			"${D}"/bin/uuidgen \
+			"${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \
+			"${D}"/usr/share/man/man1/uuidgen.1 || die
+	fi
+}
diff --git a/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40.4 b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40.4
new file mode 100644
index 000000000000..5ec37d7d3bb7
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40.4
@@ -0,0 +1,3 @@
+MD5 124d744bdf9d443591eb8193c085944b e2fsprogs-1.40.4.tar.gz 4048867
+RMD160 053556aab3de6ffffe5ab5981f436d4cdf9d9dae e2fsprogs-1.40.4.tar.gz 4048867
+SHA256 2e1ece31b004ff1f4a26e5633e884eda11457b489bc854edaa0d7f024bc06564 e2fsprogs-1.40.4.tar.gz 4048867
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch
index 616a638ef32c..547befb3ec5a 100644
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch
@@ -1,13 +1,3 @@
---- a/lib/ext2fs/tdb.c.orig	Thu Apr  5 02:43:05 2007
-+++ b/lib/ext2fs/tdb.c	Sat Jun 30 16:13:15 2007
-@@ -36,7 +36,6 @@
- #define HAVE_UTIME_H
- #define HAVE_UTIME
- #endif
--#define _XOPEN_SOURCE 500
- 
- #include <unistd.h>
- #include <stdio.h>
 --- a/lib/ext2fs/ext2_fs.h.orig	Sat Jun 30 16:36:37 2007
 +++ b/lib/ext2fs/ext2_fs.h	Sat Jun 30 16:36:43 2007
 @@ -414,7 +414,7 @@
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.40.4-prototypes.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.40.4-prototypes.patch
new file mode 100644
index 000000000000..9bb4cd926a81
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.40.4-prototypes.patch
@@ -0,0 +1,27 @@
+needed for strcasecmp() prototype
+http://sourceforge.net/tracker/index.php?func=detail&aid=1861659&group_id=2406&atid=302406
+
+--- debugfs/set_fields.c
++++ debugfs/set_fields.c
+@@ -16,6 +16,7 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <string.h>
++#include <strings.h>
+ #include <time.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
+http://sourceforge.net/tracker/index.php?func=detail&aid=1861663&group_id=2406&atid=302406
+
+--- misc/uuidd.c
++++ misc/uuidd.c
+@@ -9,6 +9,8 @@
+  * %End-Header%
+  */
+ 
++#define _GNU_SOURCE /* for setres[ug]id() */
++
+ #include <stdio.h>
+ #ifdef HAVE_STDLIB_H
+ #include <stdlib.h>