Fix installation of btrfs-check manpage.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 26 insertions, 7 deletions

diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog
index 6a06ea76f5c8..02126ff06e14 100644
--- a/sys-fs/btrfs-progs/ChangeLog
+++ b/sys-fs/btrfs-progs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/btrfs-progs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.80 2014/06/19 21:05:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.81 2014/06/20 06:00:08 floppym Exp $
+
+  20 Jun 2014; Mike Gilbert <floppym@gentoo.org>
+  +files/btrfs-progs-3.14.2-install-man.patch, btrfs-progs-3.14.2.ebuild:
+  Fix installation of btrfs-check manpage.
 
 *btrfs-progs-3.14.2 (19 Jun 2014)
 
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index f17f26674b34..2ad2b08638b5 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -7,6 +7,7 @@ AUX btrfs-progs-0.19-glibc212.patch 535 SHA256 c9a1479df01ba8b74b97ecf723d7f2a5e
 AUX btrfs-progs-3.12-defrag-sockets.patch 2488 SHA256 78980701932c5d299852c374f8bfbda2360be40957fbc95860e76e174b7892b5 SHA512 713823535b9ebe8324fbd9603955cbe5fb0c93c60ad5123cca712cc90bee948819680790e14e27245dbbe18c05187c8a09bd69235334aca67a69913dd3992df4 WHIRLPOOL 1c0110b4c12630502f0db4bffe99de0a173b3abe1d3d80e0e8e31b909e327c2a9d50d8f8d6ea8ef6b6e68c625575d62a68ff881067fea55b91c00155bfa5d57b
 AUX btrfs-progs-3.12-fix-send-subvol-492776.patch 3099 SHA256 7a149637da9a35c31089cc69e4ad5d3f4beae9fe8f8d44d7a55b75394a6ad27f SHA512 e5d32a084ef706911464cb49c35928ce4a9f3ebaa580502c73dcfb74fa2e0f022bcc05e3fb6e26aa953fff78d792594b044cff342a42fa56a774033e6d59d961 WHIRLPOOL 1026b33cc0f45ae4a8795a81bc54aad48b9550efbde01425d445ae9fbfbddbeff5449cb431581eb9235a0201534198591d244e96c807896adfae3fbfe1624814
 AUX btrfs-progs-3.14.1-arg_strtou64.patch 4244 SHA256 47755268797b4eb5371f31e9a04b4d201726ffc3c0f9777226d9759286c2071b SHA512 26a26ab792632d85e00bc9917ea128c40ab694b6309fc839c9a60b7f3b0ffab4a228ade6a9e35ba75ba615b05c9c64fe7c3b238acd66a3ac41e811b8f143f6c6 WHIRLPOOL dc48412c8d9e99f2cd5200d3e9be1311cfce193d461902b8e45153cc46c0f457adb0c7beb9aa19b7f4c0b84ef80d3872970d1c399521f92d0e499a7bb52d7d0d
+AUX btrfs-progs-3.14.2-install-man.patch 451 SHA256 95245d802fb3d69e027b9f1d08afcb04aa5877f7f713c7ee820d68bf36bce3c8 SHA512 75e232199b0fc79e622cd016f6a6adaaa6880522cde78210b805813ddd57f1fb546eb8cf31f65fd79fd73628bf9d56d0a98ad2ca32661e0320cdac200ee4b171 WHIRLPOOL f0fb586ae46969d245d2a27cc3e7fb19f6581e4a1ba6c943f97f8483677ddba13e5da91d0aaf8ffada464c7a318c914a26e511d944e826694cf987c380c2885c
 DIST btrfs-progs-0.19-redhat.patch.bz2 21699 SHA256 36e581ce32aad7119195a0f5c47d3007d38b3520b92ba3c825baf22f35f17723 SHA512 a3a9809548b61fcd25336789952d83d53a9ad1d221447907b85acd43a68518e3a746de3469bb917f51a49024b99bec1b9e1a46014b460ed8000b3919e3d444a1 WHIRLPOOL 3c33b0a2283cf55d3399609ebeb407567cb3daa60fcf01476b5acd22dd9fb1af7fa228a66d9ef24086543c9383a107811846c741feff503169561de6ef2b06d2
 DIST btrfs-progs-0.19.11.tar.bz2 171425 SHA256 b4b510c4106a5b6159f2e51ac685ca700d53693140137e45f67e3767db18b662 SHA512 3704f240f7128bff8c5fc1ce7fd44b4eb985c1cddd7139fa96da0536849bdbbe9b08bbd928c3a20e91c5a0ccd07f60020f6dacb91a6887c2fc73de668477fa99 WHIRLPOOL 7fa6e7fb5566a17bb147ec847f6c1a3a55814a5676b1bf413f9b310de503c5cfef62b3e4b86a4ce28f7ae905416fad44fa802fc75c6cecd51265a9f69cc6175a
 DIST btrfs-progs-0.19.tar.bz2 118119 SHA256 f8a3dd03e87a33506d16ccc1e5a77c4c38ff1fa84b9502ed4b88c0b39fab70fc SHA512 f0978432b524f307302d80e3a904684c21b6549f0b444f51a17f1d6f0a3dfebfc39ef185c3431a007fb354218aa7027e665ca6a3c58267bb8d0905ae34dc7b80 WHIRLPOOL c11134671eab375b51b190bba9583d7b064486563bdb4a19bd16d27ce7e1812a2b3ab4efc3cce0ce19a60b0d50d96f3110c39ce770cd9535bd839378b68e0be2
@@ -27,15 +28,15 @@ EBUILD btrfs-progs-3.12-r2.ebuild 1352 SHA256 aa54631b74410214e3e66c0f1e9bce461c
 EBUILD btrfs-progs-3.12.ebuild 1245 SHA256 8f801a7d5de7b9fffc6f312618a5beeec25d4475d3671faf0a288f757bc22086 SHA512 44ea5d9cd347badfddcbc06298634338c0a492a15083e2b36320de905f38a1c912fd30c37878ff3e3b8753f822a15f2b61b008e5759ca4e5b97cc1935146e978 WHIRLPOOL 7a441dba6b985cd41202256f2fd07d16952244c451bc381fa69a0ab117f3c6587685af755d1ae4958f627715ce5075b736d391631e6b17fc5a055401ab0f7502
 EBUILD btrfs-progs-3.14.1-r1.ebuild 1297 SHA256 19770b96213d3ef8cf7b54924698c183ee76b3e45d94f40412ef60e21c73bb2b SHA512 61c0a4b5c26698371c76c9ca502493687d190e28cc2c440eaca16c3e77229fee192645d854498bc3c4476988e3c2483c3e58f075de98e354e83197e63662aec7 WHIRLPOOL 733e4b07334c2476fe7e3ecadcafb08326bf3b918f6bbcc101eec3ec9f10b835eb70a8fcfa036a5121f8644d4d73c9ce6e041274846a1ce8ebce74b6edd535c0
 EBUILD btrfs-progs-3.14.1.ebuild 1248 SHA256 a125f1df1373fc9f265408fdc00d78ad7696e2a8802002420e6da661e9664872 SHA512 bf1e23362d998c46cc32b34b01727eaa24de60f21768e80d047e31ae1605cc11b359ff4d8fbde42f75efaea92023329fba671da9e5d7b42205abc6ed3fd5f994 WHIRLPOOL 7537764f73d37209ea1ac4f12afc493b330e2cddb59bafacc80e522af67a7fb60bf3c5d5c09fd476f541705cd92c35ff7bb0ced01f62393fc2539ea5c0800f3e
-EBUILD btrfs-progs-3.14.2.ebuild 1315 SHA256 02f867c2b00bf406f4cccd296842f41acebcdb43667fe020e1bcb6f212f9bd19 SHA512 517f20e3e300f7d8cbe5ffb3d0b4da75d7a003be2b906929575da218aa9dd73d6f238942b5a9b7d881917f16f81bbd078be360c0f657cd104a9dab731159163f WHIRLPOOL 577f95ef2e8b2fc2efbc8d945f1e76ca93237415225b4121dd2e4495a95f05f1f626b3e499b7e6f90d4977c4602765f7b2768a36e6ad139a220141185ea42e72
+EBUILD btrfs-progs-3.14.2.ebuild 1368 SHA256 6e04120f723c3e124e1ab4f24d8b111415d63e69eee85110a611796dfd1367af SHA512 9472bcd69598c25ce72f47e9ca22aa66862bfa728462cc5931f2e2c8855b730044823cd8b305baa538e803c2c0c4be23a54d52635db3f447995b125b49a4f2df WHIRLPOOL 8515dd9efa5306e1132db59abc7697984e96f79dd0b82ae20fe672d0e2e10fcde91038dd3b71d8fe48ec6dac90cd1060c8371f1215a28e66085fd38e8990ca0c
 EBUILD btrfs-progs-3.14_pre20140414.ebuild 1332 SHA256 828cd875d6efb2dbdd946e05c4bad0a117b4a9b6af99ed1edb18733485c0b72b SHA512 a699c4309ee30ad07157bdda5a1428f7ac48ad77f0a0c0438eecd6f95fe45bb41bf25918076577af88a2e7109f642edf4565727a441bcb39057064da396914c1 WHIRLPOOL 7b50e18d93c22a650b943e6e3320fd5e5423a648f769838570a800da62b8a6d6fe97397b2ab92c190ef1900ac2bf83fe9691027e322af06c80215995fea09652
 EBUILD btrfs-progs-9999.ebuild 1314 SHA256 7e01c3ffc619a97587012edb6058d3dd35aef0947a8e50d301296862773a89cc SHA512 82f9a59a04507c11f8a6894c62dc2029947b921f53ac5aac093ad8c5658de87be404f7f1e6dba588fdc800feabed743332b398b4a54ff5a35cbccb8a16d88070 WHIRLPOOL 312dae44110ac283b10ef61f0fd9a5620fca1028616249b10c5b8ba323f03885f97a88074e9a527b78389e15b9cc9709faacc017287b51f7dddba3e747dd1d39
-MISC ChangeLog 12408 SHA256 8dd72a4f52ecabe87a5c5bc1801f4715e4c98a595ba33ea8cdc99a804469907e SHA512 d4018b0e216f6298a01411d81035aed856abc21b7348378502c5094d59591d083589dfe09ce894326ebecb9fc81bd131ad7ec2cd784f901b3374244f70311041 WHIRLPOOL 1f8b3050b0bb6a7e539d808c6a48778e16972d94052c2dabe01540e42c0c50cde35202b91c31ec7222e1a82d34acbbafe8d38401bee94a71dbf028352bbe8cf7
+MISC ChangeLog 12575 SHA256 d713bca4911bf97975d4f1de76601561c3e29f6e5ea69d60a274025adb0127d8 SHA512 b60627f31d12dc9ac08d5a1d933cbf85fbc2c87cede0b8cffe0502155b914b08a65fb0c9ff6d05d38ed77b9bccb44b90a60cb979a7f62d824d5c5c8e40bf5e0b WHIRLPOOL 17126e6186b73345e7f8f092b9c843427e541987f2b96baba729584525bd2340e8e7f9afe40496265de6010304bbdb7f53784afb9ef2761978f59b9356e61837
 MISC metadata.xml 432 SHA256 45049c27e84490ae5258d3beaa9c6defe80360aa7f03733da492fd38d026a5e0 SHA512 1dda7aa3a62062d6b42579efff9468c08fcca001b28e180c8257291332ac1874f749a19a4053daec072d7b878c13873557f05d82ad42428f105556c4cd304460 WHIRLPOOL 970b4a981f1afbe87ad4240fc2dd5ebfc4bb134a2e3c188519ecb6a87d230b196a902381de3e6346855e68c6e92f883c4d6b4aa01bcdb090e2de8f230e1cecff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlOjUJUACgkQC77qH+pIQ6RNJQD9EwFIgFVEB3wBsgWf4WMWScCp
-HaQb3xDvD87Pfrdr5dwA/jPsbruXzuFc62ceiauWYhkQJ0gsoY+qTEUUEuD7ZU8U
-=rzcn
+iF4EAREIAAYFAlOjzeoACgkQC77qH+pIQ6TJkAD/ahj8xKSJd52qa6rZTbzwaX4n
+ecMSvk6D1C8iy0NDnk8A/irV127x8sNcQtYSzOEJf25562SR9oM1X1L3tJhGshN5
+=F0Xy
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild
index d80d44288b2a..47499a7201fd 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-3.14.2.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-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild,v 1.1 2014/06/19 21:05:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild,v 1.2 2014/06/20 06:00:08 floppym Exp $
 
 EAPI=5
 
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.14.2-install-man.patch"
 	epatch_user
 }
 
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-3.14.2-install-man.patch b/sys-fs/btrfs-progs/files/btrfs-progs-3.14.2-install-man.patch
new file mode 100644
index 000000000000..69e36aaadeba
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-3.14.2-install-man.patch
@@ -0,0 +1,13 @@
+diff --git a/Documentation/Makefile b/Documentation/Makefile
+index 034559e..f461bf2 100644
+--- a/Documentation/Makefile
++++ b/Documentation/Makefile
+@@ -75,7 +75,7 @@ install: install-man
+ install-man: man
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
+ 	$(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir)
+-	$(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)
++	$(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz
+ 
+ clean:
+ 	$(RM) *.xml *.xml+ *.8 *.8.gz