gentoo resync : 03.03.2019

2 files changed, 41 insertions, 15 deletions

diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 634e31c177fb..7b78ec9a5c2d 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,5 +1,6 @@
 DIST abiword-3.0.2-patchset.tar.gz 10475 BLAKE2B 41b4b894e1b433ca722270e09410de22be906920b551d19580db32b4c8557595902d23a7ed320cc71b1fc191f830e72178158ffb02cafb07e01c72d12ccd4faa SHA512 e81688bbe58cdc9c6848cd2bc74207bf9c6e8dd1f2652a707f007ce9a2f3cf8cc77eac65b04e24b67a694773f0b08ba14bdcf10db549e33cbb7ee5da634bdfb3
+DIST abiword-3.0.2-patchset.tar.xz 11976 BLAKE2B 72acb4956543843ad445525d1f5654c63f2544933aab35a95f0ed4f49e1385c06a29a3deb5b7ba09343188e9adf8f916f0223ab6c2a037424732f5e5bffba103 SHA512 afe6f791f167b40c2fdd16f2308add67990dd1fd0856f5a96e8f486a0af2e7b67cbcde29beacd2d869508e8f98bd3fb140240480882bcd9689cbb1fba6a75743
 DIST abiword-3.0.2.tar.gz 11154333 BLAKE2B af49570ad766b0e698313a4a88f14b2370a0a230866c4e8672f56780705060dba4207d4e13358cc290fb3c1a4a6a56efa05fed1f0540f10f7572d8e717e6cd20 SHA512 29ce9e80b3b85ab2933e7d39216771d8c4e05db5255eaed0cf8e1d032ffaac2cb1880bf24e754196ad5dae4969a1c2101ce4dc9c1db14604adc2f852b6a17fe3
 EBUILD abiword-3.0.2-r1.ebuild 4741 BLAKE2B 37e70806f994a8c97c42e85d356535c2bca8183314fc083c8734dbfe314d7f3cf391b03408ae5f92c53f07eef94f8b3b786deb26f0a4568e1bde67514ca16b08 SHA512 0f89e55de774dfb378fbb4ae59869a732beafd472347c7efd5ea5366d67057d805740d386207c787796371b1f5f2fe886e307333039f9a9207e2a97523411d0a
-EBUILD abiword-3.0.2.ebuild 4222 BLAKE2B e848956541152cb9dc6eab3143e3c655765b50d30c7337a23dad3da97005f499f9ccc2f6990fd7b58687416ad89e777f4aa99aab5ad1dfb595f0859c6dee0170 SHA512 e03adfdaee8e0602918d4154adabae152d73adad0401cf36ca05b456e4aa99099b4dae698fdfc6d826db200cb38cc4343bd8e6d318bb0e2b9dba8e1dd122ad4d
+EBUILD abiword-3.0.2-r2.ebuild 5233 BLAKE2B a62681980f1a7b925bb9d62e080508bc7fa6bdb227ee5fb49080c3b726bda14b0c9f076cbede3fbd12ae38e698c621dddd0bbd00ca4deef3198c20ab256825e6 SHA512 48c9f3feeb6e64fb6a961934fdc567c5e92823d675be66615ca7885cacb175dd84a686958fac8954904f26c765d9c6a247172c63230b8e3a3d4d3da00fc1bb43
 MISC metadata.xml 1107 BLAKE2B c778cccda98bbacd6f58f964748196154f517334095e7b6a0698689c758f6e2d988d8cd9e0b2909354307c4b6a51a2de8e67c3976661f78a519b4dd82de1a128 SHA512 3b11b9d4690b59fca6c4358e8292822b822ba8fc525427780597ead0550c5fec96c83d7ab4d8f1830b648f10f46dd261ed959aad63d26be814d946bd9b6907c8
diff --git a/app-office/abiword/abiword-3.0.2.ebuild b/app-office/abiword/abiword-3.0.2-r2.ebuild
index 9a6ce7846e39..40385e445871 100644
--- a/app-office/abiword/abiword-3.0.2.ebuild
+++ b/app-office/abiword/abiword-3.0.2-r2.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+GNOME2_EAUTORECONF="yes"
+GNOME2_LA_PUNT="yes"
 
