gentoo resync : 14.04.2018

13 files changed, 54 insertions, 463 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 43b7009850bb..ac792a4260dc 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index dcd650e576b2..b968db4eccef 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,12 +1,3 @@
-AUX autofs-5.0.3-heimdal.patch 1380 BLAKE2B a41c4227e00a865e4152c1996096dd528f623024595c9de3fcdcbed82666121b3b8afdea61690ecc9fa713100a2ae3f7ee3bdfce2edb82032afa92cab5df7aa8 SHA512 f8f0528988085691899c3f4c1b3f13c6b189b4fe7fa160e713a819f25cb1c860ed896e096c4226e9e6449526037b263e832d27a5e5ce9b13bc5416ee28cb7317
-AUX autofs-5.0.5-fix-install-deadlink.patch 544 BLAKE2B 4319ae4490e22ba7834fdfba0abea7394807e06fc453834a68289ffa02b37e00200551b1fd4f24d1080c30bedf75f65f53cdbf17ad32c05fffb0f54d58e04bd9 SHA512 03f4f8fa6721e5ddd16560b9d7385a3734c7614f2903bd142869b2f2b099317ae2f73f6aa59f6e62b166f00d90baba3345d5fd5c3af3344b2348984d09ba3020
-AUX autofs-5.0.6-revert-ldap.patch 512 BLAKE2B b7fb60f78e06c5b5be92f5b6e47488a31439ba76c9b6085250b99c33bd196e0d3f996b192b5482e804b0a1861f2cfbedc85fa3998eb9f5383a9ffacc711e8115 SHA512 e929bbe145c19ac5180094205a9095387e90126e8360ede99ab972cca864c40c1caf779503454784804e925e0efc0b4c459accb734f63482c758989bb17d7313
-AUX autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch 1151 BLAKE2B 8858945671bdedf0a7dde5006ec5b8e03253555ab4b224f727e00fa620ca74eb7321b6a572db22f798cbb71b9f0faebaa4679ebd7a8d17c2e6cd18e050d1e963 SHA512 d92b0fcafdf6bb5df1b1d79f628bd049e07a51318e7b487f350816b1ff54d73c24b0fb44d8558b068bf27f128cf9edbc611a5e67e5d33f96b91c47bede1ebbfd
-AUX autofs-5.0.7-libtirpc-link.patch 423 BLAKE2B 025088b3353c266b187cde0c60dfac181dfebbefcccadf58a933900cd050e4db5c0317a327650bf615838751973f8719ae58d677f6b8fdb8176d082e4da41d4b SHA512 2a66e7ad011571ad49c9c9c98a880a663f6ec3c2d31e792f727e8d2c38fa5ae00a8f48222f3b215caab5ef7db64dbc6eb9a794f556efccea5a941ff5fe4f5bc5
-AUX autofs-5.0.7-parallel-make.patch 1424 BLAKE2B cde359f0602f204c80dee7fed9d771f6a08475341aa8c26789985426b4d6934ed77a742d7f445f9e4c8b725dae204d04027490e2ed1525e90962206cb50da174 SHA512 8489a71e22c5711bc76d3756b4c3a375984392f821a58c5f28db82c0134a8dcb009905a64fdef56ca3553eaff8be883e653a36d6acf72a724b90a946408aa8cf
-AUX autofs-5.0.7-respect-user-flags-and-fix-asneeded-r3.patch 3883 BLAKE2B 794a3fab9e456c63cf1143128db5102a293d8c399315ea5fcaf9b5357dc6175f611c1f5c0e6f9a1f9b20733a0ea4b3c2b36d5ff5ca8fb9640642c69367017d0e SHA512 7332d440b583cdf88be95a4f01d0832a5807e5e807564d135fd47c08886d3abb90bc9df0c88bfa5b2a910ebf1ca3ee37ade78afb02ce6e57a4468c03b6ddbc84
-AUX autofs-5.0.7-sasl-def.patch 1114 BLAKE2B 1cadf8394eb19f0e44573ebc4e641d2f1c95521bdca20b9d9ee165acb9c6f739728f13b72600f45ec85fd3d8f695d57a8e456102594062d8cf52c33e33569efd SHA512 a6b1b75079f4651ef9886d8315c8fb6894c5800eb6a4f614fdcb205365e805ba6e4f95146ed95b283e361339eb5b0b723956b3344e50856223ae79aec7c6ca09
-AUX autofs-5.0.7-sloppy-mount.patch 3375 BLAKE2B 04b02e106bef614f0c9bb28490c6c688b25ec2f80d5db422857368699761fead5d9132070bcd8725b6c1b1169472c1b7521e495a7141ccdfc3934a468aee6ae5 SHA512 2c5cf35c9ea4258c406be629b99fabe953fca63209dfa93a74b1b8441ae92b58677bb52e408556a05be0492871ac98849baf6c8aba7429efc97e38b4a9b1fb45
 AUX autofs-5.1.2-libtirpc-as-need.patch 808 BLAKE2B a36fab796d78adff8cab4c10f8316d51809ef36781f7d95616b8c87ad093855a7c625c8cda907017c3000b3ee8a69cfc6ecfc60c655c32cd8dea0d2ede76ea0d SHA512 96441e4a040ceafd4bf323003d13170f419ea09c7d9cfdaeaf8675c945d28afde9b9ccf0ae3b0180d2038f5120e6d651c6657115658591093b778ed8f21b1bb3
 AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0de6ad1fa70f7f15ee6c882058d657fae09807b86d19f1f1017306193cb18a3ce5115e31a53a5913e29af5 SHA512 3be4e92250cb678a6d8454b5703c48f6fac14653e1e89028917a627787e8785bfae1cac5a76b2d8a030fd2ec6e491e22488c19a2034cfeedf02e98c400a228dd
 AUX autofs5.initd 1563 BLAKE2B 6fa5e84a93a85f208be6c7dce170230a7cd8a3e098dcd0cf1a59e96f8da0bc4d1795f689e4591e230a1c3c8a898a41bbfbb4e308b7885aa9bc238ca3f9b2eaea SHA512 f8e1d38917b9c7048a4f6498fb987984306e15458eaf8cb73990a99d355d7f7ce3f1aa5450725283cbbc6f5c0e2f31048f1cd26eca7f136f1fe30a6dd8d31c43
