app-office/abiword: Multiple bug fixes

- Fix flickering with recent GTK+ versions (#601300)
- cairo[X] looks to not be needed, don't rdepend on it (as other
  distributions do too) (#618756)
- Fix compilation issues (#656026)
- Fix libical3 compatibility (#677072)
- Don't force smooth scrolling (from Debian, upstreamed)

Closes: https://bugs.gentoo.org/601300
Closes: https://bugs.gentoo.org/618756
Closes: https://bugs.gentoo.org/656026
Closes: https://bugs.gentoo.org/677072
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho@gentoo.org>

2 files changed, 165 insertions, 0 deletions

diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 435ebe1a12d9..e970f08cedb8 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,2 +1,3 @@
 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
diff --git a/app-office/abiword/abiword-3.0.2-r2.ebuild b/app-office/abiword/abiword-3.0.2-r2.ebuild
new file mode 100644
index 000000000000..898df2320566
--- /dev/null
+++ b/app-office/abiword/abiword-3.0.2-r2.ebuild
@@ -0,0 +1,164 @@
+# 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 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/~pacho/gnome/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="2"
+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 )"
+
+RDEPEND="
+	>=app-text/wv-1.2
+	>=dev-libs/fribidi-0.10.4
+	>=dev-libs/glib-2.16:2
+	>=dev-libs/libgcrypt-1.4.5:0=
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.16:2
+	>=gnome-extra/libgsf-1.14.18:=
+	>=media-libs/libpng-1.2:0=
+	virtual/jpeg:0
+	>=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:0.12 )
+	plugins? (
+		collab? (
+			>=dev-libs/libxml2-2.4:2
+			>=net-libs/loudmouth-1
+			net-libs/libsoup:2.4
+			net-libs/gnutls:= )
+		grammar? ( >=dev-libs/link-grammar-4.2.1 )
+		math? ( >=x11-libs/gtkmathview-0.7.5 )
+		ots? ( >=app-text/ots-0.5-r1 )
+		readline? ( sys-libs/readline:0= )
+		thesaurus? ( >=app-text/aiksaurus-1.2[gtk] )
+		wordperfect? (
+			app-text/libwpd:0.10
+			app-text/libwpg:0.3 )
+		wmf? ( >=media-libs/libwmf-0.2.8 )
+	)
+	redland? (
+		>=dev-libs/redland-1.0.10
+		>=dev-libs/rasqal-0.9.17 )
+	spell? ( >=app-text/enchant-1.2 )
+	!<app-office/abiword-plugins-2.8
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	>=dev-libs/boost-1.40.0
+	virtual/pkgconfig
+	collab? ( dev-cpp/asio )
+"
+
+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
+
+	# 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=()
+
+	if use plugins; then
+		# Plugins depending on libgsf
+		plugins=(t602 docbook clarisworks wml kword hancom openwriter pdf
+			loadbindings mswrite garble pdb applix opendocument sdw xslfo)
+
+		# Plugins depending on librsvg
+		plugins+=(svg)
+
+		# Plugins not depending on anything
+		plugins+=(gimp bmp freetranslation iscii s5 babelfish opml eml wikipedia
+			gdict passepartout google presentation urldict hrtext mif openxml)
+
+		# inter7eps: eps.h
+		# libtidy: gsf + tidy.h
+		# paint: windows only ?
+		use collab && plugins+=(collab)
+		use goffice && plugins+=(goffice)
+		use latex && plugins+=(latex)
+		use math && plugins+=(mathview)
+		use ots && plugins+=(ots)
+		# psion: >=psiconv-0.9.4
+		use readline && plugins+=(command)
+		use thesaurus && plugins+=(aiksaurus)
+		use wmf && plugins+=(wmf)
+		# wordperfect: >=wpd-0.9 >=wpg-0.2
+		use wordperfect && plugins+=(wpg)
+	fi
+
+	gnome2_src_configure \
+		--enable-plugins="${plugins[*]}" \
+		--disable-static \
+		--disable-default-plugins \
+		--disable-builtin-plugins \
+		--disable-collab-backend-telepathy \
+		--enable-clipart \
+		--enable-statusbar \
+		--enable-templates \
+		--with-gio \
+		--without-gnomevfs \
+		--without-gtk2 \
+		$(use_enable debug) \
+		$(use_with goffice goffice) \
+		$(use_with calendar libical) \
+		$(use_enable cups print) \
+		$(use_enable collab collab-backend-xmpp) \
+		$(use_enable collab collab-backend-tcp) \
+		$(use_enable collab collab-backend-service) \
+		$(use_with eds evolution-data-server) \
+		$(use_enable introspection) \
+		$(use_with map champlain) \
+		$(use_with redland) \
+		$(use_enable spell)
+}