Version bump

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

5 files changed, 180 insertions, 20 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index e3a763e1e694..37b5f5dfacca 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/abiword
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.262 2012/08/05 21:44:50 blueness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.263 2013/10/14 20:57:01 pacho Exp $
+
+*abiword-3.0.0 (14 Oct 2013)
+
+  14 Oct 2013; Pacho Ramos <pacho@gentoo.org> +abiword-3.0.0.ebuild,
+  +files/abiword-3.0.0-eds-3.6.patch, metadata.xml:
+  Version bump
 
   05 Aug 2012; Anthony G. Basile <blueness@gentoo.org> abiword-2.8.6-r2.ebuild:
   Keyword ~arm
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 3f8d96890209..9bf8c930f3b8 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -5,14 +5,17 @@ AUX abiword-2.8.6-gcc46.patch 557 SHA256 78e3b3be4340022f57246e88948d947bfd03181
 AUX abiword-2.8.6-glib-2.31.patch 1318 SHA256 e16a496a552f43f21041e0be6077f179a66270b7534dfbd9fbb8f4e0554f5d35 SHA512 29962b0b31f7ff36e84fa55fab71037557ffb918e23df04456bb8c2db7a4d5ff306ccba1a1a52c6a0170d4ba81c3402a60fe7e115a325d2d6021caa3b5ddfa72 WHIRLPOOL fac32836561eaa09ba5e1c7cac1fb17b4168f5dabba4423c53d7a3e6c7a7874f273897093165ce8ad431171d003e40f5889446bc461a2a987595dfc0afb6f6fa
 AUX abiword-2.8.6-libpng15.patch 3710 SHA256 a5ea99ba7aa00ebc3a669d6cbd019b172e576df6b2eb8349505ed18576e10e90 SHA512 868cd6e3ea6b7e766a56c8361d4999578a603bcda7c144e519b2f85dffea675afe4efe09aa360fbd02477b5717b0768338a3e2d54cd4f46e5770290de06af1ac WHIRLPOOL d13dada3cb19b090c018a6057a41ead84b2c2743f5b2f83820750d54dbac645c630d62bdd7a2a43a745084e77757933caa55d3736864b8280b572b423aecfc36
 AUX abiword-2.8.6-libwpd.patch 15024 SHA256 92f89f04633f67d0568160e701815a5daf0a2de03608a1a3bd5b8f7e7f4f0fea SHA512 de43be752858beff389bee3f2f4197b545188652e8783da9362c4c1fa71da0b2c75cf5dea46727972819563ff2d561f4d2b298e7f9dc7f7652b023f6b14e2783 WHIRLPOOL 63d5841b0f9843119adbc4c476f76722748b7b4eae04d22f1a529ce454267ee4ee3c2378511591731a007d378e5bbff898501e3374e51d083a3b8ffd9c560ca2
+AUX abiword-3.0.0-eds-3.6.patch 354 SHA256 8b932f689df9dbad1e89f18483ac10bd00a82947c9f262decad14af4a47494d5 SHA512 2cc20c74af163203a89061afc5daba681b8ea8680a9b535470adbb7178f10207daed0ef4147cd5dfb5aa3bb0776b3bfba4b3fd9da53de623790df942b94d0934 WHIRLPOOL 6467e5a03ca704c548e8dca00e29267ac62e5f09ebba6bf3ced5f94edb51724a247b4faefb229246196fd06eb42c989f6af4759cbdfa148ce7aa4068d1fa772c
 DIST abiword-2.8.6.tar.gz 9218827 SHA256 d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15 SHA512 327ffa6da73f7a1b74d1bc374239ac087ee76672da590626da3a068f972684b0963c50641718c39a7fb2429a56c1076bdfd67e8f7f0eab0eda90b70cf846bbbd WHIRLPOOL 15f060e6e31028ebb507e8b2e4b82670dd4d0850be256851d21081d42d83e81efcd33457bd634d99bb82686dbdc6ccd6d24794ce063ec4751c511a3ff6b463ee
