gentoo resync : 02.06.2018

6 files changed, 2 insertions, 145 deletions

diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
index d7884301bb99..d0e8fa52bd3c 100644
--- a/app-text/libabw/Manifest
+++ b/app-text/libabw/Manifest
@@ -1,8 +1,3 @@
-AUX libabw-0.1.1-boost-1.59.patch 1077 BLAKE2B d7c9883639c9148ac5a1c4faf06d6f5cc15eb0f03a45f7a7e416ac080a8051b01858c13795cb4249c1952375ad5f11f4c9507a3a26bf00e799f71305933902d7 SHA512 436c8a855a8cdac0eeb24d7e6b7d7aeb2ca804402b6a70f793b654c2ff0d830a1b769db489f5c6f3650c5b65ea5cb8c62f4875b565f3f6cb9824b8f7d11e28da
-AUX libabw-0.1.1-dereference-before-null-check.patch 989 BLAKE2B 92276e79e393805847d570dfec195b8d4dbeeb6f106f4d46f31bd801f927e8ea0e481e8e40ab72861900a7282f0a57e3733bf3d491ff47451784b476025634f1 SHA512 a9b3e07d4ca41579a44c0953e2934f9e8e4abbc5c42c50a71f64c5a665f6b2b35e93facd4822546342f349b78f19d9203598818fce3f19833c9c6bd4e3c5b694
-AUX libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch 1308 BLAKE2B 9e368b07ddd2ec2a983a94a55344aa2c7e0560f435e589c609fa0cc9837cda14c433b50c20be11309dd95d5851a0d5053ffe19c353982821843ccbd29cfdd3e9 SHA512 1bd8c97e171b489e4c183a73452a0fb33e98bb3dfb184dc9abc4989ab9f43ee43ee09ee319f6f1291b4141f759f2495b7a5b65c86b8d0f9bdcb0fc50a23fd242
-DIST libabw-0.1.1.tar.xz 287628 BLAKE2B c8873512d7bb4c6594330dd35f044a6d6fb7bd07f4b915b5f0d0752ae36c9c6d2c8a5e7e7f66947fb5c27256e0701214b3fe171e1f52c09cfd42bbf106bc689e SHA512 853dd86ecc79e8590d3163e05e145ad66240ae3cf12d206d021775a94bfb33d70aa5acdcdd193ac747baeae1ba0eed18099ea6f4515be23bdd70b431e96c4b1a
 DIST libabw-0.1.2.tar.xz 318400 BLAKE2B ba25542da0d6568530241892dbdba72d2b0dcf667b50e0c1a4e656e0facf82bf77ca8eff8db4d6e57ab699f12d8dad511d32aee291541ffe6460b2ee98590b68 SHA512 a365c1aa047a97a86eee6bce8463646bdf248a51013139ee288402a832fd545586e072d7c7fc11a56f42e3637de9e922197be20d0587e53c51fd80ced409a6cd
