Version bump.

Package-Manager: portage-2.1_pre5-r2

6 files changed, 42 insertions, 35 deletions

diff --git a/x11-wm/ion3/ChangeLog b/x11-wm/ion3/ChangeLog
index 10d838ef8364..b1fd96c8a923 100644
--- a/x11-wm/ion3/ChangeLog
+++ b/x11-wm/ion3/ChangeLog
@@ -1,6 +1,13 @@
 # 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.32 2006/02/23 20:35:47 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.33 2006/03/05 18:32:33 twp Exp $
+
+*ion3-20060305 (05 Mar 2006)
+
+  05 Mar 2006; Tom Payne <twp@gentoo.org>
+  -files/ion3-20051029-statusd-locale.patch, -ion3-20051210.ebuild,
+  +ion3-20060305.ebuild:
+  Version bump.
 
   23 Feb 2006; Markus Rothe <corsair@gentoo.org> ion3-20060107.ebuild:
   Added ~ppc64; bug #123845
diff --git a/x11-wm/ion3/Manifest b/x11-wm/ion3/Manifest
index 9d8ee6e50c29..193c12d0a6e6 100644
--- a/x11-wm/ion3/Manifest
+++ b/x11-wm/ion3/Manifest
@@ -1,9 +1,24 @@
-MD5 da6c68c1de8b92948201b15e9e0bce00 ChangeLog 4633
-MD5 89fe9e1eac7cb1a31e2c903f8f07bb87 files/digest-ion3-20051210 68
+MD5 09bffc71e42856517ffaf8d9c0554db5 ChangeLog 4811
+RMD160 a8cf5ff18a57b11b904c91c9e781de52ee338ecb ChangeLog 4811
+SHA256 6a9426f3e28398e45cff35f78172093e2c7e38034e723852c2907c588beb5660 ChangeLog 4811
 MD5 5145eaa7f679d9475e8a54bb546ceaad files/digest-ion3-20060107 68
-MD5 b5d7e3f2f5b68f51a4bcde5048e1a76c files/ion3-20051029-statusd-locale.patch 684
+RMD160 e44ca91ac009c39cbd0e925e64a0649777a9ce46 files/digest-ion3-20060107 68
+SHA256 5ad3ec799bb6983c4ee969db4d9bd74fe0a3a9775e07125b471272a0f405483a files/digest-ion3-20060107 68
+MD5 764299c135999d5a350831c69d4520d4 files/digest-ion3-20060305 250
+RMD160 3389ce92742818a91a3164fc2ee60fcf1fddd4b6 files/digest-ion3-20060305 250
+SHA256 8caabcf6d2560d47a391585597ef1ff7bf8518cdb458be2e88d4caf20d6d9021 files/digest-ion3-20060305 250
 MD5 00450ed1292b72e2be71b9860c4db6ee files/ion3.desktop 217
+RMD160 438917d6c0370e7a368598ea611ec7658312627d files/ion3.desktop 217
+SHA256 4742797e200b956abf3d0b94d860aa7430c9f67a97f3640ef2c28168fa773bb9 files/ion3.desktop 217
 MD5 e5e408ab1f83116c2138a26b20c86653 files/pwm3.desktop 170
-MD5 e6d959b8365560aad227bc223f71bcd3 ion3-20051210.ebuild 1593
+RMD160 7a33137ccf3857cacd7ff693df2e8952e16e3a84 files/pwm3.desktop 170
+SHA256 e068670634d31e58db4f54e703707f7908d30ced7f765e30ab590615b3d5dccd files/pwm3.desktop 170
 MD5 07338da2e4a5cfa405fde336fc19af4c ion3-20060107.ebuild 1701
