Remove old.

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

21 files changed, 57 insertions, 894 deletions

diff --git a/sys-fs/dosfstools/ChangeLog b/sys-fs/dosfstools/ChangeLog
index dd6ba7f8617c..93b109e6a800 100644
--- a/sys-fs/dosfstools/ChangeLog
+++ b/sys-fs/dosfstools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/dosfstools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/ChangeLog,v 1.149 2014/07/11 11:32:27 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/ChangeLog,v 1.150 2014/12/15 03:10:28 radhermit Exp $
+
+  15 Dec 2014; Tim Harder <radhermit@gentoo.org> -dosfstools-3.0.22.ebuild,
+  -dosfstools-3.0.24.ebuild, -dosfstools-3.0.25.ebuild,
+  -files/dosfstools-3.0.20-parallel-install.patch,
+  -files/dosfstools-3.0.21-parallel-install.patch:
+  Remove old.
 
   11 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> dosfstools-3.0.26.ebuild:
   Add ~arm64 keyword
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index b3cdd26f774a..cd42dda4835d 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -2,24 +2,18 @@
 Hash: SHA256
 
 AUX dosfstools-3.0.20-name-ext.patch 930 SHA256 4ff4c24840f98fb033a9b20e47e0edbae75a4d708a112381ff36cd44c609574f SHA512 faaa3de7446c142787af007eca0cf1f18da1f6de48944825dc85f083777f2f41e7e68a20edc3f8cefda79b1bf85482033b03cedbf34fc30add0cac24318b6c60 WHIRLPOOL 3ee5d103c83cff75e8b7463e5f5d64c9509483947253bafec421ee2ff01854ec0c560a1768fca9b9a5cb0cb1f18acad245677c36056d255eafd01c45835263e4
-AUX dosfstools-3.0.20-parallel-install.patch 430 SHA256 b4d6a5759a08faab2eb5f3af9e8b6a229cfedc482b640e0ecb517c65935501ec SHA512 17c26a2da5f287d897911ca4b1f31f9ba48751089725e0036cbda7560442eb538e1fd3fefe314caedd9695c30044d3006a7fcd272808568cf8c9d3150c97d8f9 WHIRLPOOL 7bd098b0f246c963ad5d46d67641dbb23b07cc809d92b532ea39701a6e8027a6d65a1df2c68793c4dcbfafeb44506ba1648f20c8bdf9e4c74cf77c7ea1e7eb99
-AUX dosfstools-3.0.21-parallel-install.patch 432 SHA256 18f0cd7631647ed6322d91115ec0b88db72bd9b4b48ea2cdb90c6453efd46997 SHA512 06fb2fd35f3f6917ff075d72d6e2bba0c5101b0c46acb5efc95fa5391d89b7cb5c4ecc9a53a34188ccbc019eca786df812db2612a67e993e77544d942d0cce25 WHIRLPOOL eed4736315310b5c67b8d93adfdb37caa56f8f23a0300c39cefbc54682f00fbb7e44a254bce420fea8c7d982ea7a8bf06f57cff456c387ab84435540e2b4f39b
-DIST dosfstools-3.0.22.tar.xz 78236 SHA256 7e8390c290d144e1315523097159ed0dbb42b8f9b3ae1a5501d33b5e4b8a732f SHA512 2840bb8a0b1bd047e03e2d2b46bbce9ad4af58d719ad15d45d306ae2b0800aac2578974474543ff30aa7f01dbd9fc6ebddf34f2a23746da98b1341f3627e2d67 WHIRLPOOL 2f7ff1cf2dc31cbcde78747fe9648076f4f0f2bc8dc69691e844d4efc9f9454663e677fe55836470924361cb60d21a0e8f596765aa3fab713892e83654072e9a
-DIST dosfstools-3.0.24.tar.xz 78148 SHA256 1e21b7e7c8872fb3debf2a7fdc8c223a5f592a6efa8ae181a92f558ed28274c1 SHA512 9e75e3868f42d4cb404998e8a0cd7d3bc7fe4fc0cf68559644c960fe73e7f0eb67c26ff169085c9e1858e5402efed813b883a5f3682aea29e4d0fc9c9142a006 WHIRLPOOL 8674e879a7acd65f8fbf9559aad2652ca1acb4d02929defa3d1e25e10132c5fa7246acc009a471278d335571d9f6ff38edecafccb37439c8b65404178e232f81
-DIST dosfstools-3.0.25.tar.xz 78396 SHA256 1d4912860e88fa829314c7824821b502a66460afc5f4bb963dd149e9ee430320 SHA512 9ff954fb7bb99d430a132add517afaba75a34e9d54d1afff1aa63e2c9ded16b50d89aa3da3bb8b24a03b2a53fc10c800b66bf121ada5e1e047a99478efde3014 WHIRLPOOL 9c5017f9b979ceae5af6bf9cc10b7a3fce735ad884ba8079a9c7e6c9200f4219f518c2b76792b56892d041b7f70ddfd1d58b8d104ea79c6b20245360816e7885
 DIST dosfstools-3.0.26.tar.xz 79196 SHA256 468442fe8cd93961047d5cd67f7b67793126575103a67cd131330512b4893e75 SHA512 52b04950268ed4750d5c4d61b613f0f0e9083e91301499b8bf82efd125c75ecaeb444fdd682fa11ec1ce525d32a70937f621430b9995ea920f14d7b35a07b4ca WHIRLPOOL 6a581e8d0fef575c76330a69c063f46bccc7cbc673247228f7b4565e381cd93d7b847ff9afe4ed4c4318a86d456a65829dea2da3016e786c34e3d0f32b0ea399
-EBUILD dosfstools-3.0.22.ebuild 980 SHA256 2f104ae8e371172699bd066528d82a52d123902e4a570581d89c096c3b662b16 SHA512 e1de257bb7c309429630fac0fe54608e78c6bf97a639d41dd1c94ab0fc146be34980de8af4113f03a04120ca9c115cfa60f177c975e6b8675cc346afd62c638d WHIRLPOOL 95ae00d704b6b423cf1691e54acc23cb5aee0974930778fbaf6ea228014a518284f8416dd8fbee643ca5149b14047085565ac06806eac7a50bf932f01d3876df
-EBUILD dosfstools-3.0.24.ebuild 939 SHA256 9817ba136b94708b1ede155ea2ab166400484d1f42d0406282aa6ca4bc0cb4e2 SHA512 d5d962bfc18d4b25ab53c8e85959e9db8c6303ee319ae6f8fdf26549919f9700dca7ad121efb2ee0a70896ccd10b1dc1a702259d5f3d00162e63d9b54947dc08 WHIRLPOOL 042ea25cc7609ac37df606da61274ed03bababbd334d1978e1f0665a5651dc033e0dc0b4793e449054b6bccc3cab93564660a2086a15dcdd41e269445da0f0e9
-EBUILD dosfstools-3.0.25.ebuild 939 SHA256 b50c6e14f354d8df5d55bff9080033ff63f606b9327e8dd2cd1ed7b3ba72285d SHA512 e0bc0689011f427f4e36fdb24b6122b7d7533d8cd70f84d15b9ad35f078e66c7d65f91e6eddf74b86f01cffdde67be33b806933792f22aaa51def2cead85335b WHIRLPOOL 683bc88ceff96d73b7f50a4836e4ed7d568e28d17951b83fbc5cae82a308cad125bff0e5574d564b942df7b8a345112fd2f48d7e79b513b10bd50102f1888c32
 EBUILD dosfstools-3.0.26.ebuild 936 SHA256 045cff39f0c1dc7ad063f3a62236e27af70d91367603dbd327eeb139515199f3 SHA512 e19f6bf803a7adb01d6091f79afdaa8d8dc93fd276ad91b861cf7e87e138d3ea9f5ef270cd246eb5793554f30d38e498198b9ab3d1ccddb623aeb16a9dc7b8fe WHIRLPOOL bcec9572aa001b148d43cb2b2066dc1b1f0f6ead96fabb236a991bcd4f163a82cc8d341b1ce3c86d977ce74dba53c8d09866f146a176162eef56c29c2ee49f4e
