Needs to be rebuilt with libical subslot bumps, drop old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

12 files changed, 17 insertions, 513 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index c012e8fd25ce..a8a355492258 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-office/abiword
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.283 2015/06/13 10:05:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.284 2015/06/29 18:35:52 pacho Exp $
+
+  29 Jun 2015; Pacho Ramos <pacho@gentoo.org> -abiword-3.0.0-r2.ebuild,
+  -files/abiword-3.0.0-bison30.patch, -files/abiword-3.0.0-boost54.patch,
+  -files/abiword-3.0.0-eds-3.6.patch, -files/abiword-3.0.0-fix-crash.patch,
+  -files/abiword-3.0.0-fix-redraw.patch,
+  -files/abiword-3.0.0-fix-shortcut.patch,
+  -files/abiword-3.0.0-libgcrypt_1_6_0-1.patch,
+  -files/abiword-3.0.0-pdf-crash.patch, abiword-3.0.1.ebuild:
+  Needs to be rebuilt with libical subslot bumps, drop old
 
   13 Jun 2015; Pacho Ramos <pacho@gentoo.org> abiword-3.0.1.ebuild:
   Needs rebuilding with eds subslot bumps
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 897acecbbd4a..c2d352b40e96 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,24 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX abiword-3.0.0-bison30.patch 730 SHA256 620628b703e860c1c3476800850947026636c5a14b28730379fe7cda3f0bdb36 SHA512 a05610932af69916945b02f7ca68712cfc03c094f534c7ee37d593917fcab3e8813e6834ca25ff3011308ee188431bc2779d36938543c2875e64478f5944edc2 WHIRLPOOL be71e6a3fbcd5863ed573f720a8ef9ebc70c1a3eeecea5d08b4de5689c7b57eacce9e483179b0f7efb99193a1d8a25455de2e6722c14f02918e0938f30a0a229
-AUX abiword-3.0.0-boost54.patch 891 SHA256 cfaf9ddb0d1fb0448276f555ede644ea4a9e7cbcf07b87651d2f81ad05a03044 SHA512 0dff115a6c14dc4e7d7affd0e27d16f2426ca4aa4e47e14cf991d86d9733e58f9906c67a420edcd69bb4b8f2afeda61c7ec182c6eba1cd990cc447e01f8a4a2a WHIRLPOOL 35fbd926fc8138110c17dbfe1f53e2cf50cc31d5f0ea276431a40f105cb825270b97828012ccd77b7455569c4e2918c0aa83c592ad79364e0349910fea12eca3
-AUX abiword-3.0.0-eds-3.6.patch 354 SHA256 8b932f689df9dbad1e89f18483ac10bd00a82947c9f262decad14af4a47494d5 SHA512 2cc20c74af163203a89061afc5daba681b8ea8680a9b535470adbb7178f10207daed0ef4147cd5dfb5aa3bb0776b3bfba4b3fd9da53de623790df942b94d0934 WHIRLPOOL 6467e5a03ca704c548e8dca00e29267ac62e5f09ebba6bf3ced5f94edb51724a247b4faefb229246196fd06eb42c989f6af4759cbdfa148ce7aa4068d1fa772c
-AUX abiword-3.0.0-fix-crash.patch 1180 SHA256 9c1cd977a35e7b86dba4cb032a5b0f571134dc81170ba3627f69ba27d633c8e7 SHA512 e5e8200b913abddd7f1544f2ef2cd68c4ce6e0a49a36fe078ccb8d861c3f4e8174366d1232cc43dc918b9274ccb8c15221ab191d1c210b2a90fb8a184edd0d1e WHIRLPOOL f575549f26f3aee6b23b529d80963123754bc8a30153fdad9a9139d680a3342f88cc595f6c8c8f97a89845d087973e7bc30f73105d695d0c218c5d592b83a075
-AUX abiword-3.0.0-fix-redraw.patch 1900 SHA256 a09893fba7efcfc1078e2ea5214307dfc695328bae472b36a85106d6a6846c1e SHA512 5eb578475fc4117ced3d756b5b64de04880ff234f6e4a86a9252d61980d1499f214754d5855dd5bb4b2958942cf6ef29f5dc9c68f3b2405af42af1ef93c64c7f WHIRLPOOL bc5f6ec2f5522380e2dc5edf871b01e2a8521a4f380ce7d18afa498df5f398ee54e6c1ad145d7a101e03accb8f8ed1138e016bf95ddd5d56b48b77ff530424f3
-AUX abiword-3.0.0-fix-shortcut.patch 1741 SHA256 659582769a7516f183e375c1d23ae9715f5a2c72177025c948bcccf9f8b9cdf0 SHA512 d2183fbc2edb474014a387b91a614632411808b07dfda99a411cb1e2db0c103019022cc0bf55d7a337cef13656cf13b62d709d192196bb72144a9819bf87ae40 WHIRLPOOL 669d7e3c9c23933f28c79c4b787bac501054e255b4b5a895afe0f7c13098da99016b5523eb5bda78110f6488933d729736dcf31c72af069844cfd967804f27b6
-AUX abiword-3.0.0-libgcrypt_1_6_0-1.patch 1129 SHA256 69290d7c7a1a06523f03f57c68a9fff087855a2ae524064b73a93087400064c8 SHA512 adf6eb70b411284a97ed78b7be2e501dd977489186d32595f37f45e4802de5b8400b0381bfe75b056a58267fdd6e981c4456171d946ade9adc1f35938133eee2 WHIRLPOOL 38cf0622f421dd2ed63bb6bd754c275943a574bacbb0b64eb32f537b1e622d718ec4871345745f6088b444491c62c6ea2931a7c705fce6b813fc18f5d32303e6
-AUX abiword-3.0.0-pdf-crash.patch 3583 SHA256 4760e410f6ee3690f7572997c486e7c2d8051e3303fbbe654d62bb308660a9f4 SHA512 2ab29215197f0766c2452fdec92d98c68a5a9383085d237095158415e60032401f5e8a8b0f55d179ce1b4c35da65198d73082f9cd0408f7628b0d806aa738138 WHIRLPOOL 0ecceb99b41357f3685c8310b8cb2ad7205547509ec6d3d29985e08032ae1eb6abd7998036608eb7727b0bb39870be14da704142946732f5b6af28db2163f995
-DIST abiword-3.0.0.tar.gz 10956892 SHA256 d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b89081fac01 SHA512 3f9804b17f27b8afa2f5bcccdb1b5d6270339ad4f518523208f2e2cde54cb28391575cfd3639aaadc13ab50d5908260b159ca7b41fd92ed5a449d7012e5a4637 WHIRLPOOL 54cb234dbaae070d4f9dfa215e3c5a80a45666b7363febf4b56c7ec685c7b084bf78f2f3a6827cb8585bec4ead5c6fd8bd71bc51c35bf3423f3b31a296bdb144
 DIST abiword-3.0.1.tar.gz 11144990 SHA256 e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6 SHA512 c655aabe0ba0a9880f30808e26c02ec3280c750625faa482a68d4d336742f85659a7af7d6413d8813b82d3de0a3f6b61b6f6898f030bb921d792ad866879dbcf WHIRLPOOL 7d06614673d7275df57999783205b98a41f0588c7eadfdd4d29e30dd52cf1c44aa5b07e90d47ece328119da9877aec7754511a40768b6ea844c3683abefdcad7
