gentoo resync : 07.10.2018

6 files changed, 148 insertions, 14 deletions

diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 60a794df43d8..5b60d730bf22 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,5 +1,8 @@
 AUX libetonyek-0.1.8-glm-0.9.9.patch 409 BLAKE2B b0731eba3a65ea4e88bd24a633875157acbb4c1e727bc7bcf2a4f1af67197c1d9762a7aa6265e31357eead2baff13c28126d6f4bbc698a997f442bc58771b5b2 SHA512 edc407a4958befee95b53733b0c73bc8281575b53b8d2c65491eee6aafc63d775d3ce9d0a0578ce51cf8bc8f047a683bb0dbd8b79f2b1914dc5df6de64b835fa
+AUX libetonyek-0.1.8-no-parentheses.patch 1052 BLAKE2B 9603025aa5e9ef25d8d17ee25c6f30cd87455b68c000b92f4483deda594ecb1b061cd8e0630247fb1c2eaa8860cfa7a3c2896c3fb901bc5205bc75fd51388a4d SHA512 7ab3cdca79784d362df85b279e762189738061a386313e71d9c1aa889b40df5586fb487bbc52615835472c8d3a674163bb84569285e9c3672dac4a5694af5c57
+AUX libetonyek-0.1.8-typo-fix.patch 1189 BLAKE2B 404c2c55b8a0946670bf68e13a50a660be7c38021ed7e9a50d9522b883b512d512bc89dc294df62cb479f609616327414b6064971a86e99f38d071a17196b62e SHA512 5085b727c12219f784339a3ab8ecad88302e33338c5467e49adbc1acee91f85ee20f6b2bf765e5a085099141615976368003cc0e8fc3ed4142f0467c15b7a0ee
 DIST libetonyek-0.1.8.tar.xz 1324868 BLAKE2B 2088349df75011f54f5822ffd69336a7942a148ff829111c02efbfb99c705a9e00105147942f3e9e81278be3b1f2be4d63aba8cbf6a54127f04fc547df6b7b1d SHA512 c8c08100b0c75e0420bbcd796f7cb9285e77ce1be34757df5b237d114a428a4a6094f12e442f81769a2fac5be45ea4376ff9e1d90448e18b3443bfe7c645a865