-MISC ChangeLog 19801 SHA256 367ed3469229ff407b856b517e549ac0cb8e498e6309fadd964a4a5f0149c3b5 SHA512 86fe701e38912e1b63621893bccb68e1edb64de1bf372391aa4a73a000e295fc0bf4bea5b51dd7c411acec45a5426d060bc7f30894d3ad68f33b6e83c8d275ae WHIRLPOOL 330dabf59f5997a03a13b115b7aa8cd33d998c486d8c1babda309f479094991278097b45990a4f7f161d56c7c5d1ce78fd39381b21011b7ac97b4d2138fb6492
+MISC ChangeLog 20052 SHA256 099f027547a7b55d2c73297e3b30af50c0b47219f90223d55d1ec6b54425a61e SHA512 b1c99b50d13dc55bbcccd000a42ff01274a294a8701a40346e13d732c9bf7b2068484bada1e506ed282854f81bbfd740e25ec081eb893148bc74cbbd93c4efeb WHIRLPOOL 4eae1ce39425e5b50f76a393f7cf61ea3d37f38ae86749f23b20112e68aca79b1d6065bbc2ff0ee204ad6bd09e2422742e7c344ef6e07e6d10c10305b56e6463
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlO/zIkACgkQG9wOWsQutdbi+gP+LK/XV3HiZ4DIth9/sY6sn+tA
-jVSd6oj5pc7/T4bDDTcph6mbCCygyv14VqSSJTFDAm3lJtQ8t9Fn3zEvE6BlJ3lq
-BfTvsA8/3mYETgbwxVVDr+m6REGg1QMqoY+MttEVODSxpHWJgc3f9VM80HzNMGrF
-uRIc+Lam9GHwtRqaXzg=
-=3+xc
+iQEcBAEBCAAGBQJUjlEvAAoJEEqz6FtPBkyjCIUIAKr/9e4fjW08Dku6Vm1DTsXJ
+3NZFeyccW84aePUZSEZ/ia/c7i7IAiTCO+q5akYxI9IXiZHcxJFenqpjLJ7TBVub
+yywRUvw/C1XRpAr5xVYA9qwy0vh03Gczo9juE5ETLRkHgSCXWxMBuTFLVeiiSUaT
+E/Tg23I+34ESILZY9273p7TT5i+dXjSTy3bK1AUPHUBCU812O3QyXPpiNsLFpGq0
+YrE5hALPebHevKxAP9A8KGzFC9tPAIsihuETw5hvQWKMqlD1KctwUGsmE1ui/bD4
+yl8kOndMTWSP4WWn2G7wCh2jL2JkZfNtpcM7kXRhMtuV+qwyXj6VohI1UIYN1hs=
+=gCsw
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/dosfstools/dosfstools-3.0.22.ebuild b/sys-fs/dosfstools/dosfstools-3.0.22.ebuild
deleted file mode 100644
index cd5c7c67a759..000000000000
--- a/sys-fs/dosfstools/dosfstools-3.0.22.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-3.0.22.ebuild,v 1.6 2013/12/22 12:45:46 ago Exp $
-
-EAPI="5"
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat"
-HOMEPAGE="http://www.daniel-baumann.ch/software/dosfstools/"
-SRC_URI="http://www.daniel-baumann.ch/files/software/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-RESTRICT="test" # there is no test target #239071
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.20-name-ext.patch
-	epatch "${FILESDIR}"/${PN}-3.0.21-parallel-install.patch
-	sed -i \
-		-e "/^PREFIX/s:=.*:= ${EPREFIX}/usr:" \
-		-e '/^OPTFLAGS/d' \
-		-e '/^DEBUGFLAGS/d' \
-		-e "/\$(DOCDIR)/s:${PN}:${PF}:" \
-		Makefile || die
-	append-lfs-flags
-	tc-export CC
-}
diff --git a/sys-fs/dosfstools/dosfstools-3.0.24.ebuild b/sys-fs/dosfstools/dosfstools-3.0.24.ebuild
deleted file mode 100644
index 309fdc25e9e8..000000000000
--- a/sys-fs/dosfstools/dosfstools-3.0.24.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-3.0.24.ebuild,v 1.1 2013/11/23 20:34:42 radhermit Exp $
-
-EAPI="5"
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat"
-HOMEPAGE="http://www.daniel-baumann.ch/software/dosfstools/"
-SRC_URI="http://www.daniel-baumann.ch/files/software/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-RESTRICT="test" # there is no test target #239071
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.20-name-ext.patch
-	sed -i \
-		-e "/^PREFIX/s:=.*:= ${EPREFIX}/usr:" \
-		-e '/^OPTFLAGS/d' \
-		-e '/^DEBUGFLAGS/d' \
-		-e "/\$(DOCDIR)/s:${PN}:${PF}:" \
-		Makefile || die
-	append-lfs-flags
-	tc-export CC
-}
diff --git a/sys-fs/dosfstools/dosfstools-3.0.25.ebuild b/sys-fs/dosfstools/dosfstools-3.0.25.ebuild
deleted file mode 100644
index 208e9181f455..000000000000
--- a/sys-fs/dosfstools/dosfstools-3.0.25.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-3.0.25.ebuild,v 1.1 2014/01/18 00:02:20 radhermit Exp $
-
-EAPI="5"
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat"
-HOMEPAGE="http://www.daniel-baumann.ch/software/dosfstools/"
-SRC_URI="http://www.daniel-baumann.ch/files/software/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-RESTRICT="test" # there is no test target #239071
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.20-name-ext.patch
-	sed -i \
-		-e "/^PREFIX/s:=.*:= ${EPREFIX}/usr:" \
-		-e '/^OPTFLAGS/d' \
-		-e '/^DEBUGFLAGS/d' \
-		-e "/\$(DOCDIR)/s:${PN}:${PF}:" \
-		Makefile || die
-	append-lfs-flags
-	tc-export CC
-}
diff --git a/sys-fs/dosfstools/files/dosfstools-3.0.20-parallel-install.patch b/sys-fs/dosfstools/files/dosfstools-3.0.20-parallel-install.patch
deleted file mode 100644
index 8df28a211f4a..000000000000
--- a/sys-fs/dosfstools/files/dosfstools-3.0.20-parallel-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dosfstools-3.0.20/Makefile
-+++ dosfstools-3.0.20/Makefile
-@@ -73,7 +73,7 @@
- 			install -D -m 0644 $${MANPAGE} $(DESTDIR)/$(PREFIX)/share/man/$${LANGUAGE}/man$${SECTION}/$$(basename $${MANPAGE} .$${LANGUAGE}.$${SECTION}).$${SECTION}; \
- 		done; \
- 	done
--install-symlinks:
-+install-symlinks: install-bin install-man
- 	if [ -e $(DESTDIR)/$(SBINDIR)/fatlabel ]; \
- 	then \
- 		ln -sf fatlabel $(DESTDIR)/$(SBINDIR)/dosfslabel; \
diff --git a/sys-fs/dosfstools/files/dosfstools-3.0.21-parallel-install.patch b/sys-fs/dosfstools/files/dosfstools-3.0.21-parallel-install.patch
deleted file mode 100644
index 0288e7995da6..000000000000
--- a/sys-fs/dosfstools/files/dosfstools-3.0.21-parallel-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dosfstools-3.0.21/Makefile
-+++ dosfstools-3.0.21/Makefile
-@@ -73,7 +73,7 @@
- 			install -D -m 0644 $${MANPAGE} $(DESTDIR)/$(MANDIR)/$${LANGUAGE}/man$${SECTION}/$$(basename $${MANPAGE} .$${LANGUAGE}.$${SECTION}).$${SECTION}; \
- 		done; \
- 	done
--install-symlinks: install-bin
-+install-symlinks: install-bin install-man
- 	if [ -e $(DESTDIR)/$(SBINDIR)/fatlabel ]; \
- 	then \
- 		ln -sf fatlabel $(DESTDIR)/$(SBINDIR)/dosfslabel; \
diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index 2c8643b9d4eb..605420ee1d89 100644
--- a/sys-fs/ecryptfs-utils/ChangeLog
+++ b/sys-fs/ecryptfs-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/ecryptfs-utils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.57 2014/11/12 00:46:24 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.58 2014/12/15 03:11:41 radhermit Exp $
+
+  15 Dec 2014; Tim Harder <radhermit@gentoo.org> -ecryptfs-utils-101.ebuild,
+  -ecryptfs-utils-103.ebuild:
+  Remove old.
 
   12 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
   ecryptfs-utils-101.ebuild, ecryptfs-utils-103.ebuild,
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index 2f99f995a3a2..e901a88369c9 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,28 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ecryptfs-utils_101.orig.tar.gz 619606 SHA256 f8ddd2be2e208fb2f11aeca1721135c3c31465f78f2318981df682741ac72c55 SHA512 6245749e0f11f203d37023a42f0ac15642aab9e193dc248882ce2ebfdd41faa5e56eac7ea43f651944a55a010595a42eb40c7f64a34b57ae4d65aebe8a176e68 WHIRLPOOL 82a7d941289c543982e384f8490d45fef05c286ef85230218438e27d33047f69ec201eca38d7d789b2874d3cfdbdbcf96cb21d194022b63b68e50f55f2982f50
-DIST ecryptfs-utils_103.orig.tar.gz 623902 SHA256 646c1f031497d513a96d5442381b3c3993b977fcccdf54c444428475a0c73d91 SHA512 1e57d4eeb3a1f34a6001f969e53ee1d3aa2379a16de8caf9d3a92809459ebafb692fb7b85e8196c42c7dede09524e2e71a36eb458eef4c991f157249240cb6c7 WHIRLPOOL 1d8737f502caea717ab6095de1d613496c06d850c2f605da5bc864517ab688d8c5076f7ca41140714b8f3ebd05f2fd163309852a9a07cb8cd21dfd35c0f09d0a
 DIST ecryptfs-utils_104.orig.tar.gz 649268 SHA256 4a200176542d46439c5297021f2c7fd7343b871c20c6f73f6e6c9fc4e5fd7438 SHA512 1d093df406c731e6a44bcfc647d5e84a4110fc8d55c8a6aee7e056b0cac8f826b16fbde3dcccd0cf64fcd981a7666b71b1697951ed614ad510c4a6e403f5efd8 WHIRLPOOL e483161d9268583dd596a62299e46c9e37d2e5ceb1f0e197115a9d4b489167abe40e3fd9ff4ed411f7b97543b26c0793411d815bdba9cef211dbe69f3c7bf54c
