summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2010-10-07 07:42:34 +0000
committerPacho Ramos <pacho@gentoo.org>2010-10-07 07:42:34 +0000
commit97c6a6b1cd26ecdd5fb52ea3426940373d058347 (patch)
tree299632f06d4e8e13cbc2fb0895897c2a4e680a70 /app-office/abiword
parentMore quoting fixes (diff)
downloadhistorical-97c6a6b1cd26ecdd5fb52ea3426940373d058347.tar.gz
historical-97c6a6b1cd26ecdd5fb52ea3426940373d058347.tar.bz2
historical-97c6a6b1cd26ecdd5fb52ea3426940373d058347.zip
Fix icon installation (thanks to Faustus for reminding the problem in bug #220097) and asio dependency (bug #326729 by Samuli Suominen).
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'app-office/abiword')
-rw-r--r--app-office/abiword/ChangeLog6
-rw-r--r--app-office/abiword/Manifest10
-rw-r--r--app-office/abiword/abiword-2.8.6.ebuild9
3 files changed, 15 insertions, 10 deletions
diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index 580bd4ba13c2..de4de9e2cdb8 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/abiword
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.228 2010/09/13 12:59:50 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.229 2010/10/07 07:42:34 pacho Exp $
+
+ 07 Oct 2010; Pacho Ramos <pacho@gentoo.org> abiword-2.8.6.ebuild:
+ Fix icon installation (thanks to Faustus for reminding the problem in bug
+ #220097) and asio dependency (bug #326729 by Samuli Suominen).
13 Sep 2010; Joseph Jezak <josejx@gentoo.org> abiword-2.8.6.ebuild:
Marked ppc stable for bug #326503.
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 97b96df33f5d..abacf18a7894 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -8,13 +8,13 @@ DIST abiword-2.6.8.tar.gz 9516443 RMD160 8fcf455a5226a5525b9a89f88c9916b20e97360
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.8.6.ebuild 4625 RMD160 187cb3d604a5b932adb4bc2476f2414367eef185 SHA1 1c0365c39e55342984f52c429c530da3fa5ed6fc SHA256 af58d546c5e35b45a620bda7f69dac54ce28e09c647471d53512da5e6a1379fe
-MISC ChangeLog 30523 RMD160 9eb6faf524c7e2fde338fb0e88d1470feb0195a1 SHA1 c311b07f9190ba1572e1339ee4c581c9eead5bb0 SHA256 da9615770ae277743cddbee96f7e781d82252302c08cd6f3982979663cec6334
+EBUILD abiword-2.8.6.ebuild 4630 RMD160 275aedf900e5dad893942f9664febe7f3d249b5c SHA1 418f9917077eb0d2b00454c6aed5a4ce37b6d1d2 SHA256 837ddbb4be0a486b6afe93e2736987f3be4e136f1af7abb3cb4260a3145348af
+MISC ChangeLog 30732 RMD160 b9180b00fbc3c9d8d1cb69cec27a13a072f77055 SHA1 18c4eff3167c8ea3782adfdf669f6900be03b2b8 SHA256 abef9dec475ec38f581ad144103dc421822c82fe53f0436c8f527a610b8030b2
MISC metadata.xml 734 RMD160 ec067b329d28648227eadf10c68ca4b728a6c8d5 SHA1 4c6b2f8ad08023ff60ef349f3683781b1484b88a SHA256 f867ef524ff985d7e63af37fd00e300035807c6a9476ecec79abcc187bc87af7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkyOH0MACgkQcsIHjyDViGQtjQCg3gx3GWC4NoaQwt+VwsFiGoII
-CncAnjDNHeKlQay0VcttLeibbokeRDH9
-=QlZb
+iEYEARECAAYFAkytefMACgkQCaWpQKGI+9SAdQCfW/8o4/PQte1UfdN7KAZ7Yhtw
+SggAnR/jRMBG1ecj/MjroyMHfKcto0F+
+=hg6w
-----END PGP SIGNATURE-----
diff --git a/app-office/abiword/abiword-2.8.6.ebuild b/app-office/abiword/abiword-2.8.6.ebuild
index c84ccd920b8a..46615dea4c4a 100644
--- a/app-office/abiword/abiword-2.8.6.ebuild
+++ b/app-office/abiword/abiword-2.8.6.ebuild
@@ -1,6 +1,6 @@
# 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.8.6.ebuild,v 1.10 2010/09/13 12:59:50 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.8.6.ebuild,v 1.11 2010/10/07 07:42:34 pacho Exp $
EAPI="3"
@@ -35,7 +35,6 @@ RDEPEND="
>=x11-libs/goffice-0.8:0.8 )
plugins? (
collab? (
- dev-cpp/asio
>=dev-libs/boost-1.33.1
>=dev-libs/libxml2-2.4
>=net-libs/loudmouth-1
@@ -61,7 +60,9 @@ RDEPEND="
# svg? ( >=gnome-base/librsvg-2 )
DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.9"
+ >=dev-util/pkgconfig-0.9
+ plugins? (
+ collab? ( dev-cpp/asio ) )"
pkg_setup() {
# do not enable gnome-vfs
@@ -124,7 +125,7 @@ src_prepare() {
gnome2_src_prepare
# install icon to pixmaps (bug #220097)
- sed 's:icondir= $(datadir)/icons:icondir = $(datadir)/pixmaps:' \
+ 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' \