gentoo resync : 30.12.2017

5 files changed, 2 insertions, 142 deletions

diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 3d0e110359b0..22d948adbce9 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,8 +1,4 @@
-AUX libetonyek-0.1.6-drop-test.patch 1105 BLAKE2B f74a1774e38a9ba1ea97480432099a95466abdbea65cb7fb51b18f4add7684ee28781c725fe5e9de750c0b252118f84e41ccd31864f6dbb14c919dc6d844e7f6 SHA512 a4d53634fe5fea85120773b609aa901f164a3a93a0ead44f25fbde433470c22a6956744a3b35683bacdf1d55f99f63da47a0dcc39c78f02d537eb8a4883cec5e
-AUX libetonyek-0.1.6-mdds-1.2.patch 1170 BLAKE2B a1161fa0d252801714b5ae011c8ccd5962167af06b546642bd139f52281470f8e739975ed3e23d71744915495422583e857a1f71a8742c9a7fabffe519eb333e SHA512 4432fda977bbb0d4b1a5e163d4ff18372717aa93a12775117880b04daeb695e64ec69d3e577caef09fdeb133237a868c8afaece9b60fb4511efb55032469137f
-DIST libetonyek-0.1.6.tar.xz 1243364 BLAKE2B 00f11e91ab8b82fc2bffa00df48f2b553b922391047c8345dcbbd7a0d51fba54828bdc9bd9d1f36e66d63cbb10414784a36697d2a8eacd716663ea7fee57843c SHA512 10ae0403d98f33b27be4c3c905dec3df48cc01ce438f8760298edeadb76dd74da997edbd7dc03635fbc168b318bfe6e130f2306f495dfbf4135dd6dfcccabb4e
 DIST libetonyek-0.1.7.tar.xz 1256232 BLAKE2B ef2abcc427014d515a75ff75d90a78da0b5b28d54b5de3793540e8448f163da0b6d3ff4026373ffc3a4973d3e0e4fee280e75a77407620b3ba0e833bd7d8c82a SHA512 bec4819e161f68b7315567464bfe9e0259a59822a7926c54208cceb04061664a1220716539816a24a6f259eac6f7063c72750aaaf8d8886e3bfb0c4d5f1e0b0f
