Add modular X dependencies.

Package-Manager: portage-2.0.53

4 files changed, 22 insertions, 18 deletions

diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index 1b651f52a263..db3496e1cd27 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/imlib2
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.45 2005/10/13 00:10:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.46 2005/12/11 23:52:11 spyderous Exp $
+
+  11 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  imlib2-1.2.1.009.ebuild, imlib2-9999.ebuild:
+  Add modular X dependencies.
 
 *imlib2-1.2.1.009 (13 Oct 2005)
 
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 5ccc7b0accba..45b6bd59c07b 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8bfc160a6ce201f6eb68e372b61080cb ChangeLog 5197
+MD5 f80c2fc29cb3e3ad5d8711cd5b413b23 ChangeLog 5333
 MD5 00966d224a91444676648c49ecc1eaf4 files/digest-imlib2-1.2.0-r2 64
 MD5 02f3f24e289289de7198bafa30f934f3 files/digest-imlib2-1.2.1.006 68
 MD5 9af7d1931cb03eca6ab84c86fe856575 files/digest-imlib2-1.2.1.009 68
@@ -10,13 +7,6 @@ MD5 540efed058c6dccad80586ddd3af9604 files/imlib-1.2.0-bounds-check.patch 1076
 MD5 e493696ea98688132769496642a1044c files/imlib2-1.2.0-loaders.patch 2613
 MD5 009600ec0c993b107ca64c6da8822090 imlib2-1.2.0-r2.ebuild 1284
 MD5 a2f74872969140e87df62c826badda89 imlib2-1.2.1.006.ebuild 1220
-MD5 3bacf78c8e1ad74f01c664cc9af0f954 imlib2-1.2.1.009.ebuild 1220
-MD5 93ca856045f5f2a4e89c6c8b35198264 imlib2-9999.ebuild 1216
+MD5 e2c14f3440db60c1402ca95031684a3c imlib2-1.2.1.009.ebuild 1284
+MD5 9caf381b0f5d1bc6eb3b96c1024a15fa imlib2-9999.ebuild 1280
 MD5 0c36280f1141c2ab86d0bd09ceec038a metadata.xml 2284
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDTwUCgIKl8Uu19MoRAm0OAJ49aoqL40X8eoo2TaNlGU3owMHhugCdFH/R
-5T8cfJpA/HR2U3yot7HGJRY=
-=7hyM
------END PGP SIGNATURE-----
diff --git a/media-libs/imlib2/imlib2-1.2.1.009.ebuild b/media-libs/imlib2/imlib2-1.2.1.009.ebuild
index 80f64751cb89..96c2b4d39780 100644
--- a/media-libs/imlib2/imlib2-1.2.1.009.ebuild
+++ b/media-libs/imlib2/imlib2-1.2.1.009.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.1.009.ebuild,v 1.1 2005/10/13 00:10:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.1.009.ebuild,v 1.2 2005/12/11 23:52:11 spyderous Exp $
 
 inherit enlightenment toolchain-funcs
 
@@ -17,7 +17,12 @@ DEPEND="=media-libs/freetype-2*
 	png? ( >=media-libs/libpng-1.2.1 )
 	jpeg? ( media-libs/jpeg )
 	tiff? ( >=media-libs/tiff-3.5.5 )
-	X? ( virtual/x11 )
+	X? ( || ( ( x11-libs/libXext
+				x11-proto/xextproto
+			)
+			virtual/x11
+		)
+	)
 	mp3? ( media-libs/libid3tag )"
 
 src_compile() {
diff --git a/media-libs/imlib2/imlib2-9999.ebuild b/media-libs/imlib2/imlib2-9999.ebuild
index ad4bfc12a413..e15e37929c8e 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.13 2005/09/29 22:32:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v 1.14 2005/12/11 23:52:11 spyderous Exp $
 
 inherit enlightenment toolchain-funcs
 
@@ -17,7 +17,12 @@ DEPEND="=media-libs/freetype-2*
 	png? ( >=media-libs/libpng-1.2.1 )
 	jpeg? ( media-libs/jpeg )
 	tiff? ( >=media-libs/tiff-3.5.5 )
-	X? ( virtual/x11 )
+	X? ( || ( ( x11-libs/libXext
+				x11-proto/xextproto
+			)
+			virtual/x11
+		)
+	)
 	mp3? ( media-libs/libid3tag )"
 
 src_compile() {