-EBUILD ecryptfs-utils-101.ebuild 3569 SHA256 b170e2e3545f7ed4ee7d45d53077bd27febe09fe22232825afccf5927cd0ddbd SHA512 b9fd1d26d26cc8ec573981b13b793b8804d4d77b15085b965206bf22ce20480517bd1b7b20c1e077d7e886342c9851a0535eb19f56e81f59ae1891fde9663c7d WHIRLPOOL 28ba62e8433c09e838b5290db4a531740e84bcd938e48b54f64613f205a95ba717820a552c46c81ab6b920f432fb028950d0d42cc1f5dfc26376cb5a5ea1b0dc
-EBUILD ecryptfs-utils-103.ebuild 3569 SHA256 5cf2bc5b90ad7791cc1b43848db208e229c90016afca126cbcd3a2524b427487 SHA512 42e6e4c8dba741b15a785a96a77a72165c0d1a1c036367c525059eccfcd985ba034cd74f39eefb2288ebf3491aec97de0890a7112a9f355ffb0e50286b6d331e WHIRLPOOL 2802f2f58780668d8b6c4dc0c157de939338f846bb4765ba8c7f0d7ee8b8e96d8f1b9c5b5053eba5afe6e111f88ba3009908ec1056c41b10a1335a67524433c5
 EBUILD ecryptfs-utils-104.ebuild 3569 SHA256 c985367c842fc6251c5483ff90f999127c4b1faae55d3cc0fc8f27820ce23f4a SHA512 bce898a5d927b11921838bc4d93a9e56cad70d73970f5590c2c2ebf52fbd7de69ea5ebd23b1970f225bbb48ec204496ed93b60d940243c61148b0a7ef2287c11 WHIRLPOOL 3c22db0405dc5fd6e64c949504cc271cb4d5b2ca4768bed8a8af0ac764266f8d4b9e9b04307cbf37520f8420c6bdd92c0e5fda2d832fcc34787a9402c85b514d
-MISC ChangeLog 10087 SHA256 f1edb65741ed29c4301e087aeb70d5b514419f0298fc6cc273bcda7488bea052 SHA512 d466f39990a2bcbc658156318b9bfbc9aa83f7a92bdf06b24a94e046031235b5712467a8e42f394ff046db797ee981ae37b93e5f058bba9f7fe5646e7a4def24 WHIRLPOOL 7b8346e98f1c803c9f55ed887b7c257076edf3b5300a49619ed07dc54be01c2551f72c57af6f8af9cb5e648c7339455d0d8ed9ed7cadaf30d3101e30c9a02fd4
+MISC ChangeLog 10210 SHA256 d57444e5e0cb39f2f687eb1045e0a8ce6b4dd9433f36adab5402e1eaa89fbe53 SHA512 8a295dd3f47be535adb76952e44b9cbd54c6065805cb21878cbb4e85512c63a75e0398ea1a37d0d5a005cfab6399acc4a8ea0a9e01d12778c146ab3235f515fa WHIRLPOOL c8ebfb1450ed272a36b051e44ad8a4315c858f2b239b627be58bb6c10b473e4be41408acdf826d6a15fa02166666416c96a15be6e4d011a1a32c00741303470b
 MISC metadata.xml 622 SHA256 613a6474dd2e1be8eb7cae2d27d67d2e3d6b9a5c6a80ffc73051e105f5c51b10 SHA512 c3672415da6efad44340a6f922c552f7d898320bde7b8cedcdb0aa4958e95be1c50b068cafdad80038ae32a389c9d1774c9b836eb80a3f01b66c1071a37a4278 WHIRLPOOL a9d77eb2ff0137f26f5f7403724e8a7b59a96fe305bdac75a81732f61ee4be57437c31748ec6d0dd999997086e882e9c6cc407a74e4d89c69fcd15f045ba9fe8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUYq5pAAoJEJOE+m71LUu63IIP+gJ8u61GNy6KNp76svtojWkK