-EBUILD abiword-3.0.0-r2.ebuild 4998 SHA256 e9e9c1c4501fd4d393d34da5064cb0a98c3ee04dcd74c72ccd77386312357cf3 SHA512 d3484558be3cc434d2552a2719d600e9b9a344f831de3c1fa6ec92ce6b53341b9bc7408303ba1104d1307df67bf053b8a0b485b4e5a3fdfc02346b3785e19a7f WHIRLPOOL d3c137dec11d9cea755af8dd375847a30bbb3f3a4ee365e7d8c3adeb2372701490d0349d781b2ce5ca1ed5b8b2d8a4b91cd7a45167e0706c88542a8da9623faf
-EBUILD abiword-3.0.1.ebuild 4149 SHA256 f3d0fd8afc532369967fc9134d8b969288e7f2e57b4159e3c1ffb5dcfc5f59bf SHA512 93d479a34d28c5583d64adef318142fb1274889901971c6e752c744330d322b9339c41bb8c8ad5e613643c3469e1e692971213cabad0bbab681eca9f7d440187 WHIRLPOOL 0d6c49ac89f3eab9104f6b3a6b24341f355c76f0133db5e2e4d535e3a96fc906ab18f699e9e9ee9855bb5f54586ad28b4afb310008eeaa14112ed3edb232977f
-MISC ChangeLog 38938 SHA256 8f2d10141a320a862b449224899ad6c8eba2fea587ed8eb3d17663ec15e61280 SHA512 cbc627d9f9814cee6e5befb1d9cbd49735fc977ea8b40c757576031a34641d2e0697bb1c8f2ab273f392b684c409163bc9a6edc174af481b0042dc5554f43e7c WHIRLPOOL fc0f354708cfc50b481564f04c06ebc77c48716020d57d9dbf2f5caf2db57f305aa4e941db96eb13a3a9d9cd62031912e1c20dda12b6165c0f698bfdbde644a1
+EBUILD abiword-3.0.1.ebuild 4151 SHA256 052d21734ebd21243b4a5bdda7cd2524f2e15bd65f5153d4286d800cef80f7ce SHA512 32b888e3c96918390acc3377f8e835d1e657c466c59780416b7034956487a8be2f7e0d5f168d7905a11c3cbc6b4f2820552c5daf0815122c8ec5a3c8e742830c WHIRLPOOL 145332c9852104b5fca604a953884fe2765f5f1d82a2cd3d98043d4a6e79b94860a59a311836eef3c08ef1f880b6dfdc5a7ec4fb34f7513acd17bffe87b252b8
+MISC ChangeLog 39414 SHA256 62d9704e851299fe31b3d7775d8a89764c32381370657ffa5070695aeb354447 SHA512 94d4aa85f556f05786eca399a642b44334c44b21c2a1f4492f166ac9e4535fc295db208be6113c52b720a66c2df86dfbeb7a286088d202f4974a1ec80b8584ac WHIRLPOOL a65b1cce9c7c78d42b45ee075b064a57467fd3a6f674ad0a67707a8f5c736df08e8b42bb4fb1fd4343db75fa4d46e6685fd980b3950f6dccff6d353b7dac9bce
 MISC metadata.xml 1023 SHA256 84838627e534120d323b632d0086672656884bb3ee6fc650f784f428674524f3 SHA512 7ec3683c9e1d2afede01461d428ac97d3896235ecddc1658863b3cde923f1be3e9cf4b1b09eade66eb5aec5ef9e11c434b4b66bb64f8d1ed90e29ead4b3702f4 WHIRLPOOL f4e9d21d8441ab9d12950784754ed25e4e9503046b1c71882fe6c69df54b9f77718f090ae198a32f8236c9d873801c062f735ecfd4e70fa48528a484a8762d55
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV8AFIACgkQCaWpQKGI+9RZawCfS+mCvuXRarfNuA5wetajhL4n
-lScAn2ytLlsmHc77JTKYuBibmTLD1r1k
-=KqS1
+iEYEAREIAAYFAlWRkAkACgkQCaWpQKGI+9TwaACdEwIJz0lA9obrUcUMz0igT7+n
+McQAn199CKTjhTeTEM+/3Ejfcrjf6540
+=9eNH
 -----END PGP SIGNATURE-----
