gentoo resync : 31.12.2018

3 files changed, 72 insertions, 8 deletions

diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 5b60d730bf22..8b85caa77a2d 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -2,7 +2,9 @@ AUX libetonyek-0.1.8-glm-0.9.9.patch 409 BLAKE2B b0731eba3a65ea4e88bd24a63387515
 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
+DIST libetonyek-0.1.9.tar.xz 1477064 BLAKE2B 088d27c83d4aff41cb208cf840def78e323f378a1b7d456448db3abf51d1e850c8159ace75c8836958b533c2b84e583d5a622e638081230d2f862f6d1d175e98 SHA512 3f439b369d450bb1a4bdb3fe92023bda234b323cf676570f1738318c56867a97910f536280b9b164c3fdaa423a3ee669c935df75a5c700bc1530ea5b9a00391e
 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
+EBUILD libetonyek-0.1.9.ebuild 1297 BLAKE2B ef85c5b3f63b108d7a9ba562b83e1650210da5cac71f2868d2f0fed2c5a47d796459af36d2c1442db39e2b2cb48c4f3616c48c82b6620a8cebb961e49b3bfb10 SHA512 667aace5bf321077a711dfe37ad01ef56a1b206b6c25c27ce68eb8b1546721c1961b71b75fb85a49612df1c9a9ac92740852b39332778277d0cc1e980a5bd449
+EBUILD libetonyek-9999.ebuild 1297 BLAKE2B ef85c5b3f63b108d7a9ba562b83e1650210da5cac71f2868d2f0fed2c5a47d796459af36d2c1442db39e2b2cb48c4f3616c48c82b6620a8cebb961e49b3bfb10 SHA512 667aace5bf321077a711dfe37ad01ef56a1b206b6c25c27ce68eb8b1546721c1961b71b75fb85a49612df1c9a9ac92740852b39332778277d0cc1e980a5bd449
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/libetonyek-0.1.9.ebuild b/app-text/libetonyek/libetonyek-0.1.9.ebuild
new file mode 100644
index 000000000000..a59ca6e00967
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-0.1.9.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+DESCRIPTION="Library parsing Apple Keynote presentations"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="doc static-libs test"
+
+RDEPEND="
+	app-text/liblangtag
+	dev-libs/librevenge
+	dev-libs/libxml2
+	>=dev-util/mdds-1.3.1:1=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	media-libs/glm
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+	default
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == 9999 ]] && 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-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index 434fddd7f1a7..a59ca6e00967 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -3,28 +3,29 @@
 
 EAPI=7
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
 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
+	>=dev-util/mdds-1.3.1:1=
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	>=dev-util/mdds-1.4.2:1=
 	media-libs/glm
 	sys-devel/libtool
 	virtual/pkgconfig