-1aMRXa+ktr7mea0R2oaNL3Msq3zLdmWLjk/FetWA+3Tbv/p339F7tdyQDbliccE1
-yVtqA1rUWosx2YQH8gVYHmz96b/Jx1WICeM7YO0936PzDAo6gE64ml9FaXHlV/bc
-tfHbJlUOXvfer/i57ZUAFSSDuAIkkWeP9FBG6g5ax7X5JF8CjLG5w9y3czQpkUUK
-KsQrTOHcdFVTUl2mASgPER2t9if73Vk2vAr3yHMP4y7xZWs/BbpoEB4sCCu8Tq7T
-UGM5W4AT+9eDg1HbTySMLReeiImqlTUhZ0kwnwY1b6EOzVr1yLOv26eEQsoe0NT7
-zirNx6A+FXTQZZGhrcZ0H2jEWwpTMEh7z+YHxDUyC1hUQYrRB7B7dCx1bLTEvdGQ
-zjpNj+7Rf3fbpi63CJwOUfkXPC7O07IU74UcqEoqaIUkcsdgyTXU2/75QDncuvIj
-bBG7A0Ul23PUqwtxDPRhM1smgFY0hiW4DsI5+GWnF0rje1ocNUp2sz7sbI8uWcEB
-1sM0cW557bUofxQLbAnwGYurnBThumtyGNxGVr7bE61iaKr7il5OTjDdc/Sqye00
-5L7Fua83QErG7oir4RyV0IMXgXc+S6Acq0t7dR9nqhoQRGZ2a4vEK7IyhJLAUD22
-ntXjjHULSKFgme1bfwrO
-=IeDp
+iQEcBAEBCAAGBQJUjlF3AAoJEEqz6FtPBkyj/3wIAJvmGrMemrrlESkm+ReyoGI3
+kJEcrGkfwmiqqHJJmmT6R+jC7vaEmIu+jQB8tUHy5TFzU7UwwAvmpoKnTFkj0e/z
+VWatDbDR3/NogvyLEbKwkHTFLDhm+NDe9H+RoCwYnjQqCLyxE+lt1OZi6cIFz1xG
+tH3g9U5a4Eo2skiReFpRbDzr7TR1AAk8JX4xiLtenjbx+Hu3uSYCwZGdIJqq/RW+
+zlS6DeGjzzeZRM6da5OOQ57lej24zs8GRBTkWNvRrO4wUeomJnwNB6LJi2SXch9N
+1FO8TnsYxwU5UEh+GeLU26iHJ6i3K2bVjugwfI8JBP+A0mUeOSiI7ng69BH7n2c=
+=2kZ6
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-101.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-101.ebuild
deleted file mode 100644
index b993eba115ab..000000000000
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-101.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-101.ebuild,v 1.4 2014/11/12 00:46:24 blueness Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*"
-
-inherit flag-o-matic pam python linux-info autotools
-
-DESCRIPTION="eCryptfs userspace utilities"
-HOMEPAGE="https://launchpad.net/ecryptfs"
-SRC_URI="http://launchpad.net/ecryptfs/trunk/${PV}/+download/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc gpg gtk openssl pam pkcs11 python suid tpm"
-
-RDEPEND=">=sys-apps/keyutils-1.0
-	>=dev-libs/libgcrypt-1.2.0:0
-	dev-libs/nss
-	gpg? ( app-crypt/gpgme )
-	gtk? ( x11-libs/gtk+:2 )
-	openssl? ( >=dev-libs/openssl-0.9.7 )
-	pam? ( sys-libs/pam )
-	pkcs11? (
-		>=dev-libs/openssl-0.9.7
-		>=dev-libs/pkcs11-helper-1.04
-	)
-	tpm? ( app-crypt/trousers )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.41.0
-	python? ( dev-lang/swig )"
-
-pkg_setup() {
-	use python && python_pkg_setup
-
-	CONFIG_CHECK="~ECRYPT_FS"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	echo "#!/bin/sh" > py-compile
-
-	# Python bindings are built/installed manually.
-	sed -e "/SUBDIRS =/s/ libecryptfs-swig//" -i src/Makefile.am || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -D_FILE_OFFSET_BITS=64
-
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-nss \
-		--with-pamdir=$(getpam_mod_dir) \
-		$(use_enable doc docs) \
-		$(use_enable gpg) \
-		$(use_enable gtk gui) \
-		$(use_enable openssl) \
-		$(use_enable pam) \
-		$(use_enable pkcs11 pkcs11-helper) \
-		$(use_enable python pywrap) \
-		$(use_enable tpm tspi)
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		python_copy_sources src/libecryptfs-swig
-		building() {
-			emake \
-				PYTHON="$(PYTHON)" \
-				PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
-				PYTHON_LDFLAGS="-L$(python_get_libdir) $(python_get_library -l)" \
-				PYTHON_SITE_PKG="$(python_get_sitedir)" \
-				PYTHON_VERSION="$(python_get_version)" \
-				SWIG_PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)"
-		}
-		python_execute_function -s --source-dir src/libecryptfs-swig building
-	fi
-}
-
-src_install(){
-	emake DESTDIR="${D}" install
-
-	if use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				PYTHON="$(PYTHON)" \
-				PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
-				PYTHON_LDFLAGS="-L$(python_get_libdir) $(python_get_library -l)" \
-				PYTHON_SITE_PKG="$(python_get_sitedir)" \
-				PYTHON_VERSION="$(python_get_version)" \
-				SWIG_PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)" \
-				install || return 1
-			echo "ecryptfs-utils" > "${ED}$(python_get_sitedir)/ecryptfs-utils.pth"
-		}
-		python_execute_function -s --source-dir src/libecryptfs-swig installation
-
-		python_clean_installation_image
-	fi
-
-	use suid && fperms u+s /sbin/mount.ecryptfs_private
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize ecryptfs-utils
-
-	if use suid; then
-		ewarn
-		ewarn "You have chosen to install ${PN} with the binary setuid root. This"
-		ewarn "means that if there are any undetected vulnerabilities in the binary,"
-		ewarn "then local users may be able to gain root access on your machine."
-		ewarn
-	fi
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup ecryptfs-utils
-}
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-103.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-103.ebuild
deleted file mode 100644
index 54688eb941b5..000000000000
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-103.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-103.ebuild,v 1.3 2014/11/12 00:46:24 blueness Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*"
-
-inherit flag-o-matic pam python linux-info autotools
-
-DESCRIPTION="eCryptfs userspace utilities"
-HOMEPAGE="https://launchpad.net/ecryptfs"
-SRC_URI="http://launchpad.net/ecryptfs/trunk/${PV}/+download/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc gpg gtk openssl pam pkcs11 python suid tpm"
-
-RDEPEND=">=sys-apps/keyutils-1.0
-	>=dev-libs/libgcrypt-1.2.0:0
-	dev-libs/nss
-	gpg? ( app-crypt/gpgme )
-	gtk? ( x11-libs/gtk+:2 )
-	openssl? ( >=dev-libs/openssl-0.9.7 )
-	pam? ( sys-libs/pam )
-	pkcs11? (
-		>=dev-libs/openssl-0.9.7
-		>=dev-libs/pkcs11-helper-1.04
-	)
-	tpm? ( app-crypt/trousers )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.41.0
-	python? ( dev-lang/swig )"
-
-pkg_setup() {
-	use python && python_pkg_setup
-
-	CONFIG_CHECK="~ECRYPT_FS"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	echo "#!/bin/sh" > py-compile
-
-	# Python bindings are built/installed manually.
-	sed -e "/SUBDIRS =/s/ libecryptfs-swig//" -i src/Makefile.am || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -D_FILE_OFFSET_BITS=64
-
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-nss \
-		--with-pamdir=$(getpam_mod_dir) \
-		$(use_enable doc docs) \
-		$(use_enable gpg) \
-		$(use_enable gtk gui) \
-		$(use_enable openssl) \
-		$(use_enable pam) \
-		$(use_enable pkcs11 pkcs11-helper) \
-		$(use_enable python pywrap) \
-		$(use_enable tpm tspi)
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		python_copy_sources src/libecryptfs-swig
-		building() {
-			emake \
-				PYTHON="$(PYTHON)" \
-				PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
-				PYTHON_LDFLAGS="-L$(python_get_libdir) $(python_get_library -l)" \
-				PYTHON_SITE_PKG="$(python_get_sitedir)" \
-				PYTHON_VERSION="$(python_get_version)" \
-				SWIG_PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)"
-		}
-		python_execute_function -s --source-dir src/libecryptfs-swig building
-	fi
-}
-
-src_install(){
-	emake DESTDIR="${D}" install
-
-	if use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				PYTHON="$(PYTHON)" \
-				PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
-				PYTHON_LDFLAGS="-L$(python_get_libdir) $(python_get_library -l)" \
-				PYTHON_SITE_PKG="$(python_get_sitedir)" \
-				PYTHON_VERSION="$(python_get_version)" \
-				SWIG_PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)" \
-				install || return 1
-			echo "ecryptfs-utils" > "${ED}$(python_get_sitedir)/ecryptfs-utils.pth"
-		}
-		python_execute_function -s --source-dir src/libecryptfs-swig installation
-
-		python_clean_installation_image
-	fi
-
-	use suid && fperms u+s /sbin/mount.ecryptfs_private
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize ecryptfs-utils
-
-	if use suid; then
-		ewarn
-		ewarn "You have chosen to install ${PN} with the binary setuid root. This"
-		ewarn "means that if there are any undetected vulnerabilities in the binary,"
-		ewarn "then local users may be able to gain root access on your machine."
-		ewarn
-	fi
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup ecryptfs-utils
-}
diff --git a/sys-fs/fuse/ChangeLog b/sys-fs/fuse/ChangeLog
index cca5b2d85aa6..2859bd09935d 100644
--- a/sys-fs/fuse/ChangeLog
+++ b/sys-fs/fuse/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/fuse
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.199 2014/08/10 20:19:38 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.200 2014/12/15 03:13:20 radhermit Exp $
+
+  15 Dec 2014; Tim Harder <radhermit@gentoo.org> -fuse-2.9.2.ebuild:
+  Remove old.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> fuse-2.9.2.ebuild,
   fuse-2.9.3.ebuild:
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 103876adc794..4c7a9231fa49 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -3,16 +3,18 @@ Hash: SHA256
 
 AUX fuse-fbsd.init 467 SHA256 d896a80d67668246f586c6283f95f624fdbecb306408bec6f2c944601aae7273 SHA512 4d8ce71d9a025a52e8f1d7074f83fdc368fbdd4bdf65bccfdbdce214580d4051c20bdde7f61725d14c585db1dbbe0781cee2a0c73a857f1340a5b57ee920649e WHIRLPOOL 3cb757a5de22b36c6e638c612a99cad43edeac86e37a9590a3635d550ee12f404ea54734c69a7f139c1c1089d2446b37a6387f1aa264651000d50942f4a97047
 AUX fuse.init 756 SHA256 22a22c914d2a4f0fb5fc8495f4b7efcd1819efde548c9033ca612c181cd29eda SHA512 3d2765114081c8f6720ed25d7b7da4f6da5fbbb5b35760bb0a760f0bf2482abacabec63c1488d4e8cbe4f78875574607e6e46508dfe22df0869f4d2e1e91e607 WHIRLPOOL 2932da7d97b7418b5ead6c71f9e583b6ec1b47c86e763577312fd55492482c0c31677a78534301c7b541d476ee16b0eb2da981eb6723c1fdc9af338ce10c243c