diff --git a/app-office/abiword/abiword-3.0.0-r2.ebuild b/app-office/abiword/abiword-3.0.0-r2.ebuild
deleted file mode 100644
index 6e8abf9fc788..000000000000
--- a/app-office/abiword/abiword-3.0.0-r2.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-3.0.0-r2.ebuild,v 1.3 2014/07/23 15:13:33 ago Exp $
-
-EAPI=5
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils 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"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="calendar collab cups 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
-	virtual/jpeg
-	>=x11-libs/cairo-1.10[X]
-	>=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 )
-	plugins? (
-		collab? (
-			>=dev-libs/libxml2-2.4
-			>=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 )
-		thesaurus? ( >=app-text/aiksaurus-1.2[gtk] )
-		wordperfect? (
-			app-text/libwpd:0.9
-			app-text/libwpg:0.2 )
-		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 )
-"
-
-src_prepare() {
-	# readme.txt will be installed using dodoc
-	sed '/readme\.txt\|abw/d' \
-		-i user/wp/Makefile.am user/wp/Makefile.in || die
-
-	# http://bugzilla.abisource.com/show_bug.cgi?id=13532
-	epatch "${FILESDIR}/${PN}-3.0.0-eds-3.6.patch"
-
-	# http://bugzilla.abisource.com/show_bug.cgi?id=13564
-	epatch "${FILESDIR}/${PN}-3.0.0-fix-crash.patch"
-
-	# http://bugzilla.abisource.com/show_bug.cgi?id=13589
-	epatch "${FILESDIR}/${PN}-3.0.0-libgcrypt_1_6_0-1.patch"
-
-	# Fix build with boost-1.54
-	epatch "${FILESDIR}/${PN}-3.0.0-boost54.patch"
-
-	# http://bugzilla.abisource.com/show_bug.cgi?id=13596
-	epatch "${FILESDIR}/${PN}-3.0.0-fix-shortcut.patch"
-
-	# Fix build with bison-3.0
-	epatch "${FILESDIR}/${PN}-3.0.0-bison30.patch"
-
-	# Fix crash when saving as PDF, bug #515990
-	epatch "${FILESDIR}/${PN}-3.0.0-pdf-crash.patch"
-
-	# Fix redraw region in custom widget
-	epatch "${FILESDIR}/${PN}-3.0.0-fix-redraw.patch"
-
-	gnome2_src_prepare
-}
-
-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
-		# But doesn't build: http://bugzilla.abisource.com/show_bug.cgi?id=13563
-		#plugins="${plugins} svg"
-
-		# Plugins not depending on anything
-		plugins="${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="${plugins} collab"
-		use goffice && plugins="${plugins} goffice"
-		use latex && plugins="${plugins} latex"
-		use math && plugins="${plugins} mathview"
-		use ots && plugins="${plugins} ots"
-		# psion: >=psiconv-0.9.4
-		use readline && plugins="${plugins} command"
-		use thesaurus && plugins="${plugins} aiksaurus"
-		use wmf && plugins="${plugins} wmf"
-		# wordperfect: >=wpd-0.9 >=wpg-0.2
-		use wordperfect && plugins="${plugins} wpg"
-	fi
-
-	gnome2_src_configure \
-		--enable-plugins="$(echo ${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_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)
-}
-
-src_compile() {
-	# Parallel build fails, bug #488462
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile
-}
-
-src_install() {
-	gnome2_src_install
-	dodoc user/wp/readme.txt
-}
diff --git a/app-office/abiword/abiword-3.0.1.ebuild b/app-office/abiword/abiword-3.0.1.ebuild
index f4e6a6c061e6..91b16740ed60 100644
--- a/app-office/abiword/abiword-3.0.1.ebuild
+++ b/app-office/abiword/abiword-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-3.0.1.ebuild,v 1.4 2015/06/13 10:05:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-3.0.1.ebuild,v 1.5 2015/06/29 18:35:52 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG="yes"
@@ -32,7 +32,7 @@ RDEPEND="
 	virtual/jpeg
 	>=x11-libs/cairo-1.10[X]
 	>=x11-libs/gtk+-3.0.8:3[cups?]
-	calendar? ( >=dev-libs/libical-0.46 )
+	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 )
diff --git a/app-office/abiword/files/abiword-3.0.0-bison30.patch b/app-office/abiword/files/abiword-3.0.0-bison30.patch
deleted file mode 100644
index 0299520e282a..000000000000
--- a/app-office/abiword/files/abiword-3.0.0-bison30.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Last-update: 2014-02-02
-Author: Dimitri John Ledkov <xnox@ubuntu.com>
-Description: Cherrypick patch from NetBSD, to fix FTBFS with bison 3.0.
-
---- a/plugins/mathview/itex2mml/itex2MML.y
-+++ b/plugins/mathview/itex2mml/itex2MML.y
-@@ -1,8 +1,10 @@
- /*             itex2MML 1.4.8
-  *   itex2MML.y last modified 9/21/2011
-  */
- 
-+%parse-param {char **ret_str}
-+
- %{
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-@@ -26,9 +28,9 @@
-    }
- 
-  void (*itex2MML_error) (const char * msg) = itex2MML_default_error;
- 
-- static void yyerror (char * s)
-+ static void yyerror (char **ret_str, char * s)
-    {
-      char * msg = itex2MML_copy3 (s, " at token ", yytext);
-      if (itex2MML_error)
-        (*itex2MML_error) (msg);
diff --git a/app-office/abiword/files/abiword-3.0.0-boost54.patch b/app-office/abiword/files/abiword-3.0.0-boost54.patch
deleted file mode 100644
index f7cfeaef6184..000000000000
--- a/app-office/abiword/files/abiword-3.0.0-boost54.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Last-Update: 2014-02-05
-Forwarded: yes
-Author: Dmitry Smirnov <onlyjob@member.fsf.org>
-Bug-Debian: http://bugs.debian.org/737551
-Bug-Abiword: http://bugzilla.abisource.com/13602
-Description: fix FTBFS with libboost1.54-dev
-
---- a/plugins/collab/core/sync/xp/SynchronizedQueue.h
-+++ b/plugins/collab/core/sync/xp/SynchronizedQueue.h
-@@ -21,8 +21,9 @@
- 
- #include <deque>
- #include <boost/bind.hpp>
- #include <boost/function.hpp>
-+#include <boost/noncopyable.hpp>
- #include <sync/xp/lock.h>
- #include <sync/xp/Synchronizer.h>
- 
- class EmptyQueueException {};
---- a/plugins/collab/backends/tcp/xp/Session.h
-+++ b/plugins/collab/backends/tcp/xp/Session.h
-@@ -21,8 +21,9 @@
- 
- #include <boost/function.hpp>
- #include <boost/bind.hpp>
- #include <boost/enable_shared_from_this.hpp>
-+#include <boost/noncopyable.hpp>
- #include <deque>
- #include <sync/xp/lock.h>
- #include <sync/xp/Synchronizer.h>
- 
diff --git a/app-office/abiword/files/abiword-3.0.0-eds-3.6.patch b/app-office/abiword/files/abiword-3.0.0-eds-3.6.patch
deleted file mode 100644
index b7e362e76604..000000000000
--- a/app-office/abiword/files/abiword-3.0.0-eds-3.6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig	2012-07-26 02:59:34.000000000 +0000
-+++ src/text/ptbl/xp/pd_DocumentRDF.cpp	2012-07-26 02:59:50.000000000 +0000
-@@ -1884,7 +1884,7 @@
- 
- #ifdef WITH_EVOLUTION_DATA_SERVER
- extern "C" {
--  #include <libebook/e-book.h>
-+  #include <libebook/libebook.h>
- };
- 
- static std::string get( EVCard* c, const char* v )
diff --git a/app-office/abiword/files/abiword-3.0.0-fix-crash.patch b/app-office/abiword/files/abiword-3.0.0-fix-crash.patch
deleted file mode 100644
index bce09d18c3b2..000000000000
--- a/app-office/abiword/files/abiword-3.0.0-fix-crash.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit e0e81e6c2d7f2478b9effc8476b62425ca2c12cd
-Author: Hubert Figuière <hub@figuiere.net>
-Date:   Wed Oct 16 22:48:36 2013 -0400
-
-    Bug 13564 - Fix crash in abw to HTML conversion.
-
-diff --git a/src/wp/impexp/xp/ie_exp_HTML_Listener.cpp b/src/wp/impexp/xp/ie_exp_HTML_Listener.cpp
-index 86c57ec..b9dace1 100644
---- a/src/wp/impexp/xp/ie_exp_HTML_Listener.cpp
-+++ b/src/wp/impexp/xp/ie_exp_HTML_Listener.cpp
-@@ -2232,12 +2232,18 @@ void IE_Exp_HTML_Listener::_openList(PT_AttrPropIndex api, bool recursiveCall)
-                 _openList(api, true);
-             }
-         }
--        
--    }else
-+    }
-+    else
-     {
--        const gchar* szListStyle;
-+        const gchar* szListStyle = NULL;
-         pAP->getProperty("list-style", szListStyle);
--        bool isOrdered = g_ascii_strcasecmp(szListStyle, "Bullet List") != 0;
-+        bool isOrdered = szListStyle
-+			&& (g_ascii_strcasecmp(szListStyle, "Bullet List") != 0);
-+#ifdef DEBUG
-+        if(!szListStyle) {
-+            UT_DEBUGMSG(("***BUG*** szListStyle is NULL - http://bugzilla.abisource.com/show_bug.cgi?id=13564\n"));
-+        }
-+#endif
-         ListInfo info;
-         if (iCurrentLevel == 0)
-         {
diff --git a/app-office/abiword/files/abiword-3.0.0-fix-redraw.patch b/app-office/abiword/files/abiword-3.0.0-fix-redraw.patch
deleted file mode 100644
index cad0a92d4143..000000000000
--- a/app-office/abiword/files/abiword-3.0.0-fix-redraw.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From c260e8d107a8708d57a60fbc18ef71ffeb88fcf1 Mon Sep 17 00:00:00 2001
-From: Hubert Figuiere <hub@figuiere.net>
-Date: Sat, 22 Feb 2014 18:42:56 +0000
-Subject: [PATCH] Bug 13582 - Fix redraw region in custom widget.
-
-Cherry-picked from trunk@33870 and reworked for 3.0.x
-
-git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/branches/ABI-3-0-0-STABLE@33871 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
----
- src/af/gr/gtk/gr_UnixCairoGraphics.cpp  |  2 +-
- src/af/xap/gtk/xap_UnixCustomWidget.cpp | 10 ++++++----
- 2 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
-index 4c8d23c..15d7a7d 100644
---- a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
-+++ b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
-@@ -520,7 +520,7 @@ void GR_UnixCairoGraphics::_beginPaint()
- 		{
- 			UT_ASSERT(ev->type == GDK_EXPOSE || ev->type == GDK_DAMAGE);
- 			if (ev->type == GDK_EXPOSE || ev->type == GDK_DAMAGE)
--				UT_ASSERT(ev->expose.window == m_pWin);
-+				UT_ASSERT(ev->expose.window == m_pWin || ev->expose.window == gdk_window_get_effective_parent (m_pWin));
- 		}
- 	}
- #endif
-diff --git a/src/af/xap/gtk/xap_UnixCustomWidget.cpp b/src/af/xap/gtk/xap_UnixCustomWidget.cpp
-index b0b7015..5150afe 100644
---- a/src/af/xap/gtk/xap_UnixCustomWidget.cpp
-+++ b/src/af/xap/gtk/xap_UnixCustomWidget.cpp
-@@ -45,16 +45,18 @@ void XAP_UnixCustomWidget::_fe::expose(XAP_UnixCustomWidget *self, GdkEventExpos
- #endif
- {
- #if GTK_CHECK_VERSION(3,0,0)
--	GdkEventExpose *ev = reinterpret_cast<GdkEventExpose *>(gtk_get_current_event());
--#endif
-+	self->m_cr = cr;
-+	double x1, y1, x2, y2;
-+	cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
-+
-+	UT_Rect r(x1, y1, x2 - x1, y2 - y1);
-+#else
- 	UT_Rect r(
- 			ev->area.x,
- 			ev->area.y,
- 			ev->area.width,
- 			ev->area.height
- 		);
--#if GTK_CHECK_VERSION(3,0,0)
--	self->m_cr = cr;
- #endif
- 	self->draw(&r);
- }
--- 
-1.9.1
-
diff --git a/app-office/abiword/files/abiword-3.0.0-fix-shortcut.patch b/app-office/abiword/files/abiword-3.0.0-fix-shortcut.patch
deleted file mode 100644
index 0bc2db525150..000000000000
--- a/app-office/abiword/files/abiword-3.0.0-fix-shortcut.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Upstream-derived patch to fix SHIFT-CTRL-CURSOR_KEY shortcut combos.
-Origin:      upstream, http://bugzilla.abisource.com/attachment.cgi?id=5695&action=view
-Bug:         http://bugzilla.abisource.com/show_bug.cgi?id=13596
-Bug-Ubuntu:  https://bugs.launchpad.net/bugs/1315949
-
-Index: b/src/af/ev/gtk/ev_UnixKeyboard.cpp
-===================================================================
---- a/src/af/ev/gtk/ev_UnixKeyboard.cpp
-+++ b/src/af/ev/gtk/ev_UnixKeyboard.cpp
-@@ -87,17 +87,20 @@
- 	{
- 		state |= EV_EMS_CONTROL;
- 
--		// Gdk does us the favour of working out a translated keyvalue for us,
--		// but with the Ctrl keys, we do not want that -- see bug 9545
--		Display * display = GDK_DISPLAY_XDISPLAY(gdk_window_get_display(e->window));
--		KeySym sym = XkbKeycodeToKeysym(display,
--						e->hardware_keycode,
--						e->state & GDK_SHIFT_MASK ? 1 : 0, 0);
--		xxx_UT_DEBUGMSG(("ev_UnixKeyboard::keyPressEvent: keyval %d, hardware_keycode %d\n"
--					 "                                sym: 0x%x\n",
--					 e->keyval, e->hardware_keycode, sym));
-+		if (!s_isVirtualKeyCode(charData))
-+		{
-+			// Gdk does us the favour of working out a translated keyvalue for us,
-+			// but with the Ctrl keys, we do not want that -- see bug 9545
-+			Display * display = GDK_DISPLAY_XDISPLAY(gdk_window_get_display(e->window));
-+			KeySym sym = XkbKeycodeToKeysym(display,
-+							e->hardware_keycode,
-+							e->state & GDK_SHIFT_MASK ? 1 : 0, 0);
-+			xxx_UT_DEBUGMSG(("ev_UnixKeyboard::keyPressEvent: keyval %d, hardware_keycode %d\n"
-+						 "                                sym: 0x%x\n",
-+						 e->keyval, e->hardware_keycode, sym));
- 
--		charData = sym;
-+			charData = sym;
-+		}
- 	}
- 	if (e->state & (s_alt_mask))
- 		state |= EV_EMS_ALT;
diff --git a/app-office/abiword/files/abiword-3.0.0-libgcrypt_1_6_0-1.patch b/app-office/abiword/files/abiword-3.0.0-libgcrypt_1_6_0-1.patch
deleted file mode 100644
index 7ad3dd476717..000000000000
--- a/app-office/abiword/files/abiword-3.0.0-libgcrypt_1_6_0-1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Submitted By:            Armin K. <krejzi at email dot com>
-Date:                    2013-12-21
-Initial Package Version: 3.0.0
-Upstream Status:         Not submitted
-Origin:                  Self
-Description:             Fixes building with libgcrypt 1.6.0
-
-diff -Naur a/plugins/collab/backends/service/xp/tls_tunnel.cpp b/plugins/collab/backends/service/xp/tls_tunnel.cpp
---- a/plugins/collab/backends/service/xp/tls_tunnel.cpp	2009-09-10 12:46:19.000000000 +0200
-+++ b/plugins/collab/backends/service/xp/tls_tunnel.cpp	2013-12-20 19:25:38.728798750 +0100
-@@ -123,11 +123,16 @@
- 	return 0;
- }
- 
-+#if GCRYPT_VERSION_NUMBER >= 0x010600
-+  GCRY_THREAD_OPTION_PTHREAD_IMPL;
-+  static struct gcry_thread_cbs &gcry_threads_tunnel = gcry_threads_pthread;
-+#else
- static struct gcry_thread_cbs gcry_threads_tunnel =
- { GCRY_THREAD_OPTION_USER, NULL,
-   gcry_tunnel_mutex_init, gcry_tunnel_mutex_destroy,
-   gcry_tunnel_mutex_lock, gcry_tunnel_mutex_unlock,
-   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
-+#endif
- 
- bool Proxy::tls_tunnel_init() {
- 	if (gcry_control(GCRYCTL_SET_THREAD_CBS, &tls_tunnel::gcry_threads_tunnel) != 0)
diff --git a/app-office/abiword/files/abiword-3.0.0-pdf-crash.patch b/app-office/abiword/files/abiword-3.0.0-pdf-crash.patch
deleted file mode 100644
index 633ef7f73eb7..000000000000
--- a/app-office/abiword/files/abiword-3.0.0-pdf-crash.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 128dfbc82cbd5c2c1bb6d0cde238a933639fba50 Mon Sep 17 00:00:00 2001
-From: Hubert Figuiere <hub@figuiere.net>
-Date: Sat, 28 Dec 2013 02:05:23 +0000
-Subject: [PATCH] Bug 13586 - We don't have a frame when printing.
-
-UPLIFTED from trunk
-
-git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/branches/ABI-3-0-0-STABLE@33663 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
----
- src/text/fmt/gtk/fv_UnixSelectionHandles.cpp | 44 +++++++++++++++++++++-------
- 1 file changed, 33 insertions(+), 11 deletions(-)
-
-diff --git a/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp b/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp
-index a3a3347..8bc187c 100644
---- a/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp
-+++ b/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp
-@@ -36,42 +36,60 @@ static void handle_dragged_cb (FvTextHandle         *handle,
- 
- 	mode = _fv_text_handle_get_mode (handle);
- 
--	if (pos == FV_TEXT_HANDLE_POSITION_SELECTION_START)
-+	if (pos == FV_TEXT_HANDLE_POSITION_SELECTION_START) {
- 		handles->updateSelectionStart ((UT_sint32)x, (UT_sint32)y);
-+        }
- 	else {
--		if (mode == FV_TEXT_HANDLE_MODE_SELECTION)
-+		if (mode == FV_TEXT_HANDLE_MODE_SELECTION) {
- 			handles->updateSelectionEnd ((UT_sint32)x, (UT_sint32)y);
--                else
-+                }
-+                else {
- 			handles->updateCursor((UT_sint32)x, (UT_sint32)y);
-+                }
- 	}
- }
- 
- FV_UnixSelectionHandles::FV_UnixSelectionHandles(FV_View *view, FV_Selection selection)
- 	: FV_SelectionHandles (view, selection)
-+	, m_text_handle(NULL)
- {
- 	XAP_Frame * pFrame = static_cast<XAP_Frame*>(m_pView->getParentData());
--	XAP_UnixFrameImpl * pFrameImpl =static_cast<XAP_UnixFrameImpl *>( pFrame->getFrameImpl());
--	GtkWidget * pWidget = pFrameImpl->getViewWidget();
--
--	m_text_handle = _fv_text_handle_new (pWidget);
--        _fv_text_handle_set_relative_to (m_text_handle,
--                                         gtk_widget_get_window (pWidget));
--        g_signal_connect (m_text_handle, "handle-dragged",
--                          G_CALLBACK(handle_dragged_cb), this);
-+	// When saving to PDF (and printing) we don't have a frame
-+	// See bug 13586
-+	if (pFrame) {
-+		XAP_UnixFrameImpl * pFrameImpl = static_cast<XAP_UnixFrameImpl *>(pFrame->getFrameImpl());
-+		GtkWidget * pWidget = pFrameImpl->getViewWidget();
-+
-+		m_text_handle = _fv_text_handle_new (pWidget);
-+		_fv_text_handle_set_relative_to (m_text_handle,
-+						 gtk_widget_get_window (pWidget));
-+		g_signal_connect (m_text_handle, "handle-dragged",
-+				  G_CALLBACK(handle_dragged_cb), this);
-+	}
- }
- 
- FV_UnixSelectionHandles::~FV_UnixSelectionHandles()
- {
-+	if(!m_text_handle) {
-+		return;
-+	}
- 	g_object_unref (m_text_handle);
- }
- 
- void FV_UnixSelectionHandles::hide()
- {
-+	if(!m_text_handle) {
-+		return;
-+	}
- 	_fv_text_handle_set_mode (m_text_handle, FV_TEXT_HANDLE_MODE_NONE);
- }
- 
- void FV_UnixSelectionHandles::setCursorCoords(UT_sint32 x, UT_sint32 y, UT_uint32 height, bool visible)
- {
-+	if(!m_text_handle) {
-+		return;
-+	}
-+
- 	GdkRectangle rect;
- 
- 	_fv_text_handle_set_mode(m_text_handle, FV_TEXT_HANDLE_MODE_CURSOR);
-@@ -92,6 +110,10 @@ void FV_UnixSelectionHandles::setCursorCoords(UT_sint32 x, UT_sint32 y, UT_uint3
- void FV_UnixSelectionHandles::setSelectionCoords(UT_sint32 start_x, UT_sint32 start_y, UT_uint32 start_height, bool start_visible,
-                                                  UT_sint32 end_x, UT_sint32 end_y, UT_uint32 end_height, bool end_visible)
- {
-+	if(!m_text_handle) {
-+		return;
-+	}
-+
- 	GdkRectangle rect;
- 
- 	_fv_text_handle_set_mode(m_text_handle, FV_TEXT_HANDLE_MODE_SELECTION);
--- 
-1.9.1
-