diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2010-09-15 18:45:30 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2010-09-15 18:45:30 +0000 |
| commit | 5a46f65863200384e1918cdde877d4d2f9637ec4 (patch) | |
| tree | de0228b765bf3549264d921417958021fae37450 /app-text | |
| parent | Version bump. Respect LDFLAGS fixed upstream. Drop old. (diff) | |
| download | gentoo-2-5a46f65863200384e1918cdde877d4d2f9637ec4.tar.gz gentoo-2-5a46f65863200384e1918cdde877d4d2f9637ec4.tar.bz2 gentoo-2-5a46f65863200384e1918cdde877d4d2f9637ec4.zip | |
Make hicolor-icon-theme an alternative to gnome-icon-theme, bug #326855. Drop libtool-1 compat.
(Portage version: 2.2_rc78/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/evince/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/evince/evince-2.30.3.ebuild | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog index 0ac87324b70c..37fe60cc8533 100644 --- a/app-text/evince/ChangeLog +++ b/app-text/evince/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/evince # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.198 2010/09/11 18:50:28 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.199 2010/09/15 18:45:30 eva Exp $ + + 15 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> evince-2.30.3.ebuild: + Make hicolor-icon-theme an alternative to gnome-icon-theme, bug #326855. + Drop libtool-1 compat. 11 Sep 2010; Joseph Jezak <josejx@gentoo.org> evince-2.30.3.ebuild: Marked ppc for bug #324077. diff --git a/app-text/evince/evince-2.30.3.ebuild b/app-text/evince/evince-2.30.3.ebuild index 6be49b6c0bd8..fd376139a174 100644 --- a/app-text/evince/evince-2.30.3.ebuild +++ b/app-text/evince/evince-2.30.3.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-text/evince/evince-2.30.3.ebuild,v 1.6 2010/09/11 18:50:28 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.30.3.ebuild,v 1.7 2010/09/15 18:45:30 eva Exp $ EAPI="2" @@ -25,7 +25,9 @@ RDEPEND=" >=dev-libs/libxml2-2.5 >=x11-libs/gtk+-2.14 >=x11-libs/libSM-1 - >=x11-themes/gnome-icon-theme-2.17.1 + || ( + >=x11-themes/gnome-icon-theme-2.17.1 + >=x11-themes/hicolor-icon-theme-0.10 ) dbus? ( >=dev-libs/dbus-glib-0.71 ) gnome? ( >=gnome-base/gconf-2 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 ) @@ -82,10 +84,10 @@ src_prepare() { # Fix .desktop file so menu item shows up epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch - # Make it libtool-1 compatible - rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed" + # Do not depend on gnome-icon-theme, bug #326855 + sed 's/gnome-icon-theme//' -i configure.ac configure || die "sed failed" - # gconf-2.m4 is needed for autoconf; bug 291339 + # gconf-2.m4 is needed for autoconf, bug #291339 if ! use gnome; then cp "${FILESDIR}/gconf-2.m4" m4/ || die "Copying gconf-2.m4 failed!" fi |