gentoo resync : 14.07.2018

26 files changed, 0 insertions, 609 deletions

diff --git a/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch b/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch
deleted file mode 100644
index 458c188733a4..000000000000
--- a/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- src/console/Makefile.in.orig	2011-10-30 14:10:41.100802721 -0400
-+++ src/console/Makefile.in	2011-10-30 14:14:42.330488174 -0400
-@@ -29,10 +29,11 @@
- GETTEXT_LIBS = @LIBINTL@
- 
- CONS_INC=@CONS_INC@
- CONS_LIBS=@CONS_LIBS@
- CONS_LDFLAGS=@CONS_LDFLAGS@
-+ZLIBS=@ZLIBS@
- 
- .SUFFIXES:	.c .o
- .PHONY:
- .DONTCARE:
- 
-@@ -46,17 +47,17 @@
- 	@echo " "
- 
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
- 
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS) $(ZLIBS)
- 	strip $@
- 
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
---- src/filed/Makefile.in.orig	2012-06-28 16:52:03.000000000 +0200
-+++ src/filed/Makefile.in	2012-08-16 11:08:09.000000000 +0200
-@@ -96,13 +96,13 @@
- bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
--	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
--	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
-+	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) \
-+	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
- 
- static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
--	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
--	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
-+	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) \
-+	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
- 	strip $@
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff --git a/app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch b/app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch
deleted file mode 100644
index 8c419a3bdfac..000000000000
--- a/app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# fix file not found error during make depend
---- src/tools/Makefile.in.orig	2012-09-20 20:42:54.000000000 +0200
-+++ src/tools/Makefile.in	2012-09-20 20:35:46.000000000 +0200
-@@ -194,7 +194,7 @@
- 	@$(MV) Makefile Makefile.bak
- 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
- 	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
--	@$(CXX) -S -M $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
-+	@$(CXX) -S -M $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) -I../filed -I../dird -I../stored *.c >> Makefile
- 	@if test -f Makefile ; then \
- 	    $(RMF) Makefile.bak; \
- 	else \
diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch
deleted file mode 100644
index 3cdee15d4db7..000000000000
--- a/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# stop build if there are errors in subdirs
---- Makefile.in.orig	2010-07-20 16:53:44.000000000 +0000
-+++ Makefile.in	2010-07-20 16:55:50.000000000 +0000
-@@ -44,9 +44,8 @@
- 
- all: Makefile
- 	@for I in ${all_subdirs}; \
--	  do (cd $$I; echo "==>Entering directory `pwd`"; \
--	      $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
--			    echo ""; echo ""; exit 1;)); \
-+	  do \
-+	      $(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ || exit 1; \
- 	done
- 
- depend:
-@@ -55,9 +54,8 @@
- 	
- bacula-fd: Makefile	   
- 	@for I in ${fd_subdirs}; \
--	  do (cd $$I; echo "==>Entering directory `pwd`"; \
--	      $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo "   ====== Error in `pwd` ======"; \
--			    echo ""; echo ""; exit 1;)); \
-+	  do \
-+	        $(MAKE) DESTDIR=$(DESTDIR) -C $$I all ||  exit 1; \
- 	done
- 
- #-------------------------------------------------------------------------
diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch
deleted file mode 100644
index 4b52d214cf76..000000000000
--- a/app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# see bug #310087 
-diff -urN bacula-5.2.1.orig/src/findlib/Makefile.in bacula-5.2.1/src/findlib/Makefile.in
---- bacula-5.2.1.orig/src/findlib/Makefile.in	2010-02-24 16:33:48.000000000 +0100
-+++ bacula-5.2.1/src/findlib/Makefile.in	2010-03-22 17:37:43.772805754 +0100
-@@ -59,7 +59,7 @@
- 
- libbacfind.la: Makefile $(LIBBACFIND_LOBJS) 
- 	@echo "Making $@ ..."
--	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE) -L../lib -lbac $(LIBS) $(OPENSSL_LIBS)
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
-
diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch
deleted file mode 100644
index 98c6e6ce34be..000000000000
--- a/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# drop automatic installation of doc files
---- Makefile.in.orig	2011-02-26 09:05:21.000000000 +0000
-+++ Makefile.in	2011-02-26 09:06:01.000000000 +0000
-@@ -34,8 +34,7 @@
- 	autoconf/config.h.in  autoconf/acconfig.h  autoconf/Make.common.in \
- 	autoconf/install-sh autoconf/mkinstalldirs
- 
--doc_files = VERIFYING technotes ChangeLog README ReleaseNotes LICENSE \
--	    INSTALL
-+doc_files = 
- 
- MKDIR = $(srcdir)/autoconf/mkinstalldirs
- LIBTOOL_DEPS = @LIBTOOL_DEPS@
diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch
deleted file mode 100644
index 94d8fb60120e..000000000000
--- a/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-# bat needs to respect LDFLAGS
---- src/qt-console/bat.pro.in.orig	2010-07-20 18:28:50.000000000 +0000
-+++ src/qt-console/bat.pro.in	2010-07-20 18:29:25.000000000 +0000
-@@ -26,6 +26,7 @@
- QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
- QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
- QMAKE_CLEAN += .libs/* bat
-+QMAKE_LFLAGS += @LDFLAGS@
- 
- qwt {
-   INCLUDEPATH += @QWT_INC@ 
diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch
deleted file mode 100644
index c3bded40ad03..000000000000
--- a/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# If upgrading the old libraries gets linked first. So fix order of lib search path.
---- src/console/Makefile.in.orig	2010-03-29 11:35:00.000000000 +0000
-+++ src/console/Makefile.in	2010-03-29 11:45:14.000000000 +0000
-@@ -47,7 +47,7 @@
- 
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
--	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
-+	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
- 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- 	      $(OPENSSL_LIBS)
- 
diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch
deleted file mode 100644
index 58d26316ca7d..000000000000
--- a/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://bugs.gentoo.org/328701
-http://cvs.fedoraproject.org/viewvc/rpms/bacula/devel/bacula-5.0.2-openssl.patch?revision=1.3&view=markup
-
---- src/lib/crypto.c
-+++ src/lib/crypto.c
-@@ -51,7 +51,7 @@
-  * For OpenSSL version 1.x, EVP_PKEY_encrypt no longer
-  *  exists.  It was not an official API.
-  */
--#ifdef HAVE_OPENSSLv1
-+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
- #define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
- #define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
- #endif
---- src/lib/tls.c
-+++ src/lib/tls.c
-@@ -315,7 +315,7 @@ bool tls_postconnect_verify_host(JCR *jc
-          extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
- 
-          if (strcmp(extname, "subjectAltName") == 0) {
--#ifdef HAVE_OPENSSLv1
-+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
-             const X509V3_EXT_METHOD *method;
- #else
-             X509V3_EXT_METHOD *method;
diff --git a/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch b/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch
deleted file mode 100644
index e076cd6478cc..000000000000
--- a/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# fix file not found error during make depend
---- src/tools/Makefile.in.orig	2012-09-20 20:42:54.000000000 +0200
-+++ src/tools/Makefile.in	2012-09-20 20:35:46.000000000 +0200
-@@ -194,7 +194,7 @@
- 	@$(MV) Makefile Makefile.bak
- 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
- 	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
--	@$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) *.c >> Makefile
-+	@$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) -I../filed -I../dird -I../stored *.c >> Makefile
- 	@if test -f Makefile ; then \
- 	    $(RMF) Makefile.bak; \
- 	else \
diff --git a/app-backup/bacula/files/7.2.0/bacula-7.2.0-doc.patch b/app-backup/bacula/files/7.2.0/bacula-7.2.0-doc.patch
deleted file mode 100644
index 155746a876dd..000000000000
--- a/app-backup/bacula/files/7.2.0/bacula-7.2.0-doc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.in.orig	2015-09-03 20:03:22.000000000 +0200
-+++ Makefile.in	2015-09-03 20:03:50.000000000 +0200
-@@ -35,8 +35,7 @@
- 	autoconf/config.h.in  autoconf/acconfig.h  autoconf/Make.common.in \
- 	autoconf/install-sh autoconf/mkinstalldirs
- 
--doc_files = VERIFYING ChangeLog README ReleaseNotes LICENSE \
--	    LICENSE-FAQ LICENSE-FOSS INSTALL
-+doc_files =
- 
- MKDIR = $(srcdir)/autoconf/mkinstalldirs
- LIBTOOL_DEPS = @LIBTOOL_DEPS@
diff --git a/app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch b/app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch
deleted file mode 100644
index faf0d065b90f..000000000000
--- a/app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- src/console/Makefile.in.orig	2011-10-30 14:10:41.100802721 -0400
-+++ src/console/Makefile.in	2011-10-30 14:14:42.330488174 -0400
-@@ -29,10 +29,11 @@
- GETTEXT_LIBS = @LIBINTL@
- 
- CONS_INC=@CONS_INC@
- CONS_LIBS=@CONS_LIBS@
- CONS_LDFLAGS=@CONS_LDFLAGS@
-+ZLIBS=@ZLIBS@
- 
- .SUFFIXES:	.c .o
- .PHONY:
- .DONTCARE:
- 
-@@ -46,17 +47,17 @@
- 	@echo " "
- 
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
- 
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS) $(ZLIBS)
- 	strip $@
- 
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
---- src/filed/Makefile.in.orig	2015-09-04 12:47:13.000000000 +0200
-+++ src/filed/Makefile.in	2015-09-04 12:49:39.000000000 +0200
-@@ -66,13 +66,13 @@
- bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
--	  $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-+	  $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- 
- static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
--	   $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-+	   $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- 	strip $@
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff --git a/app-backup/bacula/files/9.0.2/bacula-9.0.2-fix-static.patch b/app-backup/bacula/files/9.0.2/bacula-9.0.2-fix-static.patch
deleted file mode 100644
index bf6630a74a29..000000000000
--- a/app-backup/bacula/files/9.0.2/bacula-9.0.2-fix-static.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- src/console/Makefile.in.orig	2017-07-25 19:03:05.664760298 +0200
-+++ src/console/Makefile.in	2017-07-25 19:05:43.576706091 +0200
-@@ -24,6 +24,7 @@
- CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@
- CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@
- JSONOBJS = bbconsjson.o console_conf.o
-+ZLIBS=@ZLIBS@
- 
- # these are the objects that are changed by the .configure process
- EXTRAOBJS = @OBJLIST@
-@@ -50,18 +51,18 @@
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
- 
- bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
- 
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
- 	strip $@
- 
- 
---- src/filed/Makefile.in.orig	2017-07-25 19:09:19.655852979 +0200
-+++ src/filed/Makefile.in	2017-07-25 19:11:39.519558592 +0200
-@@ -69,19 +69,19 @@
- bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
--	  $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-+	  $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- 
- bfdjson:  Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(JSONOBJS) \
--	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-+	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- 
- static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
--	   $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-+	   $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- 	strip $@
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff --git a/app-backup/bacula/files/9.0.2/bacula-9.0.2-lib-search-path.patch b/app-backup/bacula/files/9.0.2/bacula-9.0.2-lib-search-path.patch
deleted file mode 100644
index 33cf83dcf150..000000000000
--- a/app-backup/bacula/files/9.0.2/bacula-9.0.2-lib-search-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# If upgrading the old libraries gets linked first. So fix order of 
-# lib search path.
---- src/console/Makefile.in.orig	2017-07-26 15:03:07.000000000 +0200
-+++ src/console/Makefile.in	2017-07-23 18:31:57.000000000 +0200
-@@ -49,17 +49,17 @@
- 
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
--	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
-+	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
- 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- 	      $(OPENSSL_LIBS)
- 
- bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
--	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(JSONOBJS) \
-+	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \
- 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- 	      $(OPENSSL_LIBS)
- 
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
--	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
-+	$(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
- 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- 	      $(OPENSSL_LIBS)
- 	strip $@
diff --git a/app-backup/bacula/files/9.0.6/bacula-9.0.6-bat-pro.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-bat-pro.patch
deleted file mode 100644
index 3d055b8c3077..000000000000
--- a/app-backup/bacula/files/9.0.6/bacula-9.0.6-bat-pro.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/qt-console/bat.pro.in.orig	2018-02-18 16:17:21.027921363 +0100
-+++ src/qt-console/bat.pro.in	2018-02-18 16:18:12.554137528 +0100
-@@ -12,7 +12,7 @@
- greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
- 
- bins.path = /$(DESTDIR)@sbindir@
--bins.files = bat
-+bins.files = .libs/bat
- confs.path = /$(DESTDIR)@sysconfdir@
- confs.commands = ./install_conf_file
- help.path = /$(DESTDIR)@docdir@
-@@ -29,6 +29,9 @@
- QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
- QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
- QMAKE_CLEAN += .libs/* bat
-+QMAKE_LFLAGS += @LDFLAGS@
-+QMAKE_CFLAGS += @CFLAGS@
-+QMAKE_CXXFLAGS += @CXXFLAGS@
- 
- qwt {
-   INCLUDEPATH += @QWT_INC@
diff --git a/app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch
deleted file mode 100644
index 9d6507c9c71a..000000000000
--- a/app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/qt-console/pages.h.orig 2017-11-21 12:37:16.000000000 -0500
-+++ src/qt-console/pages.h      2018-02-07 13:11:46.223273248 -0500
-@@ -20,10 +20,11 @@
- */
- /*
-  *   Dirk Bartley, March 2007
-  */
-
-+#include <QtGlobal>
- #if QT_VERSION >= 0x050000
- #include <QtWidgets>
- #else
- #include <QtGui>
- #endif
-
diff --git a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch
deleted file mode 100644
index 3df4285c2e2e..000000000000
--- a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/lib/crypto.c.orig       2018-02-02 15:34:39.420489000 -0600
-+++ src/lib/crypto.c    2018-02-02 15:35:44.000524000 -0600
-@@ -195,7 +195,7 @@
- IMPLEMENT_ASN1_FUNCTIONS(SignatureData)
- IMPLEMENT_ASN1_FUNCTIONS(CryptoData)
-
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) )
- DEFINE_STACK_OF(SignerInfo);
- DEFINE_STACK_OF(RecipientInfo);
- #else
---- src/lib/openssl-compat.h.orig       2018-02-02 15:26:04.182557000 -0600
-+++ src/lib/openssl-compat.h    2018-02-02 15:27:50.229100000 -0600
-@@ -1,7 +1,7 @@
- #ifndef __OPENSSL_COPMAT__H__
- #define __OPENSSL_COPMAT__H__
-
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
- static inline int EVP_PKEY_up_ref(EVP_PKEY *pkey)
- {
-        CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
---- src/lib/openssl.c.orig	2018-02-16 08:36:24.092583000 -0600
-+++ src/lib/openssl.c	2018-02-16 08:37:23.795454000 -0600
-@@ -69,7 +69,7 @@
-    }
- }
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
- /* Array of mutexes for use with OpenSSL static locking */
- static pthread_mutex_t *mutexes;
- 
-@@ -263,7 +263,7 @@
- {
-    int stat = 0;
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
-    if ((stat = openssl_init_threads()) != 0) {
-       berrno be;
-       Jmsg1(NULL, M_ABORT, 0,
-@@ -310,7 +310,7 @@
-       Jmsg0(NULL, M_ERROR, 0, _("Failed to save OpenSSL PRNG\n"));
-    }
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
-    openssl_cleanup_threads();
- 
-    /* Free libssl and libcrypto error strings */
---- src/lib/tls.c.orig	2017-11-21 18:37:16.000000000 +0100
-+++ src/lib/tls.c	2018-04-16 20:00:54.082000000 +0200
-@@ -116,7 +116,7 @@
-    ctx = (TLS_CONTEXT *)malloc(sizeof(TLS_CONTEXT));
- 
-    /* Allocate our OpenSSL TLS Context */
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
-    /* Allows SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols */
-    ctx->openssl = SSL_CTX_new(TLS_method());
- 
diff --git a/app-backup/bacula/files/bacula-dir.confd b/app-backup/bacula/files/bacula-dir.confd
deleted file mode 100644
index 59f684660cda..000000000000
--- a/app-backup/bacula/files/bacula-dir.confd
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Config file for /etc/init.d/bacula-dir
-
-# If the database server where you store your bacula catalog
-# is on a different machine, please set this to 0.
-# Setting it to 1 makes bacula-dir depend on the corresponding
-# database service selected at package compile time.
-LOCAL_DB=1
-
-# Options for the director daemon.
-# The director can be run as a non-root user, however
-# please ensure that this user has proper permissions to
-# access your backup devices.
-DIR_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-dir.conf"
diff --git a/app-backup/bacula/files/bacula-dir.initd b/app-backup/bacula/files/bacula-dir.initd
deleted file mode 100644
index 0601ca56e2c4..000000000000
--- a/app-backup/bacula/files/bacula-dir.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	if [ "${LOCAL_DB}" -eq 1 ]; then
-		need "%database%"
-	fi
-	use dns bacula-fd bacula-sd
-}
-
-start() {
-	ebegin "Starting bacula director"
-	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
-		-- ${DIR_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping bacula director"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
-	eend $?
-}
diff --git a/app-backup/bacula/files/bacula-fd.confd b/app-backup/bacula/files/bacula-fd.confd
deleted file mode 100644
index eed82ccbc6f4..000000000000
--- a/app-backup/bacula/files/bacula-fd.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Config file for /etc/init.d/bacula-fd
-
-# Options for the file daemon.
-FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
diff --git a/app-backup/bacula/files/bacula-fd.initd b/app-backup/bacula/files/bacula-fd.initd
deleted file mode 100644
index 1cc636edbf9c..000000000000
--- a/app-backup/bacula/files/bacula-fd.initd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	use dns
-}
-
-start() {
-	ebegin "Starting bacula file daemon"
-	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
-		-- ${FD_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping bacula file daemon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
-	eend $?
-}
diff --git a/app-backup/bacula/files/bacula-fix-sonames.patch b/app-backup/bacula/files/bacula-fix-sonames.patch
deleted file mode 100644
index d05b2b9a37fb..000000000000
--- a/app-backup/bacula/files/bacula-fix-sonames.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-=== modified file 'autoconf/ltmain.sh'
---- autoconf/ltmain.sh	2011-11-06 20:34:58 +0000
-+++ autoconf/ltmain.sh	2012-02-09 17:27:13 +0000
-@@ -2428,6 +2428,7 @@
-   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-   -shared           only do dynamic linking of libtool libraries
-   -shrext SUFFIX    override the standard shared library file extension
-+  -soname SONAME    override the standard shared object name
-   -static           do not do any dynamic linking of uninstalled libtool libraries
-   -static-libtool-libs
-                     do not do any dynamic linking of libtool libraries
-@@ -5422,6 +5423,11 @@
- 	  prev=
- 	  continue
- 	  ;;
-+        soname)
-+	  soname_spec="$arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	weak)
- 	  func_append weak_libs " $arg"
- 	  prev=
-@@ -5741,6 +5747,11 @@
- 	continue
- 	;;
- 
-+      -soname)
-+	prev=soname
-+	continue
-+	;;
-+
-       -static | -static-libtool-libs)
- 	# The effects of -static are defined in a previous loop.
- 	# We used to do the same as -all-static on platforms that
-
diff --git a/app-backup/bacula/files/bacula-sd.confd b/app-backup/bacula/files/bacula-sd.confd
deleted file mode 100644
index 8d6f7d2e60d4..000000000000
--- a/app-backup/bacula/files/bacula-sd.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Config file for /etc/init.d/bacula-sd
-
-# Options for the storage daemon.
-# The storage daemon can be run as a non-root user, however
-# please ensure that this user has proper permissions to
-# access your backup devices.
-SD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-sd.conf"
diff --git a/app-backup/bacula/files/bacula-sd.initd b/app-backup/bacula/files/bacula-sd.initd
deleted file mode 100644
index a18840242efa..000000000000
--- a/app-backup/bacula/files/bacula-sd.initd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	use dns
-}
-
-start() {
-	ebegin "Starting bacula storage daemon"
-	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
-		-- ${SD_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping bacula storage daemon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid 
-	eend $?
-}
diff --git a/app-backup/bacula/files/newscripts/bacula-dir.initd b/app-backup/bacula/files/newscripts/bacula-dir.initd
deleted file mode 100755
index d717f07f7926..000000000000
--- a/app-backup/bacula/files/newscripts/bacula-dir.initd
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-command=/usr/sbin/bacula-dir
-command_args="${DIR_OPTIONS}"
-pidfile=/var/run/bacula-dir.9101.pid
-
-depend() {
-	need net
-	if [ "${LOCAL_DB}" -eq 1 ]; then
-		:
-	fi
-	use dns bacula-fd bacula-sd
-}
-
diff --git a/app-backup/bacula/files/newscripts/bacula-fd.initd b/app-backup/bacula/files/newscripts/bacula-fd.initd
deleted file mode 100755
index fe6a8815b9fd..000000000000
--- a/app-backup/bacula/files/newscripts/bacula-fd.initd
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command=/usr/sbin/bacula-fd
-command_args="${FD_OPTIONS}"
-pidfile=/var/run/bacula-fd.9102.pid
-
-depend() {
-	need net
-	use dns
-}
diff --git a/app-backup/bacula/files/newscripts/bacula-sd.initd b/app-backup/bacula/files/newscripts/bacula-sd.initd
deleted file mode 100755
index 07facefbb4a4..000000000000
--- a/app-backup/bacula/files/newscripts/bacula-sd.initd
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-command=/usr/sbin/bacula-sd
-command_args="${SD_OPTIONS}"
-pidfile=/var/run/bacula-sd.9103.pid
-
-depend() {
-	need net
-	use dns
-}