Depend on pango, not pango[X], since latter enables deprecated pangox backend which we don't use, bug 293368 wrt Rémi Cardona.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 13 insertions, 18 deletions

diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index 2057492e6d71..cb6a4afb4c9c 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/fontforge
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.139 2011/06/14 17:45:05 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.140 2011/06/20 05:04:41 pva Exp $
+
+  20 Jun 2011; Peter Volkov <pva@gentoo.org> fontforge-20100501.ebuild,
+  fontforge-20110222.ebuild:
+  Depend on pango, not pango[X], since latter enables deprecated pangox backend
+  which we don't use, bug 293368 wrt Rémi Cardona.
 
   14 Jun 2011; Fabian Groffen <grobian@gentoo.org> fontforge-20110222.ebuild:
   Marked ~x86-macos (#369547)
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 41fd950ad363..8c618de45ed3 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fontforge-20110222-lxkbui.patch 545 RMD160 5f2138356b8f475a633176e0ecebd778241f0ed8 SHA1 251cea6906610bcc5d5d86e106ee56b8041d28e8 SHA256 192d3606dcf8f925a9cc5f79e7430979d0eb1a0f209a4447682f135f79d33828
 AUX fontforge-desktop.patch 662 RMD160 2242c71cbb88941e398fe0bb28798df941b05cd6 SHA1 c170824b25ad698d0ef8d3a59e16312c418c1fd8 SHA256 b2308b21b7db3c1ad0f8e2880678a0866f401e3ce57903e98ed68472f1e187e8
 AUX fontforge-py27.diff 387 RMD160 633fbf1f53495d0bb87975f657e00f452d7cae9b SHA1 406b97dbd894a97f1f1a66376a1ab41c7a6081f2 SHA256 18d71c28258a00459621113a0126b525b08cfd0a2dfb406fc90c6bed3d3790ed
@@ -9,14 +6,7 @@ DIST fontforge_full-20100501.tar.bz2 6666386 RMD160 4dee2ecdbd32bf3854105f195984
 DIST fontforge_full-20110222.tar.bz2 5126031 RMD160 7f276e9e3ef673b78355bb7be50f6b2587aee633 SHA1 8fada07647f102351bb1d7d1c4da487356e7142f SHA256 8fa2818026f84bb7b8a77451d21cab7e9dea8aa904e5218afa158be6a320433e
 DIST fontforge_htdocs-20100429.tar.bz2 3115782 RMD160 f1dedf39898d12398ffe463c06ebcb5d88fb575b SHA1 eeda060ad5e83392d1a27f6c9c1eac2a9c780c09 SHA256 842a5e675341578aacdd2614ec416719eba51826749d73b2044731335d1a1883
 DIST fontforge_htdocs-20110221.tar.bz2 3129839 RMD160 ac92a01aafbb39ccbecff2953f3b6f49c3721f71 SHA1 e966fea60a2f7f022af71669f67e15e258948e0e SHA256 7a81b9a30fa8f287e63abcfee568d7fcfd1a21c75c5c69effe95fe677d963fec
-EBUILD fontforge-20100501.ebuild 3534 RMD160 81a5b4889001b774990194fae81ea54fd6500fdd SHA1 29c4c4b5c08b75a66eb0c6244bd7abf0c491d057 SHA256 6283e38c9c221e5c3ccbe9cf03fb817172d05398acc45eb7b343d366ef3475d2
-EBUILD fontforge-20110222.ebuild 3626 RMD160 22c74eceb4146f9909251938c1348aef182aaaf6 SHA1 f993c92e650d130ef880988cba190ceeb0032e31 SHA256 7ccde83bd9b487051eeff7a0271d510513aa67393260598687ccbf52ce788d63
-MISC ChangeLog 20495 RMD160 1a82df24e698c88a44eb6a8025229554b7a78c55 SHA1 70413df8288aeecfb440e4fe1c044faf1b306039 SHA256 4dd25a41b211e7d9527a1f75e412c615d5c0b59a9d919f498ca811c68d4da3a0
+EBUILD fontforge-20100501.ebuild 3530 RMD160 3a71105e6270f449767242c92b72803bc55d4489 SHA1 2f8f35fde5cb890e246c2005fa0b8ed712c42258 SHA256 cb9cc8fbe6ee58eaa12ceaf718160faddfe7de7780e24f73f4e6e09c5c24a5e7
+EBUILD fontforge-20110222.ebuild 3619 RMD160 6ff8602e33e3f38513f5135790a03a83ebf52ab6 SHA1 56802d6fe4e05ef3f499ba2530a7d238d13da926 SHA256 bff1923fcc590ae8298fc699f63b88181f445c743c06d55995e8bca7c98dd38e
+MISC ChangeLog 20725 RMD160 4772f5b642c381354774b4611091f9694f44b40a SHA1 307739dad3712a0dbe0f7b5b565e2a32a9d9284d SHA256 275ee4cafcc552017e58cffd015debbe06a0fd5bde1e1778e385808ef39144e0
 MISC metadata.xml 1457 RMD160 1d4951de15b18f544ad32bed8b23c86d9c062f99 SHA1 8cdb030e20d35deb3a7491fa2c622b67a4d9e0e7 SHA256 964fda064eb8db8a937daf398f089df1779527e1fe45aee0edede3142ea62604
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (Darwin)
-
-iEYEARECAAYFAk33ngAACgkQX3X2B8XHTokiYwCgkTHmbP41rt/92jsJOmrOcY9G
-sX8An201pXM4fgOWxIYDXOKrlSuBiZTA
-=nuu7
------END PGP SIGNATURE-----
diff --git a/media-gfx/fontforge/fontforge-20100501.ebuild b/media-gfx/fontforge/fontforge-20100501.ebuild
index 098a3c650297..7da9c4337fba 100644
--- a/media-gfx/fontforge/fontforge-20100501.ebuild
+++ b/media-gfx/fontforge/fontforge-20100501.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20100501.ebuild,v 1.9 2011/01/19 19:45:50 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20100501.ebuild,v 1.10 2011/06/20 05:04:41 pva Exp $
 
 # Some notes for maintainers this package:
 # 1. README-unix: freetype headers are required to make use of truetype debugger
@@ -40,7 +40,7 @@ RDEPEND="gif? ( >=media-libs/giflib-4.1.0-r1 )
 	svg? ( >=dev-libs/libxml2-2.6.7 )
 	unicode? ( >=media-libs/libuninameslist-030713 )
 	cairo? ( >=x11-libs/cairo-1.6.4[X] )
-	pango? ( >=x11-libs/pango-1.20.3[X] )
+	pango? ( >=x11-libs/pango-1.20.3 )
 	x11-libs/libXi
 	x11-proto/inputproto
 	!media-gfx/pfaedit"
diff --git a/media-gfx/fontforge/fontforge-20110222.ebuild b/media-gfx/fontforge/fontforge-20110222.ebuild
index 8694b33357c0..f6520a39fca7 100644
--- a/media-gfx/fontforge/fontforge-20110222.ebuild
+++ b/media-gfx/fontforge/fontforge-20110222.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20110222.ebuild,v 1.5 2011/06/14 17:45:05 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20110222.ebuild,v 1.6 2011/06/20 05:04:41 pva Exp $
 
 # Some notes for maintainers this package:
 # 1. README-unix: freetype headers are required to make use of truetype debugger
@@ -40,7 +40,7 @@ RDEPEND="gif? ( >=media-libs/giflib-4.1.0-r1 )
 	svg? ( >=dev-libs/libxml2-2.6.7 )
 	unicode? ( >=media-libs/libuninameslist-030713 )
 	cairo? ( >=x11-libs/cairo-1.6.4[X] )
-	pango? ( >=x11-libs/pango-1.20.3[X] )
+	pango? ( >=x11-libs/pango-1.20.3 )
 	x11-libs/libXi
 	x11-proto/inputproto
 	!media-gfx/pfaedit"