+DIST abiword-3.0.0.tar.gz 10956892 SHA256 d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b89081fac01 SHA512 3f9804b17f27b8afa2f5bcccdb1b5d6270339ad4f518523208f2e2cde54cb28391575cfd3639aaadc13ab50d5908260b159ca7b41fd92ed5a449d7012e5a4637 WHIRLPOOL 54cb234dbaae070d4f9dfa215e3c5a80a45666b7363febf4b56c7ec685c7b084bf78f2f3a6827cb8585bec4ead5c6fd8bd71bc51c35bf3423f3b31a296bdb144
 EBUILD abiword-2.8.6-r2.ebuild 4773 SHA256 a8f99373fbe9c3b82a725e90745258f96d658ff42651618642b0d5b1679fa085 SHA512 b8bbfdf938ab28ccdb3f87ad473795fe98f9163cb25643661f6343dbfa04447d8f5655ea847aecbd1f864c7117a871630b0f8d0acadf5ca439f413ffb6bc8837 WHIRLPOOL 56cc019615cbd7f29b95cbf1b182be74f1e40a09555838e7578341686638f88f04fab5e1e4a953efd50ef3c8fc082deb5437ca060e18dad740796ed8270ee860
-MISC ChangeLog 35685 SHA256 a90c085ee8c4b241759c9f58cb6a78158e8de5f7219c3c91fdcd14fab14a077f SHA512 f47657b92b08e01ecd1eeeb97673c8db425d0ee35df6635b3bca3a5451984f26bdb679525ddd27b561d8fcc81d845cb3a7a6f80e28287717056a45bc9794d573 WHIRLPOOL d071b6e703bdb96e13be3ee18c55a91d31a0684b3d77bf5d0728928d88499a8eb0a2d76ffae79530be6fe0148f0c493e3de05ab4ca662822b48dd0f027ac3dc6
-MISC metadata.xml 879 SHA256 68442b26d087af39be60f2b41749ae53e94073770449f80bf8f6fd2286e0be84 SHA512 73c655f659c5bf07f5524ad02ec84322cde221aee570974f861f60eeddf4a9d960d932cba725265102713fa5904d1809bea2d706f813081c780424f195f25500 WHIRLPOOL dadfa281d4e52d20af7936746686348feca89ed828e827497048cd9f007b86ad8b8b900a29c27f1da878363a2330a2f579c185d2b81593d76e8c772dca90f124
+EBUILD abiword-3.0.0.ebuild 4268 SHA256 449ed80defdbabae6c9153175ebd90cd57f319ca5f439668c90f438c904f236c SHA512 5d7cace0c3899e1f67baffbd0842868f34a56eab07455cda502dea5dcd9710ec6fe9b90da2fe5a81c8165dcd22f5aa0f778645c052d10f223942e0253f9241c1 WHIRLPOOL 1c6d3eb5dadf3c136657b0807da83692568a77297d6db3145fddb14a1731494fc295433f92ddc0214752cf9ee0f1d1b4c55217f5ee60b43a45721da9b13c8e0a
+MISC ChangeLog 35849 SHA256 d1112c2d3bd2d22301e499b76f3307c8bb6d1394dc879b7875a880121716a1b3 SHA512 4b359203b3d1717066906ae263731c81b342a12bcced2a5df6d446d6d844902a6f630bb362129968798c9fefc3e3d7bc8bd8f2b26cff5245e6692b155e55197d WHIRLPOOL b1cc73bf186dba32d19e78e373d39bdbd42f862944cce18b86fe20d5365e161e68ee18b4a88e147ce6670baa7e08c723d334c2b2da38c249c49383a11e73e603
+MISC metadata.xml 1024 SHA256 90c514037a2d24ca0c46c8960a56f3370f27becfc0c8e5657d93d6d49319af87 SHA512 c209a9dba791a7e19269620ea0f29cd51109f482545093e2bc5fb73040a1fe512ff56f8f5de80fd87e73245c08aeeedbfbfffbe9d4ce623f79f0c7c236dd57cc WHIRLPOOL d21b30b6390d35056257552a27683babc8fc3156b3c965ea8b5905c6bd32d8c7190a9890f8e9007cbe8d3b1ec298263bdc76afc0ce17f86bc39a04a2b3389359
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlAe6VwACgkQl5yvQNBFVTWYqQCffw8+nxenaWduBgCkqXXl0fQy
-aUYAn1cOIwRvB/1sPKiVkrkP8/KjZbki
-=rQV2
+iEYEAREIAAYFAlJcWp4ACgkQCaWpQKGI+9TZVACbBckTwQz9pTviXm4ejraoz74z
+lWgAn225uU9Tdpfm8u8/H2QtDMcEk7dY
+=EsK3
 -----END PGP SIGNATURE-----
diff --git a/app-office/abiword/abiword-3.0.0.ebuild b/app-office/abiword/abiword-3.0.0.ebuild
new file mode 100644
index 000000000000..6c9ae7440ea5
--- /dev/null
+++ b/app-office/abiword/abiword-3.0.0.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2013 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.ebuild,v 1.1 2013/10/14 20:57:01 pacho 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 gnome grammar +introspection latex map math ots openxml +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 !openxml !ots !readline !thesaurus !wordperfect !wmf )"
+
+RDEPEND="
+	>=app-text/wv-1.2
+	dev-lang/perl
+	>=dev-libs/boost-1.40.0
+	>=dev-libs/fribidi-0.10.4
+	>=dev-libs/glib-2.16:2
+	>=dev-libs/libgcrypt-1.4.5
+	>=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 )
+	gnome? ( >=x11-libs/goffice-0.10.0: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 )
+		latex? ( dev-libs/libxslt )
+		math? ( >=x11-libs/gtkmathview-0.7.5 )
+		ots? ( >=app-text/ots-0.5 )
+		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}
+	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"
+
+	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"
+
+		# inter7eps: eps.h
+		# libtidy: gsf + tidy.h
+		# paint: windows only ?
+		use collab && plugins="${plugins} collab"
+		use gnome && plugins="${plugins} goffice"
+		use latex && plugins="${plugins} latex"
+		use math && plugins="${plugins} mathview"
+		use openxml && plugins="${plugins} openxml"
+		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 gnome 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_install() {
+	gnome2_src_install
+	dodoc user/wp/readme.txt
+}
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
new file mode 100644
index 000000000000..b7e362e76604
--- /dev/null
+++ b/app-office/abiword/files/abiword-3.0.0-eds-3.6.patch
@@ -0,0 +1,11 @@
+--- 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/metadata.xml b/app-office/abiword/metadata.xml
index 03f0799c5d78..c87852d74d5d 100644
--- a/app-office/abiword/metadata.xml
+++ b/app-office/abiword/metadata.xml
@@ -3,17 +3,16 @@
 <pkgmetadata>
 <herd>gnome-office</herd>
 <use>
-  <flag name='collab'>Enable collaborative editing plugin</flag>
-  <flag name='grammar'>Enable grammar checking via
-    <pkg>dev-libs/link-grammar</pkg></flag>
-  <flag name='math'>Enable support for <pkg>x11-libs/gtkmathview</pkg></flag>
-  <flag name='openxml'>Enable OpenXML support</flag>
-  <flag name='ots'>Enable Text Summarizer plugin</flag>
-  <flag name='plugins'>Enable plugins build (see
-  http://www.abisource.com/wiki/PluginMatrix for more information). If your
-  file cannot be opened due lack of support, try enabling this.</flag>
-  <flag name='thesaurus'>Enable thesaurus support</flag>
-  <flag name='wordperfect'>Enable wordperfect file support via
-    <pkg>app-text/libwpd</pkg></flag>
+	<flag name='collab'>Enable collaborative editing plugin</flag>
+	<flag name='grammar'>Enable grammar checking via <pkg>dev-libs/link-grammar</pkg></flag>
+	<flag name="map">Enable world map support through <pkg>media-libs/libchamplain</pkg></flag>
+	<flag name='math'>Enable support for <pkg>x11-libs/gtkmathview</pkg></flag>
+	<flag name='openxml'>Enable OpenXML support</flag>
+	<flag name='ots'>Enable Text Summarizer plugin</flag>
+	<flag name='plugins'>Enable plugins build (see http://www.abisource.com/wiki/PluginMatrix for more information). If your
+		file cannot be opened due lack of support, try enabling this.</flag>
+	<flag name="redland">Enables support redland and raptor libs.</flag>
+	<flag name='thesaurus'>Enable thesaurus support</flag>
+	<flag name='wordperfect'>Enable wordperfect file support via <pkg>app-text/libwpd</pkg></flag>
 </use>
 </pkgmetadata>