Fix building with USE=-X #205455 by Luu Danh Hieu.

Package-Manager: portage-2.1.4.1

5 files changed, 28 insertions, 11 deletions

diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index e90a954e3573..858ecd5df97e 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fontforge
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.73 2008/02/04 17:34:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.74 2008/02/05 21:37:31 vapier Exp $
+
+  05 Feb 2008; Mike Frysinger <vapier@gentoo.org> fontforge-20071210.ebuild,
+  fontforge-20080109.ebuild, fontforge-20080203.ebuild:
+  Fix building with USE=-X #205455 by Luu Danh Hieu.
 
 *fontforge-20080203 (04 Feb 2008)
 
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 2d47cc1767da..bf3bb18b6111 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -25,15 +25,15 @@ EBUILD fontforge-20070831.ebuild 1620 RMD160 f7500649619438002b025917d1d9f1a7fa2
 EBUILD fontforge-20070915.ebuild 1628 RMD160 cf6a6da03affeb20ca660da66deb3fdc24fe167b SHA1 6eaa4d06cf27eece8481a630dcafa0f7c0fa53f8 SHA256 e45b627b712aa374bfb59e7088c305515fcc98653b52c48bc6b4de6f9e001e12
 EBUILD fontforge-20071002.ebuild 1628 RMD160 d072b5104dc75541506c275dd3a71cebc3d32107 SHA1 93052feaace421c9e9454c1f6d15fb0e9c912f63 SHA256 96e16b531b1a91929f05dbf263d00caac894f9a3a7c679ab2848394a57591255
 EBUILD fontforge-20071110.ebuild 1628 RMD160 8a124e66694eff5d1a1e83065b0ef2fce31c24c4 SHA1 2f78ede0fc7141978abeb349eb16e58d1dd89c73 SHA256 071419645b3472f5edf2449d70987326347c99a6a62dc50d84ee7052a896abe6
-EBUILD fontforge-20071210.ebuild 1629 RMD160 7cbde5d8dfda708547b9aeda15f954c18c195b1e SHA1 1d127ff996be806792f52d9a3b62aa6a0ce68d1b SHA256 57f3994ccdcec975fa756b07be208eaa3e88d697ab32644f19adc681731c47d6
-EBUILD fontforge-20080109.ebuild 1466 RMD160 26c122db6f51241e29f8cc97ef2363048c300f27 SHA1 bed0da63a78f3d566979375f9a498690a4c5bcd1 SHA256 73e3f694329fffdaca059ce1157838a867dad7ec303d6eff63ef82a93a1f7ffe
-EBUILD fontforge-20080203.ebuild 1465 RMD160 93db3bc28cc4c47c60b074e19b367df78c065f22 SHA1 2a4916ca736985fac6a76324719f6d0527919dae SHA256 e1d1b7ec94c5931483097052f53ee7891235d7cc1ee42c0e215bad82b13cb046
-MISC ChangeLog 10813 RMD160 f8b59750d1a1aa2cc7017dc517848c1ff4f7c652 SHA1 4a499e55e6bbcf18a13b504bdc8765e369f531d4 SHA256 fb35a31f3647f8359e1b08ed65e79c27caa588a3afdac2689748dcfccbf2b824
+EBUILD fontforge-20071210.ebuild 1701 RMD160 c7a2c198501689a743468cdeb405a7245ca56fca SHA1 2cbbb685c9d58e2eddd4359abece272150d09746 SHA256 ee979d79b37d74e7e419599d6b4959cd2f42196cbc14c466060215b0eef7cffa
+EBUILD fontforge-20080109.ebuild 1575 RMD160 3058aa60c1826f74846765ecb51a5e624ec6a43f SHA1 4c70aadd96689ee8b65ea7679aba3735d40054d4 SHA256 44e90a0914f310f3f3d635ada4590591c68c36cc94e2a1e8d68db4bcd5cd7ce0
+EBUILD fontforge-20080203.ebuild 1575 RMD160 0bb3f87c7647e3417236e223799a0eeace915314 SHA1 2f9c1d00abe68b04cd98226f5d2506776869144b SHA256 8e221e756ce87f8d82a7a4d7179b7be7e7cfd056df7ad42c60fbb86c6e6f066f
+MISC ChangeLog 11000 RMD160 faa193da0e4fd256e447e3d2799d699ac06131fa SHA1 0b4724a8aa2242c53f1c243383409ed42276326b SHA256 0baad98e9f8cec157cecf3b2a9f0ca5378e21dda93cc8f22ca2b6501fdee4c16
 MISC metadata.xml 158 RMD160 e563fdca0707ee5927deab77f2e5ef79816384ca SHA1 8e4ca6d183e52cdbea8cfba08b7a7910e648fc84 SHA256 9a8722fb0b5a1992b3942e85f23df4e08f10cabc2d783ca887479abe115b3ea8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHp0ukj9hvisErhMIRArkyAJ49wAConA0xBySTloPNpb9qPLug8ACfe6UG
