gentoo resync : 22.01.2019

13 files changed, 209 insertions, 73 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 113626ce8efb..dac2bbb19d93 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 6fcaf4eb5a20..caee535a7abb 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -7,8 +7,11 @@ AUX gdal-2.3.0-curl.patch 471 BLAKE2B 551c9fba5cd49afef45ae271f20b8440214b06f569
 AUX gdal-2.3.0-frmts-nitf38234.patch 421 BLAKE2B d32592e440b459a57a25de39658224db5a871a82955620140a209bab0f84872dd5c67414df16d64cf24d7ad7a180eeaff7eed7e4aef8e6a70f550575538d93ec SHA512 ffcd68e4fc277f37540a81cf200a597da0f3ee42284107724a3b6bdb44ca54459dceefd52e9d946c8b3d8fd9c5153bcdcc30dacf3ebef46180a9d22280e62c2d
 AUX gdal-2.3.0-libtiff.patch 306 BLAKE2B 8f2b39c812ceeee94b95102638885d0ff25086dec8196eaf9ae50378abe88809414da370d9b626b05d2daecfd762bf56938e35fd566952fddc18f1c614dfb4c4 SHA512 b793b1f2631a5944a79be58eab530f3cd248b25858f810515875adc71abb8e4abb1c9f9cf87ec45282bf9eca2e3932706110099a330664aadba3724954ca7297
 AUX gdal-2.3.1-poppler-0.69.0.patch 12775 BLAKE2B 27fe38cb5db58961e1f9f4aef9eddbf396dd364dd1c14bb61fefe4eb16397b75a56edd1b7e3225ccb30ecb2da1f5a5ddc669c9dd984807d5e92fb76c9b83e0b5 SHA512 84eb0107abc9030e34bd953d1b8218a15c35432c0dc687e4d52b97c66cda44e842b53d2819cd998921fe5e90830ce063aa242fe933f0675b1c649fb1c5e44ecc
+AUX gdal-2.3.1-poppler-0.71.0.patch 2770 BLAKE2B d856ebd2cc1077b39303ca0300ff5a27d1d9981c4f557bb935a0a2ddf7372ef3ae25b59c8f87a103eaf8be0eb467741b1191032889efb5f98a8bb09be1254ab5 SHA512 9c8fc013b191fc579517389928c2d0c4c2f769f188b26fa86b192dc6e7223c799f579095d0765ffe2c6f7158a661b384cb36e92e7bc8c1d5af236d24fe41281d
+AUX gdal-2.3.1-poppler-0.72.0.patch 2377 BLAKE2B c70dbfba879ecba9956b27e56ffe6fcbb076b9f6ed127eedc201c8d47cf527109374e98e2c31107f9ff14dace67556bffeff8651ae01161f2cb9e78732585846 SHA512 985a44492c585c1c8066feb7810b135535ccc87abf86996f64806e53952e7dd96c02649e072a1329aefab80c03d2d6069c829d36c4ea1471493cfb3af26eb69e
+AUX gdal-2.3.1-poppler-0.73.0.patch 906 BLAKE2B c71bf66068f19e80f38907d3f5ffd24e73ae4be99f720cc852ba8aad2f6999a020d59e068ed8a173c6f84e97471c1f6937f82d2519a166282216995cb8db69bb SHA512 0e846ec7c5ddf44144949018ae70063df1043f9dc2730bb189e794ffb40bd91869bd6f5939bd40fc88b18fb53f20151e286610a8db6e9292ba1c5ccc4065148f
 DIST gdal-2.3.0.tar.gz 14423820 BLAKE2B 6c67c66b2f68699249ccd4df2cb1e3b7042e94003b730e64bd8b8eec726a32da9485cab29552bd34c23831686ec3e879edd1848a2339c8289580ce282a287992 SHA512 b37e433be0b7a587ea9f9e5e720295e4cd1406f6c8ca770f5fedcd7fdc797e01e576eb887034b38f93f04a4e76c0ce84792bc7d91a49fea4122231a37ace812f
 DIST gdal-2.3.1.tar.gz 14450452 BLAKE2B 226ddf80ff8b9e3d420ac717b245a09fe3daa0331931f4d371b62ab9fa9bb0735ca11e1e045398de92d61b68815aa1dc3e7b6568f4853964cf42d188e46e6eb7 SHA512 0c5bb515dd2a9ad3110421b39bd680ce7e9de68e969cf35a7e63118965dbe193d25a7720a525e53af153de3e78f76ccc6983f4dcdfa6ba429d732a7a47a35d57
 EBUILD gdal-2.3.0-r2.ebuild 8138 BLAKE2B f11f4a5110a63b6eacac015ce16d05c235776a365d8328ce2046494ec560f6653f9dee26b8c99b536c6452d25e0fb600bfaed4b849b5dea87dea2bf5c0d5752b SHA512 a2cbe076456ad3b151c554b7f72da5fdf52637278b2e06816aede1e5150ee6c8aaf6441fd1be10a90b3bba380d99262c33430df10dfc7a524ea6001feca7bcab