-EBUILD libetonyek-0.1.6.ebuild 1505 BLAKE2B 67e38cc65246357b94ef122e83722f778fa719ee9d978251de489522b791d47230f002ae0c92d17f7f290a9d2ef5d49b70fcab468ca554fbe4f944b722b36505 SHA512 2576240fc405e4ab26bf2c80c5dca3ea3723010f5a9b9052aea06f12c6073894dc57522432fa3f540379a89e267f8ebd7af6d41d3892ea0629a63691b404e60d
-EBUILD libetonyek-0.1.7.ebuild 1182 BLAKE2B 0af6dfae44d842fc10a4d085bc533d3e48072e925bad91882b53a08cc3262f8a35c677627d85b81791cadc3a45df055c655743a0abfe92ddb01d25803c2df5b6 SHA512 bd054b5e7ceb6e1a852853e3854e8cda02883385e544527ee5230bb0ea96f3c6436c7e8a8b108896be4d25f22fdcd0412d18b9c9baf61e8c942836b92f68de0f
+EBUILD libetonyek-0.1.7.ebuild 1181 BLAKE2B cc869861947ebb3b5a3e117999f2f2aea14e012f9412f07d610af7c4c5df02ede968557b821d2c88252742796fbe2010f2749d6d0df5631054f6276722f0cc7d SHA512 d5e73167601b6fcd21568f4f9f45254d4b8098a1d503aaa6794b6c5af4de497bb607613eced94d4adbd9c93ccb15b1a6fbc115ced80c0db2c041989ba5b2b85c
 EBUILD libetonyek-9999.ebuild 1183 BLAKE2B 09b5d35ff2cef12a50a7356e45d206d1f94c3a6871de5ba8835e1d12cd0a87f71eea9cbe1a864f4bdc8e1a6e4159e3b66ce1726fcaac6ea46f0b1742b2c4ae9b SHA512 419fcbe9258a555d278426a1a311b14d24473612137cdedcd9fdd75b0f9cb3aa16109942443ff7bba9e6e1f52fd161a7e21cd8807948a3acdd752674db8d6b1d
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/files/libetonyek-0.1.6-drop-test.patch b/app-text/libetonyek/files/libetonyek-0.1.6-drop-test.patch
deleted file mode 100644
index a868f797484d..000000000000
--- a/app-text/libetonyek/files/libetonyek-0.1.6-drop-test.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1a20d8ece2ea3e8aa1d319cd88e8a6aa637982f2 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Fri, 30 Sep 2016 09:57:15 +0200
-Subject: [PATCH] drop test that violates Unicode tr#35
-
-(and therefore fails with latest liblangtag)
-
-Change-Id: I0e06c6c4e8bcf999cf5559d6287e77ae97e555d8
----
- src/test/IWORKLanguageManagerTest.cpp |   10 ----------
- 1 file changed, 10 deletions(-)
-
-diff --git a/src/test/IWORKLanguageManagerTest.cpp b/src/test/IWORKLanguageManagerTest.cpp
-index 8fca0a6..e663bd2 100644
---- a/src/test/IWORKLanguageManagerTest.cpp
-+++ b/src/test/IWORKLanguageManagerTest.cpp
-@@ -104,16 +104,6 @@ void IWORKLanguageManagerTest::testTagToProps()
-   }
- 
-   {
--    const string tag(mgr.addTag("ccc"));
--    CPPUNIT_ASSERT(!tag.empty());
--    RVNGPropertyList props;
--    mgr.writeProperties(tag, props);
--    assertProperty("unknown lang", props, "fo:language", "ccc");
--    CPPUNIT_ASSERT(!props["fo:country"]);
--    CPPUNIT_ASSERT(!props["fo:script"]);
--  }
--
--  {
-     // invalid tag
-     const string tag(mgr.addTag("13c"));
-     CPPUNIT_ASSERT(tag.empty());
--- 
-1.7.9.5
-
diff --git a/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch b/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch
deleted file mode 100644
index 7a3f22e94c2f..000000000000
--- a/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- libetonyek-0.1.6/configure.ac
-+++ libetonyek-0.1.6/configure.ac
-@@ -24,8 +24,8 @@ AC_LANG([C++])
- # Configure options
- # =================
- AC_ARG_WITH([mdds],
--            AS_HELP_STRING([--with-mdds=1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]),
--            [], [with_mdds="1.0"])
-+            AS_HELP_STRING([--with-mdds=1.2|0.x], [Specify which version of mdds to use (1.2 is the default)]),
-+            [], [with_mdds="1.2"])
- 
- # ===========================
- # Find required base packages
-@@ -47,7 +47,7 @@ AC_PROG_SED
- 
- AM_MISSING_PROG([GPERF], [gperf])
- 
--AS_IF([test "$with_mdds" = "1.0"], [AX_CXX_COMPILE_STDCXX_11([noext])])
-+AS_IF([test "$with_mdds" != "0.x"], [AX_CXX_COMPILE_STDCXX_11([noext])])
- 
- # ===============
- # Find librevenge
-@@ -138,8 +138,8 @@ AC_SUBST([GLM_CFLAGS])
- # =========
- # Find mdds
- # =========
--AS_IF([test "$with_mdds" = "1.0"], [
--    PKG_CHECK_MODULES([MDDS], [mdds-1.0])
-+AS_IF([test "$with_mdds" != "0.x"], [
-+    PKG_CHECK_MODULES([MDDS], [mdds-][$with_mdds])
- ], [
-     PKG_CHECK_MODULES([MDDS], [mdds])
-     AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])
diff --git a/app-text/libetonyek/libetonyek-0.1.6.ebuild b/app-text/libetonyek/libetonyek-0.1.6.ebuild
deleted file mode 100644
index e73685fed275..000000000000
--- a/app-text/libetonyek/libetonyek-0.1.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
-inherit autotools
-[[ ${PV} == 9999 ]] && inherit git-r3
-
-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 x86"
-IUSE="doc static-libs test"
-
-RDEPEND="
-	>=app-text/liblangtag-0.5
-	dev-libs/librevenge
-	dev-libs/libxml2
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	>=dev-util/mdds-1.2.0:1
-	media-libs/glm
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-mdds-1.2.patch" # patch taken from Debian
-	"${FILESDIR}/${P}-drop-test.patch" # bug 595022
-)
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]] || {
-		[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; }
-	then
-		eerror "Compilation with gcc older than 4.8 is not supported"
-		die "Too old gcc found."
-	fi
-}
-
-src_prepare() {
-	default
-	[[ -d m4 ]] || mkdir "m4"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libetonyek/libetonyek-0.1.7.ebuild b/app-text/libetonyek/libetonyek-0.1.7.ebuild
index 2ea9d0672134..d618f8eb3ce0 100644
--- a/app-text/libetonyek/libetonyek-0.1.7.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.7.ebuild
@@ -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 x86"
 IUSE="doc static-libs test"
 
 RDEPEND="