gentoo resync : 10.11.2019

3 files changed, 2 insertions, 51 deletions

diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
index 3b6f6fae83e4..c7d7a8d796e4 100644
--- a/app-text/libabw/Manifest
+++ b/app-text/libabw/Manifest
@@ -1,5 +1,3 @@
-DIST libabw-0.1.2.tar.xz 318400 BLAKE2B ba25542da0d6568530241892dbdba72d2b0dcf667b50e0c1a4e656e0facf82bf77ca8eff8db4d6e57ab699f12d8dad511d32aee291541ffe6460b2ee98590b68 SHA512 a365c1aa047a97a86eee6bce8463646bdf248a51013139ee288402a832fd545586e072d7c7fc11a56f42e3637de9e922197be20d0587e53c51fd80ced409a6cd
 DIST libabw-0.1.3.tar.xz 318808 BLAKE2B 234ff797bf3798bc7f14f2b3f0d0cc2d80eda2a6ba2d656288c26e58d53b9798003d7f45ad7c9a0f504da36c8c8ba367f8fe5b565a85fbc6a1f1627d89e7e353 SHA512 0d2646e1bad1e11b3da43714ac5931fc67ffdbc4e7a25a44ef5b6e6a41de1e0ae14596b4a87cceb07bf56dbbe9344622b3d60afcb054ee0ab8577ca8e9b5c289
-EBUILD libabw-0.1.2.ebuild 854 BLAKE2B 605b465b931a138beac45a6084d9cc2b0000e57f7cee102681cd56fe3f56c963309d0556ad5bf1f146b5de33246a5337ad024ef3f028b3530281f4a99aed6b5c SHA512 448e45210f18856a9713b959256dc4b861ae7004efa546a0295ea261fbc13a1aea5244e1ddeb93ec075dd6579c301b1a60526b84c0272221e1226b6af292ac33
-EBUILD libabw-0.1.3.ebuild 835 BLAKE2B 96622f8f5c9757c830c800bcf239894e64b09d8e5b1e728f3bd758cec41e96b6e32d3f82102339a905234f4af978a20ec997fefcad3ff04e2af12c2cb02aa280 SHA512 d4e0bd7fbcea6540b8f21ff5fa6f96e5b47a8c8d573a76adf002b19ebc6f97997fe2d3a44d8ee403ce562d56ee7a474e575f8d0cc8c3959173710829aa554ab2
+EBUILD libabw-0.1.3.ebuild 834 BLAKE2B ccd33ad9c142658d555b1ee31788f6d2e7477dd2a996c84a31e4d2905323c815f0547d4ae63b9b0cb3863beb1cb1d57e6054b1c0673f856b7442dbbca6b103c3 SHA512 323ec2ddca6e4deea8938f1bba01f77b68a75ad784b6e1a04c2e183592eb56e43e7605ccd00e9acff6135529a4b5d8a52bbd8ae254aa4584854c56208f540819
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libabw/libabw-0.1.2.ebuild b/app-text/libabw/libabw-0.1.2.ebuild
deleted file mode 100644
index 55a551b2fc4f..000000000000
--- a/app-text/libabw/libabw-0.1.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 ~ppc64 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 )
-"
-
-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.3.ebuild b/app-text/libabw/libabw-0.1.3.ebuild
index 8f82370198df..71115f275264 100644
--- a/app-text/libabw/libabw-0.1.3.ebuild
+++ b/app-text/libabw/libabw-0.1.3.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 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc static-libs"
 
 BDEPEND="