-DIST fuse-2.9.2.tar.gz 560123 SHA256 81a728fb3f87da33063068735e2fb7e2cd89df207d32687d3d3278385279cefc SHA512 017076a58a4d184f27657e1dcdc7d5f6814a9acdc365769e1efb6bf840380fba32bcee5f57b62ecb353840c06e0a8cc7c3eeeadceb4e983188b59af2fb2171bd WHIRLPOOL 721f7133ae1dacc5e52854166925aebc21bd26ee7b7226647f242a99ee5031aa798b3ebde356636fa95b0ab3611c40edd0b3146ec64f0b2ac7703e6caff60565
 DIST fuse-2.9.3.tar.gz 572044 SHA256 0beb83eaf2c5e50730fc553406ef124d77bc02c64854631bdfc86bfd6437391c SHA512 03f43f88694ec7e039ff3579a8e76349b5a5a05872c55901fc1d9ee53dbb6b1e69f6dd0005b620f3b5ead0b14da8eeb31d46b922d10f88f4e3f830aa47e8162c WHIRLPOOL 739562e48e85326049dac0ef06653e5e6574a01dd60649e23ddc0990ea6c1979e6ce952a1e84d0776b706fbcad79eb0e1328aa35f70ba4881db9a4482d254a04
-EBUILD fuse-2.9.2.ebuild 2216 SHA256 ea07eead9f29fbd2ec1ea892bb3a242a357d35df443e89df88dc11e51e89ea48 SHA512 d58a3a00b34fa07a88820b5461666c30286232d31aab420035d3df3453feffbf60c4abaf7725a445573032f778292aa5e1952daa80c63ae54104d63d20deaad8 WHIRLPOOL b5e0c88d4cbf8587912967c867d5987b3fb55cf8947194a663458e042338778a890a0a0cdd20644c39d79e2c465fc5c7508dce27ea69b6e108028430e4a6ad5b
 EBUILD fuse-2.9.3.ebuild 2255 SHA256 7fd00259080c9048f161542b7605a539727ccad3d53edda8d8b6c888ff8e1678 SHA512 07a16a471e0930b92908219514ee69411de409a27a7dedbcf6f14d5dff7b5df2bcc6e10cb7bb97362e5510e8efafe1abcdbd182d8eba26cfda1120af4fb660dc WHIRLPOOL 12493760760a578bc885495d45f082b838178463f46aa510033dc7903d29091cd0aa86589573d4d6ee728ad9e81fe7136adedc592190676bde489e716d338da3
