gentoo resync : 14.05.2020

3 files changed, 51 insertions, 19 deletions

diff --git a/app-text/libmspub/Manifest b/app-text/libmspub/Manifest
index bfd2526649ee..56ce2df606de 100644
--- a/app-text/libmspub/Manifest
+++ b/app-text/libmspub/Manifest
@@ -1,4 +1,5 @@
+AUX libmspub-0.1.4-gcc10.patch 752 BLAKE2B b59c1feef001da863688cf108dd30b3624577eb6cf7c8fadb8295cc6a0336dcd98c39c79dd369c3ed239da12574439737e85fe6bb5d7d0a1aae85d0d72c28686 SHA512 f38730c9e552dd1b0264b789e5138c7c09feb717934bc0d80bf65797343422d64f9d0173edae47af15d89a1bd352636ed56de74b7f3d5bfa69030cc1e994db00
 DIST libmspub-0.1.4.tar.xz 377472 BLAKE2B 89bd994a5aa2b3a22681dfe78fcea19561ea6057210e61630fa904ded12cca4694d715dd8f2fe8f687a91951bfa2f7aec1ff11d0b978a517476545bb07f654dd SHA512 7275f890645961b3fd56df4584788962e8c064fe3f99f5834c6ba6177ce76d00d544fbe9a25b7ab2f4180d2f3a90c609fe0bb68d61ea24e95b086190390fff31
-EBUILD libmspub-0.1.4.ebuild 1170 BLAKE2B b0a27deadfd4163569fa328bfeaf1c7d19d56bdaf63cfc71a80bf3760b49d5b2746560ad0107e958f48605cfc03b53036522f64d09db2f0d75c8c602ba24ef53 SHA512 7b403212e73bcaf9128714d09172637bdf4a785183669f8574438961623e3a7212b0c95f1985561461526cc317e711d5503bfe67faf45c3788cbef30af3912e4
+EBUILD libmspub-0.1.4.ebuild 1165 BLAKE2B ab9846fc3edf364dbe9c645e6fe84fca03e7c77b8390faa2a5767f1f3dddbe1ac0e418732e03132bd629f9bf390aabf4f6b87467ef079ee154fcd6f95b7c59c2 SHA512 3cbc945ec4eb955f181ec8e57071b059530f15693a9f7fdd7a3d4d5eb549199fae7edf73438a3023ea15294272900576c4b779c616b5a637ebc94eb12fe24770
 EBUILD libmspub-9999.ebuild 1126 BLAKE2B c552dd2106be6bbf6a8433ac4470fe60168b8a3ecd4ec728d216fc181e6e89043547cfbc0860c49a5377b9e6b94959ad29ec70167aeae14e846da53595b0f761 SHA512 77f8370a5cbd3b32a518399c0e2a7a744bb4224a24f42587e5d8fc7183f33d43612d3158da02e6811f501491fe989d1bc1a5d7631929d46f10b51a5529975c5d
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libmspub/files/libmspub-0.1.4-gcc10.patch b/app-text/libmspub/files/libmspub-0.1.4-gcc10.patch
new file mode 100644
index 000000000000..5e5d60e2b097
--- /dev/null
+++ b/app-text/libmspub/files/libmspub-0.1.4-gcc10.patch
@@ -0,0 +1,27 @@
+From 698bed839c9129fa7a90ca1b5a33bf777bc028d1 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Tue, 11 Jun 2019 12:15:28 +0200
+Subject: missing include
+
+Change-Id: I3c5c085f55223688cdc7b972f7c7981411881263
+Reviewed-on: https://gerrit.libreoffice.org/73814
+Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
+Tested-by: Michael Stahl <Michael.Stahl@cib.de>
+---
+ src/lib/MSPUBMetaData.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/MSPUBMetaData.h b/src/lib/MSPUBMetaData.h
+index 9167f4f..27bdd4f 100644
+--- a/src/lib/MSPUBMetaData.h
++++ b/src/lib/MSPUBMetaData.h
+@@ -13,6 +13,7 @@
+ #include <map>
+ #include <utility>
+ #include <vector>
++#include <stdint.h>
+ 
+ #include <librevenge/librevenge.h>
+ 
+-- 
+cgit v1.2.1
diff --git a/app-text/libmspub/libmspub-0.1.4.ebuild b/app-text/libmspub/libmspub-0.1.4.ebuild
index 536dfc3cfcd7..20eba626a22a 100644
--- a/app-text/libmspub/libmspub-0.1.4.ebuild
+++ b/app-text/libmspub/libmspub-0.1.4.ebuild
@@ -1,26 +1,28 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
+fi
 DESCRIPTION="Library parsing Microsoft Publisher documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
-
 IUSE="doc static-libs"
 
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
 RDEPEND="
 	dev-libs/icu:=
 	dev-libs/librevenge
@@ -29,27 +31,29 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/boost
 	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
 "
 
+PATCHES=( "${FILESDIR}/${P}-gcc10.patch" )
+
 src_prepare() {
 	default
 	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == 9999 ]] && eautoreconf
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
 	# bug 619044
 	append-cxxflags -std=c++14
 
-	econf \
-		--disable-werror \
-		$(use_with doc docs) \
+	local myeconfargs=(
+		--disable-werror
+		$(use_with doc docs)
 		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }