Fix builds with USE=-X #517670 by Laurent Bachelier.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 56 insertions, 17 deletions

diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index 1c5e0e71cb5a..3a3d3efce1d2 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/imlib2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.132 2014/07/28 13:45:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.133 2014/07/29 03:29:37 vapier Exp $
+
+  29 Jul 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/imlib2-1.4.6-no-x.patch, imlib2-1.4.6-r2.ebuild:
+  Fix builds with USE=-X #517670 by Laurent Bachelier.
 
   28 Jul 2014; Agostino Sarubbo <ago@gentoo.org> imlib2-1.4.6-r2.ebuild:
   Stable for ppc, wrt bug #512012
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index f04507a330c6..52254666a422 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -3,29 +3,30 @@ Hash: SHA256
 
 AUX imlib2-1.4.5-giflib-5.patch 816 SHA256 975f15c8e4258957554e96e291935e155ddcfaa2a022b0c12fc2bd4f0c7a8c9c SHA512 bb5a611102c328dba28a9d526bb2ea463a33f72bbc318ffc0be3b41f041cf7214ce92421875e32e9edf84228a2b65332a5c3f2091fe3c7555413c13af1f5b42e WHIRLPOOL c1a83699507abd7da2bbec8e98fac4302fbeb8936c3375c6b24ca6e1f377dde43f35d7f1eb761aa5f1dce38a374a472b9a75a3b5c6508f736334e8cba49333b3
 AUX imlib2-1.4.5-no-my-libs.patch 735 SHA256 3a9ddedadfb65b05505a204b30de9d1143df008a6a9c58c05e6c69c9ec8dd52f SHA512 ec50a8303ac4ea6db2aed17fdc316753ed4ca8b25d249c154fe2b664da7665ff19c1dd410cf17c335a8c33330f4f8d93ce13d6aec6b422f944bbf526c8a3d27f WHIRLPOOL 77510648ef77003b34d559b696b52075a5acf505846841e2e28308ded78ae0f8981df155bbbc12ede7078788485dc52a10a6297a0b15c5f4a8f1867f06cee639