diff --git a/net-fs/autofs/files/autofs-5.0.3-heimdal.patch b/net-fs/autofs/files/autofs-5.0.3-heimdal.patch
deleted file mode 100644
index 707364df2f97..000000000000
--- a/net-fs/autofs/files/autofs-5.0.3-heimdal.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- autofs-5.0.3.orig/modules/cyrus-sasl.c	2008-04-28 16:17:03.000000000 +0200
-+++ autofs-5.0.3/modules/cyrus-sasl.c	2008-04-28 16:41:58.000000000 +0200
-@@ -66,6 +66,15 @@
- #endif
- #endif
- 
-+/**
-+ * The type of a principal is different for MIT Krb5 and Heimdal.
-+ * These macros are provided by Heimdal, and introduced here for MIT.
-+ */
-+#ifndef krb5_realm_length
-+#define krb5_realm_length(r) ((r).length)
-+#define krb5_realm_data(r) ((r).data)
-+#endif
-+
- /*
-  *  Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME
-  *  environment variable so that the library knows where to find it.
-@@ -452,11 +461,11 @@
- 
- 	/* setup a principal for the ticket granting service */
- 	ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ,
--		krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
--		krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
-+		krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
-+		krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
- 		strlen(KRB5_TGS_NAME), KRB5_TGS_NAME,
--		krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
--		krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
-+		krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
-+		krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
- 		0);
- 	if (ret) {
- 		error(logopt,
-
diff --git a/net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch b/net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch
deleted file mode 100644
index 8ab10fcf7471..000000000000
--- a/net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- modules/Makefile.old	2010-06-19 20:43:45.373371321 +0200
-+++ modules/Makefile	2010-06-19 20:45:26.062417092 +0200
-@@ -63,7 +63,9 @@ install: all
- 	-rm -f $(INSTALLROOT)$(autofslibdir)/mount_smbfs.so
- 	ln -fs lookup_file.so $(INSTALLROOT)$(autofslibdir)/lookup_files.so
- 	ln -fs lookup_yp.so $(INSTALLROOT)$(autofslibdir)/lookup_nis.so
-+ifeq ($(SASL), 1)
- 	ln -fs lookup_ldap.so $(INSTALLROOT)$(autofslibdir)/lookup_ldaps.so
-+endif
- 	ln -fs mount_nfs.so $(INSTALLROOT)$(autofslibdir)/mount_nfs4.so
- ifeq ($(EXT2FS), 1)
-  ifeq ($(EXT3FS), 1)
diff --git a/net-fs/autofs/files/autofs-5.0.6-revert-ldap.patch b/net-fs/autofs/files/autofs-5.0.6-revert-ldap.patch
deleted file mode 100644
index 49901ddfc69b..000000000000
--- a/net-fs/autofs/files/autofs-5.0.6-revert-ldap.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- modules/lookup_ldap.c
-+++ modules/lookup_ldap.c	
-@@ -1488,6 +1488,7 @@ int lookup_init(const char *mapfmt, int
- 		}
- 	}
- 
-+#ifdef WITH_SASL
- 	/*
- 	 *  First, check to see if a preferred authentication method was
- 	 *  specified by the user.  parse_ldap_config will return error
-@@ -1500,7 +1501,6 @@ int lookup_init(const char *mapfmt, int
- 		return 1;
- 	}
- 
--#ifdef WITH_SASL
- 	/* Init the sasl callbacks */
- 	if (!autofs_sasl_client_init(LOGOPT_NONE)) {
- 		error(LOGOPT_ANY, "failed to init sasl client");
diff --git a/net-fs/autofs/files/autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch b/net-fs/autofs/files/autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
deleted file mode 100644
index 366b1eaaba3b..000000000000
--- a/net-fs/autofs/files/autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- ./modules/lookup_ldap.c
-+++ ./modules/lookup_ldap.c
-@@ -591,10 +591,12 @@ static LDAP *do_connect(unsigned logopt, const char *uri, struct lookup_context
- {
- 	LDAP *ldap;
- 
-+#ifdef HAVE_SASL
- 	if (ctxt->extern_cert && ctxt->extern_key) {
- 		set_env(logopt, ENV_LDAPTLS_CERT, ctxt->extern_cert);
- 		set_env(logopt, ENV_LDAPTLS_KEY, ctxt->extern_key);
- 	}
-+#endif
- 
- 	ldap = init_ldap_connection(logopt, uri, ctxt);
- 	if (ldap) {
-@@ -1372,10 +1374,12 @@ static void free_context(struct lookup_context *ctxt)
- 		defaults_free_searchdns(ctxt->sdns);
- 	if (ctxt->dclist)
- 		free_dclist(ctxt->dclist);
-+#ifdef HAVE_SASL
- 	if (ctxt->extern_cert)
- 		free(ctxt->extern_cert);
- 	if (ctxt->extern_key)
- 		free(ctxt->extern_key);
-+#endif
- 	free(ctxt);
- 
- 	return;
- modules/lookup_ldap.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
-index dbec753..ce1e2e5 100644
---- a/modules/lookup_ldap.c
-+++ b/modules/lookup_ldap.c
-@@ -28,7 +28,9 @@
- #include <arpa/nameser.h>
- #include <resolv.h>
- #include <lber.h>
-+#ifdef HAVE_SASL
- #include <libxml/tree.h>
-+#endif
- 
- #define MODULE_LOOKUP
- #include "automount.h"
diff --git a/net-fs/autofs/files/autofs-5.0.7-libtirpc-link.patch b/net-fs/autofs/files/autofs-5.0.7-libtirpc-link.patch
deleted file mode 100644
index 92143f1d3066..000000000000
--- a/net-fs/autofs/files/autofs-5.0.7-libtirpc-link.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/modules/Makefile b/modules/Makefile
-index 4ecbd6a..6a17540 100644
---- a/modules/Makefile
-+++ b/modules/Makefile
-@@ -114,4 +114,4 @@ lookup_ldap.so: lookup_ldap.c dclist.o base64.o $(SASL_OBJ)
- 
- mount_nfs.so: mount_nfs.c replicated.o
- 	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \
--		mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL)
-+		mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL) $(TIRPCLIB)
diff --git a/net-fs/autofs/files/autofs-5.0.7-parallel-make.patch b/net-fs/autofs/files/autofs-5.0.7-parallel-make.patch
deleted file mode 100644
index f510f8fa2015..000000000000
--- a/net-fs/autofs/files/autofs-5.0.7-parallel-make.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ed85b855e1bcdb814b3dca7f6c768b86e6353fe7 Mon Sep 17 00:00:00 2001
-From: "Lan Yixun (dlan)" <dennis.yxun@gmail.com>
-Date: Thu, 25 Jul 2013 10:04:23 +0800
-Subject: [PATCH] fix occasional build error when enable parallel compiling
-
-the problem here we pass "-jX" ( X> 1) to "make", and "rpc_subs.c"
-occasionally fail to compile due to it can't find "mount.h",
-the root cause it that "mount.h" haven't generated by that time,
-add this patch should fix this problem.
-to make rpc_subs.o explicitly depend on "mount.h".
-
----
-error message:
-
-x86_64-pc-linux-gnu-gcc -O2 -pipe -march=core2  -D_REENTRANT
--D_FILE_OFFSET_BITS=64 -I/usr/include/tirp  c -D_REENTRANT
--D_FILE_OFFSET_BITS=64 -I/usr/include/tirpc -I../include -fPIC
--D_GNU_SOURCE -DAUTOFS_MA  P_DIR=\"/etc/autofs\"
--DAUTOFS_CONF_DIR=\"/etc/conf.d\" -c rpc_subs.c
-rpc_subs.c:46:19: fatal error: mount.h: No such file or directory
-  #include "mount.h"
-                   ^
-compilation terminated.
-make[1]: *** [rpc_subs.o] Error 1
-make[1]: *** Waiting for unfinished
-jobs....
-
-Signed-off-by: Lan Yixun (dlan) <dennis.yxun@gmail.com>
----
- lib/Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index 5418009..314779b 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -70,6 +70,8 @@ nss_tok.o: nss_tok.c nss_parse.tab.h
- 
- nss_parse.tab.o: nss_parse.tab.c nss_parse.tab.h
- 
-+rpc_subs.o: mount.h
-+
- install: all
- 
- clean:
--- 
-1.8.3.2
-
diff --git a/net-fs/autofs/files/autofs-5.0.7-respect-user-flags-and-fix-asneeded-r3.patch b/net-fs/autofs/files/autofs-5.0.7-respect-user-flags-and-fix-asneeded-r3.patch
deleted file mode 100644
index c12d4bbe2b17..000000000000
--- a/net-fs/autofs/files/autofs-5.0.7-respect-user-flags-and-fix-asneeded-r3.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- a/Makefile.conf.in
-+++ b/Makefile.conf.in
-@@ -100,3 +100,6 @@ initdir = @initdir@
- 
- # Location of systemd unit files
- systemddir = @systemddir@
-+
-+# Use the compiler determined by configure
-+CC := @CC@
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -16,44 +16,30 @@ INSTALLROOT = $(DESTDIR)
- AUTOFS_LIB = ../lib/autofs.a
- 
- # Compilers, linkers and flags
--# The STRIP defined here *must not* remove any dynamic-loading symbols
--
- ifdef DMALLOCLIB
- DEBUG=1
- endif
- 
- ifdef DEBUG
- CFLAGS    ?= -g -Wall -DDEBUG
--LDFLAGS   = -g
--STRIP     = :
- else
--ifdef DONTSTRIP
- CFLAGS    ?= -O2 -g
--LDFLAGS   = -g
--STRIP     = :
--else
--CFLAGS    ?= -O2 -Wall
--LDFLAGS   = -s
--STRIP     = strip --strip-debug
--endif
- endif
-+AUTOFS_LDFLAGS = -g
- 
--CC        = gcc
--CXX       = g++
- CXXFLAGS  = $(CFLAGS)
- LD        = ld
- SOLDFLAGS = -shared
- 
- CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
--LDFLAGS += -lpthread
- 
- ifdef TIRPCLIB
- CFLAGS += -I/usr/include/tirpc
--LDFLAGS += $(TIRPCLIB)
-+AUTOFS_LDFLAGS += $(TIRPCLIB)
- endif
- 
- ifdef DMALLOCLIB
--LDFLAGS += $(DMALLOCLIB)
-+AUTOFS_LDFLAGS += $(DMALLOCLIB)
- endif
- 
- ifdef SASL
-@@ -71,5 +57,4 @@ endif
- 	$(CC) $(CFLAGS) -S $<
- 
- .c.so:
--	$(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL)
--	$(STRIP) $*.so
-+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL)
---- a/configure.in
-+++ b/configure.in
-@@ -183,7 +183,7 @@ AC_ARG_WITH(hesiod,
- 		: Search for Hesiod in normal directory path
- 	else
- 		: Search for Hesiod in specific directory
--		LDFLAGS="$LDFLAGS -L${withval}/lib"
-+		LDFLAGS="$LDFLAGS -Wl,--no-as-needed -L${withval}/lib"
- 		LIBHESIOD="-L${withval}/lib"
- 		HESIOD_FLAGS="-I${withval}/include"
- 	fi
---- a/daemon/Makefile
-+++ b/daemon/Makefile
-@@ -20,7 +20,7 @@ CFLAGS += -DAUTOFS_FIFO_DIR=\"$(autofsfi
- CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\"
- CFLAGS += -DVERSION_STRING=\"$(version)\"
- LDFLAGS += -rdynamic
--LIBS = -ldl
-+LIBS += -ldl -lpthread
- 
- ifeq ($(LDAP), 1)
-     CFLAGS += $(XML_FLAGS)
-@@ -30,8 +30,7 @@ endif
- all: automount
- 
- automount: $(OBJS) $(AUTOFS_LIB)
--	$(CC) $(LDFLAGS) $(DAEMON_LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
--	$(STRIP) automount
-+	$(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
- 
- clean:
- 	rm -f *.o *.s *~ automount
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -41,14 +41,12 @@ mount_clnt.c: mount.h
- 
- mount_clnt.o: mount_clnt.c
- 	$(CC) $(CFLAGS) -o mount_clnt.o -c mount_clnt.c
--	$(STRIP) mount_clnt.o
- 
- mount_xdr.c: mount.h
- 	$(RPCGEN) -c -o mount_xdr.c mount.x
- 
- mount_xdr.o: mount_xdr.c
- 	$(CC) $(CFLAGS) -Wno-unused-variable -o mount_xdr.o -c mount_xdr.c
--	$(STRIP) mount_xdr.o
- 
- master_tok.c: master_tok.l
- 	$(LEX) -o$@ -Pmaster_ $?
---- a/modules/Makefile
-+++ b/modules/Makefile
-@@ -87,9 +87,8 @@ endif
- # Ad hoc compilation rules for modules which need auxilliary libraries
- #
- lookup_hesiod.so: lookup_hesiod.c
--	$(CC) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \
-+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \
- 		lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV)
--	$(STRIP) lookup_hesiod.so
- 
- cyrus-sasl.o: cyrus-sasl.c
- 	$(CC) $(CFLAGS) $(LDAP_FLAGS) -c $<
-@@ -98,13 +97,10 @@ cyrus-sasl-extern.o: cyrus-sasl-extern.c
- 	$(CC) $(CFLAGS) $(LDAP_FLAGS) -c $<
- 
- lookup_ldap.so: lookup_ldap.c dclist.o base64.o $(SASL_OBJ)
--	$(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \
-+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \
- 		lookup_ldap.c dclist.o base64.o $(SASL_OBJ) \
- 		$(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV)
--	$(STRIP) lookup_ldap.so
- 
- mount_nfs.so: mount_nfs.c replicated.o
--	$(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \
-+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \
- 		mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL)
--	$(STRIP) mount_nfs.so
--
diff --git a/net-fs/autofs/files/autofs-5.0.7-sasl-def.patch b/net-fs/autofs/files/autofs-5.0.7-sasl-def.patch
deleted file mode 100644
index a12d3798bdf0..000000000000
--- a/net-fs/autofs/files/autofs-5.0.7-sasl-def.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
-index ce1e2e5..35a2106 100644
---- a/modules/lookup_ldap.c
-+++ b/modules/lookup_ldap.c
-@@ -28,9 +28,6 @@
- #include <arpa/nameser.h>
- #include <resolv.h>
- #include <lber.h>
--#ifdef HAVE_SASL
--#include <libxml/tree.h>
--#endif
- 
- #define MODULE_LOOKUP
- #include "automount.h"
-@@ -38,6 +35,10 @@
- #include "lookup_ldap.h"
- #include "base64.h"
- 
-+#ifdef WITH_SASL
-+#include <libxml/tree.h>
-+#endif
-+
- #define MAPFMT_DEFAULT "sun"
- 
- #define MODPREFIX "lookup(ldap): "
-@@ -587,7 +588,7 @@ static LDAP *do_connect(unsigned logopt, const char *uri, struct lookup_context
- {
- 	LDAP *ldap;
- 
--#ifdef HAVE_SASL
-+#ifdef WITH_SASL
- 	if (ctxt->extern_cert && ctxt->extern_key) {
- 		set_env(logopt, ENV_LDAPTLS_CERT, ctxt->extern_cert);
- 		set_env(logopt, ENV_LDAPTLS_KEY, ctxt->extern_key);
-@@ -1389,7 +1390,7 @@ static void free_context(struct lookup_context *ctxt)
- 		defaults_free_searchdns(ctxt->sdns);
- 	if (ctxt->dclist)
- 		free_dclist(ctxt->dclist);
--#ifdef HAVE_SASL
-+#ifdef WITH_SASL
- 	if (ctxt->extern_cert)
- 		free(ctxt->extern_cert);
- 	if (ctxt->extern_key)
diff --git a/net-fs/autofs/files/autofs-5.0.7-sloppy-mount.patch b/net-fs/autofs/files/autofs-5.0.7-sloppy-mount.patch
deleted file mode 100644
index 86e02bce5558..000000000000
--- a/net-fs/autofs/files/autofs-5.0.7-sloppy-mount.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From: Ian Kent <ikent@redhat.com>
-
-Historically autofs added an option to mounts, called the sloppy
-option, meant to allow mount(8) to ignore invalid mount options.
-This was done so that mount map entries for sites that needed to
-use different mount options for some machines would still work.
-It was needed for nfs mounts in particular.
-
-Recent changes to mount(8) cause the sloppy option to be passed on
-for all mounts when it is given.
-
-Previously mount(8) only passed on the option to nfs mounts so now,
-for other than nfs mounts, the mount will fail if the file system
-doesn't understand the sloppy option.
-
-Since the option was not passed on to other than nfs mounts before
-it seems sensible for autofs to not add it for other than nfs mounts
-now.
-
-Signed-off-by: Ian Kent <ikent@redhat.com>
----
- modules/mount_bind.c    |    9 ++++-----
- modules/mount_changer.c |    6 +++---
- modules/mount_ext2.c    |    6 +++---
- modules/mount_generic.c |    4 ++--
- 4 files changed, 12 insertions(+), 13 deletions(-)
-
---- a/modules/mount_bind.c
-+++ b/modules/mount_bind.c
-@@ -158,13 +158,12 @@ int mount_mount(struct autofs_point *ap,
- 		if (!status)
- 			existed = 0;
- 
--		debug(ap->logopt,
--		      MODPREFIX
--		      "calling mount --bind " SLOPPY " -o %s %s %s",
-+		debug(ap->logopt, MODPREFIX
-+		      "calling mount --bind -o %s %s %s",
- 		      options, what, fullpath);
- 
--		err = spawn_bind_mount(ap->logopt,
--			     SLOPPYOPT "-o", options, what, fullpath, NULL);
-+		err = spawn_bind_mount(ap->logopt, "-o",
-+				       options, what, fullpath, NULL);
- 
- 		if (err) {
- 			if (ap->type != LKP_INDIRECT)
---- a/modules/mount_changer.c
-+++ b/modules/mount_changer.c
-@@ -103,12 +103,12 @@ int mount_mount(struct autofs_point *ap,
- 	}
- 
- 	if (options && options[0]) {
--		debug(ap->logopt,
--		      MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s",
-+		debug(ap->logopt, MODPREFIX
-+		      "calling mount -t %s -o %s %s %s",
- 		      fstype, options, what, fullpath);
- 
- 		err = spawn_mount(ap->logopt, "-t", fstype,
--			     SLOPPYOPT "-o", options, what, fullpath, NULL);
-+			          "-o", options, what, fullpath, NULL);
- 	} else {
- 		debug(ap->logopt,
- 		      MODPREFIX "calling mount -t %s %s %s",
---- a/modules/mount_ext2.c
-+++ b/modules/mount_ext2.c
-@@ -116,11 +116,11 @@ int mount_mount(struct autofs_point *ap,
- 	}
- 
- 	if (options) {
--		debug(ap->logopt,
--		      MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s",
-+		debug(ap->logopt, MODPREFIX
-+		      "calling mount -t %s -o %s %s %s",
- 		      fstype, options, what, fullpath);
- 		err = spawn_mount(ap->logopt, "-t", fstype,
--			     SLOPPYOPT "-o", options, what, fullpath, NULL);
-+			          "-o", options, what, fullpath, NULL);
- 	} else {
- 		debug(ap->logopt,
- 		      MODPREFIX "calling mount -t %s %s %s",
---- a/modules/mount_generic.c
-+++ b/modules/mount_generic.c
-@@ -97,11 +97,11 @@ int mount_mount(struct autofs_point *ap,
- 
- 	if (options && options[0]) {
- 		debug(ap->logopt,
--		      MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s",
-+		      MODPREFIX "calling mount -t %s -o %s %s %s",
- 		      fstype, options, loc, fullpath);
- 
- 		err = spawn_mount(ap->logopt, "-t", fstype,
--			     SLOPPYOPT "-o", options, loc, fullpath, NULL);
-+				  "-o", options, loc, fullpath, NULL);
- 	} else {
- 		debug(ap->logopt, MODPREFIX "calling mount -t %s %s %s",
- 		      fstype, loc, fullpath);
-
diff --git a/net-fs/minio/Manifest b/net-fs/minio/Manifest
index 76dd09de0754..fd36dc73bf67 100644
--- a/net-fs/minio/Manifest
+++ b/net-fs/minio/Manifest
@@ -1,6 +1,8 @@
 AUX minio.initd 410 BLAKE2B bedce560151142afc4961569f6fb803c9d7bb4263d56061191e3dc7e867dccd62fa1a363d41c16afa931d0ad138bd8cd858d7dc636851c6a0130bb1405396e3b SHA512 01610c5dd7e5887f85b1246d475e5b5c23cf3fbaa0de21e9579bfa929f3634cccbab1b7a7b8e66fa9bec41ed3feaae033c4380cc3911a7af6f64286c4ed0cf78
 DIST minio-0_pre20180209.tar.gz 7521636 BLAKE2B af76c858c3afc97067b2f69025c3e3623179e80c93d537e1f90b27b078379c4e3485399f0d30a3b4c196629dd78fed969a3d0da150e79757d58fc6db74b9fce1 SHA512 1c654a40fc809ae010643451c504cc61f5343c9fa210d3e00ceeeeb0917865bed8e07759293853d195f414dbcbb99ed34dfb2f913a6e607659ab6646492598fe
 DIST minio-0_pre20180330.tar.gz 7542469 BLAKE2B 3aae4daab1357fa5ae7e42f12768c15de133c7ffa49568657c1f7b5d38e7881e948ccab9e9fdbd22e90269ded903345f3278d12b817be7fa2a92259ee1999ee6 SHA512 34b9e330e60e58099744f2216c677f2bdcff82741a926b8c1fbf93eabf654f806e7b8df89440a477f787726d909e82a1eefd5d9c8f9ed70560ca17832708f9c3
+DIST minio-0_pre20180412.tar.gz 7638430 BLAKE2B 698e0d5f5fd176f6b1dbc520d52474ce3d0e44ce5caf1345f2c6afaad3766e88e77a1c6722afa073b7b5f7176e266d00cb88d1847152f3a20b991f7819918d42 SHA512 4ef4964ec5a4b228116995b660724d404e04a132c10094c0a62974c2febaa0db7e035d93e6db4f1978ef418cc331a80db8cf3d0c6a191c57295016f1016f79e8
 EBUILD minio-0_pre20180209.ebuild 1319 BLAKE2B 71a1c48dc34cdd6f6c79cddd56566f476e4da211f3643ca0427671e2f0c1bbb36376cdc045956601e8513cb9a818bc52fe384843fc65df68732a5d30c619187a SHA512 213ad23adfbe038d28c0158cd05787c087034ff698624bfa0b507e753b24f1613635211f3790196bd23411d24f6e0efad43c54a1ffffbbe60826d6b50d64ac5a
 EBUILD minio-0_pre20180330.ebuild 1319 BLAKE2B 8908a732710a0fb77892aa5dafa22b251a1563420997be660d88bbcfbfa901e6a10db192a855ffcfbca189ba26ba08bfaeb3b1277a5de7d3cbea0092a04ce3c5 SHA512 a8f507f1987bc30adcfaf4d5b70c0bf5687c1abde9ccd54bb02c3a7fc8992874c89d51f754d93401783840a0e5241fd2e55219377f42482e160a30d73b9d55db
+EBUILD minio-0_pre20180412.ebuild 1319 BLAKE2B 108ec3fef90b317a748fb6e3159cfbc8b235ad205fb500840042524fce0a6d108cc93ef00fbe52e2e6375a2df0085103b9d890b197615a7ad7822828ee0c680f SHA512 dbcbb2731e79bec28d85cf8b265c730fbba67cf28c59f48540782c88236d80bc4d4c14b81307b8a89b7be1345e01380a6bcafd690844e2a35f808d07eca284ee
 MISC metadata.xml 321 BLAKE2B 7e012bd9c28f71a0c8ccecc85f4ba3a18e5d4d20f7ad6d0f493d228118ecef3412886a8adbf5585aee9e22c8141a9065b06f980d40588e1db408e9d0f7ac715c SHA512 b44c2fe36086faa97355cc6d55571ceca91836e6874530529d13d909974795a553bf1701eadd85a461da1f2f53c885230cce33589d1527117d7232ff959171b0
diff --git a/net-fs/minio/minio-0_pre20180412.ebuild b/net-fs/minio/minio-0_pre20180412.ebuild
new file mode 100644
index 000000000000..734cafb6aff8
--- /dev/null
+++ b/net-fs/minio/minio-0_pre20180412.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/minio/minio"
+VERSION="2018-04-12T23-41-09Z"
+EGIT_COMMIT="f60765ac93013a554af1b55660764b49cc9b3221"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="An Amazon S3 compatible object storage server"
+HOMEPAGE="https://github.com/minio/minio"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	MINIO_RELEASE="${VERSION}"
+	go run buildscripts/gen-ldflags.go
+	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
+	dobin minio
+	popd  || die
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+}