diff options
| -rw-r--r-- | app-office/abiword/ChangeLog | 11 | ||||
| -rw-r--r-- | app-office/abiword/abiword-2.6.8.ebuild | 12 |
2 files changed, 11 insertions, 12 deletions
diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog index c45efb6733c4..5dad8e069a67 100644 --- a/app-office/abiword/ChangeLog +++ b/app-office/abiword/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-office/abiword -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.209 2009/03/15 01:00:27 eva Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.210 2009/08/28 14:20:28 betelgeuse Exp $ + + 28 Aug 2009; Petteri Räty <betelgeuse@gentoo.org> abiword-2.6.8.ebuild: + Migrate to EAPI 2 in order to nuke built_with_use. *abiword-2.6.8 (15 Mar 2009) @@ -740,7 +743,7 @@ Compile against the new aspell. Thanks to dom the abiword project lead (dom on #abiword at irc.gnome.org). -*abiword-1.0.2 (??) +*abiword-1.0.2 (06 Aug 2002) 06 Aug 2002; Mark Guertin <gerk@gentoo.org> : Added ppc to keywords, please when doing revision bumps make @@ -815,7 +818,7 @@ Fix DEPEND for 'spell' USE var. -*abiword-0.99.3 (21 March 2002) +*abiword-0.99.3 (21 Mar 2002) *abiword-0.99.2 (25 Feb 2002) diff --git a/app-office/abiword/abiword-2.6.8.ebuild b/app-office/abiword/abiword-2.6.8.ebuild index 764e49bb55fc..827ceafa2053 100644 --- a/app-office/abiword/abiword-2.6.8.ebuild +++ b/app-office/abiword/abiword-2.6.8.ebuild @@ -1,8 +1,8 @@ # 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: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.6.8.ebuild,v 1.2 2009/08/28 14:20:28 betelgeuse Exp $ -EAPI="1" +EAPI="2" inherit alternatives eutils gnome2 versionator @@ -19,12 +19,13 @@ 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.2 + >=x11-libs/pango-1.24.2[X] >=gnome-base/libglade-2 >=gnome-base/libgnomeprint-2.2 >=gnome-base/libgnomeprintui-2.2 @@ -50,11 +51,6 @@ DEPEND="${RDEPEND} # FIXME: --enable-libabiword fails to compile 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) |