Merge updates from master

7 files changed, 75 insertions, 109 deletions

diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest
index 4d659053ed3f..f7febe9e87ce 100644
--- a/app-admin/graylog/Manifest
+++ b/app-admin/graylog/Manifest
@@ -1,4 +1,3 @@
-DIST graylog-3.3.11.tgz 129320028 BLAKE2B c90641ba1f5abaaeeba452dc623e6b6dd65ff5b3e53f111e72ebbbde1a96a9b7e82d6874d055c0fcec2e48842368fcd45510d4d4ebcfdd70a7bbcb967b5b1501 SHA512 2bcb84060254b3cd11aafd54f90debe9148cccdaec50cda53a50d302e7a152fb2622e9dd555420d25fa3ed6a8b8da5105ef322a152c3fcdabc9dec9c47338c6d
-DIST graylog-3.3.13.tgz 129316329 BLAKE2B ea90edfbffaeba5a022a012ddd87b83d9d5cbd9a2d348c78dd44c22cd95fe5f2f5d5eccc067066b2fd52e0ea944827c02f89233396ee70ef4a440c52e2a8da0c SHA512 7360408db9abbba472f44a01898edb55d9a07306b03dc9ee1b1ac84df2835dd5afccc5c29fbc07137da3cce2f1c59dd26974ad6f6a2ee6e69e1679916227e115
-DIST graylog-4.0.5.tgz 163294449 BLAKE2B 3b3c7e74bdfbc37bb4a416733b70d153b399b66cf97215a476aa3304dead0143a60253514c804e6cbeb5b4e2935e79a9e8ff16b88d2067c8820dcc5aaf7331aa SHA512 d9df101560fa0dcf63043c1dd41342caea58d77d24e81da0912270b6b627c1ec1c30900902a8456bcd3dd1281d4d57b499defc4e0da0a58bbc61ad53f1843448
-DIST graylog-4.0.7.tgz 190560623 BLAKE2B 329a61bb6e8f08fc670a7f9673c5e67fb197febf8ab85737c651e1f8c3a078e3528d9058f0d707bd1e3ed94fa3dc60c2a70a7f931a8cea79d31c96099a86117c SHA512 991e2eec505cfde6a7254d4fa332c564e81142afec7a3b879a60ca10b7366cba46823c078f043cc5e700e462d2ba7d23fa6774ab3e58903bed91b8b5494c9d5e
+DIST graylog-3.3.14.tgz 129341489 BLAKE2B 33c6c0ef84785a325a5d7cc484fa7cbcbf1bb09003f35266476d37bcc9eda5cde54ae044414461d40110e59bfae24ecad48cee8e3dbbfa1a6b3bd50a1a0c0e97 SHA512 8257b134e0922ba40d3cf28cbd4418117f6478f021ed872cdbdcd605f1d179d1b6ee8f44258022a358abf8dc9e510ef55e5e6ac5e004186b41d6b23b55dc7d57
+DIST graylog-4.0.10.tgz 190578964 BLAKE2B abc9be077acb7da76fe446a8a580e857abb852b6c811fe34a237527538421777ad12e779b79a85db6c54f477c547451f3c8a9aed6054d1df209626fc4ff95dac SHA512 62b97eb1a8ed49a659fdfeaa48b685e06ecda7c7a556caf29db86a2c149dd3f00c9b51ba48e3f81e3f8b9ed00cb567e86d617553028b41c1e723b373d67ec466
+DIST graylog-4.1.2.tgz 197078255 BLAKE2B 1a64529e1000c850fffd5e7566a7b3f87a495e5bf81921e92b464db5ff01046d13cc5d5d172d49b33063a89caf7f4360baff13ce1c6478dd90c50a7c5b1bed88 SHA512 86f2f80c14eb9fc45cc4b1c49a9ae4cd67054199200b87056721e59edd713b0b9a22f184b16f330998a85e0bd36901edf1f816e8ac21497d41a99c52525076fc
diff --git a/app-admin/graylog/graylog-3.3.13.ebuild b/app-admin/graylog/graylog-3.3.13.ebuild
deleted file mode 100644
index bf3420b1de92..000000000000
--- a/app-admin/graylog/graylog-3.3.13.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Free and open source log management"
-HOMEPAGE="https://www.graylog.org"
-SRC_URI="https://downloads.graylog.org/releases/graylog/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-RESTRICT="strip"
-
-RDEPEND="!app-admin/graylog2
-	acct-group/graylog
-	acct-user/graylog
-	>=virtual/jdk-1.8:*"
-
-DOCS=(
-	COPYING README.markdown UPGRADING.rst
-)
-
-GRAYLOG_DATA_DIR="/var/lib/graylog"
-GRAYLOG_INSTALL_DIR="/usr/share/graylog"
-QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
-
-src_prepare() {
-	default
-
-	# Stick to architecture of build host
-	if ! use amd64; then
-		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
-	fi
-	if ! use ppc64; then
-		rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
-	fi
-	if ! use x86; then
-		rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
-	fi
-	# Currently unsupported platforms
-	# QA warning galore but testing/patches welcome
-	rm lib/sigar/libsigar-*freebsd*so \
-		lib/sigar/libsigar-*solaris*so \
-		lib/sigar/libsigar-*hpux*.sl \
-		lib/sigar/libsigar-*macosx*.dylib \
-		lib/sigar/libsigar-ia64-*.so \
-		lib/sigar/libsigar-ppc-*.so \
-		lib/sigar/libsigar-s390x*.so \
-		lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
-
-	# gentoo specific paths
-	sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \
-		s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g;" \
-		graylog.conf.example || die
-}
-
-src_install() {
-	default
-
-	insinto /etc/graylog
-	doins graylog.conf.example
-
-	insinto "${GRAYLOG_INSTALL_DIR}"
-	doins graylog.jar
-	doins -r lib plugin
-
-	keepdir "${GRAYLOG_DATA_DIR}"
-
-	newconfd "${FILESDIR}/graylog.confd" graylog
-	newinitd "${FILESDIR}/graylog.initd" graylog
-}
-
-pkg_postinst() {
-	ewarn "Graylog does not depend on need.net any more (#439092)."
-	ewarn
-	ewarn "Please configure rc_need according to your binding address in:"
-	ewarn "/etc/conf.d/graylog"
-	ewarn
-	ewarn "Graylog requires Java >= 8"
-	ewarn "Elasticsearch 5.x or 6.x (does NOT work with 7.x)"
-	ewarn "and MongoDB 3.6, 4.0 or 4.2"
-}
diff --git a/app-admin/graylog/graylog-3.3.11.ebuild b/app-admin/graylog/graylog-3.3.14.ebuild
index bf3420b1de92..bf3420b1de92 100644
--- a/app-admin/graylog/graylog-3.3.11.ebuild
+++ b/app-admin/graylog/graylog-3.3.14.ebuild
diff --git a/app-admin/graylog/graylog-4.0.5.ebuild b/app-admin/graylog/graylog-4.0.10.ebuild
index e0b3f8d98a4d..e0b3f8d98a4d 100644
--- a/app-admin/graylog/graylog-4.0.5.ebuild
+++ b/app-admin/graylog/graylog-4.0.10.ebuild
diff --git a/app-admin/graylog/graylog-4.0.7.ebuild b/app-admin/graylog/graylog-4.1.2.ebuild
index e0b3f8d98a4d..9acb16a593fa 100644
--- a/app-admin/graylog/graylog-4.0.7.ebuild
+++ b/app-admin/graylog/graylog-4.1.2.ebuild
@@ -28,27 +28,6 @@ QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
 src_prepare() {
 	default
 
-	# Stick to architecture of build host
-	if ! use amd64; then
-		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
-	fi
-	if ! use ppc64; then
-		rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
-	fi
-	if ! use x86; then
-		rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
-	fi
-	# Currently unsupported platforms
-	# QA warning galore but testing/patches welcome
-	rm lib/sigar/libsigar-*freebsd*so \
-		lib/sigar/libsigar-*solaris*so \
-		lib/sigar/libsigar-*hpux*.sl \
-		lib/sigar/libsigar-*macosx*.dylib \
-		lib/sigar/libsigar-ia64-*.so \
-		lib/sigar/libsigar-ppc-*.so \
-		lib/sigar/libsigar-s390x*.so \
-		lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
-
 	# gentoo specific paths
 	sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \
 		s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g;" \
@@ -63,7 +42,7 @@ src_install() {
 
 	insinto "${GRAYLOG_INSTALL_DIR}"
 	doins graylog.jar
-	doins -r lib plugin
+	doins -r plugin
 
 	keepdir "${GRAYLOG_DATA_DIR}"
 
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild
index de1d816c1465..a4de61200a13 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild
@@ -29,6 +29,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/${PN}-2.3.2-blaslapack.patch"
 	"${FILESDIR}/${P}-no-test-echelon.patch"
+	"${FILESDIR}/${P}-fix-internal-linking.patch"
 )
 
 pkg_pretend() {
diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch
new file mode 100644
index 000000000000..5f085554c33f
--- /dev/null
+++ b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch
@@ -0,0 +1,70 @@
+From 7c959a3e938a32b386418ddfdfbb884a96762d90 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 7 Aug 2021 08:14:44 -0400
+Subject: [PATCH 1/1] fflas-ffpack/interfaces/libs/Makefile.am: fix internal
+ linking.
+
+This is just,
+
+  https://github.com/linbox-team/fflas-ffpack/pull/339
+
+but rebased onto the old release tarball.
+---
+ fflas-ffpack/interfaces/libs/Makefile.am | 22 ++++++++--------------
+ 1 file changed, 8 insertions(+), 14 deletions(-)
+
+diff --git a/fflas-ffpack/interfaces/libs/Makefile.am b/fflas-ffpack/interfaces/libs/Makefile.am
+index 8c56746..449f6e4 100644
+--- a/fflas-ffpack/interfaces/libs/Makefile.am
++++ b/fflas-ffpack/interfaces/libs/Makefile.am
+@@ -24,7 +24,6 @@ pkgincludesubdir=$(pkgincludedir)/interfaces/libs
+ 
+ AM_CXXFLAGS = @DEFAULT_CFLAGS@
+ AM_CPPFLAGS = -I$(top_srcdir) #/fflas-ffpack/utils/ -I$(top_srcdir)/fflas-ffpack/fflas/  -I$(top_srcdir)/fflas-ffpack/ffpack  -I$(top_srcdir)/fflas-ffpack/field
+-LDADD = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARFLAGS)
+ #AM_LDFLAGS=-static 
+ 
+ 
+@@ -55,31 +54,26 @@ libfflas_la_SOURCES= fflas_L1_inst.C \
+ 		    fflas_L3_inst.C \
+ 		    fflas_L3_inst_implem.inl
+ 
+-libfflas_la_LDFLAGS=  $(LDADD) -version-info 1:0:0 \
+-	             -no-undefined
++libfflas_la_LIBADD= $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS)
++libfflas_la_LDFLAGS= -version-info 1:0:0 -no-undefined
+ 
+ libffpack_la_SOURCES= ffpack_inst.C \
+ 		      ffpack_inst_implem.inl
+-libffpack_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \
+-		       -no-undefined $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la
+-
+-EXTRA_libffpack_la_DEPENDENCIES= libfflas.la
++libffpack_la_LIBADD= libfflas.la
++libffpack_la_LDFLAGS= -version-info 1:0:0 -no-undefined
+ 
+ libfflas_c_la_SOURCES=fflas_lvl1.C \
+ 		    fflas_lvl2.C \
+ 		    fflas_lvl3.C \
+ 		    fflas_sparse.C
+ #libfflas_c_la_CPPFLAGS=$(AM_CPPFLAGS) -DFFLAS_COMPILED -DFFPACK_COMPILED
+-libfflas_c_la_LDFLAGS=  $(LDADD) -version-info 1:0:0 \
+-                       -no-undefined 	$(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la
+-
+-EXTRA_libfflas_c_la_DEPENDENCIES=libfflas.la
++libfflas_c_la_LIBADD= libfflas.la
++libfflas_c_la_LDFLAGS= -version-info 1:0:0 -no-undefined
+ 
+ libffpack_c_la_SOURCES=ffpack.C
+ #libffpack_c_la_CPPFLAGS=$(AM_CPPFLAGS) -DFFLAS_COMPILED -DFFPACK_COMPILED
+-libffpack_c_la_LDFLAGS=  $(LDADD) -version-info 1:0:0 \
+-		        -no-undefined -lfflas -lffpack
+-EXTRA_libffpack_c_la_DEPENDENCIES=libffpack.la
++libffpack_c_la_LIBADD= libffpack.la
++libffpack_c_la_LDFLAGS= -version-info 1:0:0 -no-undefined
+ 
+ 
+ EXTRA_DIST=c_libs.doxy
+-- 
+2.31.1
+