diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2011-11-26 02:45:45 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2011-11-26 02:45:45 +0000 |
| commit | 86f51a447c635e1e9fd9a20e0220e3f4530e3fff (patch) | |
| tree | 3600ff99f712773f94a44aafa6a0dac00e590a85 /app-text | |
| parent | Fix building of cygnal sshclient, bug #391915. (diff) | |
| download | gentoo-2-86f51a447c635e1e9fd9a20e0220e3f4530e3fff.tar.gz gentoo-2-86f51a447c635e1e9fd9a20e0220e3f4530e3fff.tar.bz2 gentoo-2-86f51a447c635e1e9fd9a20e0220e3f4530e3fff.zip | |
Fix the gnome-icon-theme configure sed (bug #391859, thanks to Florian Faber <faber@faberman.de> for reporting).
(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/evince/ChangeLog | 7 | ||||
| -rw-r--r-- | app-text/evince/evince-3.2.1-r1.ebuild | 9 | ||||
| -rw-r--r-- | app-text/evince/evince-3.2.1.ebuild | 9 |
3 files changed, 16 insertions, 9 deletions
diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog index 02cc21e84960..2ac52df0b0a2 100644 --- a/app-text/evince/ChangeLog +++ b/app-text/evince/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-text/evince # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.233 2011/11/23 20:35:27 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.234 2011/11/26 02:45:45 tetromino Exp $ + + 26 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> evince-3.2.1.ebuild, + evince-3.2.1-r1.ebuild: + Fix the gnome-icon-theme configure sed (bug #391859, thanks to Florian Faber + <faber@faberman.de> for reporting). *evince-3.2.1-r1 (23 Nov 2011) diff --git a/app-text/evince/evince-3.2.1-r1.ebuild b/app-text/evince/evince-3.2.1-r1.ebuild index 2ab712e1b49a..5d1d55aae683 100644 --- a/app-text/evince/evince-3.2.1-r1.ebuild +++ b/app-text/evince/evince-3.2.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild,v 1.1 2011/11/23 20:35:27 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild,v 1.2 2011/11/26 02:45:45 tetromino Exp $ EAPI="4" GCONF_DEBUG="yes" @@ -95,9 +95,6 @@ pkg_setup() { } src_prepare() { - # Do not depend on gnome-icon-theme, bug #326855 - sed 's/gnome-icon-theme//' -i configure.ac || die "sed failed" - # Fix .desktop file so menu item shows up epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch @@ -108,4 +105,8 @@ src_prepare() { epatch "${FILESDIR}/${PN}-3.2.1-libgxps-0.2.patch" gnome2_src_prepare + + # Do not depend on gnome-icon-theme, bug #326855, #391859 + sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \ + -i configure || die "sed failed" } diff --git a/app-text/evince/evince-3.2.1.ebuild b/app-text/evince/evince-3.2.1.ebuild index b5ed574b576b..358a881455a7 100644 --- a/app-text/evince/evince-3.2.1.ebuild +++ b/app-text/evince/evince-3.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1.ebuild,v 1.2 2011/11/16 10:56:15 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1.ebuild,v 1.3 2011/11/26 02:45:45 tetromino Exp $ EAPI="4" GCONF_DEBUG="yes" @@ -92,11 +92,12 @@ pkg_setup() { } src_prepare() { - # Do not depend on gnome-icon-theme, bug #326855 - sed 's/gnome-icon-theme//' -i configure.ac || die "sed failed" - # Fix .desktop file so menu item shows up epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch gnome2_src_prepare + + # Do not depend on gnome-icon-theme, bug #326855, #391859 + sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \ + -i configure || die "sed failed" } |