Pass --without-x to avoid useless system -I/-L paths.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog
index 5985f399f4c74a7dd6730647c4587cc803887718..f64b061e9ec986520397ca46a189fe9991bf7ef4 100644 (file)
--- a/media-libs/gd/ChangeLog
+++ b/media-libs/gd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/gd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.78 2011/12/15 16:52:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.79 2011/12/15 17:08:03 vapier Exp $
+
+  15 Dec 2011; Mike Frysinger <vapier@gentoo.org> gd-2.0.35-r3.ebuild:
+  Pass --without-x to avoid useless system -I/-L paths.
 
   15 Dec 2011; Mike Frysinger <vapier@gentoo.org> gd-2.0.35-r3.ebuild,
   +files/gd-2.0.35-libpng-pkg-config.patch:

diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 6c554563af8a8e6f1a0dcd208cc8f009134eee60..d86aad8b22605334ecf0765dfd6f0fe5bada5a94 100644 (file)
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -6,13 +6,13 @@ AUX gd-2.0.35-libpng-pkg-config.patch 4240 RMD160 46c596c53cf4c1892c85dad591e349
 AUX gd-2.0.35-libpng14.patch 347 RMD160 2d845e72cfe88a0b32d61efc8377b0d5aa438709 SHA1 cba6b3a13c9d35bbe3446dcf7130250e1b3958fa SHA256 b9f5e121ae652e211c866e1982bc6c37303d43b2a3df420be7069ca5fbb04bc4
 AUX gd-2.0.35-maxcolors.patch 348 RMD160 14ef5425229c5406c90beb4a8fade801cd1013bb SHA1 1da2b14b84f2f44aeac04d16cd5fd07e6272966e SHA256 c5dbbc7c1acd9e602fea8bf893333ca6258e7801761b6c899c7da62cd88cbc3b
 DIST gd-2.0.35.tar.bz2 1212730 RMD160 f452a2c333b2ba9b7b4c143983ec2af18a335516 SHA1 ccf34a610abff2dbf133a20c4d2a4aa94939018a SHA256 bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9
-EBUILD gd-2.0.35-r3.ebuild 1801 RMD160 0327c6ca8845354cd854814ac09c72d53ab6d1f9 SHA1 e8438b4a68ae3d9989ad33a700cae12e8b2cd76f SHA256 2f91d40492d165c2417d9b005e7d880f885f9c4c61904f50a9693bc0be8a025d
-MISC ChangeLog 15851 RMD160 e16f9a0ddf87c45a8d3bc3fe552734952bc3a9e6 SHA1 d3cc7c22f05660ba9d47fa01ebe2efb0977846e4 SHA256 eca401938edce40bbd1183169dd10d4330269d6c2de231084f49a7c68ba224b8
+EBUILD gd-2.0.35-r3.ebuild 1978 RMD160 bc11d01b856f6118965be6034792d58410f2c1d9 SHA1 a7b884bf9f600128bb71e8ae6aa924c5c83a86c2 SHA256 0cdb5763c4dc3d30bb946ce7bd889f0d81025980939fdea79289d98a5c11de15
+MISC ChangeLog 15979 RMD160 1e29d1c79a23f0957105baa26b795a23fcfdbf2f SHA1 027fb519fc8c4ae634a97c34e3bc5b9470a1a60e SHA256 4ddf9dfc915d4eb4a8a2e71d42f3d333552f7ea0107d946bd6439474247edfd1
 MISC metadata.xml 1199 RMD160 d34c8a08b02ececd35c66c0c3594f326639ef8a5 SHA1 e52d9e8500558488eee80333fe2e112a23a519a5 SHA256 a670f3b0950512e392f25f290fc70b953c941cecdc6919cb38048bef2d46c843
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7qJdcACgkQaC/OocHi7JYWUgD/XYkUaeQcLqhc52288knz4RFe
-wdcmBXV902Mf70ArBiYA/jztu67kdCZy/jXRKGRMki58dGjRGXCEMRxKFD2AgrVB
-=Z8KQ
+iF4EAREIAAYFAk7qKXkACgkQaC/OocHi7JZYIQEAmTNTOdkRMk+yRi5wVW3aOZwZ
+MsqHsyQmuWpC7wdUYYgA/jZFvIlRII8FoFar2u8w2x22eUeHKFTcSbLSvT9VqBqX
+=GLl3
 -----END PGP SIGNATURE-----

diff --git a/media-libs/gd/gd-2.0.35-r3.ebuild b/media-libs/gd/gd-2.0.35-r3.ebuild
index bb3f9fb36eca9bc035e0218b54206930c7561b0a..fa2f41b59b663172547d3c4b29ec05809d54e56b 100644 (file)
--- a/media-libs/gd/gd-2.0.35-r3.ebuild
+++ b/media-libs/gd/gd-2.0.35-r3.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-libs/gd/gd-2.0.35-r3.ebuild,v 1.11 2011/12/15 16:52:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild,v 1.12 2011/12/15 17:08:03 vapier Exp $
 
 EAPI="2"
 
@@ -40,7 +40,11 @@ src_prepare() {
 
 src_configure() {
        export ac_cv_lib_z_deflate=$(usex zlib)
+       # we aren't actually {en,dis}abling X here ... the configure
+       # script uses it just to add explicit -I/-L paths which we
+       # don't care about on Gentoo systems.
        econf \
+               --without-x \
                $(use_enable static-libs static) \
                $(use_with fontconfig) \
                $(use_with png) \