From: Michele Noberasco <s4t4n@gentoo.org>
Date: Fri, 26 Jan 2007 09:47:21 +0000 (+0000)
Subject: Re-fix bug #148988
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b172718d84266b68e27e0188167591e0bf8eca5d;p=gentoo.git

Re-fix bug #148988
Package-Manager: portage-2.1.1-r2
---

diff --git a/x11-misc/adesklets/ChangeLog b/x11-misc/adesklets/ChangeLog
index 82f93be492bd..2cfca9bc7c5b 100644
--- 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.32 2007/01/24 08:43:32 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/ChangeLog,v 1.33 2007/01/26 09:47:21 s4t4n Exp $
+
+  26 Jan 2007; Michele Noberasco <s4t4n@gentoo.org> adesklets-0.6.1-r1.ebuild:
+  Re-fixed bug #148988.
 
   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.
diff --git a/x11-misc/adesklets/Manifest b/x11-misc/adesklets/Manifest
index fec3a2705731..2d227a8a700c 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 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-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.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 5623 RMD160 e744bdf811e0b729168a7465e2222c03b148678e SHA1 14daa4021423656c414a04a0cf2bbcea0febafe8 SHA256 36c4545b352713245ee4066134d52202cdc8d438e4b51701a12f1daf51201c4f
-MD5 e1357c0da8656fb4a6917ef01acc1f4e ChangeLog 5623
-RMD160 e744bdf811e0b729168a7465e2222c03b148678e ChangeLog 5623
-SHA256 36c4545b352713245ee4066134d52202cdc8d438e4b51701a12f1daf51201c4f ChangeLog 5623
+MISC ChangeLog 5727 RMD160 f64a9bb870e7b2d82c7f530e933ca0170794f609 SHA1 930345aad45b095c9350667498a10d37a09e7634 SHA256 ddb96284170f23a5248dd772a759aa2809c83767b1ade33f0dd2d2c20bc945b2
+MD5 11d82e0b3edecd16168d54783e70f45c ChangeLog 5727
+RMD160 f64a9bb870e7b2d82c7f530e933ca0170794f609 ChangeLog 5727
+SHA256 ddb96284170f23a5248dd772a759aa2809c83767b1ade33f0dd2d2c20bc945b2 ChangeLog 5727
 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 977ead2c6529..a50104851237 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.3 2007/01/24 08:43:32 s4t4n Exp $
+# $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 $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -48,7 +48,7 @@ src_unpack()
 	#Fix for bug #148988: fontconfig >= 2.4 support
 	use fontconfig &&
 	{
-		if has_version ">=dev-libs/fontconfig-2.4"; then
+		if has_version ">=media-libs/fontconfig-2.4"; then
 			epatch ${FILESDIR}/${P}-fontconfig.patch
 			eautoreconf
 		fi
@@ -78,7 +78,7 @@ src_install()
 	#a bit of black magick to fix bug #157002
 	use fontconfig &&
 	{
-		if has_version ">=dev-libs/fontconfig-2.4"; then
+		if has_version ">=media-libs/fontconfig-2.4"; then
 			if [ "`cat doc/Makefile | grep \/bin\/sh\ \$\(SHELL\)`" != "" ]; then
 				sed -i 's/\/bin\/sh//' doc/Makefile
 			fi