fix building with USE=-X #82919 by Diego Pettenò

Package-Manager: portage-2.0.51-r15

5 files changed, 34 insertions, 9 deletions

diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index c2b71c822f1d..594090f66ec8 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,11 +1,12 @@
 MD5 b56d49149076eb48b6ca66006bff2a5d ChangeLog 3914
 MD5 6a421e15e38c966d3e142c490bc94d0e imlib2-1.1.2.ebuild 1025
 MD5 0c36280f1141c2ab86d0bd09ceec038a metadata.xml 2284
-MD5 87f85c639c66e3839839d872be7c6ece imlib2-1.2.0.20050220.ebuild 968
-MD5 1dc08c470d4cd11b838245387d7347ea imlib2-9999.ebuild 958
-MD5 ad8452c7c38c600fc1ebd408441aeb5c imlib2-1.2.0-r1.ebuild 1054
+MD5 73ef73519df68881d0f6c96a44b25fe7 imlib2-1.2.0.20050220.ebuild 1065
+MD5 9e7d1f8117dfb091a04c3f87815f14f6 imlib2-9999.ebuild 962
+MD5 640d3d64d2e3970bb786d9617e82492f imlib2-1.2.0-r1.ebuild 1058
 MD5 93919cf7ac5b3157f770bcc0bae3c904 files/digest-imlib2-1.2.0.20050220 74
 MD5 78f8f17705b3e58fd3f15a898dfa2e25 files/digest-imlib2-1.1.2 64
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-imlib2-9999 0
 MD5 00966d224a91444676648c49ecc1eaf4 files/digest-imlib2-1.2.0-r1 64
 MD5 e493696ea98688132769496642a1044c files/imlib2-1.2.0-loaders.patch 2613
+MD5 0263e17f00e6e19d606fe6c941114468 files/imlib2-1.2.0.20050220-no-x.patch 471
diff --git a/media-libs/imlib2/files/imlib2-1.2.0.20050220-no-x.patch b/media-libs/imlib2/files/imlib2-1.2.0.20050220-no-x.patch
new file mode 100644
index 000000000000..6e14892bcdea
--- /dev/null
+++ b/media-libs/imlib2/files/imlib2-1.2.0.20050220-no-x.patch
@@ -0,0 +1,18 @@
+Index: src/lib/image.h
+===================================================================
+RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/image.h,v
+retrieving revision 1.2
+diff -u -r1.2 image.h
+--- src/lib/image.h	16 Jan 2005 18:23:47 -0000	1.2
++++ src/lib/image.h	22 Feb 2005 23:52:42 -0000
+@@ -3,7 +3,9 @@
+ 
+ #include "common.h"
+ #ifdef BUILD_X11
+-#include <X11/Xlib.h>
++# include <X11/Xlib.h>
++#else
++# define X_DISPLAY_MISSING
+ #endif
+ 
+ #include <dlfcn.h>
diff --git a/media-libs/imlib2/imlib2-1.2.0-r1.ebuild b/media-libs/imlib2/imlib2-1.2.0-r1.ebuild
index 9b3f7fd9ee98..11d71e00bbbe 100644
--- a/media-libs/imlib2/imlib2-1.2.0-r1.ebuild
+++ b/media-libs/imlib2/imlib2-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.0-r1.ebuild,v 1.1 2005/02/21 05:49:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.0-r1.ebuild,v 1.2 2005/02/22 23:55:52 vapier Exp $
 
 EHACKAUTOGEN=yes
 inherit enlightenment
@@ -34,7 +34,7 @@ src_compile() {
 
 	export MY_ECONF="
 		${mymmx} \
-		$(use_with X x) \
+		$(use_enable X x11) \
 	"
 	enlightenment_src_compile
 }
diff --git a/media-libs/imlib2/imlib2-1.2.0.20050220.ebuild b/media-libs/imlib2/imlib2-1.2.0.20050220.ebuild
index 8e111c717bbe..8c1a1e18a014 100644
--- a/media-libs/imlib2/imlib2-1.2.0.20050220.ebuild
+++ b/media-libs/imlib2/imlib2-1.2.0.20050220.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.0.20050220.ebuild,v 1.1 2005/02/21 10:45:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.0.20050220.ebuild,v 1.2 2005/02/22 23:55:52 vapier Exp $
 
 EHACKAUTOGEN=yes
 inherit enlightenment
@@ -18,6 +18,12 @@ DEPEND="=media-libs/freetype-2*
 	tiff? ( >=media-libs/tiff-3.5.5 )
 	X? ( virtual/x11 )"
 
+src_unpack() {
+	enlightenment_src_unpack
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-no-x.patch
+}
+
 src_compile() {
 	local mymmx=""
 	if [ "${ARCH}" == "amd64" ] ; then
@@ -28,7 +34,7 @@ src_compile() {
 
 	export MY_ECONF="
 		${mymmx} \
-		$(use_with X x) \
+		$(use_enable X x11) \
 	"
 	enlightenment_src_compile
 }
diff --git a/media-libs/imlib2/imlib2-9999.ebuild b/media-libs/imlib2/imlib2-9999.ebuild
index 387b9960a87c..a9cb040b21b0 100644
--- a/media-libs/imlib2/imlib2-9999.ebuild
+++ b/media-libs/imlib2/imlib2-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v 1.3 2005/01/08 09:00:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v 1.4 2005/02/22 23:55:52 vapier Exp $
 
 EHACKAUTOGEN=yes
 inherit enlightenment
@@ -28,7 +28,7 @@ src_compile() {
 
 	export MY_ECONF="
 		${mymmx} \
-		$(use_with X x) \
+		$(use_enable X x11) \
 	"
 	enlightenment_src_compile
 }