-MISC ChangeLog 26135 SHA256 d10407e55bd09cdda3c6bd745395420bdf5b92c0bc08b470bdde1d3ace67fbc1 SHA512 ea964f535394074b786ac3370d29fe3d4ab17c78648d8c3463e5c88acdd7f8a21a4caab924a187cb4bdab026d9ec83b30f2923070b753f4ccab30026209cb1b5 WHIRLPOOL cb96ba304d476efc710017ba4bce7843a54a1b94c84c218a25b499276b7c3fc93558f3ea8e7984f0bcd378fe4abcf2392453739c73675da086055340fcb9e4d3
+MISC ChangeLog 26222 SHA256 b3af1c2c52e1891f14a2559d754a9df437a5b137d0e280127d17ce176a8ef6a0 SHA512 e5459c7a688077d7d3607deddb6737e9b5a9098cc1b4400cb9e70b269ea395ffa0aefe596e001f2c26c536b3882d228b7cd76c8771a089362d7dc20525f87275 WHIRLPOOL 1848cf0614e668dcd97b6cad62b3e3eca0d449737c5d27f594a66910f5efc3efd29ac8f8dbf64f7b9e72d12367c0dfaba8ad86c5b9d3d3ac432797df8bcec367
 MISC metadata.xml 248 SHA256 32abf15e7c6c5b1d79352aff76413358aea37ae781534cee099c03723de657bc SHA512 b820a6d68eb09f0c3eda90fd7ed53d21afc40eb3daef875542f711b8064a5c7fc78f06462a5aa6a9a7e7d71bd82225ecaee627eb599b5c5fd563d2599cf78974 WHIRLPOOL 9187ff09bb4d8f155befdf23e5ec86740069de083eb920122ed18702a1f3a83ad9aa2e9adacd307940c9455d3b346853726f750e350be0f4f644b898e9dc3c21
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn09oACgkQcaHudmEf86o+sQCcCu9FDISzcNiNgFU12mmj4eXN
-YecAni75X7fJrmIch95NzJVsxmpDbziY
-=zSPq
+iQEcBAEBCAAGBQJUjlHbAAoJEEqz6FtPBkyjjBAH/1GWN3Dy3TdDRKTEkZllNWHF
+cNUYVJrIwY+qQJSedn0WhPKWLNER2TEpIHLNG1QJwljHa8c02cg6DsCrzjCzLGbh
+UBwoEfSNYpfRPpJLTNlvzpKnY0sOwJByzwFKxRZhlHKVXGWrWsdXkWVczlgBqkCx
+DKkLo9mZMTjt8NgSi1wb6GeJzFycLfr5p3zE0vbRdoQ+rX/VjFgEV2VU4nzi3bXb
+ZTyuraGA+RVOrzTpycuz+lz1dhziyHLWGe3V36qyeN71TJwjdXPERPnSKQ0hd5U8
+8TRT83KrVaINkbZomHmBWmEQ8QbZvLWjccpX4A1zJ6L1pBw7XYGNg6WY1ZzNtUk=
+=zqsp
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/fuse/fuse-2.9.2.ebuild b/sys-fs/fuse/fuse-2.9.2.ebuild
deleted file mode 100644
index 117298e1bae8..000000000000
--- a/sys-fs/fuse/fuse-2.9.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.9.2.ebuild,v 1.15 2014/08/10 20:19:38 slyfox Exp $
-
-EAPI=5
-inherit eutils libtool linux-info udev toolchain-funcs
-
-MY_P=${P/_/-}
-DESCRIPTION="An interface for filesystems implemented in userspace"
-HOMEPAGE="http://fuse.sourceforge.net"
-SRC_URI="mirror://sourceforge/fuse/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="kernel_linux kernel_FreeBSD static-libs"
-
-PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
-DEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use kernel_linux ; then
-		if kernel_is lt 2 6 9 ; then
-			die "Your kernel is too old."
-		fi
-		CONFIG_CHECK="~FUSE_FS"
-		FUSE_FS_WARNING="You need to have FUSE module built to use user-mode utils"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# sandbox violation with mtab writability wrt #438250
-	# don't sed configure.in without eautoreconf because of maintainer mode
-	sed -i -e 's:umount --fake:true --fake:' configure || die
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		INIT_D_PATH="${EPREFIX}/etc/init.d" \
-		MOUNT_FUSE_PATH="${EPREFIX}/sbin" \
-		UDEV_RULES_PATH="${EPREFIX}/$(get_udevdir)/rules.d" \
-		$(use_enable static-libs static) \
-		--disable-example
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog Filesystems README \
-		README.NFS NEWS doc/how-fuse-works \
-		doc/kernel.txt FAQ
-	docinto example
-	dodoc example/*
-
-	if use kernel_linux ; then
-		newinitd "${FILESDIR}"/fuse.init fuse
-	elif use kernel_FreeBSD ; then
-		insinto /usr/include/fuse
-		doins include/fuse_kernel.h
-		newinitd "${FILESDIR}"/fuse-fbsd.init fuse
-	else
-		die "We don't know what init code install for your kernel, please file a bug."
-	fi
-
-	prune_libtool_files
-	rm -rf "${D}/dev"
-
-	dodir /etc
-	cat > "${ED}"/etc/fuse.conf <<-EOF
-		# Set the maximum number of FUSE mounts allowed to non-root users.
-		# The default is 1000.
-		#
-		#mount_max = 1000
-
-		# Allow non-root users to specify the 'allow_other' or 'allow_root'
-		# mount options.
-		#
-		#user_allow_other
-	EOF
-}
diff --git a/sys-fs/multipath-tools/ChangeLog b/sys-fs/multipath-tools/ChangeLog
index fa577d093a7c..cf878fc646a2 100644
--- a/sys-fs/multipath-tools/ChangeLog
+++ b/sys-fs/multipath-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/multipath-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.68 2014/07/30 19:27:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.69 2014/12/15 03:08:13 radhermit Exp $
+
+  15 Dec 2014; Tim Harder <radhermit@gentoo.org>
+  -multipath-tools-0.4.9-r5.ebuild,
+  -files/multipath-tools-0.4.8-kparted-ext-partitions.patch,
+  -files/multipath-tools-0.4.9-buffer-overflows.patch,
+  -files/multipath-tools-0.4.9-build.patch,
+  -files/multipath-tools-0.4.9-log_enquery_overflow.patch:
+  Remove old.
 
   30 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
   multipath-tools-0.4.9-r5.ebuild, multipath-tools-0.5.0-r1.ebuild:
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index a9c205b3e1b3..f6a1c92556f8 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,28 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX multipath-tools-0.4.8-kparted-ext-partitions.patch 1046 SHA256 4cd2e75782dbaba715b85ef1ececdc130e24d7497897ceea9802c779e79c1c73 SHA512 9cce969e9e1a7816356fa2b624cae5f71b4291cd3383ca462a98bf6b68aa9111f8bb42d3105697746eced52a29ed4fb006957ccbda77d04da31a179715c64ff8 WHIRLPOOL 840acca64843add545933ec174b52e6200d0a41ffd07f2a1d0175ea1460210430d781c6a079fc1b8ff8da28a685a9c17770ce5abfa97311444d13ab99c0600a9
-AUX multipath-tools-0.4.9-buffer-overflows.patch 993 SHA256 1f9ca1d26fee69dc7d5c1b65a835d23e1b8dd8de6fd3678faf3e7b499611d15d SHA512 5d17c452868d8e01ea171a4e734aeecc837d959d55a17de051ba006f1980d3b8c84f7d0d0db4f22c1c3f741ed074a1377a5ae8d8534f956e16b904ee1ee382aa WHIRLPOOL 86605d00cfe683a078b0828648dc1d79b4b99bb6b4da6110745466d37de70eeaad89af5979c8c257e69cf5a233cc535b696fff8fb86a15120f621a1e776e903a
-AUX multipath-tools-0.4.9-build.patch 5564 SHA256 2a412dad4ce65fa554799fea3dad70fdd0bd26dad850e6890474ea4cd1016d83 SHA512 c26cc0bee065f6ac58c7e780f3a059b94239745edf4c613464722b13280a657523591c145d849a10b43a755513e8820a94c2166bc5fc0f90c90d50133de39bcc WHIRLPOOL e469dd38ceeb9a0318c82f8c2c30061e3acbb03aed7a8fbc220d2062fade86cda5efdd8ee36fdf1fab731fbbc9d82ef6f21a5f513bdea1e3d1db02d6330c4490
-AUX multipath-tools-0.4.9-log_enquery_overflow.patch 2452 SHA256 43cedfbfdc1a5636e107bc3d388f0b03185b12761c3abb18424352f516d72b4b SHA512 acbdb4fc901acd8473b3dca2d0fe0b622d240c0ae02f4dda16bbb0d847f1fe05a849ec1916df1916e2c5f398cbf21b9c9f1c7b09429f3ee3ca6ea78d6996e1d3 WHIRLPOOL f9c991b829649196889dd7d30a260fd6ff24f1adaf0aefa04bb9779b474430723608816cf2efc8294c5e146ca339990e4c4702fc9e58206e58d0fa6d1b366d38
 AUX multipath-tools-0.5.0-makefile.patch 6790 SHA256 e6810a05b059f542fdfeea72f0befbafaadd71563f4d78df4bc37380a1376cf0 SHA512 bed96f4cdb40df1e4c126a218c67c2a48a9c9a5df8248848ff69d928f07f1cf6ffd97e02dc0aa086171d4d65f56144c918267874b6b551e689243364908b5cf1 WHIRLPOOL 2621de1450390933029f60155562da28b524b92c553c080e2a42fac8629e12e26c63a7a3ebd3e820f21351d1d84c24a0fe5f262432ac1c14b8cf57310c918b34
 AUX multipath-tools-0.5.0-systemd-pkgconfig.patch 1192 SHA256 84dfec6872fe613680bdc9207663260aa47779eb0640ed3ff264efff9e83aa7b SHA512 60b5717b0e3fd9a3d422b756359ce6bb5018346c104bd45543135257b1c4efb3c586d188e35176bbcfa2c81ed9d4824e3c96cc395e52605934e9cc4935f17fec WHIRLPOOL 710787df816072669d9e50717846da75bc5358328d25003979b98a589a9478114e2681d3da4c8866ad21af0ce09b628301314c02f2879d34f564c695fe92dc88
 AUX multipath.rc 622 SHA256 9b68396afda8114610058d456318dc201a4d8799fb1d0504538e34966a7fd3d8 SHA512 7ccdd4823786a0d876496aeef8282ac1b2c4aadf4bfd6a3aee9221412b5f48c8be1e05c49d7150ecdb1ac03afb3af962d6fa3bc26d198193395e307fb181b5fa WHIRLPOOL de16a6b3002dd24801609dbb9ae44c555d7d8256bff60327bd1fa89faf8512a4801d1cee1c6a0fe8bd34aebeec306ace9378a6e7069e5e9ff4f4b69521683cc9
 AUX rc-multipathd 517 SHA256 d96e3d7ca1edbbbc92f1336d4c340f1b516e71c49c85e990e3f4063c1b5db241 SHA512 ba28c81597d9db1f4b0d9d2253f086539745cf0f06b5643d859ffc02d4ad7bd7fc526370987b1f84b028b1523b49cffe904a26a0b122f13e7bc89f9b39771deb WHIRLPOOL d4a8820e2597e5ab5ab534c126b2c153b655d026ef243802859d11ff14eada9ce4413916506385e6654289677dc43be4c9f1a680671b8938f6ea29066b227dcf
-DIST multipath-tools-0.4.9.tar.bz2 169180 SHA256 8d44c8815144b5589cc3e604cb3fc16c76a028aef08aa1bec334ff70bf9ac712 SHA512 ff4d74951b4ca6f95deb501876e5edec00b6880c98bd3f24452133c142a4118f186a5988e08151ecf5dc7348568eb434be19c31ee5257c5372997f44003eb540 WHIRLPOOL 4c5433fbd34cad0481ac1dd68cacc26b0e7fb503001c00dc9dd2fe4c96624ea55537e90e0834695a7f53b93e578a024576c9a3bf81477e83cb425d20ac1ecf6e
 DIST multipath-tools-0.5.0.tar.bz2 184024 SHA256 f13cf1eb84e94e83b2019e68f7965526903c13e94246db43965d181668a0a6f9 SHA512 dfad21c45d0f69e39041d30d203a582c8ee8329bf390c51cde10155b3de379e7ad8fead2ac4beb268a924fd7e7dc8e1cf538ea3c70d41479fd8786fa30ba22a9 WHIRLPOOL bc8a365d66d1c5f584de04304125949926d4a1576cba4a00acca0f1333eb13d83318da36d9d88c5dc92691a331d427ad6b99eb1f2983fbc387303dbfdbae11ff
-EBUILD multipath-tools-0.4.9-r5.ebuild 2378 SHA256 4112e5d42225998f6feedd787c45853bb90e3806676abd0b0caacbd602ce98cb SHA512 88fba3cf0ed672eec4ec042123d0178995b393c8c4ab72b8556c8eb431d0170e8369fc5e6f76f7f514a77e4cb0005bfffbaeb0c67efdbd2aa1356e88093fb3f6 WHIRLPOOL 8a444c45d7b874c2e7c472bb3f6fbf0f70b0d1bb4b40f5d55675b3ce9219c5336ea27107c4b9ab822c22a6e6b352eec6aeccf05281962e0261cca0304d987cb2
 EBUILD multipath-tools-0.5.0-r1.ebuild 1853 SHA256 407b21ac085472bb56a4da0c48ee3875916dd6a9ed1ecd18e965427d06ef58d9 SHA512 7bf5789c2d366067c6d213bb72b2f37fc8d9fbaf77bf4991b2395764bfc264fdaf1fdf3e28ad602b1778d50ed2218e8bcf7dc9e2a201702877a94f7feacbf6f9 WHIRLPOOL 24a6c620bb26611a9f97285c6dc83dd76ad7eae362c854088e8172df5bf11795d624817d4851fbaa2b0d08aeeb039c1acb503e6e5c87b8ea0ab142ff9b6b3f20
-MISC ChangeLog 12361 SHA256 b20669214a63dd6d596df82e26fa45ea9ae9a0d986164f525b202b93102987d4 SHA512 f2fc4729436db8293cab8b913ae14bb9aec066c0cbf41ddea97a9afb37b5a834b14962de1a8fa62776cffe21bbdad20875cb6cee4dd98b26c8ea5010ccb49fb4 WHIRLPOOL b5a234aa48e1bf044b588896ceb424b7a64e1bc256428c8bc39fb1536d596e62ace952c9562e90839ad55a668cc9ee679b0967c49cf355ec37baa843c3b69c56
+MISC ChangeLog 12680 SHA256 cf384f2021fd11a53ad19d5df068a382d8f35f40f35cadba6d4aeff826a3945b SHA512 d8c52c8d4671ecd9ea0b4dca68328adda305711d221fa7ef52df1152a659b212229a6a52d552172e89db61002c261b3e099e173a11b9a508865540e75e4435ef WHIRLPOOL 0f9aa4d94dfe0bbc2a81575617b87a028c65b5087add91111f85640ef168fea90bd04417e6174d077fa6ae36b1e5755885105368f76adbb5833ad85b55dabb2c
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT2UcnAAoJEEdUh39IaPFNtvAIAKL73IKIhgAp7GJVrWG710Sv
-Gzqgfzcz4676V7OZhs3Hxoy5GqyBOe3AOQkcwYQQB8pcSEFtaGLr1h+SslyMYSAh
-8wBImEaTPcuuqhSTIs1LZblYNyXVAGBfDaFG95B5HPkCzCLL7wiirDrpLQ5xTMHK
-gaxCT+/jN7Biw5hRkFcs/QtjAC5PbzxFH5xVQaEa/NKM5ciFjEFJ2Ia8bTwOOJIg
-QniB4XXSXr3gQ0ttNIfAgBHEonN7yXhtjX+yqtju2nfz1glqXt58HFR4/tWYDN7g
-GUwmjpAH15iIRPfzjVQxNrFb5qBJ5OOohhtpQT1lm0hm7hiiYtAts3Zyub+UEK0=
-=aGrW
+iQEcBAEBCAAGBQJUjlCqAAoJEEqz6FtPBkyjlNYH/2Fyzi6Yv7cuaO/3VweAE33m
+m89vcQC4TY5BSVKKhxnQ0Clnlk/+5R4YQ8nY78clQsveoMUX4879iQwnGqX8LSXo
+u8It8cOWj++QqBwnLN2cnx7ZZ+tEbybrE05InY+nQCG6wImBVyijSMycRo4vgLxW
+VJQXdElYVYA5Z/6Hx/G9K5d7tY2uAVpKbYPr1LB26YJtjEZdCopDNUmn4qaa/ffm
+uVoIGq6vITGca1TSXpKf6ALAJmE3a8KZ/fm4K6JiTPy6bJ1jHxjm94rcFTto6/NX
+rgzxbMjaAq8TCKpb1blr/ADn0Lp5IC1MmG0jroxnQtAlxsAyFG2e1nRnP9dc9RM=
+=Nw6h
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.4.8-kparted-ext-partitions.patch b/sys-fs/multipath-tools/files/multipath-tools-0.4.8-kparted-ext-partitions.patch
deleted file mode 100644
index 3f70fd70e4c3..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.4.8-kparted-ext-partitions.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c421c9282791696264d1333fb2552835140354c3 Mon Sep 17 00:00:00 2001
-From: Robin H. Johnson <robbat2@gentoo.org>
-Date: Thu, 5 Nov 2009 03:44:12 +0000
-Subject: [PATCH] kpartx: Fix broken calculation of extended partitions that caused random devices to be used instead of the correct parent device.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
----
- kpartx/dos.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/kpartx/dos.c b/kpartx/dos.c
-index 1691105..317fc56 100644
---- a/kpartx/dos.c
-+++ b/kpartx/dos.c
-@@ -53,7 +53,9 @@ read_extended_partition(int fd, struct partition *ep, int en,
- 			if (n < ns) {
- 				sp[n].start = here + le32_to_cpu(p.start_sect);
- 				sp[n].size = le32_to_cpu(p.nr_sects);
--				sp[n].container = en + 1;
-+                                // This line seems to have no understandable
-+                                // purpose, and causes the wrong device to be used
-+                                //sp[n].container = en + 1;
- 				n++;
- 			} else {
- 				fprintf(stderr,
--- 
-1.6.4
-
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-buffer-overflows.patch b/sys-fs/multipath-tools/files/multipath-tools-0.4.9-buffer-overflows.patch
deleted file mode 100644
index 38719acebea6..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-buffer-overflows.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- multipath-tools-0.4.9.orig/libmultipath/prioritizers/datacore.c	2010-05-22 05:01:58.000000000 -0700
-+++ multipath-tools-0.4.9/libmultipath/prioritizers/datacore.c	2010-11-28 12:22:12.037228583 -0800
-@@ -94,7 +94,7 @@
- 	if ((io_hdr.info & SG_INFO_OK_MASK) != SG_INFO_OK)
- 		return 0;
- 
--	snprintf(vendor, 9, "%.8s\n", inqBuffp + 8);
-+	snprintf(vendor, 8, "%.8s\n", inqBuffp + 8);
- 	snprintf(product, 17, "%.16s", inqBuffp + 16);
- 	snprintf(luname, 21, "%.19s", inqBuffp + 36);
- 	snprintf(wwpn, 17, "%.16s", inqBuffp + 96);
---- multipath-tools-0.4.9.orig/libmultipath/prioritizers/hds.c	2010-05-22 05:01:58.000000000 -0700
-+++ multipath-tools-0.4.9/libmultipath/prioritizers/hds.c	2010-11-28 12:22:44.199483997 -0800
-@@ -123,7 +123,7 @@
- 		return -1;
- 	}
- 
--	snprintf (vendor, 9, "%.8s", inqBuffp + 8);
-+	snprintf (vendor, 8, "%.8s", inqBuffp + 8);
- 	snprintf (product, 17, "%.16s", inqBuffp + 16);
- 	snprintf (serial, 5, "%.4s", inqBuffp + 40);
- 	snprintf (ldev, 5, "%.4s", inqBuffp + 44);
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch b/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch
deleted file mode 100644
index 11636b4eb68d..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch
+++ /dev/null
@@ -1,181 +0,0 @@
---- a/kpartx/Makefile
-+++ b/kpartx/Makefile
-@@ -6,7 +6,7 @@
- 
- CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- 
--LDFLAGS = -ldevmapper
-+LIBS = -ldevmapper
- OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \
-        gpt.o mac.o crc32.o lopart.o xstrncpy.o devmapper.o
- EXEC = kpartx
-@@ -14,8 +14,7 @@
- all: $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
- 	
- install: $(EXEC) $(EXEC).8
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -23,13 +22,14 @@
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
- 	$(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
--	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/
-+	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 
- uninstall:
- 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
--	rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
-+	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
-+	rm -f $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules
- 
- clean:
--	rm -f core *.o $(EXEC) *.gz
-+	rm -f core *.o $(EXEC)
---- a/Makefile.inc
-+++ b/Makefile.inc
-@@ -32,11 +32,10 @@
- syslibdir   = $(prefix)/$(LIB)
- libdir	    = $(prefix)/$(LIB)/multipath
- 
--GZIP        = /bin/gzip -9 -c
- INSTALL_PROGRAM = install
- 
--OPTFLAGS     = -pipe -g -Wall -Wunused -Wstrict-prototypes
--CFLAGS	     = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
-+OPTFLAGS     = -Wall -Wunused -Wstrict-prototypes
-+CFLAGS	     += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
- SHARED_FLAGS = -shared
- 
- %.o:	%.c
---- a/multipath/Makefile
-+++ b/multipath/Makefile
-@@ -7,32 +7,30 @@
- OBJS = main.o
- 
- CFLAGS += -I$(multipathdir)
--LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir)
-+LIBS = -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath
- 
- EXEC = multipath
- 
- all: $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
--	$(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
--	$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/
-+	$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/65-multipath.rules
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
- 
- uninstall:
--	rm $(DESTDIR)/etc/udev/rules.d/multipath.rules
--	rm $(DESTDIR)$(bindir)/$(EXEC)
--	rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
--	rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
-+	rm -f $(DESTDIR)/etc/udev/rules.d/65-multipath.rules
-+	rm -f $(DESTDIR)$(bindir)/$(EXEC)
-+	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
-+	rm -f $(DESTDIR)$(man5dir)/$(EXEC).conf.5
- 
- clean:
--	rm -f core *.o $(EXEC) *.gz
-+	rm -f core *.o $(EXEC)
---- a/multipathd/Makefile
-+++ b/multipathd/Makefile
-@@ -6,8 +6,8 @@
- # basic flags setting
- #
- CFLAGS += -I$(multipathdir)
--LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \
--	   -lmultipath -L$(multipathdir)
-+LIBS = -lpthread -ldevmapper -lreadline -ldl \
-+	   -L$(multipathdir) -lmultipath
- 
- #
- # debuging stuff
-@@ -28,21 +28,20 @@
- all : $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 
- uninstall:
- 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
- 	rm -f $(DESTDIR)$(rcdir)/$(EXEC)
--	rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
-+	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
- 
- clean:
--	rm -f core *.o $(EXEC) *.gz
-+	rm -f core *.o $(EXEC)
- 
---- a/libmultipath/Makefile
-+++ b/libmultipath/Makefile
-@@ -26,7 +26,7 @@ endif
- all: $(LIBS)
- 
- $(LIBS): $(OBJS)
--	$(CC) $(SHARED_FLAGS) $(LIBDEPS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS)
-+	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS) $(LIBDEPS)
- 	ln -sf $@ $(DEVLIB)
- 
- install:
---- a/libmultipath/checkers/Makefile
-+++ b/libmultipath/checkers/Makefile
-@@ -18,10 +18,10 @@ CFLAGS += -I..
- all: $(LIBS)
- 
- libcheckdirectio.so: libsg.o directio.o
--	$(CC) $(SHARED_FLAGS) -o $@ $^ -laio
-+	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^ -laio
- 
- libcheck%.so: libsg.o %.o
--	$(CC) $(SHARED_FLAGS) -o $@ $^
-+	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^
- 
- install:
- 	$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir)
---- a/libmultipath/prioritizers/Makefile
-+++ b/libmultipath/prioritizers/Makefile
-@@ -20,10 +20,10 @@ CFLAGS += -I..
- all: $(LIBS)
- 
- libprioalua.so: alua.o alua_rtpg.o
--	$(CC) $(SHARED_FLAGS) -o $@ $^
-+	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^
- 
- libprio%.so: %.o
--	$(CC) $(SHARED_FLAGS) -o $@ $^
-+	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^
- 
- install: $(LIBS)
- 	$(INSTALL_PROGRAM) -m 755 libprio*.so $(DESTDIR)$(libdir)
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-log_enquery_overflow.patch b/sys-fs/multipath-tools/files/multipath-tools-0.4.9-log_enquery_overflow.patch
deleted file mode 100644
index 67367c9f42e0..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-log_enquery_overflow.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From e1d69df0cdd1627676501df3a533b25ffadaeff0 Mon Sep 17 00:00:00 2001
-From: Arkadiusz Miskiewicz <arekm@maven.pl>
-Date: Sat, 27 Nov 2010 19:21:21 +0100
-Subject: [PATCH] multipath-tools overflow
-
-On Saturday 27 of November 2010, you wrote:
-
-[...]
-
-> the whole logarea is memset to 0 by logarea_init(), and each dequeued
-> message is also memset to 0 by log_dequeue(), so it seems normal that
-> msg->str value is 0x0, but it's really its address that matters.
-
-Ok, got it. Pointers, memory areas in my debugging session - are looking
-good then.
-
->
-> It's not clear to me : are you actually hitting a bug or is it your
-> debug session that puzzles you ?
-
-I'm hitting a bug. multipathd dies for me at that strcpy(). Now I think
-the bug is strcpy usage instead of memcpy because I'm building with
--O2 -D_FORTIFY_SOURCE=2 which turns on special glibc overflow
-detection.
-
-That detection seem to be smart enough to know that &str area is not
-a string memory and aborts the program.
-
-Found similar problem discussed here
-http://sourceware.org/ml/binutils/2005-11/msg00308.html
-
-glibc aborts the program:
-[pid 13432] writev(2, [{"*** ", 4}, {"buffer overflow detected", 24},
-{" ***: ", 6}, {"/home/users/arekm/rpm/BUILD/multipath-tools-0.4.9
-/multipathd/multipathd", 71}, {" terminated\n", 12}], 5) = 117
-
-same for valgrind:
-**13436** *** strcpy_chk: buffer overflow detected ***: program terminated
-==13436==    at 0x4024997: VALGRIND_PRINTF_BACKTRACE (valgrind.h:4477)
-==13436==    by 0x40265F8: __strcpy_chk (mc_replace_strmem.c:781)
-==13436==    by 0x40EDC06: log_enqueue (string3.h:107)
-==13436==    by 0x40ED68A: log_safe (log_pthread.c:24)
-==13436==    by 0x40E296A: dlog (debug.c:36)
-==13436==    by 0x804ECEC: pidfile_create (pidfile.c:37)
-==13436==    by 0x804E731: main (main.c:1424)
-
-The bug is not visible if I run multipathd in debug mode (-d).
-
-This patch fixes the problem for me by avoiding false positive on strcpy_chk.
----
- libmultipath/log.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libmultipath/log.c b/libmultipath/log.c
-index e56e46b..57b7696 100644
---- a/libmultipath/log.c
-+++ b/libmultipath/log.c
-@@ -142,7 +142,7 @@ int log_enqueue (int prio, const char * fmt, va_list ap)
- 	la->empty = 0;
- 	msg = (struct logmsg *)la->tail;
- 	msg->prio = prio;
--	strcpy((void *)&msg->str, buff);
-+	memcpy((void *)&msg->str, buff, strlen(buff) + 1);
- 	lastmsg->next = la->tail;
- 	msg->next = la->head;
- 
--- 
-1.7.6.5
-
diff --git a/sys-fs/multipath-tools/multipath-tools-0.4.9-r5.ebuild b/sys-fs/multipath-tools/multipath-tools-0.4.9-r5.ebuild
deleted file mode 100644
index 16bc6b2e16e1..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.4.9-r5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/multipath-tools-0.4.9-r5.ebuild,v 1.12 2014/07/30 19:27:36 ssuominen Exp $
-
-EAPI=4
-inherit base eutils toolchain-funcs udev
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="http://christophe.varoqui.free.fr/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=sys-fs/lvm2-2.02.45
-	>=virtual/udev-171
-	dev-libs/libaio
-	sys-libs/readline
-	!<sys-apps/baselayout-2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.9-build.patch
-	"${FILESDIR}"/${PN}-0.4.9-buffer-overflows.patch
-	"${FILESDIR}"/${PN}-0.4.8-kparted-ext-partitions.patch
-	"${FILESDIR}"/${PN}-0.4.9-log_enquery_overflow.patch
-)
-
-src_compile() {
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake LIBDM_API_FLUSH=1 CC="$(tc-getCC)"
-}
-
-src_install() {
-	local udevdir="$(get_udevdir)"
-
-	dodir /sbin /usr/share/man/man8
-	emake \
-		DESTDIR="${D}" \
-		libudevdir='${prefix}'/"${udevdir}" \
-		install
-
-	insinto /etc
-	newins "${S}"/multipath.conf.annotated multipath.conf
-	# drop this one it doesnt work with recent udev bug #413063
-	rm "${D}"/etc/udev/rules.d/65-multipath.rules || die
-	# /etc/udev is reserved for user modified rules!
-	mv "${D}"/etc/udev/rules.d "${D}/${udevdir}"/ || die
-	fperms 644 "${udevdir}"/rules.d/66-kpartx.rules
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-	newinitd "${FILESDIR}"/multipath.rc multipath
-
-	dodoc multipath.conf.* AUTHOR ChangeLog FAQ README TODO
-	docinto kpartx
-	dodoc kpartx/ChangeLog kpartx/README
-}
-
-pkg_preinst() {
-	# The dev.d script was previously wrong and is now removed (the udev rules
-	# file does the job instead), but it won't be removed from live systems due
-	# to cfgprotect.
-	# This should help out a little...
-	if [[ -e ${ROOT}/etc/dev.d/block/multipath.dev ]] ; then
-		mkdir -p "${D}"/etc/dev.d/block
-		echo "# Please delete this file. It is obsoleted by /etc/udev/rules.d/65-multipath.rules" \
-			> "${D}"/etc/dev.d/block/multipath.dev
-	fi
-}
-
-pkg_postinst() {
-	elog "If you need multipath on your system, you must"
-	elog "add 'multipath' into your boot runlevel!"
-}