From 7b35c265d4631fe7b6606a1f2c7ed42c8570c2fd Mon Sep 17 00:00:00 2001 From: Michele Noberasco Date: Wed, 24 Jan 2007 08:43:32 +0000 Subject: [PATCH] Made fontconfig 2.4 patch be applied only if fontconfig >=2.4 is actually installed. Added some magic sed to fix bug #157002. Package-Manager: portage-2.1.1-r2 --- x11-misc/adesklets/ChangeLog | 6 +++++- x11-misc/adesklets/Manifest | 16 ++++++++-------- x11-misc/adesklets/adesklets-0.6.1-r1.ebuild | 18 +++++++++++++++--- 3 files changed, 28 insertions(+), 12 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 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 adesklets-0.6.1-r1.ebuild, adesklets-0.6.1.ebuild: diff --git a/x11-misc/adesklets/Manifest b/x11-misc/adesklets/Manifest index 506ffac0db57..fec3a2705731 100644 --- a/x11-misc/adesklets/Manifest +++ b/x11-misc/adesklets/Manifest @@ -11,18 +11,18 @@ MD5 00a2cce2428caedc9eb20a9cdd3b40a0 files/adesklets-ctrlmenu.patch 776 RMD160 9895b6f002a9c67925c31dc06dce79bbb52d2dfc files/adesklets-ctrlmenu.patch 776 SHA256 1d0859c7a033d8dd6673613b1d57683692530b3274fbdf23ce9d6a655d39f91e files/adesklets-ctrlmenu.patch 776 DIST adesklets-0.6.1.tar.bz2 387553 RMD160 65cca6fe53f23f029c74cb101022e4481ee114d0 SHA1 bb81b4cedd5b0389b96d47c4ba57b3298fc05146 SHA256 9998e240715c34b5d4c8b31b5ed1fef38262a39fad08fa65be0b58a47eccc3c2 -EBUILD adesklets-0.6.1-r1.ebuild 3239 RMD160 4d38a51406ba5621ed83d4cf7afb779bb5ae5d77 SHA1 3270446f1a59d4dd2d9419068fb792cf69a890d5 SHA256 8ffb01744823d552d082c46f43efebf18dd706ffbe4b920339469ffee265e174 -MD5 435a7b65a16bef371ab469b2c3d9343d adesklets-0.6.1-r1.ebuild 3239 -RMD160 4d38a51406ba5621ed83d4cf7afb779bb5ae5d77 adesklets-0.6.1-r1.ebuild 3239 -SHA256 8ffb01744823d552d082c46f43efebf18dd706ffbe4b920339469ffee265e174 adesklets-0.6.1-r1.ebuild 3239 +EBUILD adesklets-0.6.1-r1.ebuild 3541 RMD160 d40c515fe9f07d53dbf6c49fb2e7de2e5a7f7e32 SHA1 be6178f9dd2b2a9b1af444c6bb6bdaf6b517d081 SHA256 7dc3ac7badf88e687a2caa81ac265ff70583dbbe56be6ed3c121004fa1a1c8a9 +MD5 9b3363556bf03d5a38a73bb1662a8987 adesklets-0.6.1-r1.ebuild 3541 +RMD160 d40c515fe9f07d53dbf6c49fb2e7de2e5a7f7e32 adesklets-0.6.1-r1.ebuild 3541 +SHA256 7dc3ac7badf88e687a2caa81ac265ff70583dbbe56be6ed3c121004fa1a1c8a9 adesklets-0.6.1-r1.ebuild 3541 EBUILD adesklets-0.6.1.ebuild 3012 RMD160 1e1c0b62d605a0b6163da89f136080de6feedeaa SHA1 49b8cd643f37c9b31b60373e0dd2e82aaa468e42 SHA256 f95b9be648af835ea36023970de5fce9dad03fca0e41f31d6a1f24906f74648f MD5 65947ca0c12b809024b6136f281e7519 adesklets-0.6.1.ebuild 3012 RMD160 1e1c0b62d605a0b6163da89f136080de6feedeaa adesklets-0.6.1.ebuild 3012 SHA256 f95b9be648af835ea36023970de5fce9dad03fca0e41f31d6a1f24906f74648f adesklets-0.6.1.ebuild 3012 -MISC ChangeLog 5413 RMD160 b7e4736a061ee85a188ccb1b93a6883999ef807f SHA1 11be1cd36db58314dee90b50ce8c50e4a6c04691 SHA256 4877613d12d8830b21ab341e3c951572ff84222ef7d60074bd39b41bf8afeae6 -MD5 949b49452ed6a9420339fb3e6c062235 ChangeLog 5413 -RMD160 b7e4736a061ee85a188ccb1b93a6883999ef807f ChangeLog 5413 -SHA256 4877613d12d8830b21ab341e3c951572ff84222ef7d60074bd39b41bf8afeae6 ChangeLog 5413 +MISC ChangeLog 5623 RMD160 e744bdf811e0b729168a7465e2222c03b148678e SHA1 14daa4021423656c414a04a0cf2bbcea0febafe8 SHA256 36c4545b352713245ee4066134d52202cdc8d438e4b51701a12f1daf51201c4f +MD5 e1357c0da8656fb4a6917ef01acc1f4e ChangeLog 5623 +RMD160 e744bdf811e0b729168a7465e2222c03b148678e ChangeLog 5623 +SHA256 36c4545b352713245ee4066134d52202cdc8d438e4b51701a12f1daf51201c4f ChangeLog 5623 MISC metadata.xml 551 RMD160 99b9eb03ca5c5ab03e1625584e1d09cd1724f7c3 SHA1 42da0483253593302e16025c8b416279aa7a870b SHA256 a6180c2f4d9890bb483e436f94c17de4a08b9e027d54d712240df00b62950e54 MD5 ba2766b0b67886a694c4c93cdab3c972 metadata.xml 551 RMD160 99b9eb03ca5c5ab03e1625584e1d09cd1724f7c3 metadata.xml 551 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 -- 2.26.2