+RMD160 0060a8b265a6d322613b477312816e143c809018 ion3-20060107.ebuild 1701
+SHA256 b2d19c67680d67e05547eb50b15543f8abb7914c2942b8e9557283e83cf072d6 ion3-20060107.ebuild 1701
+MD5 f1c24872e569d962f09eb1d704555e3a ion3-20060305.ebuild 1697
+RMD160 6a497732b75b5dee02e801816605cfecdf41645a ion3-20060305.ebuild 1697
+SHA256 a9d3c2f1ca87b782c61d140d418cc5163e6f493014e52002f1b63c5b83c9e8b0 ion3-20060305.ebuild 1697
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
+RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d metadata.xml 244
+SHA256 c7b6d3457d4746a2b281c4ac598bcf78b8e1553d8d63f2523b4cd0f4eaa422b1 metadata.xml 244
diff --git a/x11-wm/ion3/files/digest-ion3-20051210 b/x11-wm/ion3/files/digest-ion3-20051210
deleted file mode 100644
index c2aac3c41a52..000000000000
--- a/x11-wm/ion3/files/digest-ion3-20051210
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e6aeff49f559d48e8cedea354c77a347 ion-3ds-20051210.tar.gz 592804
diff --git a/x11-wm/ion3/files/digest-ion3-20060305 b/x11-wm/ion3/files/digest-ion3-20060305
new file mode 100644
index 000000000000..a73e528e3c21
--- /dev/null
+++ b/x11-wm/ion3/files/digest-ion3-20060305
@@ -0,0 +1,3 @@
+MD5 b2ab5225460a106dbe17a170219e594c ion-3ds-20060305.tar.gz 612653
+RMD160 f88b6777b4432850c65540ba896d36ef44a186d2 ion-3ds-20060305.tar.gz 612653
+SHA256 c06fe30f268d3c22dc82c3b06c0512c87e8b93b2dd7332f4d8f2fcbdac4378d7 ion-3ds-20060305.tar.gz 612653
diff --git a/x11-wm/ion3/files/ion3-20051029-statusd-locale.patch b/x11-wm/ion3/files/ion3-20051029-statusd-locale.patch
deleted file mode 100644
index 18ebf0cb9aa1..000000000000
--- a/x11-wm/ion3/files/ion3-20051029-statusd-locale.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur ion-3ds-20051029/mod_statusbar/ion-statusd/ion-statusd.c ion-3ds/mod_statusbar/ion-statusd/ion-statusd.c
---- ion-3ds-20051029/mod_statusbar/ion-statusd/ion-statusd.c	2005-10-29 14:33:05.000000000 +0200
-+++ ion-3ds/mod_statusbar/ion-statusd/ion-statusd.c	2005-11-01 23:42:53.000000000 +0100
-@@ -24,6 +24,10 @@
- #include <libmainloop/signal.h>
- #include <libmainloop/defer.h>
- 
-+#ifndef CF_NO_LOCALE
-+#include <locale.h>
-+#endif
-+
- #include "../../version.h"
- 
- 
-@@ -143,8 +147,10 @@
-     int opt;
-     bool quiet=FALSE;
- 
-+#ifndef CF_NO_LOCALE
-     if(setlocale(LC_ALL, "")==NULL)
-         warn("setlocale() call failed.");
-+#endif
- 
-     configtab=extl_table_none();
-     
diff --git a/x11-wm/ion3/ion3-20051210.ebuild b/x11-wm/ion3/ion3-20060305.ebuild
index aa6d0fabf6c7..ee2b59ca478d 100644
--- a/x11-wm/ion3/ion3-20051210.ebuild
+++ b/x11-wm/ion3/ion3-20060305.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-20051210.ebuild,v 1.1 2005/12/10 22:31:44 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20060305.ebuild,v 1.1 2006/03/05 18:32:33 twp Exp $
 
 inherit eutils
 
@@ -11,9 +11,17 @@ HOMEPAGE="http://www.iki.fi/tuomov/ion/"
 SRC_URI="http://modeemi.cs.tut.fi/~tuomov/ion/dl/${MY_PN}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~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}