--- /var/portage/app-office/abiword/abiword-2.6.8.ebuild	2009-04-05 10:08:24.000000000 +0200
+++ abiword-2.7.2.ebuild	2009-06-01 03:34:46.000000000 +0200
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 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.1 2009/03/15 01:00:27 eva Exp $
+# $Header: $
 
-EAPI="1"
+EAPI="2"
 
-inherit alternatives eutils gnome2 versionator
+inherit alternatives autotools gnome2 versionator
 
 MY_MAJORV=$(get_version_component_range 1-2)
 
@@ -15,81 +15,74 @@
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gnome spell xml"
+IUSE="debug gnome spell"
 
-# FIXME: gsf could probably be conditional
-
-RDEPEND="dev-libs/popt
-	sys-libs/zlib
-	>=dev-libs/glib-2
-	>=x11-libs/gtk+-2.6
-	x11-libs/libXft
-	>=x11-libs/pango-1.2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=x11-libs/goffice-0.4:0.4
+RDEPEND="sys-libs/zlib
+	>=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.14
+	>=x11-libs/pango-1.2[X]
+	>=x11-libs/cairo-1.8[X]
 	>=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 )
+	dev-libs/expat
+	>=gnome-base/librsvg-2.16
+	>=gnome-extra/libgsf-1.14.9
 	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"
+	gnome? ( >=gnome-extra/gucharmap-2
+		 >=x11-libs/goffice-0.6:0.6 )"
 
 DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.9"
-
-# FIXME: --enable-libabiword fails to compile
+	>=dev-util/pkgconfig-0.9"
 
 pkg_setup() {
-	if ! built_with_use --missing true x11-libs/pango X; then
-		eerror "You must rebuild x11-libs/pango with USE='X'"
-		die "You must rebuild x11-libs/pango with USE='X'"
-	fi
-
 	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"
+		$(use_enable spell)
+		--enable-print
+		--with-gio
+		--without-gnomevfs
+		$(use_with gnome goffice)
+		$(use_with gnome gucharmap)
+		--enable-default-plugins"   # include OpenDocument import/export
 }
 
-src_install() {
-	# Install icon to pixmaps, bug #220097
-	sed 's:icondir = $(datadir)/icons:icondir = $(datadir)/pixmaps:'	\
-		-i GNUmakefile || die "sed 1 failed"
+src_prepare() {
+	gnome2_src_prepare
+
+	# change install locations (bug #220097)
+	sed 's:desktopdir = @ABIWORD_DATADIR@/applications:desktopdir = $(datadir)/applications:' \
+		-i Makefile.am || die "sed 1 failed"
+	sed 's:mimedir = @ABIWORD_DATADIR@/mime-info:mimedir = $(datadir)/mime-info:' \
+		-i Makefile.am || die "sed 2 failed"
+	sed 's:icondir= @ABIWORD_DATADIR@/icons:icondir = $(datadir)/pixmaps:' \
+		-i Makefile.am || die "sed 3 failed"
+	sed '/readme\.txt\|abw/d' \
+		-i user/wp/Makefile.am || die "sed 4 failed"
+	eautoreconf
+}
 
+src_install() {
 	gnome2_src_install
 
 	sed "s:Exec=abiword:Exec=abiword-${MY_MAJORV}:" \
-		-i "${D}"/usr/share/applications/abiword.desktop || die "sed 2 failed"
+		-i "${D}"/usr/share/applications/abiword.desktop || die "sed 5 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
+	dodoc AUTHORS 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"
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
 }