gentoo resync : 30.12.2017

3 files changed, 2 insertions, 40 deletions

diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index d56c7dd2e1d0..62ce6526a92a 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,5 +1,3 @@
-DIST libwps-0.4.7.tar.xz 595580 BLAKE2B 697d0572aa8dccc732b5ff3f23c3bacf2a82ea77442e819172a03a8b906aaee010fc992419d161f573efb3c998cc8d001a7431e16996f5348fe4aa80b8060bdd SHA512 d38b778016f8ca6a44edba86177d28a3f0bcd338e57276a615eeb9d470def71aa9326c3077789129418b38e88ae6f6d1901d08f5716081ba2eb9847a133c96da
 DIST libwps-0.4.8.tar.xz 648512 BLAKE2B b446c9999ff0e760569daa52fd24e42af8cdda78f2c0bc77d26cc25957381456f045dde1eb4ec8bd7999de29f658d67b2a493fdeacde4faa12a00aa28725603f SHA512 bf5d7aeb6f06e87f15ec8e911fb6436fb4e14839123db71488638f0e658034ad4ea8849ed83926af2fab9b50a7ef7410199d4a1102abc63c83d37bf1966a4afb
-EBUILD libwps-0.4.7.ebuild 773 BLAKE2B bac2dcbc511e78d0d071d3d0c6ae289e8484a6ee6514fd0cc14ff2f6eef17ac0897f97d6a57542c33ceb5fac1001ea35825e992001854023e0919c285c55f28c SHA512 b3dc7813691615c354c9fa862e1e8c64a26719392c81a78ac7c2ed4e7954b41d2dfc115ca01fbda09bb54964a1bf79bfba5329ff97a9e0d7cefa87f9f7a45a1b
-EBUILD libwps-0.4.8.ebuild 747 BLAKE2B 06b6f4d5110ebad61b4c2f0ec574d7a6f3b483f9eb1510ac50c41244298c582a363fc65ac95d6fb1ac214990f05f230f8109f0bf5355df2d2002e280f0a57340 SHA512 ebb3a2590e17af430efe625141ead0b8ac18c01fbe956be059be12eff9a7a1d618aa36dc4e01d84b6146c98bad7483367ff4f44e8959d11b46777c32176f8332
+EBUILD libwps-0.4.8.ebuild 746 BLAKE2B 60cfafa10653cb4911a6c8bc88fd54fbb36de63ba2a8d60a845155eb0e62018f78d7232711be572b1954cf8c763b1eb589b6e4650fcf35e7750ec3fc8ebac981 SHA512 45c309260c9aac532a096bd5f91dfbba32ed7fa79172958c4004f3073e56fcdbf1c32885391ca81cccc7871efca207580a50a97d7be0eaf24574d9fb9f2a9fbb
 MISC metadata.xml 512 BLAKE2B e2125277139c062748282be37319771c209ba9b9c6f68e0ab9b8e9b5d10c4dfda9f6369aca792be2f21db8c1dcf3e840f78f159190162114458ed9279bf46270 SHA512 971b6f541825d73b66f09bc6b6ab677c2b1f1430a6cdd469dfe57162528d13b048681c8e00de061aa8ef5f98914b36b8bce7e13a35044937e65298469241bc1e
diff --git a/app-text/libwps/libwps-0.4.7.ebuild b/app-text/libwps/libwps-0.4.7.ebuild
deleted file mode 100644
index 640c8c1bdff2..000000000000
--- a/app-text/libwps/libwps-0.4.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Microsoft Works file word processor format import filter library"
-HOMEPAGE="https://sourceforge.net/p/libwps/wiki/Home/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
-IUSE="doc debug static-libs tools"
-
-RDEPEND="
-	dev-libs/librevenge
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	econf \
-		--disable-werror \
-		--with-sharedptr=c++11 \
-		$(use_enable debug) \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
-		$(use_enable tools)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libwps/libwps-0.4.8.ebuild b/app-text/libwps/libwps-0.4.8.ebuild
index a0f61a04ecea..2e18f207c814 100644
--- a/app-text/libwps/libwps-0.4.8.ebuild
+++ b/app-text/libwps/libwps-0.4.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
 IUSE="doc debug static-libs tools"
 
 RDEPEND="