+AUX imlib2-1.4.6-no-x.patch 879 SHA256 546ea92a9ffada2e4ed9b711bda7822202622086d199fcb5e146836b331020e2 SHA512 885da8349d41d4c07f648d6d42c97d7b37b6a92a7bfc549c78435ddbde7c79611daa0e0ae51b7debe81f49a2fb646a8849ee4bb11ae7c427e27b171ac653605a WHIRLPOOL a1942017efd814edb29b8b6cce2a0b3a7ee78778b390de91fd58d601528f15e5ba2caca502fee625a17f40cbfcf757579a05c64222eced94824a784626b95811
 AUX imlib2-1.4.6-out-of-source-build.patch 818 SHA256 f00f7a6320fe3b44b9dea34dfe4a74968ac59477ba2a4797adcc767a64567402 SHA512 d75e4f7732d198f78d9cbbfb883a9b5e625831e69f71ddf2853ab826c1571d2f4994420fa3272b07133380f8bc99222b65dfd7c43845ecfc02ee1dd4bee33537 WHIRLPOOL 97bf67dabf889c4e0a1a41af075ee417b7b10f3e045bb8cddd9bf620f06282a1291074f6fbd62849e8c288cfd31840c349630be9263ecf9ffa73c47a0d2cdca5
 DIST imlib2-1.4.5.tar.gz 986785 SHA256 6e809413a571f82b9e67aeaf5577a1245a034c866ae5fa83c191a227f60cc7a0 SHA512 6c3bceec39ffcb7515925c3eb4199834295732a1cc9cfa307aa8610e2565e770edfc5464ca983d1d95570bd9bac09c989e0751fa39b07cf794c0c5dce4262edf WHIRLPOOL 53c003601ca6f89927794af0f0ba48f31cce31504061b71f68f0d67b0c4266d2617a24df467af2a03d485d129ad6de745382338addf39f70810ec71db6b0833c
 DIST imlib2-1.4.6.tar.gz 971792 SHA256 17cc128c0e61974d59c423b59d0fb5cb85c97169adf5b05184cc58f7c87b4f4e SHA512 8c49f2c9a4b997b536ab7553ffd80b764eccf95c6926a90c10390463e353df27c0e52345bdea9ac8fbefae3e29274022e6a8c0944f406a449293a06192a95fe5 WHIRLPOOL 98ff99fb216a867f60287b369a0b05bf5eea2da23ee8bec14f105f1805f12b035f3ff03ede0bc5909eec178b09e285b5bb0ab0c394487502aa893a94a34da90c
 EBUILD imlib2-1.4.5-r1.ebuild 1777 SHA256 0a31e394a6f507a23757023afc933894eab79cb20d6f5a96d5a988e086d04bb2 SHA512 f204428f402c698bc0cdca2985aa8746551faa3e880a938a754d38fa6ae03b4c24b819d59df3eda542d518dc1ef0b06f82543df224ec8387c7e450ab7eee1608 WHIRLPOOL edb8d980511245bfe35d5e1429bb00476ebd542b0746ac752a8c516a36505d9611ee4c21c8a3289f2ebdf1fafe6de4c8bc5bacdc98ee8b67b22c9669fdfd266b
 EBUILD imlib2-1.4.6-r1.ebuild 1774 SHA256 f27cedffadd9768c0b5ff4d1f8d5cb9653c1cd94fd380afaf940c233951f7479 SHA512 c4b133b05da40487a326f21456bf47ef83c25b108fd068556ed4144aecf2e0fec91ca2da5f6d30568c5d7611447b371aad3e4cba488bb4c89a0d0ab8f2094ac1 WHIRLPOOL 8a2aa70271484a4024fa64f3b1849a5ed9717254da1f58c92052b9a10f112b68e5a28e652059d5d58ae4260537a82cf60ffb7cdc5b0f18da1d0a5f74de236854
-EBUILD imlib2-1.4.6-r2.ebuild 2523 SHA256 5aaaff5c708dea902e649f87e520f372f9464ec6f5f94a763bf8c63699a7ce58 SHA512 dd80cd852750c56a018d3d6ea44d2620cd4ddf36646db9b47428267c5e9ca823d4bbb23763465db5ee50cc75e3e6bfd8429b1676f28e6163375900bec56133f9 WHIRLPOOL bd5bc529b1f5e78129d071fd6c2798da2822a74bffd1e3e26dd2981ab20d0a6fcdeaabd018cf75aebd5204358a7242f955548d49f5ecfb077d9f1a70ba352dc8
+EBUILD imlib2-1.4.6-r2.ebuild 2564 SHA256 12cdf538893da62f79fb82b533c5e3d4b6bff4e9dee75107b60ee9cb2a3737b3 SHA512 152e4dcbb5e7d7885b88505527eba60199c200b9da4d8c8e2228bb6126b850efc466fac98a845f2d45e439be2cefa2ea69a217751df3c20585ca687bbd6fcaa0 WHIRLPOOL cfc3919de7dfd40fdb33c5622b0185f9fd6c7bb2d21b1394c51ac637eb8bd3e8aaa8c56abfcbdb682e2dd893af7ef933bfed34b39220544f0d672b82c1631616
 EBUILD imlib2-9999.ebuild 1951 SHA256 da015b2e8a4bfcc1632743c3224de4ebbf776bb1c201efe4f5004f1eebee3faf SHA512 f10b6ba36f0d4a53cf4030b565acf58f9f23295d9505813cb99fd6364896e95b9a67b701513f8967b7476f088310b7bed164dd2301d0a31e21254d1d49d521ef WHIRLPOOL 3ed8a647aadbf359b7b90da573e840631dff860148f8ad17b491597065056dd6335f94075f76a953b0fbb8bf734f70ebfd7f3f206ce537d33d7f0f150f7ba577
