gentoo resync : 22.06.2019

3 files changed, 2 insertions, 69 deletions

diff --git a/app-text/writerperfect/Manifest b/app-text/writerperfect/Manifest
index f48e40004c2c..0ab971727df9 100644
--- a/app-text/writerperfect/Manifest
+++ b/app-text/writerperfect/Manifest
@@ -1,6 +1,4 @@
 AUX writerperfect-0.9.6-gsf-buildfix.patch 428 BLAKE2B e141a4fb1a4515d1359d314dd066fa52edea3f5d69f14e06e08a8eef110a57b164011db311b9c6f0d563d7ca6e921d4082e6a61c6ea1d3a871f6d0dcb8049d71 SHA512 9446e3826173909177c091c752666a540aa5edf26aa0e7546b2e7520d64df5e8f4db578e79e6e86fb261118bcadc8f620bd7eee36d5d335812a00151c5dee5bc
-DIST writerperfect-0.9.5.tar.xz 302176 BLAKE2B 4ef8fd72f01e3c208a59c520440975f38dcf1edc353134721b7f06d042752adad9c825503f5756a74bede2307f7317c28e054dbcb6c5c1000a606822e97d2c8b SHA512 7467a798da362883101780b598e9a673c10f86f29c01ece1438ea524a0413a00928274f87895f3a8ae26f6784cdcc34e0e84039ca591dc3f75b2e25c53744ccc
 DIST writerperfect-0.9.6.tar.xz 330360 BLAKE2B da566fb8e1aae3708646b49b695cf26c5b64aeda1ca1df08ced2549ca8718840744ab011cb7567d1e371ac8e7ee6cfef6a67ee9837cf38b570a3794dc4682f81 SHA512 4a86a23ae2caa133066279994255d8ca7ee16f40ad646bd8ff434c7e4e1a29cf23db7e811b8eca1823dcf9e2456b2e8dbacf03bd5bc0377638fc52fc7d4495a5
-EBUILD writerperfect-0.9.5.ebuild 1761 BLAKE2B ef4e87d22c7ab182cb1f3e9677bbfa12498f2fade4c353bf1ba0093a4c00ae4cb90d2926b99e799e2dc0304e60102f593126cb0da0f3ee2b4746ef43a6fc1e1b SHA512 95591cec04441b34a37e60460eab58ea69641c9876e7074bcdb1dcd25aa1b7fd438dc52c98f61674b151b82eacdc18cc42c6c844390c6f78ccbd299c07b04fd6
-EBUILD writerperfect-0.9.6.ebuild 1943 BLAKE2B 6ecd0c967002f1165c12321af04a7b0e1809fdc4ee35a5c30627df0c762363ef3422db37b7706500061bac7d84552c864701f399a1804da577649d1156192b8f SHA512 cd8819bb9791a2d0fbf4d9ac3283d565bc53f1b1171855a59feb898398621057c214e448c7101e75b30b70abeeefedd1990afb8981049d0534c8f64a993d2ebd
+EBUILD writerperfect-0.9.6.ebuild 1942 BLAKE2B 3839bd4c54dad8cf969f5b00722a72d8161156679a198cdd73da03918619506789242cb5c88998fc5ad70587aff669a4c9e65697cdb5cbcae356690ca64e7edc SHA512 9463cde1539f9aa2485a35e69288941366d5b7d63d7ae348cc3409aad8946a9046ab9fa2e9437a483e967bd94e91de76d7176b4338a062f31ac987aa32791b35
 MISC metadata.xml 1792 BLAKE2B db2026455dd4d1ecb5b0e91a404dbb68556e48568394c41f6b5f928f7dd635f7607f79a8a90b8ca06524a9a0ec399f863373a94f9e1b767dff36fc63488ea7f7 SHA512 911c9be2bc46655e7452189f29ada72faab7800056c88cea3afd81d9fe11330e554bbf27d61fc23789441a80f211c706204585f08baa0f76f461438ce809e575
diff --git a/app-text/writerperfect/writerperfect-0.9.5.ebuild b/app-text/writerperfect/writerperfect-0.9.5.ebuild
deleted file mode 100644
index ebcd8a970359..000000000000
--- a/app-text/writerperfect/writerperfect-0.9.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Various formats to Open document format converter"
-HOMEPAGE="http://libwpd.sf.net"
-SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux ~x86-solaris"
-IUSE="abiword +cdr debug ebook freehand gsf keynote +mspub +mwaw pagemaker +visio +wpd +wpg +wps"
-
-# FIXME: libepubgen, librvngabw
-RDEPEND="
-	=app-text/libodfgen-0.1*
-	>=dev-libs/librevenge-0.0.1
-	media-libs/libeot
-	abiword? ( =app-text/libabw-0.1* )
-	cdr? ( =media-libs/libcdr-0.1* )
-	ebook? ( =app-text/libebook-0.1* )
-	freehand? ( =media-libs/libfreehand-0.1* )
-	gsf? ( gnome-extra/libgsf )
-	keynote? ( =app-text/libetonyek-0.1* )
-	mspub? ( =app-text/libmspub-0.1* )
-	mwaw? ( =app-text/libmwaw-0.3* )
-	pagemaker? ( media-libs/libpagemaker )
-	visio? ( =media-libs/libvisio-0.1* )
-	wpd? ( app-text/libwpd:0.10 )
-	wpg? ( =app-text/libwpg-0.3* )
-	wps? ( =app-text/libwps-0.4* )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	|| ( abiword cdr ebook freehand keynote mspub mwaw pagemaker visio wpd wpg wps )
-"
-# configure fails if no import library is selected...
-
-src_configure() {
-	# bug 651620
-	append-cxxflags -std=c++11
-
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_with abiword libabw) \
-		$(use_with cdr libcdr) \
-		$(use_with ebook libebook) \
-		$(use_with freehand libfreehand) \
-		$(use_with gsf libgsf) \
-		$(use_with keynote libetonyek) \
-		$(use_with mspub libmspub) \
-		$(use_with mwaw libmwaw) \
-		$(use_with pagemaker libpagemaker) \
-		$(use_with visio libvisio) \
-		$(use_with wpd libwpd) \
-		$(use_with wpg libwpg) \
-		$(use_with wps libwps)
-}
diff --git a/app-text/writerperfect/writerperfect-0.9.6.ebuild b/app-text/writerperfect/writerperfect-0.9.6.ebuild
index 4079835b3f7f..a9f43a1e673e 100644
--- a/app-text/writerperfect/writerperfect-0.9.6.ebuild
+++ b/app-text/writerperfect/writerperfect-0.9.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 x86 ~x86-linux ~x86-solaris"
 IUSE="abiword +cdr debug ebook epub freehand gsf keynote +mspub +mwaw pagemaker qxp +visio +wpd +wpg +wps zmf"
 
 # configure fails if no import library is selected...