Fix building with USE=-X #159007 by Alexander Skwar.

Package-Manager: portage-2.1.2-r8

4 files changed, 38 insertions, 13 deletions

diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index 7f9be3c6a7c5..dc3d9ad58e4b 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fontforge
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.45 2007/02/07 04:57:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.46 2007/02/08 04:36:23 vapier Exp $
+
+  08 Feb 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/fontforge-20061220-no-X.patch, fontforge-20061220.ebuild:
+  Fix building with USE=-X #159007 by Alexander Skwar.
 
   07 Feb 2007; Mike Frysinger <vapier@gentoo.org> fontforge-20061220.ebuild:
   Use emake rather than make #159929 by Timothy Redaelli.
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 66bfbf0f00ad..79507943aadf 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -17,6 +17,10 @@ AUX fontforge-20061014-build.patch 3044 RMD160 e2edd376c8ec5b30d1a683402e072e81c
 MD5 e5e5d2579cac85e53029f60a9c557f51 files/fontforge-20061014-build.patch 3044
 RMD160 e2edd376c8ec5b30d1a683402e072e81c3895a08 files/fontforge-20061014-build.patch 3044
 SHA256 f3b94fadef41a65709d2851167a4fa7854351e882f37dae7c5fa45f49a79e065 files/fontforge-20061014-build.patch 3044
+AUX fontforge-20061220-no-X.patch 250 RMD160 dfb73fc9e2c7e7fabb7c7621831371ec6514c1c7 SHA1 39516743f5db452bf561f248f3706f7e9ece3d5f SHA256 9fcb9514cdea9cbb6bda09b45dbf1de95144f80e4905b57e15dcf0aa3f0ec8bb
+MD5 d099050b3e8c22bc72366170a9a18b1e files/fontforge-20061220-no-X.patch 250
+RMD160 dfb73fc9e2c7e7fabb7c7621831371ec6514c1c7 files/fontforge-20061220-no-X.patch 250
+SHA256 9fcb9514cdea9cbb6bda09b45dbf1de95144f80e4905b57e15dcf0aa3f0ec8bb files/fontforge-20061220-no-X.patch 250
 DIST cidmaps-20041222.tgz 313755 RMD160 c25b1a4f0d8ed0634402d2ce2b36ba47e0c2ef1b SHA1 d111db1f6d9a05cf6cb1387c2fb2eeb21ba0279a SHA256 e0c16072d4c0fea3614073306ba243aa974a00130c5201651892950d855641f3
 DIST fontforge_full-20050502.tgz 4149453 RMD160 e71b767872dc93311c6f31141b14049a6bd7931f SHA256 66a0a85506bc128b69e3ea4e5d450d0e963065e6d423c5cc8281b1fcfe6c63bf
 DIST fontforge_full-20050624.tgz 4392875 RMD160 51780d966196c658f7a04a3161db42359dbd80bb SHA256 7dec72cf1313146ec9ac5a5f3956ea40369c8047b0298c63ea3efdcc739c4dc6
@@ -67,14 +71,14 @@ EBUILD fontforge-20061025.ebuild 1504 RMD160 b81217e8e4883feae6634b028981de9dd78
 MD5 49edcc0ffb72b12dabfffae8f7cd4d33 fontforge-20061025.ebuild 1504
 RMD160 b81217e8e4883feae6634b028981de9dd7828b25 fontforge-20061025.ebuild 1504
 SHA256 c5fb38d7e6ef691a2269c9a93e5c0223ff28da815b0bb3126928dce060808b03 fontforge-20061025.ebuild 1504