-MISC ChangeLog 16511 SHA256 d101dd6ec32a51294bbe8fcb698df6c7ddfb01d04fe4fafed9a5eb6f3f90cdd8 SHA512 16c10233cfacc3d2bc2d3984d97b1973ac15271f6efaae9bbcc5af8e906aced3eb486cfa77ceaf7b495741cac77e14a7f18ac6b25b45f85065edd14f4e3c3275 WHIRLPOOL 9cf1bd176036d6571b3c71e359543e33cf5ef212a707207c31e7861bdd6d5da824d395f86dce6d069b3b0136202ce60f4942dd81c3e8fea1e12272b4532dcc4b
+MISC ChangeLog 16678 SHA256 7b0ecb3f15ab7979eab6bdfebe0d60a371a7f41c66ae665de0d7757fb36c640a SHA512 bd2145dccbcc13f7e89e59a7d53cdb0c47650ff515bb0c3803dcd157f073ab26bf0dba706d7406eaf254f363c978e116077e5d54ecb2dce5ae8b88d9ad41e3fc WHIRLPOOL 52d82ca4974bd5bb21d210a7057bf183457f17fd0f92a327cf26e222678a5d94b49ff5a87fbc86a4bcccbd028449c3a573dff7470221a3435ed73d46dffb7c22
 MISC metadata.xml 2200 SHA256 343b4e61546c7f2a89249bd63c4018975cbc53bd8622d641d27dc05f8aa5235a SHA512 1993bd9088534da0122db66e83017259423f79f4dd9de442f4f4dec6fe4398979813ae83f0a7640630da1f6fcf2b8ab59d64ed5cba09144cd243f232618501f1 WHIRLPOOL bbd8aafa47c63e0b32b888e89a62d321591a2c43ea0b3d816206c62f2a0381de89c554a84479727a281957c8b707175c8b125c47135ccf17d707928cadc51ff8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT1lP6AAoJELp701BxlEWfdPIP/iaPFmUnDXq/0DSCL2Mb2BOH
-1nlAP2ALGrGFLKi2/oboZ62wKIfepI9GlCY/YHKSkapkspi+U9/5iaHus9i0keTo
-YM/kHIlHPtxoaxbVU0+/L/qPdyD5MNedkKpkpxCNg8PA7DnPmk8/OeeFEmI0pGQv
-H7De0dvNYtdsSh/wbVA+cQUaXmoPzaexjvFnYpp2RBpPThNmx/2p3iaYCviJ+fYj
-E1uGeZOAbacSyQVAtlIWkkmzH11yUe3ayEim9NGpQI947x1j6sQnd5Ju+kmFFTNO
-3RLJoX4fQFig1sdYsiL9sp9QBdEnAXqKFxama7nkNlqzqgdAb7bHmTN4hdJnyb/x
-SLGOdGo62x7xGW0VoYA4ij7M8qtVgnsUPx1ST7S4FY64jVuMhGQHTHVD/XPkD1i0
-XQt9IAKb90N8e+8vMoDyVNitTSQrLYwB+0Q4VzkiAfHYNSBD1nQEKzu2lxCeN6Bn
-4KUhztAyy0keMTmDHg5nC+YD/pcrqp3LpAk4UnQJc/ySHiqS/c/LnrGRqXrCFqiT
-4nNiNiVZxGFPj6K2Pb8NIg+MyEoEGWFmGnsa4N1/9/bazU0qZ0Y1jG94zeBCcdU+
-9tCn9ogLwD6T0I4c7Z3vpV5dMZmKlF+kVy/3v/xM30+xyU07isZ3bz7qCw7n2jR8
-2Yybr0s4Y0heqaR0xHnU
-=fekv
+iQIcBAEBCAAGBQJT1xUpAAoJEPGu1DbS6WIAcZEP/3vGPKcg/83Tyb19++QVFZvu
+LE+s146HunRu6N+bBkLcVPs/ri+41bKvTU3HXrKLmDV8jntQJnEIcBSuYter3ano
+XYkVhfOnDGQYZrmy2JEu5Diw/WVH+zjX1QjLvTmSpaPjASSvTYFFQvqVQwjel8Er
+OqUL2Qmb93Y/KQUspvTdJ2Oklyb7/maTdY5t5SIITuogCivRtjkXaMdV9DF5iO2u
+rEiqzI4t4lRfAtkJ5EiAPSOeX6mlsjBQASMjdxAxQlGfYa8rwSr8qYtajw4CL3Sc
+OzRkFFYHZehQGZNXrVEIPEIQL3tMIfd7GcuoqEoKiwDqkrcc9/pc4g1o1rvr+j1A
+g27YFYBtQxeYs5n+lY7yo4cdYEvMWzYDol59CAz255ek71AgW+73WA9nvKgDhyKo
+0JNx5QoC9+QQkKi6xuwfqF7t5TT9pJ4mQ7bpJ0MFdgbxiNHmVTEbg8KL/q+msoUN
+o1Ibut80Skg8Yxh3RkiTxEqJucXi54AaaInzUZkycoLno53OJmKuMqXZGQ4wUlX6
+Su1jFIchFza/srx/tTGZ/x6oYIkHDu6p99RMiHlXlFgPONJ6hlBIDyAxuVLMlK7R
+5RxfOigvQQKm2ArS67AQnNmo3OQvd/rP624so5CW2z4vQgNBi6Zw7WO+paR/O3Ja
+TB43o07Px164JTtZOie7
+=WxwH
 -----END PGP SIGNATURE-----