-EBUILD libetonyek-0.1.8.ebuild 1223 BLAKE2B a6b9d1b52b17ba30d2f5eeb1e3716322d69ac50a655294607b6e4ba0633ae2f35fc64b4ada3e9bbfaa02e93d9b0eb5719224c8d3b1ef8273c213fb424692096e SHA512 526520f569135e98351aaa12ff5a5b2c45b6689cc0f54cabeae9c6aa593231bd0fb35f4ffd387ee449ad44b2e1f991ebd1038cea8872d78469189c2d1d77dc5d
-EBUILD libetonyek-9999.ebuild 1183 BLAKE2B 326e3f725846dbda6102ccf8a4ef4a1b63c723c80c36cdc927243482c38cf2d745d032149246bd6b3d083b455042e6eda60d4212c36f8239c621ccbaeb0e9ef8 SHA512 3993f39d97f9e53ce01237e2eb94ce458538903b1a66b8462c4fe9135b3101b0fe534e61d36ae79de939df2988cfd061463ffed06dc08172a289284661fd4ad3
+EBUILD libetonyek-0.1.8-r1.ebuild 1439 BLAKE2B 4aedcdd5eeabda732bfb69204d073fe83157b489177b16683785b0db2ea09e2697e48438dfd455f40f9706e5cb6a80795b54a7f1a4bccfbe49795417fda02967 SHA512 5aa9b843157114144e65e867faf5ff9beb9d5916440b3e72b4ce9e9b2cc3cd207573f9c65d207ea543409fd264e8b4f8ad34ef1b16f3ed1b801cf1fd604c94fa
+EBUILD libetonyek-0.1.8.ebuild 1224 BLAKE2B afde4827cbdbc5d956e84dd46fc9df2252e5d3c6af8fcce8f3b1afbfe694a5050729b3989f1cde73efea30ae63cee413d2ea825b2df6c13595b509be0786d937 SHA512 1939662481af2af90d0b45ac6949c5453fdd20cd554ef4a0143465a1c48551377b0614742e3643fd59b31fe4296b22dfa493890f5ba90996dc40e1e14b32ae60
+EBUILD libetonyek-9999.ebuild 1329 BLAKE2B 58566cb1623a2aa4b053650f3b9af882df926a4df39e25a129ca7b7e28a2e8b9aae0f09848777841aa81eb1d345ad8bfc5e129cb5ad597ab310e54f9007f34fc SHA512 54c998440fdc017bd77e7c959d75b6ce0736d50b2f067d7be760651189b92327d12b4449c1b5b76c451b6d28e38a90ef45ea51c5c18c0161f8ebda6b75e5685a
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/files/libetonyek-0.1.8-no-parentheses.patch b/app-text/libetonyek/files/libetonyek-0.1.8-no-parentheses.patch
new file mode 100644
index 000000000000..e13fe5f31cef
--- /dev/null
+++ b/app-text/libetonyek/files/libetonyek-0.1.8-no-parentheses.patch
@@ -0,0 +1,29 @@
+From 935cb58a61e45f441bdea143317a7d0d52c7f944 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Sat, 5 May 2018 14:01:43 +0200
+Subject: [PATCH] =?utf8?q?WaE:=20unnecessary=20parentheses=20in=20declarat?=
+ =?utf8?q?ion=20of=20=E2=80=98aligns=E2=80=99?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: Ic3cb38d071db8e3947c09a4b216b62d18e01b6aa
+---
+ src/lib/IWAParser.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/IWAParser.cpp b/src/lib/IWAParser.cpp
+index ab9c6c8..973610e 100644
+--- a/src/lib/IWAParser.cpp
++++ b/src/lib/IWAParser.cpp
+@@ -1676,7 +1676,7 @@ void IWAParser::parseCellStyle(const unsigned id, IWORKStylePtr_t &style)
+       auto align=get(properties.uint32(8));
+       if (align<=2)
+       {
+-        const IWORKVerticalAlignment(aligns[])=
++        const IWORKVerticalAlignment aligns[] =
+         {
+           IWORK_VERTICAL_ALIGNMENT_TOP, IWORK_VERTICAL_ALIGNMENT_MIDDLE, IWORK_VERTICAL_ALIGNMENT_BOTTOM
+         };
+-- 
+2.11.0
diff --git a/app-text/libetonyek/files/libetonyek-0.1.8-typo-fix.patch b/app-text/libetonyek/files/libetonyek-0.1.8-typo-fix.patch
new file mode 100644
index 000000000000..32593fed4805
--- /dev/null
+++ b/app-text/libetonyek/files/libetonyek-0.1.8-typo-fix.patch
@@ -0,0 +1,28 @@
+From 9b78187ac2ccca0158cc9cc0bcc0576b457a78d7 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Mon, 23 Apr 2018 17:20:16 +0100
+Subject: [PATCH] intial-creator->initial-creator
+
+Change-Id: I6fe5d0732edb97ac7ff6d527f48543cab1bb3f7b
+Reviewed-on: https://gerrit.libreoffice.org/53337
+Reviewed-by: David Tardon <dtardon@redhat.com>
+Tested-by: David Tardon <dtardon@redhat.com>
+---
+ src/lib/IWORKCollector.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/IWORKCollector.cpp b/src/lib/IWORKCollector.cpp
+index 0e0c775..4252a49 100644
+--- a/src/lib/IWORKCollector.cpp
++++ b/src/lib/IWORKCollector.cpp
+@@ -771,7 +771,7 @@ void IWORKCollector::fillMetadata(librevenge::RVNGPropertyList &props)
+   if (!m_metadata.m_title.empty())
+     props.insert("dc:subject", m_metadata.m_title.c_str());
+   if (!m_metadata.m_author.empty())
+-    props.insert("meta:intial-creator", m_metadata.m_author.c_str());
++    props.insert("meta:initial-creator", m_metadata.m_author.c_str());
+   if (!m_metadata.m_keywords.empty())
+     props.insert("meta:keyword", m_metadata.m_keywords.c_str());
+   if (!m_metadata.m_comment.empty())
+-- 
+2.11.0
diff --git a/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild b/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild
new file mode 100644
index 000000000000..e58d47644acf
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
+[[ ${PV} == 9999 ]] && inherit git-r3
+inherit autotools
+
+DESCRIPTION="Library parsing Apple Keynote presentations"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc static-libs test"
+
+RDEPEND="
+	app-text/liblangtag
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	>=dev-util/mdds-1.2.2:1=
+	media-libs/glm
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-glm-0.9.9.patch"
+	"${FILESDIR}/${P}-typo-fix.patch"
+	"${FILESDIR}/${P}-no-parentheses.patch"
+)
+
+src_prepare() {
+	default
+	[[ -d m4 ]] || mkdir "m4"
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-werror
+		$(use_with doc docs)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+	)
+	if has_version ">=dev-util/mdds-1.4"; then
+		myeconfargs+=( --with-mdds=1.4 )
+	else
+		myeconfargs+=( --with-mdds=1.2 )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libetonyek/libetonyek-0.1.8.ebuild b/app-text/libetonyek/libetonyek-0.1.8.ebuild
index a3df8b9feddd..88f7b92bc33b 100644
--- a/app-text/libetonyek/libetonyek-0.1.8.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	>=dev-util/mdds-1.2.2:1
+	>=dev-util/mdds-1.2.2:1/1.2
 	media-libs/glm
 	sys-devel/libtool
 	virtual/pkgconfig
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index 39b6f10a69f8..434fddd7f1a7 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
 LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="doc static-libs test"
 
 RDEPEND="
@@ -24,7 +24,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	>=dev-util/mdds-1.2.2:1
+	>=dev-util/mdds-1.4.2:1=
 	media-libs/glm
 	sys-devel/libtool
 	virtual/pkgconfig
@@ -39,12 +39,19 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests) \
-		--with-mdds=1.2
+	local myeconfargs=(
+		--disable-werror
+		$(use_with doc docs)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+	)
+	if has_version ">=dev-util/mdds-1.4"; then
+		myeconfargs+=( --with-mdds=1.4 )
+	else
+		myeconfargs+=( --with-mdds=1.2 )
+	fi
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {