Version bump and patch for modular X. Bug # 117459. Thanks Mike Auty.

(Portage version: 2.1_pre3-r1)

5 files changed, 21 insertions, 9 deletions

diff --git a/x11-wm/ion3/ChangeLog b/x11-wm/ion3/ChangeLog
index f10677167356..93e0d7395300 100644
--- a/x11-wm/ion3/ChangeLog
+++ b/x11-wm/ion3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/ion3
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.30 2006/01/15 17:33:07 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.31 2006/01/15 17:43:25 twp Exp $
+
+*ion3-20060107 (15 Jan 2006)
+
+  15 Jan 2006; Tom Payne <twp@gentoo.org> -ion3-20051029.ebuild,
+  +ion3-20060107.ebuild:
+  Version bump and patch for modular X. Bug # 117459. Thanks Mike Auty.
 
   15 Jan 2006; Tom Payne <twp@gentoo.org> -ion3-20050116.ebuild:
   Remove old version. ion3 is still under development and should not be marked
diff --git a/x11-wm/ion3/Manifest b/x11-wm/ion3/Manifest
index 52e14875d6d0..83e1a3cc57ed 100644
--- a/x11-wm/ion3/Manifest
+++ b/x11-wm/ion3/Manifest
@@ -1,9 +1,9 @@
 MD5 40e879676acfbe8cbb7e7688a71e2a54 ChangeLog 4336
-MD5 776df82659ec1f00d3e91d59968d7d01 files/digest-ion3-20051029 68
 MD5 89fe9e1eac7cb1a31e2c903f8f07bb87 files/digest-ion3-20051210 68
+MD5 5145eaa7f679d9475e8a54bb546ceaad files/digest-ion3-20060107 68
 MD5 b5d7e3f2f5b68f51a4bcde5048e1a76c files/ion3-20051029-statusd-locale.patch 684
 MD5 00450ed1292b72e2be71b9860c4db6ee files/ion3.desktop 217
 MD5 e5e408ab1f83116c2138a26b20c86653 files/pwm3.desktop 170
-MD5 671494f27e3af1f41523e37a2bb394f1 ion3-20051029.ebuild 1640
 MD5 e6d959b8365560aad227bc223f71bcd3 ion3-20051210.ebuild 1593
+MD5 e1a22b0a4a1bb61df2a6a59fedcf2ca8 ion3-20060107.ebuild 1690
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
diff --git a/x11-wm/ion3/files/digest-ion3-20051029 b/x11-wm/ion3/files/digest-ion3-20051029
deleted file mode 100644
index 08877a4ad31a..000000000000
--- a/x11-wm/ion3/files/digest-ion3-20051029
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b055eab63623443f6aa80a8274dc761b ion-3ds-20051029.tar.gz 590222
diff --git a/x11-wm/ion3/files/digest-ion3-20060107 b/x11-wm/ion3/files/digest-ion3-20060107
new file mode 100644
index 000000000000..b9a5054f9c82
--- /dev/null
+++ b/x11-wm/ion3/files/digest-ion3-20060107
@@ -0,0 +1 @@
+MD5 434b7b97acc8d77a93b65529fe118002 ion-3ds-20060107.tar.gz 597794
diff --git a/x11-wm/ion3/ion3-20051029.ebuild b/x11-wm/ion3/ion3-20060107.ebuild
index c76b61d85c87..6b86e7f18747 100644
--- a/x11-wm/ion3/ion3-20051029.ebuild
+++ b/x11-wm/ion3/ion3-20060107.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20051029.ebuild,v 1.2 2005/11/01 23:04:29 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20060107.ebuild,v 1.1 2006/01/15 17:43:25 twp Exp $
 
 inherit eutils
 
@@ -13,15 +13,21 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE="xinerama"
-DEPEND="virtual/x11
+DEPEND="
+	|| (
+		(
+			x11-libs/libICE
+			x11-libs/libXext
+			xinerama? ( x11-libs/libXinerama )
+		)
+		virtual/x11
+	)
 	app-misc/run-mailcap
 	>=dev-lang/lua-5.0.2"
 S=${WORKDIR}/${MY_PN}
 
 src_compile() {
 
-	epatch ${FILESDIR}/${P}-statusd-locale.patch
-
 	autoreconf -i
 
 	local myconf=""