diff --git a/media-libs/imlib2/files/imlib2-1.4.6-no-x.patch b/media-libs/imlib2/files/imlib2-1.4.6-no-x.patch
new file mode 100644
index 000000000000..b3ce989b9c3e
--- /dev/null
+++ b/media-libs/imlib2/files/imlib2-1.4.6-no-x.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/517670
+
+already in upstream
+
+From 3e6ca0b48d2b07980c310935ad1a8dde209efed5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 28 Jul 2014 23:01:23 -0400
+Subject: [PATCH] do not link with X libs when X is disabled
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ src/lib/Makefile.am | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
+index b03f753..93c708f 100644
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -84,7 +84,10 @@ AMD64_OBJS = $(AMD64_SRCS:.S=.lo)
+ 
+ EXTRA_DIST = $(MMX_SRCS) $(AMD64_SRCS) asm_loadimmq.S
+ 
+-MY_LIBS = -lXext -lX11 $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm
++MY_LIBS = $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm
++if BUILD_X11
++MY_LIBS += -lXext -lX11
++endif
+ 
+ if BUILD_MMX
+ libImlib2_la_LIBADD       = $(MMX_OBJS) $(MY_LIBS)
+-- 
+2.0.0
+
diff --git a/media-libs/imlib2/imlib2-1.4.6-r2.ebuild b/media-libs/imlib2/imlib2-1.4.6-r2.ebuild
index f6328ecdb095..38b0118321a2 100644
--- a/media-libs/imlib2/imlib2-1.4.6-r2.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r2.ebuild,v 1.11 2014/07/28 13:45:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r2.ebuild,v 1.12 2014/07/29 03:29:37 vapier Exp $
 
 # NOTE!!!: to avoid masking of -9999 the
 # package.mask entry for multilib version
@@ -49,6 +49,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.4.5-no-my-libs.patch #497894
 	epatch "${FILESDIR}"/${PN}-1.4.5-giflib-5.patch #457634
 	epatch "${FILESDIR}"/${P}-out-of-source-build.patch #510522
+	epatch "${FILESDIR}"/${P}-no-x.patch
 
 	eautomake
 }