-HgRMSo78+A7pdWPPD1TlsOg=
-=vrKD
+iD8DBQFHqNZLj9hvisErhMIRAlhiAKCovtTIH7KxtJXlUmzWwFhfeQa38ACfSdXg
+PG6KxYOj3Uk6CivAKikEirA=
+=P0tj
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fontforge/fontforge-20071210.ebuild b/media-gfx/fontforge/fontforge-20071210.ebuild
index 4b5f0490f320..7b9051e3f508 100644
--- a/media-gfx/fontforge/fontforge-20071210.ebuild
+++ b/media-gfx/fontforge/fontforge-20071210.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20071210.ebuild,v 1.9 2008/01/10 17:49:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20071210.ebuild,v 1.10 2008/02/05 21:37:31 vapier Exp $
 
 inherit eutils
 
@@ -31,6 +31,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-parallel-build.patch #202019
 	epatch "${FILESDIR}"/${P}-noX-nopython-build.patch #202360
+	sed -i '3i#undef X_DISPLAY_MISSING' inc/config.h.in || die #205455
 }
 
 src_compile() {
diff --git a/media-gfx/fontforge/fontforge-20080109.ebuild b/media-gfx/fontforge/fontforge-20080109.ebuild
index 0a2dd8c4cd5c..8917d174318b 100644
--- a/media-gfx/fontforge/fontforge-20080109.ebuild
+++ b/media-gfx/fontforge/fontforge-20080109.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20080109.ebuild,v 1.2 2008/01/10 16:26:30 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20080109.ebuild,v 1.3 2008/02/05 21:37:31 vapier Exp $
 
 DESCRIPTION="postscript font editor and converter"
 HOMEPAGE="http://fontforge.sourceforge.net/"
@@ -24,6 +24,12 @@ RDEPEND="gif? ( >=media-libs/giflib-4.1.0-r1 )
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i '3i#undef X_DISPLAY_MISSING' inc/config.h.in || die #205455
+}
+
 src_compile() {
 	# no real way of disabling gettext/nls ...
 	use nls || export ac_cv_header_libintl_h=no
diff --git a/media-gfx/fontforge/fontforge-20080203.ebuild b/media-gfx/fontforge/fontforge-20080203.ebuild
index a7824a57d132..3d34193b16fc 100644
--- a/media-gfx/fontforge/fontforge-20080203.ebuild
+++ b/media-gfx/fontforge/fontforge-20080203.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20080203.ebuild,v 1.1 2008/02/04 17:34:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20080203.ebuild,v 1.2 2008/02/05 21:37:31 vapier Exp $
 
 DESCRIPTION="postscript font editor and converter"
 HOMEPAGE="http://fontforge.sourceforge.net/"
@@ -24,6 +24,12 @@ RDEPEND="gif? ( >=media-libs/giflib-4.1.0-r1 )
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i '3i#undef X_DISPLAY_MISSING' inc/config.h.in || die #205455
+}
+
 src_compile() {
 	# no real way of disabling gettext/nls ...
 	use nls || export ac_cv_header_libintl_h=no