-EBUILD gdal-2.3.1.ebuild 8061 BLAKE2B e8ae8cb8b04b1699e6b03f3f314cb6ea8f328570481834fe9c8db8fc45981a11a9a6ad80284f14fb698cef3a0bd87c48131a2dd4d2e8b9c5a4533e28e1d1ef69 SHA512 5a5d1521960ed475bb50a7a8547bdbb70f9476f5eae056975ae9d2aaf80ebe0336a21321412d76ca3c94dcb11a685a38bd67e193d65607dd94ded883879b02d7
+EBUILD gdal-2.3.1.ebuild 8497 BLAKE2B 263ccfa2d5ec703d0a51adea18f3a4cdfa5d2a8808c04b30f37bc5cb674e8d5c2f2eb578c4942691610a3d509252967b16056a371929a0eb1490ef4922c15f49 SHA512 9fe9e0bbe01a40dcff87ea0aa6004c8f5ca58619227bd76349ed0b85406c23c6f0cef79021a7634cce10fd1072a1f8bc1d6f7e5a6b6c35cb4a1bf5c21d999a29
 MISC metadata.xml 1616 BLAKE2B 7167165623c93e069ce77ef80e68e6339fc38354c0db343564ce8ecf3566e0d61b8b5aeb4e6b69e66bf1e8932d18de54b528bf1a2148767efe3b5cf985a31748 SHA512 dca0cb7a8c94a5313aed09f8c28ae35a55de4b0ff8198469b7f9adc8220b29cbd8c3f92db121b944b03c169b302ac8aa95f4342b76510590aff63a5f122c74c1
diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.71.0.patch b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.71.0.patch
new file mode 100644
index 000000000000..90ee94d06216
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.71.0.patch
@@ -0,0 +1,82 @@
+Description: Add support for Poppler 0.71.0.
+Author: Even Rouault <even.rouault@spatialys.com>
+Origin: https://github.com/OSGeo/gdal/commit/4cc0215b8f2cef3582265cdfaf16589390697706
+Bug: https://github.com/OSGeo/gdal/issues/1121
+Bug-Debian: https://bugs.debian.org/915722
+
+--- a/frmts/pdf/pdfdataset.cpp
++++ b/frmts/pdf/pdfdataset.cpp
+@@ -2593,18 +2593,25 @@ static void PDFDatasetErrorFunctionCommo
+ }
+ 
+ #ifdef POPPLER_0_20_OR_LATER
+-static void PDFDatasetErrorFunction(CPL_UNUSED void* userData, CPL_UNUSED ErrorCategory eErrCategory,
++
++static void PDFDatasetErrorFunction(void* /* userData*/,
++                                    ErrorCategory /* eErrCategory */,
+ #ifdef POPPLER_0_23_OR_LATER
+                                     Goffset nPos,
+ #else
+                                     int nPos,
+ #endif
+-                                    char *pszMsg)
++#ifdef POPPLER_0_71_OR_LATER
++                                    const char *pszMsg
++#else
++                                    char *pszMsg
++#endif
++                                   )
+ {
+     CPLString osError;
+ 
+     if (nPos >= 0)
+-        osError.Printf("Pos = %d, ", (int)nPos);
++        osError.Printf("Pos = " CPL_FRMT_GUIB ", ", static_cast<GUIntBig>(nPos));
+     osError += pszMsg;
+     PDFDatasetErrorFunctionCommon(osError);
+ }
+@@ -4442,7 +4449,7 @@ GDALDataset *PDFDataset::Open( GDALOpenI
+ #ifdef HAVE_POPPLER
+     if (bUseLib.test(PDFLIB_POPPLER))
+     {
+-        PDFRectangle* psMediaBox = poPagePoppler->getMediaBox();
++        const auto* psMediaBox = poPagePoppler->getMediaBox();
+         dfX1 = psMediaBox->x1;
+         dfY1 = psMediaBox->y1;
+         dfX2 = psMediaBox->x2;
+@@ -4780,14 +4787,12 @@ GDALDataset *PDFDataset::Open( GDALOpenI
+     GooString* poMetadata = poCatalogPoppler->readMetadata();
+     if (poMetadata)
+     {
+-        char* pszContent = poMetadata->getCString();
++        const char* pszContent = poMetadata->getCString();
+         if (pszContent != nullptr &&
+             STARTS_WITH(pszContent, "<?xpacket begin="))
+         {
+-            char *apszMDList[2];
+-            apszMDList[0] = pszContent;
+-            apszMDList[1] = nullptr;
+-            poDS->SetMetadata(apszMDList, "xml:XMP");
++            const char * const apszMDList[2] = { pszContent, nullptr };
++            poDS->SetMetadata(const_cast<char**>(apszMDList), "xml:XMP");
+         }
+         delete poMetadata;
+     }
+--- a/frmts/pdf/pdfio.h
++++ b/frmts/pdf/pdfio.h
+@@ -58,6 +58,15 @@
+ #define makeSubStream_object_type Object*
+ #endif
+ 
++// Detect Poppler 0.71 that no longer defines GBool
++#ifdef POPPLER_0_69_OR_LATER
++#ifndef initObj
++#define POPPLER_0_71_OR_LATER
++#define GBool bool
++#define gFalse false
++#endif
++#endif
++
+ class VSIPDFFileStream: public BaseStream
+ {
+     public:
diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.72.0.patch b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.72.0.patch
new file mode 100644
index 000000000000..3302df9100df
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.72.0.patch
@@ -0,0 +1,58 @@
+From b471814ef406582f2b1bc0aabbe430c0026608c7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat, 12 Jan 2019 17:21:54 +0100
+Subject: [PATCH] Fix build with poppler-0.72.0
+
+Non-upstreamable patch that breaks backward compatibility.
+---
+ frmts/pdf/pdfdataset.cpp | 4 ++--
+ frmts/pdf/pdfobject.cpp  | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
+index 84fe1fe..38b8c30 100644
+--- a/frmts/pdf/pdfdataset.cpp
++++ b/frmts/pdf/pdfdataset.cpp
+@@ -3459,7 +3459,7 @@ void PDFDataset::FindLayersPoppler()
+ #endif
+             if( ocg != nullptr && ocg->getName() != nullptr )
+             {
+-                const char* pszLayerName = (const char*)ocg->getName()->getCString();
++                const char* pszLayerName = (const char*)ocg->getName()->c_str();
+                 AddLayer(pszLayerName);
+                 oLayerOCGMapPoppler[pszLayerName] = ocg;
+             }
+@@ -4787,7 +4787,7 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+     GooString* poMetadata = poCatalogPoppler->readMetadata();
+     if (poMetadata)
+     {
+-        const char* pszContent = poMetadata->getCString();
++        const char* pszContent = poMetadata->c_str();
+         if (pszContent != nullptr &&
+             STARTS_WITH(pszContent, "<?xpacket begin="))
+         {
+diff --git a/frmts/pdf/pdfobject.cpp b/frmts/pdf/pdfobject.cpp
+index 0a5f907..9bed6c1 100644
+--- a/frmts/pdf/pdfobject.cpp
++++ b/frmts/pdf/pdfobject.cpp
+@@ -1061,7 +1061,7 @@ const CPLString& GDALPDFObjectPoppler::GetString()
+ #else
+         GooString* gooString = m_po->getString();
+ #endif
+-        return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
++        return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->c_str()),
+                                                       static_cast<int>(gooString->getLength())));
+     }
+     else
+@@ -1422,7 +1422,7 @@ char* GDALPDFStreamPoppler::GetBytes()
+         char* pszContent = (char*) VSIMalloc(m_nLength + 1);
+         if (pszContent)
+         {
+-            memcpy(pszContent, gstr->getCString(), m_nLength);
++            memcpy(pszContent, gstr->c_str(), m_nLength);
+             pszContent[m_nLength] = '\0';
+         }
+         delete gstr;
+-- 
+2.20.1
+
diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch
new file mode 100644
index 000000000000..8529d99e7351
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch
@@ -0,0 +1,35 @@
+From 77ea05388924fcf2a8c9fd4a777c97e4d69f5e17 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 16 Jan 2019 20:52:59 +0100
+Subject: [PATCH] Fix build with poppler-0.73
+
+---
+ gdal/frmts/pdf/pdfsdk_headers.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/frmts/pdf/pdfsdk_headers.h b/frmts/pdf/pdfsdk_headers.h
+index 9150b0f410..574943b41f 100644
+--- a/frmts/pdf/pdfsdk_headers.h
++++ b/frmts/pdf/pdfsdk_headers.h
+@@ -50,7 +50,6 @@
+ #pragma warning( disable : 4244 ) /* conversion from 'const int' to 'Guchar', possible loss of data */
+ #endif
+ 
+-#include <goo/gtypes.h>
+ #include <goo/GooList.h>
+ 
+ /* begin of poppler xpdf includes */
+@@ -79,6 +78,10 @@
+ 
+ /* end of poppler xpdf includes */
+ 
++/* poppler-0.73 compatibility */
++#define Guchar unsigned char
++#define Guint unsigned int
++
+ #ifdef _MSC_VER
+ #pragma warning( pop )
+ #endif
+-- 
+2.20.1
+
diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild
index 317b386da9e5..9f81394be026 100644
--- a/sci-libs/gdal/gdal-2.3.1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -83,6 +83,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
 	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
 	"${FILESDIR}/${PN}-2.3.1-poppler-0.69.0.patch"
+	"${FILESDIR}/${PN}-2.3.1-poppler-0.71.0.patch" # bug 674556
 )
 
 src_prepare() {
@@ -119,6 +120,11 @@ src_prepare() {
 
 	default
 
+	# not upstreamable, not fixed in 2.4.0 or master as of 2019-01-12:
+	has_version ">=app-text/poppler-0.72.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.72.0.patch"
+	# not upstreamable, not fixed in 2.4.0 or master as of 2019-01-16:
+	has_version ">=app-text/poppler-0.73.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.73.0.patch"
+
 	eautoreconf
 }
 
@@ -311,6 +317,7 @@ src_install() {
 	fi
 
 	doman "${S}"/man/man*/*
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 5cd1ecfb7d97..045ae6d6f04b 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,5 +1,3 @@
-DIST indilib-1.6.0.tar.gz 1726681 BLAKE2B fc746fe74b41467930f50f4aabe63d485372dc3f7e551bf8b91ec92694efc5a73a29495ee4931f84215a90afdd1deb3c12f87aaedc32d33e408114674e6d79ad SHA512 a086a63e15f5f6fb05a0d1569578f5fbd4d6ba6ff5a0aaff7bd475925d3858840753f1aa04e7429a22576f52432a19e93b781e821ea908db6b7352af85f30422
 DIST indilib-1.7.5.tar.xz 1380436 BLAKE2B 092f4100894218bf749ee0d7c910c4ee20026cf471f4f65686b67dd37a924b448b6de3733e70d7047dca6a77fd8ae26b9a568f8249336be78d052984838a2ccf SHA512 57205ed9ea9d8e8215886b17d9f0307755bca571d599967dc607320fad5ec62096f31526280f3b184ffeb0434d9adb71e65a7d6f89d29edaa643d729765f47a8
-EBUILD indilib-1.6.0.ebuild 1105 BLAKE2B 8f5e21b13aea5f88309ea355abf526255c200a78b545e2992c774aefd28383bb5a14c07137f1370f820577c257e6304feed0e6be0912e69fe39fd7f2cf76b963 SHA512 42ca02a83d01913d99a786365166088a13bc0a41f49a99077f9d0acb58592f990124d753eaa21ff860deae33d438cacd591d7f6533cda7370b75f395e3e4750b
-EBUILD indilib-1.7.5.ebuild 1095 BLAKE2B 58bb77a65f538027bf2f045a0e994085e83e253a655471efbd7fcc7e6e0ec1fe8106844596d80924625ee2897e35e9bf4a35b5c9f545a64879c3dbcc0aa734a0 SHA512 36bf75020736571a57df25c7871c6ac9f207b8dee10045d4ed59d39e1ee41751db549c772e87fff118e75d984ad629959db9a42146b75bfe776b15e1a8c69bcd
+EBUILD indilib-1.7.5.ebuild 1093 BLAKE2B c74b0e81070522d33288a206e8200276d9953900b0445436db63d55729fd68476247347d083eac12b5c4a82716f4b084f8fa3fc67ef85233ef17e593d716ec48 SHA512 9b1d66d5f521da18f8002ef52b6c0e6017904404e8b123c839669e3f0fa3ab6afe4b824e306a90c0ce69d1e3664146f95456ca0609456accdff8cba9204d1ad3
 MISC metadata.xml 375 BLAKE2B 68a9fc46a21fd5e530412d36468b96bbf409de646206ec8e36bf35fd39ec9193464100f5cc3398c1bfac01a947a70970ecf2d505a1932070ff6ca12dc3a9db1e SHA512 b5dc385e3823484e4fdc5974ace09edb4c19272c159e086cdc6968cafda528b27623c3696dbe42e5a869c3b9b9060dcf99466d5ac9961363de2f05fdcc523448
diff --git a/sci-libs/indilib/indilib-1.6.0.ebuild b/sci-libs/indilib/indilib-1.6.0.ebuild
deleted file mode 100644
index 2bf180538e5e..000000000000
--- a/sci-libs/indilib/indilib-1.6.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="lib${PN/lib/}"
-
-inherit cmake-utils udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="http://www.indilib.org/"
-SRC_URI="https://github.com/${PN}/${PN/lib/}/releases/download/v${PV}/${MY_PN}_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="ogg test"
-
-RDEPEND="
-	net-misc/curl
-	sci-libs/cfitsio:=
-	sci-libs/gsl:=
-	sci-libs/libnova
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	virtual/libusb:0
-	ogg? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	test? ( >=dev-cpp/gtest-1.8.0 )
-"
-
-DOCS=( AUTHORS ChangeLog COPYRIGHT README TODO )
-
-S=${WORKDIR}/${MY_PN}
-
-src_test() {
-	BUILD_DIR="${BUILD_DIR}"/test cmake-utils_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINDI_BUILD_QT5_CLIENT=OFF
-		-DINDI_BUILD_UNITTESTS=$(usex test)
-		-DUDEVRULES_INSTALL_DIR="$(get_udevdir)"
-		$(cmake-utils_use_find_package ogg OggTheora)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/indilib/indilib-1.7.5.ebuild b/sci-libs/indilib/indilib-1.7.5.ebuild
index ef516b5138a5..a8179c7fb67a 100644
--- a/sci-libs/indilib/indilib-1.7.5.ebuild
+++ b/sci-libs/indilib/indilib-1.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="ogg test"
 
 RDEPEND="
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index 9f8e8b12f815..c4618a41b1ab 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -9,5 +9,5 @@ DIST mpir-2.7.2.tar.bz2 3771429 BLAKE2B c3431bcb84207fdb1bc0242fe56b7c2d45643e8c
 DIST mpir-3.0.0.tar.bz2 2572041 BLAKE2B f564944dd76586ca6e50c39f1199468b905a3db7bbb8b2ee6cf3dcdfb00757d7eefc57e010d5cfc3d6db7ba2676e36f7980365e85c87827b4901ec4e80349915 SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e
 EBUILD mpir-2.6.0-r2.ebuild 1718 BLAKE2B 20d17fc3e1f9ce93365b387fff094e5bb416dc932954938b75e24d2ace74560d3dcbd03289493a490ed8e9a613263be35d7a60e3396862141bdb75c40d70f40e SHA512 7e104c8c81ad2445788768e83bd40abf0dc370b7c33a77ac6cc498813b043001f57b7f902a5198df4fd1259fefa2fff9370fc7aa17a997fad04911a71f046da8
 EBUILD mpir-2.7.2.ebuild 1719 BLAKE2B e4c9c8a697fb658a76eecdc651c119729a9ec8ecf30d54f054e8f5c61e7a873824e3f566cc5afa2509b96c33eadebbd79bc94aa074e144b562d2fe61c841d6cb SHA512 0cabe5c4e5c1df7b8ecd54b4ba87caff0b934d1805fcbb32b68ba393ba5684fac4314ed277e39286697295f94e79900fc809586b96131d0d03c264873dfd0c07
-EBUILD mpir-3.0.0.ebuild 1730 BLAKE2B d2e2d53e2ef88eae283bd03aa1ed38f3b5bfc9b796208d56a6ad56a44b652215b86167fda36391c1cf401639a408cb697d76924a82b73a9bbd90bad481164377 SHA512 17a52f08f460bf5b446c101831d6113a8edf6d77736115e27523bba0e00833cb931c87661d41ccb2b1577ae0bcb3ed9a8d36d2b3caa077a4b37508dac515391e
+EBUILD mpir-3.0.0.ebuild 1731 BLAKE2B 0680ce0297d7aef75afa0e75d093dae142db8294fb0a59177044ab2b454fb9908bd1c53b190b26b6996b752b3aeb1fcb294445a1b1fb5aa58f3873dea59dbbc2 SHA512 a9146e3d93fe8dc9b60d2759eb6759382187d07c0bbff8f809d3c1eb3e104e1e0bd01a0a80e5ec737c5b74f6bad84980742861584c6bc9820bcc25d2f79f239d
 MISC metadata.xml 792 BLAKE2B 9c0bea642d53a6afb0abeecefcc940c012b5cecf8c6e98fdf69eb718f63ea8e7c7f913fa1cd8360240b5f355e3742a5ccae00166690cf8a83226ad636342d279 SHA512 811f781a961982955ba036f719ec5cce3def93190fb786ef3c3a60f1b54f9b7638d8083cf0f273174002da7d358d25e8764de591d7b587b41198c48c52908fcc
diff --git a/sci-libs/mpir/mpir-3.0.0.ebuild b/sci-libs/mpir/mpir-3.0.0.ebuild
index f6a4b38450fd..202580838f5c 100644
--- a/sci-libs/mpir/mpir-3.0.0.ebuild
+++ b/sci-libs/mpir/mpir-3.0.0.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
@@ -11,7 +11,7 @@ SRC_URI="http://www.mpir.org/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0/23"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="+cxx cpudetection static-libs"
 
 DEPEND="
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 5a5fc9ae0ee4..b0bdaedcfcb7 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -3,4 +3,4 @@ AUX opencascade-7.3.0-fixed-DESTDIR.patch 2272 BLAKE2B 30b0e045d872673ff65f00b47
 AUX opencascade-7.3.0-vtk-compat.patch 431 BLAKE2B 468a804ed906555637110b0d7cb7a4ef994fae9130e7317e525d21598cc19b67e8c7bfaaaffea82ee8fb94a20c14b42e6ec02e2541ddfc54fc288c8d0f68fc7c SHA512 026ed3451c1c36e1f187be390773329ad011c9ebdb766b730ee04f9f9a844a307c4fefc6669c81187fd34d8264bea233680c7ee43afb566e695c3d64c37438a4
 DIST opencascade-7.3.0.tar.gz 48576720 BLAKE2B bf63ba77aabc8a8c92d694f78f24bab71c07e68e7ba4b8d5d90966733dbd9c0c83a76e35f059e798d4a60640d663330cd13a828b19ec02a5372053ab39a74aa6 SHA512 17eb1810b43a8b001867563f97801ceb38a7878fa53d9b39b46a5cf3dd676310fa80e83e90668a99ec6aff9d4f09733fb6c7be83c1e3ab4eaa9fda55888050da
 EBUILD opencascade-7.3.0.ebuild 4409 BLAKE2B d33465c90d3d909cef1eb03fecce63e3000aaadef3846a8229805232482a095441ab9d5c845c9b269ce1e47fcd7ce7f7ef7c532d4203846f7e6e6c192a397ed7 SHA512 3b0765d7f7a10224c9ccb13460c22d2f0bd22b44095344b0bd8c428aea802ee18698666060f8d7689b6f867c79a03f1dc1d252b83874eb2dd6f0fef36dea2fec
-MISC metadata.xml 547 BLAKE2B afe180fe9c0dc0aa357c84327220d543b919b18fde795512806e091a95cabb4a1e5db7dfe121ad6bcc728f41a794b97668fee8bece573defed9160391dc9d11d SHA512 b20c7221cc347b103440fad7098f48cdebd2f544c51e217671364380399f3d89b30f98ed323c457114640375c686b17abaa1d7193166cbb17cba0dfb916ae584
+MISC metadata.xml 713 BLAKE2B 3ea497dd1bf8d2406888803fe73c8da19592bd1080dfa7d969dea88b3d4e9bcc53d4b60fdeda70dae6a42717be3deea7bebd10e02fdf64bae56119961912d38d SHA512 aaa05e0d0b41488e2ec4a409548ee4a8437cfa2bb0b7d6cab4538dcd800e55f6cf8b9bddd604994710c257765a73fcd2d5d0e347477a8da3849d2138434dd498
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index ac137460a1e7..38f461d22b3b 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="freeimage">Enable support for image i/o via media-libs/freeimage</flag>
-    <flag name="gl2ps">Use gl2ps PostScript printing library</flag>
-    <flag name="gles2">Use OpenGL ES 2.0</flag>
-    <flag name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
-    <flag name="vtk">Enable Virtualisation Toolkit</flag>
-  </use>
+<maintainer type="person">
+	<email>waebbl@gmail.com</email>
+	<name>Bernd Waibel</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<use>
+	<flag name="freeimage">Enable support for image i/o via media-libs/freeimage</flag>
+	<flag name="gl2ps">Use gl2ps PostScript printing library</flag>
+	<flag name="gles2">Use OpenGL ES 2.0</flag>
+	<flag name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
+	<flag name="vtk">Enable Virtualisation Toolkit</flag>
+</use>
 </pkgmetadata>