-EBUILD fontforge-20061220.ebuild 1465 RMD160 bfb914b3a288a1d79538e7e731f2afa26813c839 SHA1 749e17ec89bf7816483310b049667ad41cb8ff05 SHA256 fa154b3e35d13ad906ec6ad8a3f72b2c45cce9cc73c3d467229373a519c67fc0
-MD5 60e0bd75451b1707d3c859546e372c2d fontforge-20061220.ebuild 1465
-RMD160 bfb914b3a288a1d79538e7e731f2afa26813c839 fontforge-20061220.ebuild 1465
-SHA256 fa154b3e35d13ad906ec6ad8a3f72b2c45cce9cc73c3d467229373a519c67fc0 fontforge-20061220.ebuild 1465
-MISC ChangeLog 6860 RMD160 9fbac7a0940111f0f0fbeac02c02a5949fb011ae SHA1 e67d8aa0f82a0d5fadd76e1a3f2f43da07b77846 SHA256 0b38bac4d3f6fef517fcb60af6390706066785be8a08463449036ca00a5c9b54
-MD5 918c8f11758e3630222ab50e858003f9 ChangeLog 6860
-RMD160 9fbac7a0940111f0f0fbeac02c02a5949fb011ae ChangeLog 6860
-SHA256 0b38bac4d3f6fef517fcb60af6390706066785be8a08463449036ca00a5c9b54 ChangeLog 6860
+EBUILD fontforge-20061220.ebuild 1511 RMD160 239d88fde8b05a9d185e22f5f95b339ef35e3efe SHA1 0e8ba892c36c021980ca7e9a11c5e5e7df6d0aca SHA256 d53dae83d0a3fcb5a86f0bb031f568125088206906247fbf436c79ec4288c13b
+MD5 a32dbe6d9802e1b3e2b5611d3b120b8e fontforge-20061220.ebuild 1511
+RMD160 239d88fde8b05a9d185e22f5f95b339ef35e3efe fontforge-20061220.ebuild 1511
+SHA256 d53dae83d0a3fcb5a86f0bb031f568125088206906247fbf436c79ec4288c13b fontforge-20061220.ebuild 1511
+MISC ChangeLog 7033 RMD160 12f36bab87d02e1be72d76fdf74598ef1bc8d8e6 SHA1 f38881341ca17273becd1b8d1922a51b8488bed2 SHA256 158388f22072a581db0d924b47c0c54fe7a839ab62a6da8cd64269f26c65ba18
+MD5 205e12645af12cec8ebaf67a62b14ab2 ChangeLog 7033
+RMD160 12f36bab87d02e1be72d76fdf74598ef1bc8d8e6 ChangeLog 7033
+SHA256 158388f22072a581db0d924b47c0c54fe7a839ab62a6da8cd64269f26c65ba18 ChangeLog 7033
 MISC metadata.xml 158 RMD160 e563fdca0707ee5927deab77f2e5ef79816384ca SHA1 8e4ca6d183e52cdbea8cfba08b7a7910e648fc84 SHA256 9a8722fb0b5a1992b3942e85f23df4e08f10cabc2d783ca887479abe115b3ea8
 MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
 RMD160 e563fdca0707ee5927deab77f2e5ef79816384ca metadata.xml 158
@@ -115,7 +119,7 @@ SHA256 2b04c564abfab1e03ca44a3f37d244d46c4810ecd508b617358d1cdbcad7e2fc files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFyVxZ8bi6rjpTunYRAiyEAKDU/e/qsQYIUoeTht4eM/KTT5J0fQCeML+r
-/rwmolQEDIUleBsmVDyE/38=
-=mqAK
+iD8DBQFFyqjQ8bi6rjpTunYRAqz/AJ9WjJEz5I6/MVTSywkhvkDfUd+kLACg1GCj
+Kg8BskWiT80Ho8hc1BGWo30=
+=Tvek
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fontforge/files/fontforge-20061220-no-X.patch b/media-gfx/fontforge/files/fontforge-20061220-no-X.patch
new file mode 100644
index 000000000000..152335180d01
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-20061220-no-X.patch
@@ -0,0 +1,16 @@
+Fix from upstream
+
+http://bugs.gentoo.org/159007
+
+--- configure
++++ configure
+@@ -22716,9 +22716,6 @@
+ X_11LIB=-lX11
+ if test "$no_x" = "yes"; then
+  X_11LIB=
+- cat >>confdefs.h <<\_ACEOF
+-#define FONTFORGE_CONFIG_NO_WINDOWING_UI 1
+-_ACEOF
+ 
+ else
+ 
diff --git a/media-gfx/fontforge/fontforge-20061220.ebuild b/media-gfx/fontforge/fontforge-20061220.ebuild
index 725a23a5f144..810692504f63 100644
--- a/media-gfx/fontforge/fontforge-20061220.ebuild
+++ b/media-gfx/fontforge/fontforge-20061220.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/media-gfx/fontforge/fontforge-20061220.ebuild,v 1.3 2007/02/07 04:57:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20061220.ebuild,v 1.4 2007/02/08 04:36:23 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -26,6 +26,7 @@ DEPEND="png? ( >=media-libs/libpng-1.2.4 )
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-no-X.patch #159007
 	sed -i -e 's:ungif:gif:g' configure* || die
 	sed -i -e 's:"libungif":"libgif":g' gdraw/gimagereadgif.c || die
 }