diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-03-15 02:54:35 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-03-15 02:54:35 +0000 |
| commit | e997476ea5694fef01830265484c0217067a914a (patch) | |
| tree | 5c726193e36a8b9855a6a176f2450beed331dd7d /x11-misc/google-gadgets | |
| parent | Remove support for xulrunner wrt bugs #351659 and #403415 (diff) | |
| download | gentoo-2-e997476ea5694fef01830265484c0217067a914a.tar.gz gentoo-2-e997476ea5694fef01830265484c0217067a914a.tar.bz2 gentoo-2-e997476ea5694fef01830265484c0217067a914a.zip | |
Fix bug 385477 correctly since the change is not backwards compatible.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/google-gadgets')
| -rw-r--r-- | x11-misc/google-gadgets/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/x11-misc/google-gadgets/ChangeLog b/x11-misc/google-gadgets/ChangeLog index c026d3c142ca..83b4e0a7c77b 100644 --- a/x11-misc/google-gadgets/ChangeLog +++ b/x11-misc/google-gadgets/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/google-gadgets # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.43 2012/03/15 02:47:00 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.44 2012/03/15 02:54:35 ssuominen Exp $ + + 15 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> + google-gadgets-0.11.2.ebuild: + Fix bug 385477 correctly since the change is not backwards compatible. 15 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> google-gadgets-0.11.2.ebuild: diff --git a/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild b/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild index ba3d70aac4b2..0365eab11531 100644 --- a/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild +++ b/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild,v 1.13 2012/03/15 02:47:00 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild,v 1.14 2012/03/15 02:54:35 ssuominen Exp $ EAPI=4 inherit autotools eutils fdo-mime multilib @@ -83,18 +83,17 @@ pkg_setup() { src_prepare() { sed -i -r \ -e '/^GGL_SYSDEPS_INCLUDE_DIR/ c\GGL_SYSDEPS_INCLUDE_DIR=$GGL_INCLUDE_DIR' \ - configure.ac||die "404" + configure.ac || die # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 385477. - sed -i '1i#define OF(x) x' \ - third_party/unzip/ioapi.h || die "zlib sed failed" + has_version '>=sys-libs/zlib-1.2.5.1-r1' && sed -i -e \ + '1i#define OF(x) x' third_party/unzip/ioapi.h eautoreconf } src_configure() { econf \ - --disable-dependency-tracking \ --disable-update-desktop-database \ --disable-update-mime-database \ --disable-werror \ |