diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2010-10-07 07:42:34 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2010-10-07 07:42:34 +0000 |
| commit | fc8eaf61d05c0c6378083f4f7e930eb3406f531a (patch) | |
| tree | d3c6ed4d8893832780722d4023561ac45aff6ee2 /app-office | |
| parent | More quoting fixes (diff) | |
| download | gentoo-2-fc8eaf61d05c0c6378083f4f7e930eb3406f531a.tar.gz gentoo-2-fc8eaf61d05c0c6378083f4f7e930eb3406f531a.tar.bz2 gentoo-2-fc8eaf61d05c0c6378083f4f7e930eb3406f531a.zip | |
Fix icon installation (thanks to Faustus for reminding the problem in bug #220097) and asio dependency (bug #326729 by Samuli Suominen).
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/abiword/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/abiword/abiword-2.8.6.ebuild | 9 |
2 files changed, 10 insertions, 5 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/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' \ |