gentoo resync : 30.06.2019

19 files changed, 612 insertions, 9 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 82e987e797ac..b0a97ab81d76 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/blis/Manifest b/sci-libs/blis/Manifest
new file mode 100644
index 000000000000..41b80f4c7060
--- /dev/null
+++ b/sci-libs/blis/Manifest
@@ -0,0 +1,8 @@
+AUX blas.lds 204 BLAKE2B 0e24237d75a95258e8e8bb6880fa8e5ecf0b59c15d03ed94af2a75f59c13d3ac6b81e630fe488a07eea5f738664604b3e7720ebc4d1865959c05d26d367d6294 SHA512 bfe176f5a707e3698d78983fc71e9bbb36bb433584b4abdb8add9bde2ae9d159c861f3662a3d8caa6f412a3acfda243f6d8ca650f596d2d444fe77cc5df10672
+AUX blis-0.5.2-blas-provider.patch 581 BLAKE2B bde52a363fa6a7b26da98ae6cf8af06311bd9fe2f5729d1759621238cc33437abb9b0fbf01d80a6f6a80a7871fd687e9fe047efcb8cc05c5a3cdc0cdf7e4a7d9 SHA512 e291becb8f5b99a11b75779f7a549681fb38cf04fe15516225caadf2672dda8ed5db9e24030c5cd3c261f5fc2b6d96d7e078aa9076e3fd46dfce39afc5681515
+AUX blis-0.5.2-gh313.patch 8758 BLAKE2B 52c3ed408b231070a4301b423652076f8d9b13ef570f9313b5705802d1faa0bec412e47bf30b34b6c0f7a9b71c1f5134562c13f41bdf84ac5074ab5f1d59b533 SHA512 d72f85b879f7768c5f6b166b288b974a6767d757fdb8c46e5e8a970a27ca45cf4dbab79e716ecb75dda49ef4e0675b8dffa94924bdc2f554dbe3a3ca16d2f12b
+AUX blis-0.5.2-rpath.patch 384 BLAKE2B f5a0390384d30d2929fcb5ff22424770dc3b6a4b9e3796b675a0237d9a1971c358463d5a98aee2f4851396b81b85f67d49e8015e94ce433d2b3a6f7f17e54b15 SHA512 626acf971adfdcee9d8578283f64f2e4e5dad14da4a6d38b7198635c775823312b54cd1b11e3f4a79e79716358f1f4260d5b88be74705ae6ec4eb3fd4ce2723a
+AUX cblas.lds 205 BLAKE2B ab2c41b571dbb9b55e36fa5afe4344ed9ef33454f6b7a5cda0726aa7f98a61dcef3065976cc02ab593aad94c5d6c0a23efce726da30673bd06cf57b64e826b93 SHA512 23008248e2b2c221a9ce36c2aca3e2acf58a6d434ffde498a058689af5d16d6e87ab56900508bb0403c5f5a1fc9366b202a7fc44a42d04c409197ec1ec164408
+DIST blis-0.5.2.tar.gz 3502383 BLAKE2B b09fda20711086c8bde0d4efc3f3c9b0f6072e1ddb8bd2846465877f0353cced27548abe1239b6a042fe655e85e4b7b3c960322e39b2c733866b8e17777718bd SHA512 4f91a7834ef0ed39544dd21856814467416a222240050cca323917b0fc61b9201ae4dbd109aa687cdecb27ddee5d6bf4510ef023e1c1dc73599faef0482d3d04
+EBUILD blis-0.5.2.ebuild 2644 BLAKE2B 36eef678828a8ab810dba3a88b9ab3cb9cee35c2c9c7c026d1ceca827aca60a9f9140d8d0d301b892da958c1ad2bd3027ab7642d3f5d08a964fd623660042004 SHA512 5b85048a750e9205c86c6d1e3ede935318622d3b393052f623c22933d82d5ec6098dd3204956fd7f9224b97a7399160bfef3e0185987a64c092a7d5065384ae3
+MISC metadata.xml 1489 BLAKE2B a14d1a33ee756a4706e1a4d93eaad65add9a040164a0c65408f0c62d1c705dee2a32df31990ee4ee58e25b31e352e55cdd27f28ebf62e10316f2e36dc7c2dbfc SHA512 5d948c8507816cf9a6ae36b3c08772b347e37bf52deea1ec11a7f362439da503e9773c7727ff1f7d9f17567c65bae5b2de1627507853064a8dc3fd7cc1f8b60b
diff --git a/sci-libs/blis/blis-0.5.2.ebuild b/sci-libs/blis/blis-0.5.2.ebuild
new file mode 100644
index 000000000000..939d0b608d65
--- /dev/null
+++ b/sci-libs/blis/blis-0.5.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils
+
+DESCRIPTION="BLAS-like Library Instantiation Software Framework"
+HOMEPAGE="https://github.com/flame/blis"
+SRC_URI="https://github.com/flame/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="openmp pthread serial static-libs eselect-ldso doc 64bit-index"
+REQUIRED_USE="?? ( openmp pthread serial ) ?? ( eselect-ldso 64bit-index )"
+
+RDEPEND="eselect-ldso? ( !app-eselect/eselect-cblas
+				   >=app-eselect/eselect-blas-0.2 )"
+
+DEPEND="${RDEPEND}
+	dev-lang/python
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-rpath.patch"
+	"${FILESDIR}/${P}-blas-provider.patch"
+	"${FILESDIR}/${P}-gh313.patch"
+)
+
+src_configure () {
+	local BLIS_FLAGS=()
+	local confname
+	# determine flags
+	if use openmp; then
+		BLIS_FLAGS+=( -t openmp )
+	elif use pthread; then
+		BLIS_FLAGS+=( -t pthreads )
+	else
+		BLIS_FLAGS+=( -t no )
+	fi
+	use 64bit-index && BLIS_FLAGS+=( -b 64 -i 64 )
+	# determine config name
+	case "${ARCH}" in
+		"x86" | "amd64")
+			confname=auto ;;
+		"ppc64")
+			confname=generic ;;
+		*)
+			confname=generic ;;
+	esac
+	# This is not an autotools configure file. We don't use econf here.
+	./configure \
+		--enable-verbose-make \
+		--prefix="${BROOT}"/usr \
+		--libdir="${BROOT}"/usr/$(get_libdir) \
+		$(use_enable static-libs static) \
+		--enable-blas \
+		--enable-cblas \
+		${BLIS_FLAGS[@]} \
+		--enable-shared \
+		$confname || die
+}
+
+src_compile() {
+	DEB_LIBBLAS=libblas.so.3 DEB_LIBCBLAS=libcblas.so.3 \
+		LDS_BLAS="${FILESDIR}"/blas.lds LDS_CBLAS="${FILESDIR}"/cblas.lds \
+		default
+}
+
+src_test () {
+	emake check
+}
+
+src_install () {
+	default
+	use doc && dodoc README.md docs/*.md
+
+	if use eselect-ldso; then
+		dodir /usr/$(get_libdir)/blas/blis
+		insinto /usr/$(get_libdir)/blas/blis
+		doins lib/*/lib{c,}blas.so.3
+		dosym libblas.so.3 usr/$(get_libdir)/blas/blis/libblas.so
+		dosym libcblas.so.3 usr/$(get_libdir)/blas/blis/libcblas.so
+	fi
+}
+
+pkg_postinst() {
+	use eselect-ldso || return
+
+	local libdir=$(get_libdir) me="blis"
+
+	# check blas
+	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
+	local current_blas=$(eselect blas show ${libdir})
+	if [[ ${current_blas} == blis || -z ${current_blas} ]]; then
+		eselect blas set ${libdir} ${me}
+		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+	else
+		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+		elog "To use blas [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect blas set ${libdir} ${me}"
+	fi
+}
+
+pkg_postrm() {
+	use eselect-ldso && eselect blas validate
+}
diff --git a/sci-libs/blis/files/blas.lds b/sci-libs/blis/files/blas.lds
new file mode 100644
index 000000000000..db79d3bc9054
--- /dev/null
+++ b/sci-libs/blis/files/blas.lds
@@ -0,0 +1,15 @@
+{
+  # Export BLAS symbols
+  global:
+    *_;
+    RowMajorStrg;
+
+  # Hide everything else.
+  local:
+    cblas_*;
+    CBLAS_*;
+    bli_thread_set_num_threads_;
+    bli_thread_set_ways_;
+    bli_*;
+    *;
+};
diff --git a/sci-libs/blis/files/blis-0.5.2-blas-provider.patch b/sci-libs/blis/files/blis-0.5.2-blas-provider.patch
new file mode 100644
index 000000000000..5999f847929c
--- /dev/null
+++ b/sci-libs/blis/files/blis-0.5.2-blas-provider.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 2d31fee..7008682 100644
+--- a/Makefile
++++ b/Makefile
+@@ -659,6 +659,8 @@ else
+ 	@$(LINKER) $(SOFLAGS) -o $(LIBBLIS_SO_OUTPUT_NAME) $? $(LDFLAGS)
+ endif
+ endif
++	$(LINKER) $(SOFLAGS) -o $(BASE_LIB_PATH)/$(DEB_LIBBLAS) $? $(LDFLAGS) -Wl,--soname,$(DEB_LIBBLAS) -Wl,--version-script=$(LDS_BLAS)
++	$(LINKER) $(SOFLAGS) -o $(BASE_LIB_PATH)/$(DEB_LIBCBLAS) $? $(LDFLAGS) -Wl,--soname,$(DEB_LIBCBLAS) -Wl,--version-script=$(LDS_CBLAS)
+ 
+ # Local symlink for shared library.
+ # NOTE: We use a '.loc' suffix to avoid filename collisions in case this
diff --git a/sci-libs/blis/files/blis-0.5.2-gh313.patch b/sci-libs/blis/files/blis-0.5.2-gh313.patch
new file mode 100644
index 000000000000..fab3a8a09ee3
--- /dev/null
+++ b/sci-libs/blis/files/blis-0.5.2-gh313.patch
@@ -0,0 +1,187 @@
+diff --git a/common.mk b/common.mk
+index 5513098a5..999df774b 100644
+--- a/common.mk
++++ b/common.mk
+@@ -118,7 +118,8 @@ get-noopt-cxxflags-for   = $(strip $(CFLAGS_PRESET) \
+ get-refinit-cflags-for   = $(strip $(call load-var-for,COPTFLAGS,$(1)) \
+                                    $(call get-noopt-cflags-for,$(1)) \
+                                    -DBLIS_CNAME=$(1) \
+-                                   $(BUILD_FLAGS) \
++                                   $(BUILD_CPPFLAGS) \
++                                   $(BUILD_SYMFLAGS) \
+                             )
+ 
+ get-refkern-cflags-for   = $(strip $(call load-var-for,CROPTFLAGS,$(1)) \
+@@ -126,23 +127,27 @@ get-refkern-cflags-for   = $(strip $(call load-var-for,CROPTFLAGS,$(1)) \
+                                    $(call get-noopt-cflags-for,$(1)) \
+                                    $(COMPSIMDFLAGS) \
+                                    -DBLIS_CNAME=$(1) \
+-                                   $(BUILD_FLAGS) \
++                                   $(BUILD_CPPFLAGS) \
++                                   $(BUILD_SYMFLAGS) \
+                             )
+ 
+ get-config-cflags-for    = $(strip $(call load-var-for,COPTFLAGS,$(1)) \
+                                    $(call get-noopt-cflags-for,$(1)) \
+-                                   $(BUILD_FLAGS) \
++                                   $(BUILD_CPPFLAGS) \
++                                   $(BUILD_SYMFLAGS) \
+                             )
+ 
+ get-frame-cflags-for     = $(strip $(call load-var-for,COPTFLAGS,$(1)) \
+                                    $(call get-noopt-cflags-for,$(1)) \
+-                                   $(BUILD_FLAGS) \
++                                   $(BUILD_CPPFLAGS) \
++                                   $(BUILD_SYMFLAGS) \
+                             )
+ 
+ get-kernel-cflags-for    = $(strip $(call load-var-for,CKOPTFLAGS,$(1)) \
+                                    $(call load-var-for,CKVECFLAGS,$(1)) \
+                                    $(call get-noopt-cflags-for,$(1)) \
+-                                   $(BUILD_FLAGS) \
++                                   $(BUILD_CPPFLAGS) \
++                                   $(BUILD_SYMFLAGS) \
+                             )
+ 
+ # When compiling sandboxes, we use flags similar to those of general framework
+@@ -153,19 +158,24 @@ get-kernel-cflags-for    = $(strip $(call load-var-for,CKOPTFLAGS,$(1)) \
+ get-sandbox-c99flags-for = $(strip $(call load-var-for,COPTFLAGS,$(1)) \
+                                    $(call get-noopt-cflags-for,$(1)) \
+                                    $(CSBOXINCFLAGS) \
+-                                   $(BUILD_FLAGS) \
++                                   $(BUILD_CPPFLAGS) \
++                                   $(BUILD_SYMFLAGS) \
+                             )
+ get-sandbox-cxxflags-for = $(strip $(call load-var-for,COPTFLAGS,$(1)) \
+                                    $(call get-noopt-cxxflags-for,$(1)) \
+                                    $(CSBOXINCFLAGS) \
+-                                   $(BUILD_FLAGS) \
++                                   $(BUILD_CPPFLAGS) \
++                                   $(BUILD_SYMFLAGS) \
+                             )
+ 
+ # Define a separate function that will return appropriate flags for use by
+ # applications that want to use the same basic flags as those used when BLIS
+-# was compiled. (This is the same as get-frame-cflags-for(), except that it
+-# omits the BUILD_FLAGS, which are exclusively for use when BLIS is being
+-# compiled.)
++# was compiled. (NOTE: This is the same as the $(get-frame-cflags-for ...)
++# function, except that it omits two variables that contain flags exclusively
++# for use when BLIS is being compiled/built: BUILD_CPPFLAGS, which contains a
++# cpp macro that confirms that BLIS is being built; and BUILD_SYMFLAGS, which
++# contains symbol export flags that are only needed when a shared library is
++# being compiled/linked.)
+ get-user-cflags-for      = $(strip $(call load-var-for,COPTFLAGS,$(1)) \
+                                    $(call get-noopt-cflags-for,$(1)) \
+                             )
+@@ -627,22 +637,26 @@ $(foreach c, $(CONFIG_LIST_FAM), $(eval $(call append-var-for,CPICFLAGS,$(c))))
+ 
+ # --- Symbol exporting flags (shared libraries only) ---
+ 
++# NOTE: These flags are only applied when building BLIS and not used by
++# applications that import BLIS compilation flags via the
++# $(get-user-cflags-for ...) function.
++
+ # Determine default export behavior / visibility of symbols for gcc.
+ ifeq ($(CC_VENDOR),gcc)
+ ifeq ($(IS_WIN),yes)
+ ifeq ($(EXPORT_SHARED),all)
+-CMISCFLAGS := -Wl,--export-all-symbols, -Wl,--enable-auto-import
++BUILD_SYMFLAGS := -Wl,--export-all-symbols, -Wl,--enable-auto-import
+ else # ifeq ($(EXPORT_SHARED),public)
+-CMISCFLAGS := -Wl,--exclude-all-symbols
++BUILD_SYMFLAGS := -Wl,--exclude-all-symbols
+ endif
+ else # ifeq ($(IS_WIN),no)
+ ifeq ($(EXPORT_SHARED),all)
+ # Export all symbols by default.
+-CMISCFLAGS := -fvisibility=default
++BUILD_SYMFLAGS := -fvisibility=default
+ else # ifeq ($(EXPORT_SHARED),public)
+ # Hide all symbols by default and export only those that have been annotated
+ # as needing to be exported.
+-CMISCFLAGS := -fvisibility=hidden
++BUILD_SYMFLAGS := -fvisibility=hidden
+ endif
+ endif
+ endif
+@@ -653,11 +667,11 @@ endif
+ ifeq ($(CC_VENDOR),icc)
+ ifeq ($(EXPORT_SHARED),all)
+ # Export all symbols by default.
+-CMISCFLAGS := -fvisibility=default
++BUILD_SYMFLAGS := -fvisibility=default
+ else # ifeq ($(EXPORT_SHARED),public)
+ # Hide all symbols by default and export only those that have been annotated
+ # as needing to be exported.
+-CMISCFLAGS := -fvisibility=hidden
++BUILD_SYMFLAGS := -fvisibility=hidden
+ endif
+ endif
+ 
+@@ -667,27 +681,25 @@ ifeq ($(IS_WIN),yes)
+ ifeq ($(EXPORT_SHARED),all)
+ # NOTE: clang on Windows does not appear to support exporting all symbols
+ # by default, and therefore we ignore the value of EXPORT_SHARED.
+-CMISCFLAGS :=
++BUILD_SYMFLAGS :=
+ else # ifeq ($(EXPORT_SHARED),public)
+ # NOTE: The default behavior of clang on Windows is to hide all symbols
+ # and only export functions and other declarations that have beenannotated
+ # as needing to be exported.
+-CMISCFLAGS :=
++BUILD_SYMFLAGS :=
+ endif
+ else # ifeq ($(IS_WIN),no)
+ ifeq ($(EXPORT_SHARED),all)
+ # Export all symbols by default.
+-CMISCFLAGS := -fvisibility=default
++BUILD_SYMFLAGS := -fvisibility=default
+ else # ifeq ($(EXPORT_SHARED),public)
+ # Hide all symbols by default and export only those that have been annotated
+ # as needing to be exported.
+-CMISCFLAGS := -fvisibility=hidden
++BUILD_SYMFLAGS := -fvisibility=hidden
+ endif
+ endif
+ endif
+ 
+-$(foreach c, $(CONFIG_LIST_FAM), $(eval $(call append-var-for,CMISCFLAGS,$(c))))
+-
+ # --- Language flags ---
+ 
+ # Enable C99.
+@@ -1026,7 +1038,7 @@ VERS_DEF       := -DBLIS_VERSION_STRING=\"$(VERSION)\"
+ # Define a C preprocessor flag that is *only* defined when BLIS is being
+ # compiled. (In other words, an application that #includes blis.h will not
+ # get this cpp macro.)
+-BUILD_FLAGS    := -DBLIS_IS_BUILDING_LIBRARY
++BUILD_CPPFLAGS := -DBLIS_IS_BUILDING_LIBRARY
+ 
+ 
+ 
+diff --git a/configure b/configure
+index 5b5695cd5..bb21671f0 100755
+--- a/configure
++++ b/configure
+@@ -152,13 +152,13 @@ print_usage()
+ 	echo "                 functions and variables that belong to public APIs are"
+ 	echo "                 exported in shared libraries. However, the user may"
+ 	echo "                 instead export all symbols in BLIS, even those that were"
+-	echo "                 intended for internal use only. Note Note that the public"
+-	echo "                 APIs encompass all functions that almost any user would"
+-	echo "                 ever want to call, including the BLAS/CBLAS compatibility"
+-	echo "                 APIs as well as the basic and expert interfaces to the"
+-	echo "                 typed and object APIs that are unique to BLIS. Also note"
+-	echo "                 that changing this option to 'all' will have no effect in"
+-	echo "                 some environments, such as when compiling with clang on"
++	echo "                 intended for internal use only. Note that the public APIs"
++	echo "                 encompass all functions that almost any user would ever"
++	echo "                 want to call, including the BLAS/CBLAS compatibility APIs"
++	echo "                 as well as the basic and expert interfaces to the typed"
++	echo "                 and object APIs that are unique to BLIS. Also note that"
++	echo "                 changing this option to 'all' will have no effect in some"
++	echo "                 environments, such as when compiling with clang on"
+ 	echo "                 Windows."
+ 	echo " "
+ 	echo "   -t MODEL, --enable-threading[=MODEL], --disable-threading"
diff --git a/sci-libs/blis/files/blis-0.5.2-rpath.patch b/sci-libs/blis/files/blis-0.5.2-rpath.patch
new file mode 100644
index 000000000000..a8b5a46870d1
--- /dev/null
+++ b/sci-libs/blis/files/blis-0.5.2-rpath.patch
@@ -0,0 +1,13 @@
+diff --git a/common.mk b/common.mk
+index ef0acfb..e1ce31d 100644
+--- a/common.mk
++++ b/common.mk
+@@ -527,7 +527,7 @@ LIBBLIS_L      := $(LIBBLIS_SO)
+ LIBBLIS_LINK   := $(LIBBLIS_SO_PATH)
+ ifeq ($(IS_WIN),no)
+ # For Linux and OS X: set rpath property of shared object.
+-LDFLAGS        += -Wl,-rpath,$(BASE_LIB_PATH)
++#LDFLAGS        += -Wl,-rpath,$(BASE_LIB_PATH)
+ endif
+ endif
+ endif
diff --git a/sci-libs/blis/files/cblas.lds b/sci-libs/blis/files/cblas.lds
new file mode 100644
index 000000000000..18ec172028ca
--- /dev/null
+++ b/sci-libs/blis/files/cblas.lds
@@ -0,0 +1,15 @@
+{
+  # Export CBLAS symbols
+  global:
+    cblas_*;
+    CBLAS_*;
+    RowMajorStrg;
+
+  # Hide everything else.
+  local:
+    bli_thread_set_num_threads_;
+    bli_thread_set_ways_;
+    bli_*;
+    *_;
+    *;
+};
diff --git a/sci-libs/blis/metadata.xml b/sci-libs/blis/metadata.xml
new file mode 100644
index 000000000000..a27c6853409d
--- /dev/null
+++ b/sci-libs/blis/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <bugs-to>https://github.com/flame/blis/issues/</bugs-to>
+    <doc>https://github.com/flame/blis</doc>
+  </upstream>
+  <maintainer type="project">
+    <name>Mo Zhou</name>
+    <email>lumin@debian.org</email>
+  </maintainer>
+  <longdescription>
+    BLIS is a portable software framework for instantiating high-performance
+    BLAS-like dense linear algebra libraries. The framework was designed to
+    isolate essential kernels of computation that, when optimized, immediately
+    enable optimized implementations of most of its commonly used and
+    computationally intensive operations. BLIS is written in ISO C99 and
+    available under a new/modified/3-clause BSD license. While BLIS exports a
+    new BLAS-like API, it also includes a BLAS compatibility layer which gives
+    application developers access to BLIS implementations via traditional BLAS
+    routine calls. An object-based API unique to BLIS is also available.
+  </longdescription>
+  <use>
+    <flag name="openmp">Use openmp threadding model</flag>
+    <flag name="pthread">Use pthread threadding model</flag>
+    <flag name="serial">Use no threadding model</flag>
+    <flag name="eselect-ldso">Enable runtime library switching by eselect and ld.so.</flag>
+    <flag name="64bit-index">Enable 64bit array indexing, incompatible with runtime switching</flag>
+  </use>
+</pkgmetadata>
diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
index 706fe3d835c7..b5ed7ad53ea0 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -1,5 +1,6 @@
 AUX dcmtk-3.6.3-dcmqrdb-cfg.patch 3031 BLAKE2B 9fd21949e42c7f0c479db7d9b81c133837bec4ba68554e463d253c47b451ded6e1d74aa8d545ca10220570be48021f8640eb47f63706ad517ee0ae6c6b2fa2cf SHA512 2487f88a650e299cc6a2011ba12f74bd2c305c4d8aad57034b04f99f4c0095505f6e000cada9fcafe466590719c0678735cafec0254d473c48e171c3adc91d9a
+AUX dcmtk-3.6.3-fix-gcc9.patch 2620 BLAKE2B 101faae609065ab9e37a4b9edd1363562a4b86a6bca0f7e9cce5d85aeb2aca6f8e61761657ee31eaa64c8a1c3c9b8d64af950b5d7988f66c393c96a46e4c0232 SHA512 f2de58f58234ab1a7ccfb5c2dd04e3a46f71a8875f32fd1aa8d139e14527d34624686a967d087040281c5dc3a62266321384a4dc9504562f117fdcde1321bf4a
 AUX dcmtk-3.6.3-nostrip.patch 7049 BLAKE2B 57d7b4d2cc3bdd683cb6c51c6d9c7e37023ddaf255655cf3f6c1473484d4e41d4a75b3bcb452a3caa06b8c751cfca47a14b0cd10372c1ebde936f7dec3046ed0 SHA512 00f28de0995c2d38b32b59298ac1c97878248647d403df86244d16a16cfd4c7ba47e7fe400592e5ac0f935a3704733a768fa3b94c9625903e86ab5f714d093bd
 DIST dcmtk-3.6.3.tar.gz 6269785 BLAKE2B 8f0797840fa5ab4ffb60e46f65b16739d3ed0cb7591b20cbfba81a59de97344a663f73bed8fc7f349a99accc46fd2fde3cff021861bde6f07957a433a4db67a3 SHA512 5b907422d2d80e417ae8239e159d1300da4ed8db7e92cee619cc1d37116165e8824f8a9103605e07a95b1bffe94bbd2d5e05125f068281d241e8e78755d0b5e8
-EBUILD dcmtk-3.6.3.ebuild 2001 BLAKE2B 86e238bd4e5c4c407b586d00ba35647b76a90d115627950449a34da2b6ba22b2731317763c52fd5297a2f9cb7bfbd875aa2578620e938d9bed4a821f0458d666 SHA512 a2ffe250b409318886005a092c349dc510d754c46629fa23cfbdef1ab423876e43141c721784a6d19e3ddbbfdd829398731c88a4684c2a549fddd36dcf4d5ff1
+EBUILD dcmtk-3.6.3.ebuild 2039 BLAKE2B 655b3b3d424ebdba0d96f629b2308d1bd5650c03ebf48e575f05a8a9c3295928aff91cf34086b1a2f19a41907ff4811394f6c4622f3fd0ba3b2501dbe5a44d2c SHA512 7b92fda743f4ad39112f440b63db6549547a0e12510b9feb2c2a04cbea1a96db49d3c4ee04a8bf4e61bf500c0a94325332a997cc1f5f2434040b1b6a59b24211
 MISC metadata.xml 317 BLAKE2B cad6b71cf9d8e4f626ee594c2eaad2e75f8ae288ea53206ae8ba37f0be04168f2ce7adeef7e45876d1358250e7ec6f2d9a07cc1c0ea4cf929323f1292ae4853a SHA512 0c6bb7cc6f8d56a7809354d0630ee49f33b63f7b60ad0a0ccbbfd7f28391a4c6b0c9f56caeb7cefcc74bf169ed6d46adda4fd204ef633311376b3cc3f7193d68
diff --git a/sci-libs/dcmtk/dcmtk-3.6.3.ebuild b/sci-libs/dcmtk/dcmtk-3.6.3.ebuild
index 463fca72dfb1..4990be778c72 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.3.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,12 +17,12 @@ IUSE="doc png ssl tcpd tiff +threads xml zlib"
 RDEPEND="
 	dev-libs/icu:=
 	virtual/jpeg:0
-	png? ( media-libs/libpng:* )
+	png? ( media-libs/libpng:0= )
 	ssl? ( dev-libs/openssl:0= )
 	tcpd? ( sys-apps/tcp-wrappers )
-	tiff? ( media-libs/tiff:0 )
-	xml? ( dev-libs/libxml2:2 )
-	zlib? ( sys-libs/zlib )"
+	tiff? ( media-libs/tiff:0= )
+	xml? ( dev-libs/libxml2:2= )
+	zlib? ( sys-libs/zlib:0= )"
 DEPEND="${RDEPEND}
 	media-gfx/graphviz
 	doc? ( app-doc/doxygen )"
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-dcmqrdb-cfg.patch
 	"${FILESDIR}"/${P}-nostrip.patch
+	"${FILESDIR}"/${P}-fix-gcc9.patch
 )
 
 src_prepare() {
diff --git a/sci-libs/dcmtk/files/dcmtk-3.6.3-fix-gcc9.patch b/sci-libs/dcmtk/files/dcmtk-3.6.3-fix-gcc9.patch
new file mode 100644
index 000000000000..596a1ae21b95
--- /dev/null
+++ b/sci-libs/dcmtk/files/dcmtk-3.6.3-fix-gcc9.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/686592
+
+In file included from /var/tmp/portage/sci-libs/dcmtk-3.6.3/work/dcmtk-3.6.3/ofstd/include/dcmtk/ofstd/variadic/variant.h:19,
+                 from /var/tmp/portage/sci-libs/dcmtk-3.6.3/work/dcmtk-3.6.3/ofstd/include/dcmtk/ofstd/ofvriant.h:379,
+                 from /var/tmp/portage/sci-libs/dcmtk-3.6.3/work/dcmtk-3.6.3/ofstd/tests/tvariant.cc:26:
+/var/tmp/portage/sci-libs/dcmtk-3.6.3/work/dcmtk-3.6.3/ofstd/include/dcmtk/ofstd/variadic/helpers.h:57:32: error: narrowing conversion of ‘-1’ from ‘int’ to ‘long unsigned int’ [-Wnarrowing]
+   57 | : OFintegral_constant<size_t,-1> {};
+      |
+
+--- a/ofstd/include/dcmtk/ofstd/variadic/helpers.h
++++ b/ofstd/include/dcmtk/ofstd/variadic/helpers.h
+@@ -14,6 +14,8 @@
+ #ifndef VARIADIC_HELPERS_H
+ #define VARIADIC_HELPERS_H
+ 
++#include <limits>
++
+ #include "dcmtk/config/osconfig.h"    /* make sure OS specific configuration is included first */
+ 
+ #include "dcmtk/ofstd/oftraits.h"
+@@ -54,7 +56,7 @@
+ 
+ template<size_t Index,typename T>
+ struct OFvariadic_find_type_t<Index,T>
+-: OFintegral_constant<size_t,-1> {};
++: OFintegral_constant<size_t,std::numeric_limits<size_t>::max()> {};
+ 
+ template<typename T,typename T0=OFvariadic_nil,typename T1=OFvariadic_nil,typename T2=OFvariadic_nil,typename T3=OFvariadic_nil,typename T4=OFvariadic_nil,typename T5=OFvariadic_nil,typename T6=OFvariadic_nil,typename T7=OFvariadic_nil,typename T8=OFvariadic_nil,typename T9=OFvariadic_nil,typename T10=OFvariadic_nil,typename T11=OFvariadic_nil,typename T12=OFvariadic_nil,typename T13=OFvariadic_nil,typename T14=OFvariadic_nil,typename T15=OFvariadic_nil,typename T16=OFvariadic_nil,typename T17=OFvariadic_nil,typename T18=OFvariadic_nil,typename T19=OFvariadic_nil,typename T20=OFvariadic_nil,typename T21=OFvariadic_nil,typename T22=OFvariadic_nil,typename T23=OFvariadic_nil,typename T24=OFvariadic_nil,typename T25=OFvariadic_nil,typename T26=OFvariadic_nil,typename T27=OFvariadic_nil,typename T28=OFvariadic_nil,typename T29=OFvariadic_nil,typename T30=OFvariadic_nil,typename T31=OFvariadic_nil,typename T32=OFvariadic_nil,typename T33=OFvariadic_nil,typename T34=OFvariadic_nil,typename T35=OFvariadic_nil,typename T36=OFvariadic_nil,typename T37=OFvariadic_nil,typename T38=OFvariadic_nil,typename T39=OFvariadic_nil,typename T40=OFvariadic_nil,typename T41=OFvariadic_nil,typename T42=OFvariadic_nil,typename T43=OFvariadic_nil,typename T44=OFvariadic_nil,typename T45=OFvariadic_nil,typename T46=OFvariadic_nil,typename T47=OFvariadic_nil,typename T48=OFvariadic_nil,typename T49=OFvariadic_nil>
+ struct OFvariadic_find_type
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index aa5345fb9970..aebbcf688edc 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -7,5 +7,6 @@ DIST gsl-2.4.tar.gz 5916715 BLAKE2B f22c07b2d5759a383e05b8bfdba70071672cc27f12ff
 DIST gsl-2.5.tar.gz 7303881 BLAKE2B 7c6d10c21071a1af1f03123f83244476d2e90fcd27d05a115b03a74fe631eb7d8081f5260e534ae58ab0997c1111f980a5e4cb50d110ca626fe810c44be70180 SHA512 5b4c5c023f9029ce220f4e09aa4d0234fed94d42ac224d58fda095fe0532d54237a7c33278f8b5d0ba051f6004486edb38d0adb4fcb49337a8c1d8a18cf4a24a
 EBUILD gsl-1.16.ebuild 3092 BLAKE2B e213441308cddca756b5de778f78f40d73e1b9cf4e951bb1e1bb0efbe3602284adad4a4bee6231cdada74d1a5ae05e9ead4a9634c2b4d35a3dd11cb3ddae7652 SHA512 d5dffee6c9ee7c1c66d9517251e397eb7af212c2a649b48aff22b88a5871276e8076c785242fb49fe25d6e101a53268b7a10438350d0d5ffaba82abae27d6286
 EBUILD gsl-2.4.ebuild 3201 BLAKE2B b3277c57be36d13fd4d84c8821226cb12ade83582570f20f70daa0b7683c17839445cd9a2c0b9c7ddd6361159f7d49809d01fcd5f889d8cb38ebe0d6478b9b7b SHA512 07784db20ac72dd1004f0736facbf196db0c648c0a8dc1574f4c6eef4fb3970508408a39d072cb2c050e2bae8bcc95d928dcec964e08e2d554eee1440a769b5a
+EBUILD gsl-2.5-r1.ebuild 1431 BLAKE2B a9118612f4b6029cabf08ed7627940be2af6474116e06d841fb1242474c7fa2f3cefb92646b4252956897603c82fde996291559ee76765fef540ba3769a2a32d SHA512 c18bcae35fd4ddd1cbdb68163ae454f80b75b1ca1919c53f7f8f846615169e77b34a5b085236384d86e574f8c634eb85cc076deb139fcdea861dbf9e3709b9c2
 EBUILD gsl-2.5.ebuild 3189 BLAKE2B ec1f00607c47c9b0fe1725af91e6e99ca1b1f7ff6591b320fae3e52dee8ada680e5b77ed6d999556b3d79237bbeb544eb29d34dff06d09373f168d76c1578913 SHA512 f56d0ab2b97b283bf9ae8e372da15d9db2c3d9ca4f7e08df6425c795537550a092c2a1f80cd633eef3cf58c35b9aead55f982d61a7532ec676a24d4471f5e113
 MISC metadata.xml 1190 BLAKE2B b9015dc09464b327144a546a0e9dae6e1c5eaf3ce118a24b7ad1853f09af1952284f754aada2436d7e1a1df82638720492445d8f015ccb1cec05c78dd718fc26 SHA512 f56ec87aeb8f257480a631748db79c78193797e1ecd586dbbd78f31a01fbbd3341fa67ffd3244e5dba352478ee552184d6a1d9b5ef5d54d67b038215090eca00
diff --git a/sci-libs/gsl/gsl-2.5-r1.ebuild b/sci-libs/gsl/gsl-2.5-r1.ebuild
new file mode 100644
index 000000000000..0c95bb68c55f
--- /dev/null
+++ b/sci-libs/gsl/gsl-2.5-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Scientific Library"
+HOMEPAGE="https://www.gnu.org/software/gsl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/${PN}-2.3-cblas.patch.bz2"
+
+LICENSE="GPL-3"
+SLOT="0/23"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cblas-external +deprecated static-libs"
+
+RDEPEND="cblas-external? ( virtual/cblas:= )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${WORKDIR}"/${PN}-2.3-cblas.patch )
+
+src_prepare() {
+	# bug 349005
+	[[ $(tc-getCC)$ == *gcc* ]] && \
+		[[ $(tc-getCC)$ != *apple* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \
+		&& filter-mfpmath sse
+	filter-flags -ffast-math
+
+	default
+	if use deprecated; then
+		sed -i -e "/GSL_DISABLE_DEPRECATED/,+2d" configure.ac || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	if use cblas-external; then
+		export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
+		export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
+	fi
+	econf \
+		--enable-shared \
+		$(use_with cblas-external) \
+		$(use_enable static-libs static)
+}
+
+src_test() {
+	local MAKEOPTS="${MAKEOPTS} -j1"
+	default
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
new file mode 100644
index 000000000000..a1ad30c5c624
--- /dev/null
+++ b/sci-libs/lapack/Manifest
@@ -0,0 +1,3 @@
+DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
+EBUILD lapack-3.8.0.ebuild 3034 BLAKE2B 80cc6eb969420eba0ce80cffbbb6297b302c13f4b8a3dfb84ae141277937d79aab97069489f0ff74f10167c84d7d42093eabf58e17d3406190b17a3e8bda86f7 SHA512 27672b9e60c7448ab86ea403db2b3f65996e97df09fedb47e81c9443d939b589d3d83a61dba8fe37f53dd0cc07af54f0b95fa5446ecdedd1f27195667902941e
+MISC metadata.xml 1423 BLAKE2B 2ec6d7c07c4827cca666cddb7e7b2e47238ff3fd40fd5e15463196812a7a82e0b85e5d36ae2a2c3315c3b4e0b5f3d4a79a953cb1703836b20dc14862956bcf29 SHA512 39a5e8738999caaf00b4f7fcdb3afdd1405a7c817920b9247a76dbc64e06f8c2011763031a058673ac8a411cad2219cbd7c8664d379535e2afea72d2bd578fbe
diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild
new file mode 100644
index 000000000000..3fb7fa9984db
--- /dev/null
+++ b/sci-libs/lapack/lapack-3.8.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake-utils
+
+DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
+HOMEPAGE="http://www.netlib.org/lapack/"
+SRC_URI="http://www.netlib.org/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="lapacke doc eselect-ldso"
+# TODO: static-libs 64bit-index
+
+RDEPEND="
+	eselect-ldso? ( >=app-eselect/eselect-blas-0.2
+	>=app-eselect/eselect-lapack-0.2 )
+	!app-eselect/eselect-cblas
+	!sci-libs/blas-reference
+	!sci-libs/cblas-reference
+	!sci-libs/lapack-reference
+	!sci-libs/lapacke-reference
+	virtual/fortran
+	doc? ( app-doc/blas-docs )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCBLAS=ON
+		-DLAPACKE=$(usex lapacke)
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install () {
+	cmake-utils_src_install
+
+	use eselect-ldso || return
+	# Create private lib directory for eselect::blas (ld.so.conf)
+	dodir /usr/$(get_libdir)/blas/reference
+	dosym ../../libblas.so usr/$(get_libdir)/blas/reference/libblas.so
+	dosym ../../libblas.so.3 usr/$(get_libdir)/blas/reference/libblas.so.3
+	dosym ../../libcblas.so usr/$(get_libdir)/blas/reference/libcblas.so
+	dosym ../../libcblas.so.3 usr/$(get_libdir)/blas/reference/libcblas.so.3
+
+	# Create private lib directory for eselect::lapack (ld.so.conf)
+	dodir /usr/$(get_libdir)/lapack/reference
+	dosym ../../liblapack.so usr/$(get_libdir)/lapack/reference/liblapack.so
+	dosym ../../liblapack.so.3 usr/$(get_libdir)/lapack/reference/liblapack.so.3
+}
+
+pkg_postinst () {
+	use eselect-ldso || return
+
+	local me=reference libdir=$(get_libdir)
+	# check eselect-blas
+	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
+	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_blas} == ${me} || -z ${current_blas} ]]; then
+		eselect blas set ${libdir} ${me}
+		elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
+	else
+		elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
+		elog "To use blas [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect blas set ${libdir} ${me}"
+	fi
+
+	# check eselect-lapack
+	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
+	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_lapack} == ${me} || -z ${current_lapack} ]]; then
+		eselect lapack set ${libdir} ${me}
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+	else
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+		elog "To use lapack [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect lapack set ${libdir} ${me}"
+	fi
+}
+
+pkg_postrm () {
+	use eselect-ldso || return
+
+	eselect blas validate
+	eselect lapack validate
+}
diff --git a/sci-libs/lapack/metadata.xml b/sci-libs/lapack/metadata.xml
new file mode 100644
index 000000000000..adc276993c4f
--- /dev/null
+++ b/sci-libs/lapack/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+The BLAS (Basic Linear Algebra Subprograms) are high quality "building
+block" routines for performing basic vector and matrix operations. Level 1
+BLAS do vector-vector operations, Level 2 BLAS do matrix-vector operations,
+and Level 3 BLAS do matrix-matrix operations. Because the BLAS are
+efficient, portable, and widely available, they're commonly used in the
+development of high quality linear algebra software, LAPACK for
+example. This packages implements the reference FORTRAN 77 library,
+the reference C library as a wrapper to the FORTRAN 77 BLAS library.
+
+LAPACK is a comprehensive library that does linear algebra
+operations including matrix inversions, least squared solutions to
+linear sets of equations, eigenvector analysis, singular value
+decomposition, etc. It is a very comprehensive and reputable package
+that has found extensive use in the scientific community.
+This package installs the reference FORTRAN 77 implementation from Netlib.
+  </longdescription>
+  <use>
+    <flag name="lapacke">Build LAPACKE</flag>
+    <flag name="eselect-ldso">Enable runtime library switching by
+    eselect and ld.so.</flag>
+  </use>
+</pkgmetadata>
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index e20cba77fa00..ea18b0d73cd3 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -3,6 +3,6 @@ DIST libgeotiff-1.4.0.tar.gz 1517881 BLAKE2B 5340029481b1d529626170e61b73948a620
 DIST libgeotiff-1.4.1.tar.gz 1674928 BLAKE2B 6c83ca77728c40995bf262d165c8566573c995f0d0116a3756f688b5686ff6529295d3340afdd771268c80050fb81b10953f7ae7339c46ed23d44dbd73cf302d SHA512 4a68bd7b9adf7453fdcb8f98cdeb79289b5f21315d1ef91d54fcc01724c8d687d243826c05a5523bb08c930296335959d2290916d46b6d802e63ac9be727c628
 DIST libgeotiff-1.5.1.tar.gz 528083 BLAKE2B 24dd812c4b12a942b21640c031fd890bb2151f6dfedfd98d0b54cf41d6341ee4d352edd427d350f36542169f822a360f8d0c9f3bb13019a422db77f43e7bd893 SHA512 6599ec89dd39d975ba389584778dd084ded628d3304b302e3af25bb7d156cf583c56b52f1c89c253b041df43f99d6893190ee1556398dab1ba044f12ef8b8dc1
 EBUILD libgeotiff-1.4.0.ebuild 1507 BLAKE2B af67acd8b1095a41d858b412cb9b8056e364056c9a646f160e6b3e2f8eca16b94b3ccbba05cf67ed190d5200683d82635b593bd822c7e07ff91ede7f15fa362b SHA512 1f07cae9b9c412e3efa268f3517ccd6c744551496d2c4bd4235ec03c126515b2b173b767bd12533a4958abf11ab2b9c0e0be2c7b2a6ad345aaa52a109aa88bc0