-inherit autotools gnome2
+inherit gnome2
 
 DESCRIPTION="Fully featured yet light and fast cross platform word processor"
 HOMEPAGE="http://www.abisource.com/"
 SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.gz"
+	https://dev.gentoo.org/~pacho/gnome/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~x86 ~amd64-linux ~x86-linux"
-IUSE="calendar collab cups debug eds +goffice grammar +introspection latex map math ots +plugins readline redland spell wordperfect wmf thesaurus"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~x86 ~amd64-linux ~x86-linux"
 
+IUSE="calendar collab cups debug eds +goffice grammar +introspection latex map math ots +plugins readline redland spell wordperfect wmf thesaurus"
 # You need 'plugins' enabled if want to enable the extra plugins
 REQUIRED_USE="!plugins? ( !collab !grammar !latex !math !ots !readline !thesaurus !wordperfect !wmf )"
 
@@ -28,16 +30,16 @@ RDEPEND="
 	>=gnome-extra/libgsf-1.14.18:=
 	>=media-libs/libpng-1.2:0=
 	virtual/jpeg:0
-	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/cairo-1.10
 	>=x11-libs/gtk+-3.0.8:3[cups?]
 	calendar? ( >=dev-libs/libical-0.46:= )
 	eds? ( >=gnome-extra/evolution-data-server-3.6.0:= )
 	goffice? ( >=x11-libs/goffice-0.10.2:0.10 )
-	introspection? ( >=dev-libs/gobject-introspection-1.0.0 )
-	map? ( >=media-libs/libchamplain-0.12 )
+	introspection? ( >=dev-libs/gobject-introspection-1.0.0:= )
+	map? ( >=media-libs/libchamplain-0.12:0.12 )
 	plugins? (
 		collab? (
-			>=dev-libs/libxml2-2.4
+			>=dev-libs/libxml2-2.4:2
 			>=net-libs/loudmouth-1
 			net-libs/libsoup:2.4
 			net-libs/gnutls:= )
@@ -65,21 +67,44 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
+	# http://bugzilla.abisource.com/show_bug.cgi?id=13842
 	"${WORKDIR}"/${P}-patchset/${PN}-2.8.3-desktop.patch
+
+	# http://bugzilla.abisource.com/show_bug.cgi?id=13843
 	"${WORKDIR}"/${P}-patchset/${PN}-2.6.0-boolean.patch
+
+	# http://bugzilla.abisource.com/show_bug.cgi?id=13844
 	"${WORKDIR}"/${P}-patchset/${PN}-3.0.0-librevenge.patch
+
+	# http://bugzilla.abisource.com/show_bug.cgi?id=13845
 	"${WORKDIR}"/${P}-patchset/${PN}-3.0.0-link-grammar-5-second.patch
+
+	# http://bugzilla.abisource.com/show_bug.cgi?id=13846
 	"${WORKDIR}"/${P}-patchset/${PN}-3.0.0-libwp.patch
 	"${WORKDIR}"/${P}-patchset/${PN}-3.0.1-libwps-0.4.patch
 	"${WORKDIR}"/${P}-patchset/${PN}-3.0.1-fixwps.patch
+
+	# http://bugzilla.abisource.com/show_bug.cgi?id=13847
 	"${WORKDIR}"/${P}-patchset/${PN}-3.0.2-fix-installing-readme.patch
+
+	# http://bugzilla.abisource.com/show_bug.cgi?id=13841
 	"${WORKDIR}"/${P}-patchset/${PN}-3.0.2-fix-nullptr-c++98.patch
-)
 
-src_prepare() {
-	gnome2_src_prepare
-	eautoreconf
-}
+	# http://bugzilla.abisource.com/show_bug.cgi?id=13815
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.2-fix-black-drawing-regression.patch
+
+	# https://bugzilla.abisource.com/show_bug.cgi?id=13907
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.2-smooth-scrolling.patch
+
+	# https://bugzilla.abisource.com/show_bug.cgi?id=13791
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.2-fix-flickering.patch
+
+	# https://github.com/AbiWord/abiword/commit/bdaf0e2da72bdc9d9bb3020445fe7b1b5dd7c062
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.2-libical3.patch
+
+	# https://bugzilla.abisource.com/show_bug.cgi?id=13697
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.2-bool-boolean.patch
+)
 
 src_configure() {
 	local plugins=()