diff options
| author |   Martin Ehmsen <ehmsen@gentoo.org> | 2006-02-10 10:27:47 +0000 |
|---|---|---|
| committer | Martin Ehmsen <ehmsen@gentoo.org> | 2006-02-10 10:27:47 +0000 |
| commit | 32d191122f3da891d3bd212b0a2fef89581565e9 (patch) | |
| tree | bfda9d71ec4d6b634e0d84dad67d0b036e46897b /app-text/djvu | |
| parent | stable on amd64 wrt bug 122307 (diff) | |
| download | gentoo-2-32d191122f3da891d3bd212b0a2fef89581565e9.tar.gz gentoo-2-32d191122f3da891d3bd212b0a2fef89581565e9.tar.bz2 gentoo-2-32d191122f3da891d3bd212b0a2fef89581565e9.zip | |
Only include gcc-4 compilation fix if gcc-4 is being used, bug #122329.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'app-text/djvu')
| -rw-r--r-- | app-text/djvu/ChangeLog | 5 | ||||
| -rw-r--r-- | app-text/djvu/Manifest | 6 | ||||
| -rw-r--r-- | app-text/djvu/djvu-3.5.16.ebuild | 12 |
3 files changed, 14 insertions, 9 deletions
diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog index fb1ba9bb3aba..7ba831d96521 100644 --- a/app-text/djvu/ChangeLog +++ b/app-text/djvu/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/djvu # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.28 2006/02/09 17:18:15 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.29 2006/02/10 10:27:47 ehmsen Exp $ + + 10 Feb 2006; Martin Ehmsen <ehmsen@gentoo.org> djvu-3.5.16.ebuild: + Only include gcc-4 compilation fix if gcc-4 is being used, bug #122329. 09 Feb 2006; Patrick McLean <chutzpah@gentoo.org> djvu-3.5.16.ebuild: Install plugins in proper libdir for multilib (bug #122243). diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest index 776b929bdd6f..4b52ce9df40b 100644 --- a/app-text/djvu/Manifest +++ b/app-text/djvu/Manifest @@ -10,9 +10,9 @@ SHA256 49552c608b5708041b4dee2cf1aa6dd91ad76e8e20e1362b015b34898d31379f djvu-3.5 MD5 986cb703c5675d7e0fd2df81fdb6bb64 djvu-3.5.14.ebuild 1108 RMD160 437ca73fa680ac88359bee4589736a72114fc20c djvu-3.5.14.ebuild 1108 SHA256 1d8f0e7df2abae07d4338e56d2f1d36678c5f34d4ff7263a74d4874f195a23e9 djvu-3.5.14.ebuild 1108 -MD5 b33fc7df648d0ee79777b4f62dc78f21 djvu-3.5.16.ebuild 1915 -RMD160 4e5e84fadc920c71bd09fd8ef483bb4c03045d04 djvu-3.5.16.ebuild 1915 -SHA256 9280f2f8378e714a36b636e05ae0a54649d994bddd701b91a75fd8dc2be932a6 djvu-3.5.16.ebuild 1915 +MD5 987ae102350898d98da1a16cca7cb8d7 djvu-3.5.16.ebuild 1880 +RMD160 ed4bdc4ae7e60c11e4b109649f8d4596639452e5 djvu-3.5.16.ebuild 1880 +SHA256 515cd4693999a5a86bf423d6d054dbd4b6b1bbd3897dad6ce673d7da0bef8bda djvu-3.5.16.ebuild 1880 MD5 376a63d9cbc58a7737d37680734f0ee0 files/digest-djvu-3.5.12 69 RMD160 c6a301fad55fa16d877b279ce64ceba26fca1c71 files/digest-djvu-3.5.12 69 SHA256 94022678deee51e3b2ec2c610d10da719eada16b6d887364918f9a9d925b3c4b files/digest-djvu-3.5.12 69 diff --git a/app-text/djvu/djvu-3.5.16.ebuild b/app-text/djvu/djvu-3.5.16.ebuild index e60528092e7a..6bbc2e0f488f 100644 --- a/app-text/djvu/djvu-3.5.16.ebuild +++ b/app-text/djvu/djvu-3.5.16.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.16.ebuild,v 1.3 2006/02/09 17:18:15 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.16.ebuild,v 1.4 2006/02/10 10:27:47 ehmsen Exp $ -inherit nsplugins flag-o-matic fdo-mime eutils multilib +inherit nsplugins flag-o-matic fdo-mime eutils multilib toolchain-funcs MY_P="${PN}libre-${PV}" @@ -25,9 +25,11 @@ src_unpack() { unpack ${A} cd ${S} - # gcc 4.1 compilation fixes - epatch ${FILESDIR}/${P}-gcc41-hash.patch || die - epatch ${FILESDIR}/${P}-gcc41.patch || die + # gcc 4 compilation fixes + if [ $(gcc-major-version) -ge 4 ]; then + epatch ${FILESDIR}/${P}-gcc41-hash.patch || die + epatch ${FILESDIR}/${P}-gcc41.patch || die + fi # Replace autochecking acdesktop.m4 with a gentoo-specific one cp ${FILESDIR}/gentoo-acdesktop.m4 ${S}/gui/desktop/acdesktop.m4 |