diff options
| author |   Michele Noberasco <s4t4n@gentoo.org> | 2007-01-24 08:43:32 +0000 |
|---|---|---|
| committer | Michele Noberasco <s4t4n@gentoo.org> | 2007-01-24 08:43:32 +0000 |
| commit | ab546ad76e6783ded5c087d472ba43db28ad282d (patch) | |
| tree | cbd039a6d16632c103b709c0dcef671ce84a7ca3 /x11-misc | |
| parent | version bump (diff) | |
| download | gentoo-2-ab546ad76e6783ded5c087d472ba43db28ad282d.tar.gz gentoo-2-ab546ad76e6783ded5c087d472ba43db28ad282d.tar.bz2 gentoo-2-ab546ad76e6783ded5c087d472ba43db28ad282d.zip | |
Made fontconfig 2.4 patch be applied only if fontconfig >=2.4 is actually installed. Added some magic sed to fix bug #157002.
(Portage version: 2.1.1-r2)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/adesklets/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/adesklets/adesklets-0.6.1-r1.ebuild | 18 |
2 files changed, 20 insertions, 4 deletions
diff --git a/x11-misc/adesklets/ChangeLog b/x11-misc/adesklets/ChangeLog index 764417e4c636..82f93be492bd 100644 --- a/x11-misc/adesklets/ChangeLog +++ b/x11-misc/adesklets/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/adesklets # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/ChangeLog,v 1.31 2007/01/07 08:19:19 s4t4n Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/ChangeLog,v 1.32 2007/01/24 08:43:32 s4t4n Exp $ + + 24 Jan 2007; Michele Noberasco <s4t4n@gentoo.org> adesklets-0.6.1-r1.ebuild: + Made fontconfig 2.4 patch be applied only if fontconfig >=2.4 is actually installed. + Added some magic sed to fix bug #157002. 07 Jan 2007; Michele Noberasco <s4t4n@gentoo.org> adesklets-0.6.1-r1.ebuild, adesklets-0.6.1.ebuild: diff --git a/x11-misc/adesklets/adesklets-0.6.1-r1.ebuild b/x11-misc/adesklets/adesklets-0.6.1-r1.ebuild index 07bd9194b403..977ead2c6529 100644 --- a/x11-misc/adesklets/adesklets-0.6.1-r1.ebuild +++ b/x11-misc/adesklets/adesklets-0.6.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/adesklets-0.6.1-r1.ebuild,v 1.2 2007/01/07 08:19:19 s4t4n Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/adesklets-0.6.1-r1.ebuild,v 1.3 2007/01/24 08:43:32 s4t4n Exp $ WANT_AUTOMAKE="latest" WANT_AUTOCONF="latest" @@ -48,8 +48,10 @@ src_unpack() #Fix for bug #148988: fontconfig >= 2.4 support use fontconfig && { - epatch ${FILESDIR}/${P}-fontconfig.patch - eautoreconf + if has_version ">=dev-libs/fontconfig-2.4"; then + epatch ${FILESDIR}/${P}-fontconfig.patch + eautoreconf + fi } # when performing minor changes to src/adesklets.c or src/commands.c, @@ -73,6 +75,16 @@ src_compile() src_install() { + #a bit of black magick to fix bug #157002 + use fontconfig && + { + if has_version ">=dev-libs/fontconfig-2.4"; then + if [ "`cat doc/Makefile | grep \/bin\/sh\ \$\(SHELL\)`" != "" ]; then + sed -i 's/\/bin\/sh//' doc/Makefile + fi + fi + } + dodir usr/share/info dodir usr/share/man/man1 make DESTDIR=${D} install || die |