-EBUILD libgeotiff-1.4.1-r1.ebuild 1288 BLAKE2B 29d7fc36597ec31717fdcfdda203123b972069af3364f3d27f8782563ceb11b76d0a9f29bc0579314077f58397ca4489320736e306ecab64f66462d89fbbeb70 SHA512 e5fc2a4623d9a5f94dda82b0fd4d00e10b86c9f3e27fbebc05b84fb11e4b506b07209de809b1310b3b4e36d80951f47b9a61dc1bbcc6d4a4b1a2bf3605e2fd52
+EBUILD libgeotiff-1.4.1-r1.ebuild 1283 BLAKE2B 7e222c81bf7c88e3e7e9c283d47acff95e6971fe54c73561683fc544d968144f3867075d81eee1c5ac82e185e1a55b99ec11d2255abdc25a4b8c49c657a76d61 SHA512 c7f124c3dc98c66ffd7c4fd800aa31132cd80482981c980398eebfedca0c34fa12b3d19f22a84b341cb33f4a48c7e9efd57687aa4949880c07772b27ee655510
 EBUILD libgeotiff-1.5.1-r1.ebuild 1287 BLAKE2B f25dc592b8ea6f624a35a0a4e269d4b44705aa441d9844ee412c3891784d2f75b714fbb6cfba2235ca2ad7be89e45bcea1173a0ddc9e59750e86f8457b09eb9f SHA512 e0ffc07f1150e0b91443921674ef85533139184f43baa0736b03351acfc20b1b7d66dfc123b4aa3bd788e5f4cae1b142d46d7ac7164d855f1d97d07dfee2ba7b
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild
index d30e21eb05f2..4ecb88ce04f4 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://download.osgeo.org/geotiff/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs"
 
 RDEPEND="