Update "dont-put-things-in-root" patch to build properly with USE=-ntfsprogs (bug #538230).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF

3 files changed, 25 insertions, 18 deletions

diff --git a/sys-fs/ntfs3g/ChangeLog b/sys-fs/ntfs3g/ChangeLog
index d05b20b9379f..1327c7c84159 100644
--- a/sys-fs/ntfs3g/ChangeLog
+++ b/sys-fs/ntfs3g/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/ntfs3g
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.160 2015/01/29 08:20:05 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.161 2015/01/30 22:09:08 chutzpah Exp $
+
+  30 Jan 2015; Patrick McLean <chutzpah@gentoo.org>
+  files/ntfs3g-2014.2.15-dont-put-things-in-root.patch:
+  Update "dont-put-things-in-root" patch to build properly with USE=-ntfsprogs
+  (bug #538230).
 
 *ntfs3g-2014.2.15-r1 (29 Jan 2015)
 
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index 9a1f0c9c5d58..efbd76b81443 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA256
 
 AUX 99-ntfs3g.rules 51 SHA256 912165f71bbcae4753cd10a74c78bfd98e49bd9adbf80b96c39fc6738b12d463 SHA512 9310dd1dceec9a6252d3e8b95a9a1002c84a6f077457892eefe1255c85557041defbd8dcf6acef86285b45abd8bbe85822dd59a9e4c307bba80dd2c17f971851 WHIRLPOOL 9a0439ceb3bb1f142ee1929c03dab22066fdb3dba85c216265f6f10f3e9e2416beb4f3a73c8965b621b8d7b34c467a81628b6656f59e4c51e9fd529007f7ca27
-AUX ntfs3g-2014.2.15-dont-put-things-in-root.patch 1603 SHA256 49533f7afc92b68194af50d026f5963dbe7065eb4d771b9d03eca9d5fe803ed4 SHA512 c5e501ed0b45f45013e15b2df6b345d8deaa8ba32e7792304aec2ff32fb0c799bfccfe951019708ae7681c4353d79c09fcc5925da8d9bfd008c4c01981be90dc WHIRLPOOL 91120648217506fb9cd15ed40e2569452c6e16cecd60f32a441817a9bbb33b96fdcba57206f55dfb54e428463b6773e91be7ced14408a9d8e5f71fc440992828
+AUX ntfs3g-2014.2.15-dont-put-things-in-root.patch 1678 SHA256 123fc496de097b4a774e79ad6e32b8ba81477b1f1bbb7d016f7b1dbb08d93ac2 SHA512 eee374c2e1af73e421a39fbba05bbf3fcddd7c3124b667b33b304dff01f62b375bdda12349e8a685005285f0323606fd1ce8b7e778f915b623639ae428ff93a5 WHIRLPOOL 1ba855bf70017d1f2e84028fc156c6c7ba079657da00568ef77739db0599bd0ccd9afffea05c98424eba61e80ffd0931a55bd5abc5c907228395e339899d6dc1
 AUX ntfs3g-2014.2.15-fix-fstrim-applied-to-partitons.patch 6124 SHA256 8ae05ab8729b5832776e753a89224d603be1b4d8c18578ff8f886d4814cd98aa SHA512 e85ff66757465b4090167c8f12d72b3ee4c003502de2f122c418987e6bdc0366288e9bc674625964dca5e17b4511fc9b89b0c2f8653401f490a1889d008946da WHIRLPOOL 444b6339dbe9b74138eaba7b10b4fde539068f7a3e7993c9001ada13ba8a8d4fee3f870692f3af41c9ff31244c1b3127efa38222eec32029352d7d6a60ff29e0
 AUX ntfs3g-2014.2.15-implement-fstrim.patch 18171 SHA256 fc9ff216641ffd43de9442b4341fa5f73ef2cfbc99b7495a7139b31c42b42f5a SHA512 8f8a3112c864b72540f4d581fab7e68c7c5b2fb5b11865e6c4ab2af80630891fe086480af15fdb820ac54e327e843b6f8a854da257ed5ac9291b530e83b981f3 WHIRLPOOL 8bdd4e315dfe09e62fa932a46055c5adb090042fd533013fe937f3486e87b657d39818580d38a2dbc22d7c4f9f76102ced6ae62d9c62216fe9718028831175cf
 AUX ntfs3g-2014.2.15-no-split-usr.patch 1322 SHA256 3fdd9b2947e1ded82258a86d55d481d641613d8ff916f6eeacc6c0e68042beb8 SHA512 232a1a7b84339c86758365564fce2058c3e652f833c6908245aa5f6f0e91d5c09cedcb978a1ebe62897c7288df4fe8671ba7085af403056742d897181e479e05 WHIRLPOOL 733bcf75833bcd57f90fc69e55e6b4698470d92c4494cc4a567ba8b4ea562437587d13a1278b766f77ff16097057e3a9a0abfbb131466957a5d14bac0f3f37c9
@@ -12,22 +12,22 @@ DIST ntfs-3g_ntfsprogs-2014.2.15.tgz 1143575 SHA256 4c3099400cb14b231a3c9d718b3a
 EBUILD ntfs3g-2013.1.13.ebuild 2434 SHA256 b8c975febe41bec165ebd20ae039053c399e9de96ea9797a30d50b9950f023dd SHA512 a77afdd789778b2fec5c1dcb43780c738ab0f2c329c829fa3d2b0c8daaaa104255e019e9c8dcf1e053ee98664b24f22355a0d636deb8af1cf1dff2df8c0353d1 WHIRLPOOL 9775e88ed92cbb6f946fc354c48d303825252b56bf3f19d1a814388131d2093f67cd148cc468c9fe3c4380b208b06b6e3c3662180f7b04c5648518203f754121
 EBUILD ntfs3g-2014.2.15-r1.ebuild 2292 SHA256 1e0cf3002e1489b72d8a0a2975febce794c000ca2476370e4fb6c75e9510060b SHA512 288227dfb5f25641386bf18cc8e72917b904df71692a77bf0a232b717d0a2b140960b17ddbff0568ceac6d7e8ae3823c3da86b949da824e67c989a2da9a6f090 WHIRLPOOL 976933ecd9b74acf6ad062f949f857e04341edc6329290f1879ddb78c51bf23b58ef1ae5c7893e093cc338d05d4f22894a2b449797814b1b6ab0f9fd929736ac
 EBUILD ntfs3g-2014.2.15.ebuild 2465 SHA256 c6907ae036d3d5b677679e65257f8565d24d0e67cd52161eea43e49480170fd0 SHA512 033c1a0d3c1451ec975d4bdf4545e65301b73fc63095d5f9f351e1496abe01742fde0395079a695c7f2c72067d72e1d835f2666929677c38a867a267a154e5e7 WHIRLPOOL fdec6680ef3ab770966a5590d24db6bbf153eb521c06b37d402eca307a0b11d55678da846ce1fad9f9fcd079800cab1aac292f8640791bd636e6473b62ab8645
-MISC ChangeLog 25543 SHA256 58c8244d07c3c932e4ebd291f1235eae80ba0ad69974b02f8c62cbfd4f1e7e15 SHA512 d1ea2d9df1fd77bba306c59980216af00c9eff1de1ab848a6e146c6363b9160f9b428e5b92bda89a3a8378928dfb1a5aef7b895dc5af5c31ee0220c136afa1a8 WHIRLPOOL e59542c5c2d5e3dde12385f51d627ead43b769012c1ad66aa5a9929e8fa18b213d72f2886caa43bf86d76eb574805bf3562d7b3fcd3b07ec0ac6081536b1f216
+MISC ChangeLog 25748 SHA256 88066f98c809e9e18edf3149d90218820131fdef44bd36156673aadacff7bb13 SHA512 3f23f9976132f7f41a0602bb3bb23a775b2865e2065c396291f5c5a537ca2ce26b1654748a4dcb97e92b87fd55424b4af3ec70abb805cd7fcb81fc9c2ec41f9f WHIRLPOOL f5a2f6e2ffc6fd1efc3f948675e100e4a4211264e9b28e2e42be406eee87a6129590d7cee15e413e4c39f6616590db31f1ed3e640c233529e0b7c5ca0538eb17
 MISC metadata.xml 1162 SHA256 45be03e4ef0502e7ea46ece5b46380736f480af8e84e93c87cb26b05c052207d SHA512 6f35bc78044bce54a53834b9c95a37861386b8071b8d7dcfb6576deacc5788077bebd9d7ff5578888ba9f1b6e7ae47a8d04ba970e2441624ec5c4bbafdb39312 WHIRLPOOL b12bcd6a0cc88b881aedd8df7694edd1c655661f6b7fb7d27579da1c2e047a491f11bd96f69caf07161aa1dbb521be1d258de7211fcb8f4315c618d740492ef1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUye0/AAoJEHy/RO9cNQiDNtUQAMTSP19+0jeGHf3djj48KSFl
-FW1zT8gWsxhgIxwd/mXNWHlpgWromP7jZKK9UoyQKx6EVcwXW+P2baE8aexh8w/b
-Jpy0yq/9ICxrVrmv9445ahwNaMMnyTo3wB9jght5s14p6STytNO65qqIPMPyizQu
-z1CItGPr+xLBoxJiH/bFokzt44z7LD+rs3cZjf4aLiYcxf3kkx/cx+O8X58tJ4Cy
-QkYSupNKcBUN7BbBJBPmB9DZYs9hwcDrhTYqdU9x0E+cHshjh030OrI3ChCjCmkW
-jhMldqZR9odnE7Cu1j+WKJ7ZWtCyyqnuIKIo7ie/qPTqw6V/Z5uU2QWWffrUcDko
-OvwbyloNhQiB443/rvju/9YHSpJaARdV5Lmq0gntwHvW4GPbFKGFzBPbB0mXTJDb
-tlp9dchOWqmaccwEB/6MIQ4PCCpU+zV/l3ONpUQ3gOpzU5gYZiP8tGSMbvOgtwJJ
-n0plEfzTgU+/yNGJaho35n1vHZ08nWl6QcK3A5XxcfsglClCqmSU1akwF4e2hv5K
-jY0uO9aMDPFnrBkUzPFQGXi+Cm9vOf1nRmPHUToeN/iQRAQcSdnsbaBjDaWJ9HjA
-M8SElJRiHVTR7RuoAQ8WWy+bAxt9OP3E1+IaCt+ZbMkZtPIhKzML39A7SsdfQXzN
-7rOsGUH46yWQYZVuJs9w
-=WOzY
+iQIcBAEBCAAGBQJUzAEXAAoJEHy/RO9cNQiDTiAP/ilQsvGdpUrr7yGW8CJTogyK
+JmuqlfDAZ2c1s9OCIXB7JyX+7Yt4klifdBrOYs6ZHkmRQEBHlFjqHcwzKl1RNnE+
+lsnly9c5B29/o+MXBSzoNAMCp7Slr0r+9Yeh+at3dzkyAi2U8zyRWYYkXCb6uXE3
+D8JGItoCMZqCCPh/K/UUbOq1/D6cwf5r8sTff0CuRjKEtlPb5/h63QM4cj61X0B9
+/Uw/kDEFQBmLbpWqCXAEG5b/1LLSZSSzKohY8hIk4WHZg+Rjn5Ns0fbwpepG0tMB
+9vq8Ky4OAOnosjzTY2Kc3OUQdWMNoigf/Nx9uiUoBEB51Gjr07uUNzBkrLNGDkHh
+bDturuLv3kkcXsRw34AOlv5QQCnGREXBvsw7LsSeQOGAZYhFCUjzk+HT9VYFDzUk
+1MTvnaqRvoDqJuknsm9MRFHqVj9KAF8lLqzbWjLqD1sQVdTCiVia5K53bR92nlkZ
+L/K8wf4iZsbzxUZhFCcDeJkA3bGzU4uRTrS4ZNZX2KepHyovPH7s8d81L+2ZLkFJ
+/jVqDoSUpUN5V7rLx4+8TfXM1MhWvR4GxMU0D3hYIzI91Ojb4ujpobc0qVGsfm5E
+4ABQeKfohkvDYjulQjRrFii/tGfqhZ7CpuSSLxAzK9m6cR1j7Ult14Lmq0A1i7uG
+aFLoOYAncL9rUeNutkW4
+=EY4U
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/ntfs3g/files/ntfs3g-2014.2.15-dont-put-things-in-root.patch b/sys-fs/ntfs3g/files/ntfs3g-2014.2.15-dont-put-things-in-root.patch
index 66551f1e4ecf..2444793480b5 100644
--- a/sys-fs/ntfs3g/files/ntfs3g-2014.2.15-dont-put-things-in-root.patch
+++ b/sys-fs/ntfs3g/files/ntfs3g-2014.2.15-dont-put-things-in-root.patch
@@ -1,12 +1,13 @@
 diff -ur ntfs-3g_ntfsprogs-2014.2.15.orig/ntfsprogs/Makefile.am ntfs-3g_ntfsprogs-2014.2.15/ntfsprogs/Makefile.am
 --- ntfs-3g_ntfsprogs-2014.2.15.orig/ntfsprogs/Makefile.am	2015-01-29 00:12:51.786936314 -0800
 +++ ntfs-3g_ntfsprogs-2014.2.15/ntfsprogs/Makefile.am	2015-01-29 00:13:59.156442369 -0800
-@@ -140,8 +140,7 @@
+@@ -140,8 +140,8 @@
  # mkfs.ntfs[.8] hard link
  
  install-exec-hook:
 -	$(INSTALL) -d $(DESTDIR)/sbin
 -	$(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/sbin/mkfs.ntfs
++	$(INSTALL) -d $(DESTDIR)/$(sbindir)
 +	$(LN_S) -f mkntfs $(DESTDIR)/$(sbindir)/mkfs.ntfs
  
  install-data-hook:
@@ -14,13 +15,14 @@ diff -ur ntfs-3g_ntfsprogs-2014.2.15.orig/ntfsprogs/Makefile.am ntfs-3g_ntfsprog
 diff -ur ntfs-3g_ntfsprogs-2014.2.15.orig/src/Makefile.am ntfs-3g_ntfsprogs-2014.2.15/src/Makefile.am
 --- ntfs-3g_ntfsprogs-2014.2.15.orig/src/Makefile.am	2015-01-29 00:12:51.789936248 -0800
 +++ ntfs-3g_ntfsprogs-2014.2.15/src/Makefile.am	2015-01-29 00:14:00.570411008 -0800
-@@ -68,9 +68,8 @@
+@@ -68,9 +68,9 @@
  
  if ENABLE_MOUNT_HELPER
  install-exec-local:	install-rootbinPROGRAMS
 -	$(MKDIR_P) "$(DESTDIR)/sbin"
 -	$(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g"
 -	$(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
++	$(MKDIR_P) "$(DESTDIR)/$(sbindir)"
 +	$(LN_S) -f "../bin/ntfs-3g" "$(DESTDIR)/$(sbindir)/mount.ntfs-3g"
 +	$(LN_S) -f "../bin/lowntfs-3g" "$(DESTDIR)/$(sbindir)/mount.lowntfs-3g"
  endif