Explicitly disable fontconfig support if it is not in USE. Closes bug #166292.

Package-Manager: portage-2.1.2-r9

diff --git a/x11-misc/adesklets/ChangeLog b/x11-misc/adesklets/ChangeLog
index 2cfca9bc7c5bf6f6a507c57143c06d10366d0c96..054a8c1f4f1b2238091f7a19e3ea222196a84b6a 100644 (file)
--- a/x11-misc/adesklets/ChangeLog
+++ b/x11-misc/adesklets/ChangeLog
@@ -1,6 +1,9 @@
 # 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.33 2007/01/26 09:47:21 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/ChangeLog,v 1.34 2007/02/13 18:29:37 s4t4n Exp $
+
+  13 Feb 2007; Michele Noberasco <s4t4n@gentoo.org> adesklets-0.6.1-r1.ebuild:
+  Explicitly disable fontconfig if it is not in USE. Closes bug #166292.
 
   26 Jan 2007; Michele Noberasco <s4t4n@gentoo.org> adesklets-0.6.1-r1.ebuild:
   Re-fixed bug #148988.

diff --git a/x11-misc/adesklets/Manifest b/x11-misc/adesklets/Manifest
index 2d227a8a700cfe4a26626525a15edd5c30654111..261494cdfb1dfe3da823327f2eabc0dafb6bae8c 100644 (file)
--- 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 3545 RMD160 6a643daf55e361d53713ee63bb45b686966241cf SHA1 46725e0a800a6f6747d7ae374ccf4b0f04b4e3d5 SHA256 3388a7edbd2bfbac5415119bbdfafc570097b15840d7660c2c26a2d918b50076
-MD5 13f19ae76060f6782992220c5790f478 adesklets-0.6.1-r1.ebuild 3545
-RMD160 6a643daf55e361d53713ee63bb45b686966241cf adesklets-0.6.1-r1.ebuild 3545
-SHA256 3388a7edbd2bfbac5415119bbdfafc570097b15840d7660c2c26a2d918b50076 adesklets-0.6.1-r1.ebuild 3545
+EBUILD adesklets-0.6.1-r1.ebuild 3604 RMD160 827a4ab3d82afdb50904c15af6681b1757337a46 SHA1 a725b2a2260fabc7591109942add2285b52a5c49 SHA256 45d12a6fdb926c47819785085f40183649d65e7bc6d03da5508372792b5d54dc
+MD5 5dc4b0c6e5720255bc8bdcbb7f2e5f98 adesklets-0.6.1-r1.ebuild 3604
+RMD160 827a4ab3d82afdb50904c15af6681b1757337a46 adesklets-0.6.1-r1.ebuild 3604
+SHA256 45d12a6fdb926c47819785085f40183649d65e7bc6d03da5508372792b5d54dc adesklets-0.6.1-r1.ebuild 3604
 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 5727 RMD160 f64a9bb870e7b2d82c7f530e933ca0170794f609 SHA1 930345aad45b095c9350667498a10d37a09e7634 SHA256 ddb96284170f23a5248dd772a759aa2809c83767b1ade33f0dd2d2c20bc945b2
-MD5 11d82e0b3edecd16168d54783e70f45c ChangeLog 5727
-RMD160 f64a9bb870e7b2d82c7f530e933ca0170794f609 ChangeLog 5727
-SHA256 ddb96284170f23a5248dd772a759aa2809c83767b1ade33f0dd2d2c20bc945b2 ChangeLog 5727
+MISC ChangeLog 5880 RMD160 a04b3a2f7785a606b255e6e052dd65567a07c75e SHA1 627edf8dff399e9fbb8f9933aece7f6f6f2ea1f4 SHA256 1f8e5cd74ecdf89af8381c790c54185eb512307f4ac48cb235629d0244f3180d
+MD5 5827d099b2de19f23c425daab920c9df ChangeLog 5880
+RMD160 a04b3a2f7785a606b255e6e052dd65567a07c75e ChangeLog 5880
+SHA256 1f8e5cd74ecdf89af8381c790c54185eb512307f4ac48cb235629d0244f3180d ChangeLog 5880
 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 a5010485123731c3b9fa2b825b12308e224f94bd..44f42ea5732ffcfc9771947862e3eca7c486845b 100644 (file)
--- 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.4 2007/01/26 09:47:21 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/adesklets-0.6.1-r1.ebuild,v 1.5 2007/02/13 18:29:37 s4t4n Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -68,6 +68,7 @@ src_compile()
        use perl || myconf="${myconf} --without-perl-support"
        myconf="${myconf} $(use_enable debug)"
        use ctrlmenu && myconf="--enable-control-on-context-menu"
+       use fontconfig || myconf="${myconf} --without-fontconfig"
 
        econf ${myconf} || die
        emake || die