-EBUILD libabw-0.1.1.ebuild 1058 BLAKE2B ceee966d4dd894802d115d3c7ae7c2bc40c2c2656666c274005c056fcfd932ff03422dd6da0874a9ed6eb6d0174fc9b0dbd53f38fb9c0db58639b487608c6338 SHA512 3fefdbbd95e93c934c634798f0dc6a00eacee90f0fc53967d3a3b1685cdd49f37787c903192b9e0ede7e160e5fe9fe70183107c0a6a114e970b92fd79b7c95d8
-EBUILD libabw-0.1.2.ebuild 852 BLAKE2B 94986c5e7647b8a7950d4a3f585b061dba492ac1009d59bfce03e8e5dd5fab09bce7a86c738ac1924a85db88675655aaba5b2fae1e888bdb9a777408edc1d937 SHA512 d31164f1070df9c60e38dbc06b87786d4fe94a5913b3aed776d007fc899633d48bcef3a9df97ce7355d3183d077c768464aed74adf0769b34f222c16c55c0849
+EBUILD libabw-0.1.2.ebuild 851 BLAKE2B fd94404dcfcdc39a0427bd7e79b5bf2fb97e7bb3e784b38077ad6293cffaebf1c7f16d1f87a2a2c9f6e0300ff4bc12e00d98d6ef80e301d4797427375935bda0 SHA512 4b12c64971db94eb5bb43d7f55e84e4b1c250beeb0bf2da92baf43f81843ad58dd4eeac3d7d292f88c6c0f7ddf3c86296cd24f6c04bbe3c15badc04261d25bc2
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch b/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch
deleted file mode 100644
index f2e745a44d20..000000000000
--- a/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: David Tardon <dtardon@redhat.com>
-Date: Sun, 30 Aug 2015 06:05:31 +0000 (+0200)
-Subject: fix build with boost 1.59
-X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=ee2d0729315888d1847587ad556470d2fdc883a7;hp=7ea0b5530cf321cd80231b84421e4c107d1cc479
-
-fix build with boost 1.59
-
-Change-Id: I5645629526a8d9d896e4faeb2c7b9ea88540fd23
----
-
-diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
-index 5766f39..d12d8e2 100644
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -26,6 +26,7 @@ generated_files = \
- 	$(top_builddir)/src/lib/tokens.h \
- 	$(top_builddir)/src/lib/tokenhash.h
- 
-+libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED
- libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LIBADD  = $(REVENGE_LIBS) $(LIBXML_LIBS) $(ZLIB_LIBS) @LIBABW_WIN32_RESOURCE@
- libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_DEPENDENCIES = @LIBABW_WIN32_RESOURCE@
- libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined)
diff --git a/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch b/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch
deleted file mode 100644
index 1df274afbe8f..000000000000
--- a/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: David Tardon <dtardon@redhat.com>
-Date: Sat, 20 Dec 2014 17:35:36 +0000 (+0100)
-Subject: coverity#1259904 dereference before null check
-X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=a65eb81c5e9d9da0548eb9066f9dde77a7328cc3
-
-coverity#1259904 dereference before null check
-
-Change-Id: If53074b31a821b0764acc9e9f1b0f9d7894e2e5e
----
-
-diff --git a/src/lib/ABWParser.cpp b/src/lib/ABWParser.cpp
-index cf914bf..426ab54 100644
---- a/src/lib/ABWParser.cpp
-+++ b/src/lib/ABWParser.cpp
-@@ -338,9 +338,11 @@ void libabw::ABWParser::readAbiword(xmlTextReaderPtr reader)
- void libabw::ABWParser::readM(xmlTextReaderPtr reader)
- {
-   xmlChar *const key = xmlTextReaderGetAttribute(reader, BAD_CAST("key"));
--  m_state->m_currentMetadataKey = reinterpret_cast<const char *>(key);
-   if (key)
-+  {
-+    m_state->m_currentMetadataKey = reinterpret_cast<const char *>(key);
-     xmlFree(key);
-+  }
- }
- 
- void libabw::ABWParser::readHistory(xmlTextReaderPtr reader)
diff --git a/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch b/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch
deleted file mode 100644
index 4854072bc8a0..000000000000
--- a/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: David Tardon <dtardon@redhat.com>
-Date: Sat, 20 Dec 2014 17:40:45 +0000 (+0100)
-Subject: coverity#1259905 do not let AbiDocument::parse throw
-X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=2f372e8adf8e6b1f8cf70f08adddcf66be54d94a
-
-coverity#1259905 do not let AbiDocument::parse throw
-
-This also fixes coverity#1259906 and coverity#1259907 .
-
-Change-Id: I55d892517ac93ca43478d51d8e4a20c704ff6790
----
-
-diff --git a/src/lib/AbiDocument.cpp b/src/lib/AbiDocument.cpp
-index b8ab661..23ff750 100644
---- a/src/lib/AbiDocument.cpp
-+++ b/src/lib/AbiDocument.cpp
-@@ -110,7 +110,7 @@ is not protected
- \return A value that indicates whether the conversion was successful and in case it
- was not, it indicates the reason of the error
- */
--ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, librevenge::RVNGTextInterface *textInterface)
-+ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, librevenge::RVNGTextInterface *textInterface) try
- {
-   ABW_DEBUG_MSG(("AbiDocument::parse\n"));
-   if (!input)
-@@ -122,4 +122,9 @@ ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, libre
-     return true;
-   return false;
- }
-+catch (...)
-+{
-+  return false;
-+}
-+
- /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/app-text/libabw/libabw-0.1.1.ebuild b/app-text/libabw/libabw-0.1.1.ebuild
deleted file mode 100644
index a1015d7310f3..000000000000
--- a/app-text/libabw/libabw-0.1.1.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
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Library parsing abiword documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libabw"
-SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="doc static-libs"
-
-RDEPEND="
-	dev-libs/librevenge
-	dev-libs/libxml2
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.46
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=(
-	# from git master
-	"${FILESDIR}/${PN}-0.1.1-dereference-before-null-check.patch"
-	"${FILESDIR}/${PN}-0.1.1-do-not-let-AbiDocument_parse-throw.patch"
-	"${FILESDIR}/${PN}-0.1.1-boost-1.59.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# bug 619470
-	append-cxxflags -std=c++14
-
-	econf \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libabw/libabw-0.1.2.ebuild b/app-text/libabw/libabw-0.1.2.ebuild
index 93e138cf1a8e..9bc7f96f1b3a 100644
--- a/app-text/libabw/libabw-0.1.2.ebuild
+++ b/app-text/libabw/libabw-0.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc static-libs"
 
 RDEPEND="