Drop libgda plugin still relying on old libgnomedb (bug #354241). Remove old and keep 2.4 only for bsd.

Package-Manager: portage-2.1.9.39/cvs/Linux x86_64

5 files changed, 174 insertions, 114 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index 537daf1049f7..9cee275160eb 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/abiword
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.233 2011/02/05 20:35:04 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.234 2011/02/13 14:39:39 pacho Exp $
+
+*abiword-2.8.6-r1 (13 Feb 2011)
+
+  13 Feb 2011; Pacho Ramos <pacho@gentoo.org> abiword-2.4.6.ebuild,
+  -abiword-2.6.8.ebuild, +abiword-2.8.6-r1.ebuild:
+  Drop libgda plugin still relying on old libgnomedb (bug #354241). Remove old
+  and keep 2.4 only for bsd.
 
   05 Feb 2011; Jonathan Callen <abcd@gentoo.org> abiword-2.8.6.ebuild:
   Add ~amd64-linux/~x86-linux, use ED instead of D in a couple places
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 0ae12f1b7e57..6065806b260d 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,30 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 11_history_fullpath.dpatch 1905 RMD160 17c9ceecbe54c9e83605fe74d1b52ee42b5bbc4f SHA1 4eb037972e1115b01c04e2d4e6474973d787d8a7 SHA256 16b50d4aa4822aba7577f804bd98fc35c30561e5aa354f2c2ca9cd0c8819941f
 AUX freebsd_fix.patch 550 RMD160 aa37f1f1737c1723840b72a1e48724575dd196a6 SHA1 c39b6964ef1e24652c026c344513facd94c88226 SHA256 28db978a944016d43862a221af8ef9dbc69e239b3abde14ede33ca21485ed8c5
 DIST abiword-2.4.6.tar.bz2 24994889 RMD160 ca56800d811b3aca0af6b2fb6cd70cbea29ab792 SHA1 3011d221d09336f09f4bb0732add3405961a8623 SHA256 1ca509814d1ce939c98f2776f95351a2a6ea216d12c20be30d40eefd13f43020
-DIST abiword-2.6.8.tar.gz 9516443 RMD160 8fcf455a5226a5525b9a89f88c9916b20e973607 SHA1 fc979982edc3445385705afdb1e2ebb1fa53a4f6 SHA256 b6656a0da13d94b334f02637c89d8fe13aa54752040ad1b8f14f668d8cb96e93
 DIST abiword-2.8.6.tar.gz 9218827 RMD160 caabab25d197f9553ea12376de36fc7f5a771a58 SHA1 998f69d038000b3fc027d4259548f02d67c8d0df SHA256 d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15
-EBUILD abiword-2.4.6.ebuild 2386 RMD160 4ac1e0a59095bc57db60a1a058843239347d4048 SHA1 44aa8a580436ffd8658e4358944c14c8658ee667 SHA256 ce092cb97fba3e39c431405f54fc313db7b91118eb12e6ee07cd0b89501a1b35
-EBUILD abiword-2.6.8.ebuild 2505 RMD160 9ede2fe9064f1cb186e81365d5cc64f9bb56c3f3 SHA1 38310e886a7aa4771287e13d29e93073daa81f8d SHA256 91ef7b431b767ac51f3a0d323a45377bf7936cdde0538fcf045d2758f9e28db0
+EBUILD abiword-2.4.6.ebuild 2351 RMD160 acd0bf713e7594333462a05dcd507cf7b76c769b SHA1 8c48b4cdcb91bd1ec08fc2a07d7a0327dee4e724 SHA256 06496841e8fc2c832e6dd24efba94c47598029c1308d3583460f1352832aee6a
+EBUILD abiword-2.8.6-r1.ebuild 4530 RMD160 5bb28483855ca826b19b03e8f65d4954cd5a37a3 SHA1 43dfb670c8429fede2847bcbf4fd1dde13dcb1b8 SHA256 db8c9720a5071f58ca0a19a73291196c712cf1d8475e9fb9ba9a727b4eb9525a
 EBUILD abiword-2.8.6.ebuild 4638 RMD160 d150f2ee7f8c15afbf38115c17cea2491a251a44 SHA1 a79fead7e742bf317a1976109119e5cb7bf5e2f3 SHA256 69337e3be5c8e57ca5e3d8d583bc52a58342b1bc04cdc3775e574622eb847cc6
-MISC ChangeLog 31226 RMD160 79a500da5f95f3c287045c2bc7a2f8b551c345c3 SHA1 d422833c81377df45a5dadaf89ba55e0783d0b58 SHA256 599785f5fe7896067383672c12212a52e2da086ce2a5909723d87c080a82bf49
+MISC ChangeLog 31488 RMD160 a436a052a3870f4537809fac0f01238c139f3874 SHA1 fd07663c02488877be68688642ea88c071863f28 SHA256 9d222ca8c4d84cd153c5661198b2c65c37260a9c811131a8aa218b690efde80f
 MISC metadata.xml 879 RMD160 df1f57e78a294b266ece583d9c04e685fc6f2b53 SHA1 8876780818c62eb42318ba47ef68c15cc80a2a10 SHA256 68442b26d087af39be60f2b41749ae53e94073770449f80bf8f6fd2286e0be84
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNTbSCAAoJELHSF2kinlg4qjAP+wUUeJjl7p27GKdCTXePkTPv
-o12YWtG17kVPxpSUSnnQ+0JbxHpuSPfNE6S9tAgirtpdq0Cb7xJ+IX9urdP8KrYB
-behyJ2D2aqtxEqAxQCk6vem/Oai+uyIRuHhDxQoycxibL4U/uA9mXBAkDnor9FER
-PTFKVG8jmoiHUpun4BXpM7ZeAxc879v9dQdkx8R4Vy9nsHL3DsS6iJhDU//FjaTI
-KyO7mofH+Ud+yPW2+++dYo+FKrwHN++5O7jU7nirg96vW7lQNrwCmgURwnGOFfZD
-85ATboleG9Tz7R6K14kbLwYbZXqC07YY30AyzW10/AxBO061F6QTQNkOIPU6HHyj
-8tbAYsm+oqIww10SYiOJ85+HHVWi74vLZRqz9r/D13QUaOsg921h9+wKA+tsavzQ
-b7ECHuPd+PFzA7gp8FVKO0JUB1+j25YFhOtpyp2+tXBO+YZiERxGBYRAOCJzcyTs
-89c7wTnxtyvm7oyt6vUfW53bYG/Jj8BZsQOZQ5eejX5z69NFXl7jUb9BT/TZGTDa
-bP+0XoreV/7G1qdNGju3TiKb5x/wOZotLa+2GqQlIPv6eim92Y6Y8XdM/PkZA0/N
-gS2BI5ktTYUUlJV/YhxeKsMb0EmpM4W8IQRap0pTU9n2Qotgms+4vDZfYjRxoudn
-WNcUDTpgvJwnalUV5XS0
-=DHoY
+iEYEARECAAYFAk1X7TEACgkQCaWpQKGI+9RzxQCbBV3iGs7N4kO/thsrunDeyOq2
+9/AAn0u9NHblA+tyTgw5tUtm7CR28Na2
+=+3P6
 -----END PGP SIGNATURE-----
diff --git a/app-office/abiword/abiword-2.4.6.ebuild b/app-office/abiword/abiword-2.4.6.ebuild
index 6b5a4482a435..bc6bbc67c44c 100644
--- a/app-office/abiword/abiword-2.4.6.ebuild
+++ b/app-office/abiword/abiword-2.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.6.ebuild,v 1.18 2010/07/20 15:12:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.6.ebuild,v 1.19 2011/02/13 14:39:39 pacho Exp $
 
 inherit alternatives eutils fdo-mime
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~x86-fbsd"
 IUSE="debug gnome spell xml"
 
 RDEPEND="dev-libs/popt
diff --git a/app-office/abiword/abiword-2.6.8.ebuild b/app-office/abiword/abiword-2.6.8.ebuild
deleted file mode 100644
index e8dc02fbf5fb..000000000000
--- a/app-office/abiword/abiword-2.6.8.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.6.8.ebuild,v 1.9 2010/07/20 15:12:33 jer Exp $
-
-EAPI="2"
-
-inherit alternatives eutils gnome2 versionator
-
-MY_MAJORV=$(get_version_component_range 1-2)
-
-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 ia64 ppc ppc64 sparc x86"
-IUSE="debug gnome spell xml"
-
-# FIXME: gsf could probably be conditional
-
-# Pango version so it always has X use flag
-RDEPEND="dev-libs/popt
-	sys-libs/zlib
-	>=dev-libs/glib-2
-	>=x11-libs/gtk+-2.6
-	x11-libs/libXft
-	>=x11-libs/pango-1.24.2[X]
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=x11-libs/goffice-0.4:0.4
-	>=media-libs/libpng-1.2
-	>=media-libs/fontconfig-2.1
-	>=media-libs/freetype-2.1
-	>=app-text/wv-1.2
-	>=dev-libs/fribidi-0.10.4
-	xml? ( >=dev-libs/libxml2-2.4.10 )
-	!xml? ( dev-libs/expat )
-	spell? ( >=app-text/enchant-1.2 )
-	gnome?	(
-		>=gnome-base/libbonobo-2
-		>=gnome-base/libgnomeui-2.2
-		>=gnome-extra/gucharmap-1.4
-		>=gnome-base/gnome-vfs-2.2 )
-	>=gnome-extra/libgsf-1.12.0"
-
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.9"
-
-# FIXME: --enable-libabiword fails to compile
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable debug symbols)
-		$(use_enable gnome gnomeui)
-		$(use_enable gnome gucharmap)
-		$(use_enable gnome gnomevfs)
-		$(use_enable spell spellcheck)
-		$(use_with xml libxml2)
-		$(use_with !xml expat)
-		--enable-libabiword
-		--enable-printing"
-}
-
-src_install() {
-	# Install icon to pixmaps, bug #220097
-	sed 's:icondir = $(datadir)/icons:icondir = $(datadir)/pixmaps:'	\
-		-i GNUmakefile || die "sed 1 failed"
-
-	gnome2_src_install
-
-	sed "s:Exec=abiword:Exec=abiword-${MY_MAJORV}:" \
-		-i "${D}"/usr/share/applications/abiword.desktop || die "sed 2 failed"
-
-	mv "${D}/usr/bin/abiword" "${D}/usr/bin/AbiWord-${MY_MAJORV}"
-	dosym AbiWord-${MY_MAJORV} /usr/bin/abiword-${MY_MAJORV}
-
-	dodoc *.TXT user/wp/readme.txt
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
-
-	elog "As of version 2.4, all abiword plugins have been moved"
-	elog "into a seperate app-office/abiword-plugins package"
-	elog "You can install them by running emerge abiword-plugins"
-}
diff --git a/app-office/abiword/abiword-2.8.6-r1.ebuild b/app-office/abiword/abiword-2.8.6-r1.ebuild
new file mode 100644
index 000000000000..37cb82715fcd
--- /dev/null
+++ b/app-office/abiword/abiword-2.8.6-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.8.6-r1.ebuild,v 1.1 2011/02/13 14:39:39 pacho Exp $
+
+EAPI="3"
+
+inherit alternatives gnome2 versionator
+
+MY_MAJORV=$(get_version_component_range 1-2)
+
+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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="collab cups gnome grammar latex math ots openxml plugins readline spell wordperfect wmf thesaurus" # svg
+
+# libgsf raised to make sure it provides gio backend (ebuild)
+# not enabling telepathy backend for collab, it depends on libempathy-gtk which
+# has be removed from empathy-2.30 already
+RDEPEND="
+	>=app-text/wv-1.2
+	>=dev-libs/fribidi-0.10.4
+	>=dev-libs/glib-2.16
+	>=gnome-base/librsvg-2.16
+	>=gnome-extra/libgsf-1.14.15
+	>=media-libs/libpng-1.2
+	virtual/jpeg:0
+	>=x11-libs/cairo-1.8[X]
+	>=x11-libs/gtk+-2.14[cups?]
+	gnome? (
+		>=gnome-extra/gucharmap-2
+		>=x11-libs/goffice-0.8:0.8 )
+	plugins? (
+		collab? (
+			>=dev-libs/boost-1.33.1
+			>=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 )
+		openxml? ( dev-libs/boost )
+		ots? ( >=app-text/ots-0.5 )
+		readline? ( sys-libs/readline )
+		thesaurus? ( >=app-text/aiksaurus-1.2[gtk] )
+		wordperfect? (
+			>=app-text/libwpd-0.8
+			>=media-libs/libwpg-0.1 )
+		wmf? ( >=media-libs/libwmf-0.2.8 )
+	)
+	spell? ( >=app-text/enchant-1.2 )
+	!<app-office/abiword-plugins-2.8"
+#		svg? ( >=gnome-base/librsvg-2 )
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	collab? ( dev-cpp/asio )"
+
+pkg_setup() {
+	# do not enable gnome-vfs
+	G2CONF="${G2CONF}
+		--enable-shave
+		--disable-static
+		--disable-maintainer-mode
+		--disable-default-plugins
+		--disable-builtin-plugins
+		--disable-collab-backend-telepathy
+		--enable-clipart
+		--enable-statusbar
+		--enable-templates
+		--with-gio
+		--without-gnomevfs
+		$(use_with gnome goffice)
+		$(use_enable cups print)
+		$(use_enable collab collab-backend-xmpp)
+		$(use_enable collab collab-backend-tcp)
+		$(use_enable collab collab-backend-service)
+		$(use_enable spell)"
+}
+
+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 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"
+		# plugin doesn't build
+		#use svg && plugins="${plugins} rsvg"
+		use thesaurus && plugins="${plugins} aiksaurus"
+		use wmf && plugins="${plugins} wmf"
+		# wordperfect: >=wpd-0.8 >=wps-0.1
+		use wordperfect && plugins="${plugins} wpg"
+	fi
+
+	gnome2_src_configure --enable-plugins="$(echo ${plugins})"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# install icon to pixmaps (bug #220097)
+	sed 's:$(datadir)/icons:$(datadir)/pixmaps:' \
+		-i Makefile.am Makefile.in || die "sed 1 failed"
+	# readme.txt will be installed using dodoc
+	sed '/readme\.txt\|abw/d' \
+		-i user/wp/Makefile.am user/wp/Makefile.in || die "sed 2 failed"
+}
+
+src_install() {
+	gnome2_src_install
+
+	sed "s:Exec=abiword:Exec=abiword-${MY_MAJORV}:" \
+		-i "${ED}"/usr/share/applications/abiword.desktop || die "sed 3 failed"
+
+	mv "${ED}/usr/bin/abiword" "${ED}/usr/bin/AbiWord-${MY_MAJORV}"
+	dosym AbiWord-${MY_MAJORV} /usr/bin/abiword-${MY_MAJORV}
+
+	dodoc AUTHORS user/wp/readme.txt || die "dodoc failed"
+
+	# Not needed
+	find "${D}" -name "*.la" -delete || die "failed *.la removal"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
+}