summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2009-08-28 14:20:28 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2009-08-28 14:20:28 +0000
commit803ce699b8de9b75d55a12aa0435058084858ea8 (patch)
tree5ced9d787048bb9cb766a0420e5e51dbcaba425b /app-office/abiword
parentVersion bump wrt #280089, thanks to Roel Brook for reporting. (diff)
downloadhistorical-803ce699b8de9b75d55a12aa0435058084858ea8.tar.gz
historical-803ce699b8de9b75d55a12aa0435058084858ea8.tar.bz2
historical-803ce699b8de9b75d55a12aa0435058084858ea8.zip
Migrate to EAPI 2 in order to nuke built_with_use.
Package-Manager: portage-2.2_rc38/cvs/Linux i686
Diffstat (limited to 'app-office/abiword')
-rw-r--r--app-office/abiword/ChangeLog11
-rw-r--r--app-office/abiword/Manifest12
-rw-r--r--app-office/abiword/abiword-2.6.8.ebuild12
3 files changed, 17 insertions, 18 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/Manifest b/app-office/abiword/Manifest
index 2ae6c1891c41..831c1fd27905 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -12,13 +12,13 @@ EBUILD abiword-2.4.6.ebuild 2382 RMD160 4cb2bc0901592c1671c5f08cae44ab9ddcfcbba4
EBUILD abiword-2.6.4.ebuild 2624 RMD160 c4c3ce568ee9ac9c3a2782fd3b1b3c893285effe SHA1 3668300a2ebcd040429b5a889701eabfda97fdb9 SHA256 d540ae07688676616a887fce4fd9e6b08c5804c88d71b7be029f4004edf87688
EBUILD abiword-2.6.5.ebuild 2641 RMD160 5887f5d9c12eb270909d7c747ec2f3b46f98d529 SHA1 b902447a4fe31cabb1d8e76eea7543d1bf0c6d2d SHA256 04a2fd1c9d7e687a524b3b7533ae8fb190840c302e26f2df45b1f1ef40ea2465
EBUILD abiword-2.6.6.ebuild 2641 RMD160 9ae0e47290e70c4e7c93810c02eac970db92c4f8 SHA1 2f91ab038446b4ff343d0850abb6791329f575fc SHA256 e97394eda573079c71bafcf8859052c04e9df0785677c817cf9378ac9698de23
-EBUILD abiword-2.6.8.ebuild 2641 RMD160 6b946c95f657d6b384f9c06cfd5f502a1872c19f SHA1 b27061a694e50b831f5779ebcbf1c43c049e7cb2 SHA256 628b6fccd3877091825d92c55f384a4dbdbc79023f0479c7c6060e88ada9eb3a
-MISC ChangeLog 27894 RMD160 6c4f7b1654df67b7c21e7051733e72a7efe3b198 SHA1 13c31f1a30e0075593ad75176ac4eb67511b251b SHA256 f0b7296253acf0000914c3d2e534fb1d1a69f94284bde73a126e5544452ab257
+EBUILD abiword-2.6.8.ebuild 2525 RMD160 667fd2add3c74a7fe4cbfb79ea07c4b1c4460e75 SHA1 c98eb333c39d2f095d5a3a09ca7ee8080b5942b8 SHA256 9d80f8e0e711652761b8c891de443508c7b6e217293d9b90a1fdbe2f825cebb8
+MISC ChangeLog 28037 RMD160 ce9e7fa0627fc9acd4de96bf798e9c89d61f4c6e SHA1 d5b48154e1d72f36aaba377769cf7a04b02a8299 SHA256 d485e225411f52ddfda4f2eca02f0350f3d5a24c189f194ff6273da447a6e8e8
MISC metadata.xml 165 RMD160 46d22302656e49f090e45d3c10f90c4e16f75877 SHA1 7fc9c8a1bf4ba6ea2047d4fa8046e13a2abd6b82 SHA256 9e51028c1f6811ec63067385fb8d6cb393d04b1a1d6688e0bbeb368ef34d57a0
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkm8UzEACgkQ1fmVwcYIWAbthQCgj8+PNfY3a1RL9nPOE+RxpHCg
-81wAn1iKkR2FRO7zyyLs1qup04WPj+j8
-=3rjD
+iEYEARECAAYFAkqX53IACgkQcxLzpIGCsLRADQCeJMpJI3BaVW7RRwFXFJ3Ra8Y/
+QoIAn26HtNhmJ9gU7qlyjoRgGK50B2SF
+=Dlow
-----END PGP SIGNATURE-----
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)