diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2015-05-24 09:46:10 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2015-05-24 09:46:10 +0000 |
| commit | 5c5d127c79d357f20a5ebc7c6ccbc1e3a922879a (patch) | |
| tree | 8aea679e8d3b54a9b746256f9c37d838c84a3f34 /media-gfx | |
| parent | Disable broken tests. (diff) | |
| download | gentoo-2-5c5d127c79d357f20a5ebc7c6ccbc1e3a922879a.tar.gz gentoo-2-5c5d127c79d357f20a5ebc7c6ccbc1e3a922879a.tar.bz2 gentoo-2-5c5d127c79d357f20a5ebc7c6ccbc1e3a922879a.zip | |
Fix build with gettext-0.19, bug #512624 by zimous
(Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/gliv/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/gliv/gliv-1.9.7.ebuild | 30 |
2 files changed, 25 insertions, 12 deletions
diff --git a/media-gfx/gliv/ChangeLog b/media-gfx/gliv/ChangeLog index 12c4b04dc0b5..e517a2fc0a3d 100644 --- a/media-gfx/gliv/ChangeLog +++ b/media-gfx/gliv/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/gliv -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/ChangeLog,v 1.36 2014/08/09 12:09:43 ago Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/ChangeLog,v 1.37 2015/05/24 09:46:10 pacho Exp $ + + 24 May 2015; Pacho Ramos <pacho@gentoo.org> gliv-1.9.7.ebuild: + Fix build with gettext-0.19, bug #512624 by zimous 09 Aug 2014; Agostino Sarubbo <ago@gentoo.org> gliv-1.9.6.ebuild, gliv-1.9.7.ebuild: diff --git a/media-gfx/gliv/gliv-1.9.7.ebuild b/media-gfx/gliv/gliv-1.9.7.ebuild index 3e50dfbe96e8..c723b35699e6 100644 --- a/media-gfx/gliv/gliv-1.9.7.ebuild +++ b/media-gfx/gliv/gliv-1.9.7.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/gliv-1.9.7.ebuild,v 1.3 2014/08/09 12:09:43 ago Exp $ - -EAPI=4 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/gliv-1.9.7.ebuild,v 1.4 2015/05/24 09:46:10 pacho Exp $ +EAPI=5 inherit eutils autotools DESCRIPTION="An image viewer that uses OpenGL" @@ -15,18 +14,29 @@ SLOT="0" KEYWORDS="~amd64 ppc ~x86" IUSE="nls" -RDEPEND=">=x11-libs/gtk+-2.6:2 +RDEPEND=" + >=x11-libs/gtk+-2.6:2 virtual/opengl - >x11-libs/gtkglext-1.0.6" + >x11-libs/gtkglext-1.0.6 +" DEPEND="${RDEPEND} virtual/pkgconfig >=sys-devel/bison-1.875 - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" src_prepare() { - epatch "${FILESDIR}"/${P}-as-needed.patch \ - "${FILESDIR}/${P}-destdir.patch" - eautoreconf + # Fix build with gettext-0.19, bug #512624 + # using gettextize no-interactive example from dev-util/bless package + if use nls; then + cp $(type -p gettextize) "${T}"/ + sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize" || die + "${T}"/gettextize -f --no-changelog --intl > /dev/null + fi + + epatch "${FILESDIR}"/${P}-as-needed.patch \ + "${FILESDIR}/${P}-destdir.patch" + eautoreconf } src_configure() { |