final stable version. supersedes all previous versions

svn path=/; revision=15

18 files changed, 30 insertions, 448 deletions

diff --git a/x11-wm/ion3/Manifest b/x11-wm/ion3/Manifest
index 3c15c92..9754acb 100644
--- a/x11-wm/ion3/Manifest
+++ b/x11-wm/ion3/Manifest
@@ -1,90 +1,16 @@
-AUX 20070902/201_all_fix-paths.patch 2197 RMD160 0b8e10fec59bc47421e1a03c912c94cde4442282 SHA1 77f8b846aec55e48fbffb71306458c75baf806a5 SHA256 b22f7202f51ff7a5a775ed6cfa2cced23716a9ec5bad29538eab6632748802b6
-MD5 b6a97e57804b8c383f41ef27662d4cdb files/20070902/201_all_fix-paths.patch 2197
-RMD160 0b8e10fec59bc47421e1a03c912c94cde4442282 files/20070902/201_all_fix-paths.patch 2197
-SHA256 b22f7202f51ff7a5a775ed6cfa2cced23716a9ec5bad29538eab6632748802b6 files/20070902/201_all_fix-paths.patch 2197
-AUX 20070902/202_all_fix-menus.patch 990 RMD160 a49c2e8c44c4c7ddceae989a0637cb4ca51647f4 SHA1 ef72a6d5b100c8148d96f6718bc95a456a3b51eb SHA256 2f9404a884e28f9d7ff42ba6ae24df99436b7a9f3c75560282fb87daa9fdf9af
-MD5 aecae9e8f4e48e9b74532a3309643598 files/20070902/202_all_fix-menus.patch 990
-RMD160 a49c2e8c44c4c7ddceae989a0637cb4ca51647f4 files/20070902/202_all_fix-menus.patch 990
-SHA256 2f9404a884e28f9d7ff42ba6ae24df99436b7a9f3c75560282fb87daa9fdf9af files/20070902/202_all_fix-menus.patch 990
-AUX 20070902/205_all_ion-lock.patch 780 RMD160 9834836d55fb390f06d8e3c1ea821ef01c1a74b8 SHA1 6bd0278dd7d56fd9f1025fae8a00db24bf0e781f SHA256 ea4ad810355fab8a848e6506a6a2762b5ab9c37f28a7edac73030e6026bc3fae
-MD5 4f2dcedcbf6d885723d1b888f0aacb87 files/20070902/205_all_ion-lock.patch 780
-RMD160 9834836d55fb390f06d8e3c1ea821ef01c1a74b8 files/20070902/205_all_ion-lock.patch 780
-SHA256 ea4ad810355fab8a848e6506a6a2762b5ab9c37f28a7edac73030e6026bc3fae files/20070902/205_all_ion-lock.patch 780
-AUX 20070902/208_all_as-needed.patch 350 RMD160 d4a5d21442b8cdb618e116dd542389b2c6a0d442 SHA1 2a59201ad480f35e7553c4bd470c696fc5dc0436 SHA256 0bedd444e6384f35f6b37c4ec2848150f25ae1d1b93fe5062934887786cba893
-MD5 477892385b4dd0708761fe54886459d7 files/20070902/208_all_as-needed.patch 350
-RMD160 d4a5d21442b8cdb618e116dd542389b2c6a0d442 files/20070902/208_all_as-needed.patch 350
-SHA256 0bedd444e6384f35f6b37c4ec2848150f25ae1d1b93fe5062934887786cba893 files/20070902/208_all_as-needed.patch 350
-AUX 20071109/201_all_fix-paths.patch 2197 RMD160 0b8e10fec59bc47421e1a03c912c94cde4442282 SHA1 77f8b846aec55e48fbffb71306458c75baf806a5 SHA256 b22f7202f51ff7a5a775ed6cfa2cced23716a9ec5bad29538eab6632748802b6
-MD5 b6a97e57804b8c383f41ef27662d4cdb files/20071109/201_all_fix-paths.patch 2197
-RMD160 0b8e10fec59bc47421e1a03c912c94cde4442282 files/20071109/201_all_fix-paths.patch 2197
-SHA256 b22f7202f51ff7a5a775ed6cfa2cced23716a9ec5bad29538eab6632748802b6 files/20071109/201_all_fix-paths.patch 2197
-AUX 20071109/202_all_fix-menus.patch 990 RMD160 a49c2e8c44c4c7ddceae989a0637cb4ca51647f4 SHA1 ef72a6d5b100c8148d96f6718bc95a456a3b51eb SHA256 2f9404a884e28f9d7ff42ba6ae24df99436b7a9f3c75560282fb87daa9fdf9af
-MD5 aecae9e8f4e48e9b74532a3309643598 files/20071109/202_all_fix-menus.patch 990
-RMD160 a49c2e8c44c4c7ddceae989a0637cb4ca51647f4 files/20071109/202_all_fix-menus.patch 990
-SHA256 2f9404a884e28f9d7ff42ba6ae24df99436b7a9f3c75560282fb87daa9fdf9af files/20071109/202_all_fix-menus.patch 990
-AUX 20071109/205_all_ion-lock.patch 780 RMD160 9834836d55fb390f06d8e3c1ea821ef01c1a74b8 SHA1 6bd0278dd7d56fd9f1025fae8a00db24bf0e781f SHA256 ea4ad810355fab8a848e6506a6a2762b5ab9c37f28a7edac73030e6026bc3fae
-MD5 4f2dcedcbf6d885723d1b888f0aacb87 files/20071109/205_all_ion-lock.patch 780
-RMD160 9834836d55fb390f06d8e3c1ea821ef01c1a74b8 files/20071109/205_all_ion-lock.patch 780
-SHA256 ea4ad810355fab8a848e6506a6a2762b5ab9c37f28a7edac73030e6026bc3fae files/20071109/205_all_ion-lock.patch 780
-AUX 20071109/208_all_as-needed.patch 350 RMD160 d4a5d21442b8cdb618e116dd542389b2c6a0d442 SHA1 2a59201ad480f35e7553c4bd470c696fc5dc0436 SHA256 0bedd444e6384f35f6b37c4ec2848150f25ae1d1b93fe5062934887786cba893
-MD5 477892385b4dd0708761fe54886459d7 files/20071109/208_all_as-needed.patch 350
-RMD160 d4a5d21442b8cdb618e116dd542389b2c6a0d442 files/20071109/208_all_as-needed.patch 350
-SHA256 0bedd444e6384f35f6b37c4ec2848150f25ae1d1b93fe5062934887786cba893 files/20071109/208_all_as-needed.patch 350
+AUX 20080207/201_all_fix-paths.patch 2420 RMD160 5ebf918ad8b77b75db17d56a95fc99341dc67d51 SHA1 9bea00a904963d6da57805623d495547a6681735 SHA256 35c7746dd6b6bc4553f9ec9ad1609b82153e7bab002b734d8d1db38ae86e9dc6
+AUX 20080207/202_all_fix-menus.patch 990 RMD160 a49c2e8c44c4c7ddceae989a0637cb4ca51647f4 SHA1 ef72a6d5b100c8148d96f6718bc95a456a3b51eb SHA256 2f9404a884e28f9d7ff42ba6ae24df99436b7a9f3c75560282fb87daa9fdf9af
+AUX 20080207/205_all_ion-lock.patch 780 RMD160 9834836d55fb390f06d8e3c1ea821ef01c1a74b8 SHA1 6bd0278dd7d56fd9f1025fae8a00db24bf0e781f SHA256 ea4ad810355fab8a848e6506a6a2762b5ab9c37f28a7edac73030e6026bc3fae
+AUX 20080207/208_all_as-needed.patch 350 RMD160 d4a5d21442b8cdb618e116dd542389b2c6a0d442 SHA1 2a59201ad480f35e7553c4bd470c696fc5dc0436 SHA256 0bedd444e6384f35f6b37c4ec2848150f25ae1d1b93fe5062934887786cba893
 AUX ion3-mod-ionflux-20070512.tar.bz2 12770 RMD160 8e834de0c3048b676bc5c5d5454aedac09129eb3 SHA1 d482654557104adfbf6d184e44f87a993577720a SHA256 63c4902159923aa02921e39aa7746ca8819ba1c216efa8fa6384fd093f60d18c
-MD5 c8c2d7b039f751db017275f5f977702e files/ion3-mod-ionflux-20070512.tar.bz2 12770
-RMD160 8e834de0c3048b676bc5c5d5454aedac09129eb3 files/ion3-mod-ionflux-20070512.tar.bz2 12770
-SHA256 63c4902159923aa02921e39aa7746ca8819ba1c216efa8fa6384fd093f60d18c files/ion3-mod-ionflux-20070512.tar.bz2 12770
 AUX ion3-mod-xrandr-20070410.tar.bz2 10833 RMD160 8542c0dfebfd1536e6a1ad89a3b791609ca8f16e SHA1 a1ef665e0914154bf89f8b5fc8f282695438f06f SHA256 80f23a435b21f8691fc63b78394fa29b25b5304f46895dd961ac905bcc76c82f
-MD5 dcb17665b215d0891be40392f57197c1 files/ion3-mod-xrandr-20070410.tar.bz2 10833
-RMD160 8542c0dfebfd1536e6a1ad89a3b791609ca8f16e files/ion3-mod-xrandr-20070410.tar.bz2 10833
-SHA256 80f23a435b21f8691fc63b78394fa29b25b5304f46895dd961ac905bcc76c82f files/ion3-mod-xrandr-20070410.tar.bz2 10833
-AUX ion3-scripts-20070902.tar.bz2 103961 RMD160 8a58bc09d81f13dd8b2df27662907ec793bccedf SHA1 bf61ce4f6c3e3634411fca4e09cabd73f051c975 SHA256 b8c1fc03257c2f347f186e33dea19d2a294e41560e703b63d8fe68db93ef5cac
-MD5 89855df8c92334f75dc7926c31e1db29 files/ion3-scripts-20070902.tar.bz2 103961
-RMD160 8a58bc09d81f13dd8b2df27662907ec793bccedf files/ion3-scripts-20070902.tar.bz2 103961
-SHA256 b8c1fc03257c2f347f186e33dea19d2a294e41560e703b63d8fe68db93ef5cac files/ion3-scripts-20070902.tar.bz2 103961
-AUX ion3-scripts-20071117.tar.bz2 104141 RMD160 5a55a95c2d1157f0bf8f47d9e06780c6e2f93653 SHA1 938b58b115f57ea27e4f4b01a39204ecc4aebea0 SHA256 a557b46feea45361c19da1077effc34bdc930c1ef3d555136c51f8fa0e0d26df
-MD5 0a441d466f2b8e6bb3d17c981efdb74a files/ion3-scripts-20071117.tar.bz2 104141
-RMD160 5a55a95c2d1157f0bf8f47d9e06780c6e2f93653 files/ion3-scripts-20071117.tar.bz2 104141
-SHA256 a557b46feea45361c19da1077effc34bdc930c1ef3d555136c51f8fa0e0d26df files/ion3-scripts-20071117.tar.bz2 104141
+AUX ion3-scripts-20080130.tar.bz2 106181 RMD160 43d538504b5f51b12e3e77f1c1a4fa9dd683cc60 SHA1 7830718336303552bb0dad5ce2e1bdc54a1e526b SHA256 d668ae2543c2ee9cdf5206a4a81278707899abe313d774bab845f92b94ad0437
 AUX ion3.desktop 217 RMD160 438917d6c0370e7a368598ea611ec7658312627d SHA1 cf5cd1f09faf7530f8cb2f832a17c0cf893541c4 SHA256 4742797e200b956abf3d0b94d860aa7430c9f67a97f3640ef2c28168fa773bb9
-MD5 00450ed1292b72e2be71b9860c4db6ee files/ion3.desktop 217
-RMD160 438917d6c0370e7a368598ea611ec7658312627d files/ion3.desktop 217
-SHA256 4742797e200b956abf3d0b94d860aa7430c9f67a97f3640ef2c28168fa773bb9 files/ion3.desktop 217
 AUX pwm3.desktop 170 RMD160 7a33137ccf3857cacd7ff693df2e8952e16e3a84 SHA1 7ff6792b6e61a9a2fbb4f0fa7e3d9dbf856c8d28 SHA256 e068670634d31e58db4f54e703707f7908d30ced7f765e30ab590615b3d5dccd
-MD5 e5e408ab1f83116c2138a26b20c86653 files/pwm3.desktop 170
-RMD160 7a33137ccf3857cacd7ff693df2e8952e16e3a84 files/pwm3.desktop 170
-SHA256 e068670634d31e58db4f54e703707f7908d30ced7f765e30ab590615b3d5dccd files/pwm3.desktop 170
 AUX xft-ion3-20070902.patch 18375 RMD160 2510ae25502346f0347eafce8a313aac4db2a36c SHA1 ae75b297d6cf8c3f5dfd3793c22d754369f982bb SHA256 1db26c1db08b9a87530ef29ad2538cf191bc5d08630cc776f1dbd61940eff21f
-MD5 68f3da20b45ec583347b5325d9062e19 files/xft-ion3-20070902.patch 18375
-RMD160 2510ae25502346f0347eafce8a313aac4db2a36c files/xft-ion3-20070902.patch 18375
-SHA256 1db26c1db08b9a87530ef29ad2538cf191bc5d08630cc776f1dbd61940eff21f files/xft-ion3-20070902.patch 18375
 AUX xft-ion3-20071109.patch 18375 RMD160 2510ae25502346f0347eafce8a313aac4db2a36c SHA1 ae75b297d6cf8c3f5dfd3793c22d754369f982bb SHA256 1db26c1db08b9a87530ef29ad2538cf191bc5d08630cc776f1dbd61940eff21f
-MD5 68f3da20b45ec583347b5325d9062e19 files/xft-ion3-20071109.patch 18375
-RMD160 2510ae25502346f0347eafce8a313aac4db2a36c files/xft-ion3-20071109.patch 18375
-SHA256 1db26c1db08b9a87530ef29ad2538cf191bc5d08630cc776f1dbd61940eff21f files/xft-ion3-20071109.patch 18375
-DIST ion-3rc-20070902.tar.gz 655566 RMD160 abca8f424869cc78d8880c869981c796c8e7dd83 SHA1 24762d3677cc64754b4649d24c8fb17aa78156d2 SHA256 b42321986a84e16f95ad2e3d955749e0c3edaca0e7d202230c90fcdf5f064a18
-DIST ion-3rc-20071109.tar.gz 646945 RMD160 b89b725ec1f508161e30126c26f8494bd7ccfd28 SHA1 709d99b524e25fc190038959191dbaeb306a9a2d SHA256 fdfb2fe6faa571942ec89b00ef64f88a4f48965ea20abc72cb7d5ad7b3ef6697
-DIST ion-doc-3rc-20070902.tar.gz 670268 RMD160 9d561a72cfcdeab5f4e4af42cb8b5f7e233a8f05 SHA1 046cc879e7d17ec5893785eb06f618a8f26c5092 SHA256 a5f12b469c013c77dcc3c0a9d56f02009f974cb6f9b3b15bdda2b826145ed585
-DIST ion-doc-3rc-20071109.tar.gz 670886 RMD160 3c30de69762d6567a322e46b7be348388e857e72 SHA1 14543a4901ba0113a9c9b92aee576dca93adf85a SHA256 0f4e2cfe529b371845ed7f72fba18a173f0610ba0e14f389eed40bf05db70c65
-EBUILD ion3-20070902.ebuild 5446 RMD160 4ccd24893ff1efb89b7cb702861a9ca9128def3a SHA1 4de829a55b09c2d281081294b93a0372d29ec512 SHA256 18bac5e9e2ffab81b570a05770a073b2d9197f236238bb3e83fc8adb46831466
-MD5 f946b3f4bfeb6283ed4dff1247d27e01 ion3-20070902.ebuild 5446
-RMD160 4ccd24893ff1efb89b7cb702861a9ca9128def3a ion3-20070902.ebuild 5446
-SHA256 18bac5e9e2ffab81b570a05770a073b2d9197f236238bb3e83fc8adb46831466 ion3-20070902.ebuild 5446
-EBUILD ion3-20071109.ebuild 5446 RMD160 de69a87a4e83a84b6ff22cd4607e9acb99e5ae58 SHA1 f96180780c2b1deeb9da4c781fc21516ad07e419 SHA256 4aef433e309601d0ef5cb1674e6fd05b8c984f583f329cbddcefd69815692e61
-MD5 efd2e2ffedd7f210157544b3a4e9b514 ion3-20071109.ebuild 5446
-RMD160 de69a87a4e83a84b6ff22cd4607e9acb99e5ae58 ion3-20071109.ebuild 5446
-SHA256 4aef433e309601d0ef5cb1674e6fd05b8c984f583f329cbddcefd69815692e61 ion3-20071109.ebuild 5446
+DIST ion-3-20080207.tar.gz 653316 RMD160 124d95921f2366586cd9d23f3f244f25b3ad24a9 SHA1 6f999a8f6744bd7992aea7d253f1641f05439854 SHA256 8e2cfe11ac762290eb6dfdaa0c91947f5f5ee15a8860caf3769f525087a1846f
+DIST ion-doc-3-20080207.tar.gz 937819 RMD160 3f707b477f196d05cc1d6c74bcc9f3e906ed579c SHA1 a242b6850566ac5a36775197979af8bb8ce6e457 SHA256 66dc41e686899bb37462c981b3adc4dccd40e61d5771d476466f228bcbca47ac
+EBUILD ion3-20080207.ebuild 5409 RMD160 c836ff87b000fdccbda5512f1a21b10480a3c781 SHA1 a5d359039ab61e4f1b33ae1c60718174896d6507 SHA256 45c80ba4d82c76f94b813be225459f73e7e6a038d4afd0a56460600ef2316f53
 MISC ChangeLog 11928 RMD160 ab339523290a2dc564782f7df2f9baf81e88454d SHA1 7fd9a54a56f8406ce8f160350831f6275da6f7bd SHA256 bf50042f386f5b758134ac40f1c9521cd0b24f2864caf21026f0ff65c0070786
-MD5 5790bd7f85710b2efb267b6aece7b9de ChangeLog 11928
-RMD160 ab339523290a2dc564782f7df2f9baf81e88454d ChangeLog 11928
-SHA256 bf50042f386f5b758134ac40f1c9521cd0b24f2864caf21026f0ff65c0070786 ChangeLog 11928
 MISC metadata.xml 248 RMD160 7e7a4fe276728c6c4d6d0face7f0708dae9776d7 SHA1 b16dc683091d4a7cee7f9b8a6d6034a257df80b0 SHA256 3f6027d293a7bd953fd444ba8a1345ca6b9c00c28b35e8328386b9635d8eb71f
-MD5 c4aada614ade13541606f0901dffd61f metadata.xml 248
-RMD160 7e7a4fe276728c6c4d6d0face7f0708dae9776d7 metadata.xml 248
-SHA256 3f6027d293a7bd953fd444ba8a1345ca6b9c00c28b35e8328386b9635d8eb71f metadata.xml 248
-MD5 4773fc3748eefe0a68234b715dea1b78 files/digest-ion3-20070902 512
-RMD160 09ea1732091be54936155c6704ee394748fea406 files/digest-ion3-20070902 512
-SHA256 5b3c0bc831a227e98d05cf05a137af586d38a245f38a65b7e04963afccd83734 files/digest-ion3-20070902 512
-MD5 e9a49921125cde7a43587829cb508f16 files/digest-ion3-20071109 512
-RMD160 6214778a264d4790aeed9f45cad182164e45fe1b files/digest-ion3-20071109 512
-SHA256 c3dc43e187530380a586ac0953e1f38ce4d67f9225eb42510a4e65136529b2b8 files/digest-ion3-20071109 512
diff --git a/x11-wm/ion3/files/20071109/201_all_fix-paths.patch b/x11-wm/ion3/files/20071109/201_all_fix-paths.patch
deleted file mode 100644
index cb27bfc..0000000
--- a/x11-wm/ion3/files/20071109/201_all_fix-paths.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- ion-3rc-20070708.orig/system.mk	2007-07-14 12:40:45.000000000 +0200
-+++ ion-3rc-20070708/system.mk	2007-07-14 15:54:39.000000000 +0200
-@@ -7,7 +7,7 @@
- ## Installation paths
- ##
- 
--PREFIX=/usr/local
-+PREFIX=/usr
- 
- # Unless you are creating a package conforming to some OS's standards, you
- # probably do not want to modify the following directories:
-@@ -15,7 +15,7 @@
- # Main binaries
- BINDIR=$(PREFIX)/bin
- # Configuration .lua files
--ETCDIR=$(PREFIX)/etc/ion3
-+ETCDIR=/etc/X11/ion3
- # Some .lua files and ion-* shell scripts
- SHAREDIR=$(PREFIX)/share/ion3
- # Manual pages
-@@ -56,18 +56,18 @@
- 
- # If you have installed Lua 5.1 from the official tarball without changing
- # paths, this should do it.
--LUA_DIR=/usr/local
--LUA_LIBS = -L$(LUA_DIR)/lib -llua
--LUA_INCLUDES = -I$(LUA_DIR)/include
--LUA=$(LUA_DIR)/bin/lua
--LUAC=$(LUA_DIR)/bin/luac
-+#LUA_DIR=/usr/local
-+#LUA_LIBS = -L$(LUA_DIR)/lib -llua
-+#LUA_INCLUDES = -I$(LUA_DIR)/include
-+#LUA=$(LUA_DIR)/bin/lua
-+#LUAC=$(LUA_DIR)/bin/luac
- 
- # If you are using the Debian packages, the following settings should be
- # what you want.
--#LUA_LIBS=`pkg-config --libs lua5.1`
--#LUA_INCLUDES=`pkg-config --cflags lua5.1`
--#LUA=/usr/bin/lua5.1
--#LUAC=/usr/bin/luac5.1
-+LUA_LIBS=`pkg-config --libs lua`
-+LUA_INCLUDES=`pkg-config --cflags lua`
-+LUA=/usr/bin/lua
-+LUAC=/usr/bin/luac
- 
- 
- ##
-@@ -104,7 +104,7 @@
- # asprintf and vasprintf in the c library. (gnu libc has.)
- # If HAS_SYSTEM_ASPRINTF is not defined, an implementation
- # in sprintf_2.2/ is used.
--#HAS_SYSTEM_ASPRINTF=1
-+HAS_SYSTEM_ASPRINTF=1
- 
- # If you're on an archaic system (such as relatively recent *BSD releases)
- # without even dummy multibyte/widechar and localisation support, you may 
-@@ -143,14 +143,14 @@
- 
- #C89_SOURCE=-ansi
- 
--#POSIX_SOURCE=-D_POSIX_C_SOURCE=200112L
-+POSIX_SOURCE=-D_POSIX_C_SOURCE=200112L
- 
- # Most systems
--#XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED
-+XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED
- # SunOS, (Irix)
- #XOPEN_SOURCE=-D__EXTENSIONS__
- 
--#C99_SOURCE=-std=c99 -DCF_HAS_VA_COPY
-+C99_SOURCE=-std=c99 -DCF_HAS_VA_COPY
- 
- # The -DCF_HAS_VA_COPY option should allow for some optimisations, and 
- # in some cases simply defining
diff --git a/x11-wm/ion3/files/20071109/202_all_fix-menus.patch b/x11-wm/ion3/files/20071109/202_all_fix-menus.patch
deleted file mode 100644
index c2d77c8..0000000
--- a/x11-wm/ion3/files/20071109/202_all_fix-menus.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur ../work/ion-3ds-20061223/etc/cfg_ioncore.lua ion-3ds-20061223/etc/cfg_ioncore.lua
---- ../work/ion-3ds-20061223/etc/cfg_ioncore.lua	2006-12-23 17:59:43.000000000 +0300
-+++ ion-3ds-20061223/etc/cfg_ioncore.lua	2006-12-31 15:35:59.000000000 +0300
-@@ -331,7 +331,8 @@
- defmenu("mainmenu", {
-     menuentry("Run...",         "mod_query.query_exec(_)"),
-     menuentry("Terminal",       "ioncore.exec_on(_, XTERM or 'xterm')"),
--    menuentry("Lock screen",    "ioncore.exec_on(_, 'xlock')"),
-+    menuentry("Lock screen",                                                                                                                                  
-+              "ioncore.exec_on(_, ioncore.lookup_script('ion-lock'))"),                                                                                       
-     menuentry("Help",           "mod_query.query_man(_)"),
-     menuentry("About Ion",      "mod_query.show_about_ion(_)"),
-     submenu("Styles",           "stylemenu"),
diff --git a/x11-wm/ion3/files/20071109/205_all_ion-lock.patch b/x11-wm/ion3/files/20071109/205_all_ion-lock.patch
deleted file mode 100644
index dda2016..0000000
--- a/x11-wm/ion3/files/20071109/205_all_ion-lock.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nur ion3-20050322.orig/utils/Makefile ion3-20050322/utils/Makefile
---- ion3-20050322.orig/utils/Makefile	2005-03-22 14:31:06.000000000 +0000
-+++ ion3-20050322/utils/Makefile	2005-03-22 16:29:37.197355881 +0000
-@@ -11,7 +11,7 @@
- SUBDIRS=ion-completefile
- INSTALL_SUBDIRS=$(SUBDIRS)
- 
--SHELLSCRIPTS = ion-runinxterm ion-completeman
-+SHELLSCRIPTS = ion-runinxterm ion-completeman ion-lock
- 
- TARGETS = ion-completeman
- 
-diff -Nur ion3-20050322.orig/utils/ion-lock ion3-20050322/utils/ion-lock
---- ion3-20050322.orig/utils/ion-lock	1970-01-01 00:00:00.000000000 +0000
-+++ ion3-20050322/utils/ion-lock	2005-03-22 16:29:19.550092305 +0000
-@@ -0,0 +1,6 @@
-+#!/bin/sh
-+if xscreensaver-command -version >/dev/null 2>&1; then
-+	exec xscreensaver-command -lock
-+else
-+	exec xlock
-+fi
diff --git a/x11-wm/ion3/files/20071109/208_all_as-needed.patch b/x11-wm/ion3/files/20071109/208_all_as-needed.patch
deleted file mode 100644
index 662a078..0000000
--- a/x11-wm/ion3/files/20071109/208_all_as-needed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr ion-3ds-20070318.orig/de/Makefile ion-3ds-20070318/de/Makefile
---- ion-3ds-20070318.orig/de/Makefile	2007-03-18 21:31:37.000000000 +0100
-+++ ion-3ds-20070318/de/Makefile	2007-04-30 17:30:23.000000000 +0200
-@@ -17,6 +17,8 @@
- 
- MAKE_EXPORTS=de
- 
-+LDFLAGS+=-lXext
-+
- ######################################
- 
- include $(TOPDIR)/build/rules.mk
diff --git a/x11-wm/ion3/files/20070902/201_all_fix-paths.patch b/x11-wm/ion3/files/20080207/201_all_fix-paths.patch
index cb27bfc..9cc3ca4 100644
--- a/x11-wm/ion3/files/20070902/201_all_fix-paths.patch
+++ b/x11-wm/ion3/files/20080207/201_all_fix-paths.patch
@@ -1,15 +1,16 @@
---- ion-3rc-20070708.orig/system.mk	2007-07-14 12:40:45.000000000 +0200
-+++ ion-3rc-20070708/system.mk	2007-07-14 15:54:39.000000000 +0200
-@@ -7,7 +7,7 @@
- ## Installation paths
- ##
+diff -uNr ion-3-20080207.orig/system.mk ion-3-20080207/system.mk
+--- ion-3-20080207.orig/system.mk	2008-02-08 20:23:22.000000000 +0100
++++ ion-3-20080207/system.mk	2008-02-08 23:04:55.000000000 +0100
+@@ -8,7 +8,7 @@
  
+ # Installation path prefix. Unless you know what you're doing, the default
+ # of /usr/local is likely the correct choice.
 -PREFIX=/usr/local
 +PREFIX=/usr
  
  # Unless you are creating a package conforming to some OS's standards, you
  # probably do not want to modify the following directories:
-@@ -15,7 +15,7 @@
+@@ -16,7 +16,7 @@
  # Main binaries
  BINDIR=$(PREFIX)/bin
  # Configuration .lua files
@@ -18,7 +19,7 @@
  # Some .lua files and ion-* shell scripts
  SHAREDIR=$(PREFIX)/share/ion3
  # Manual pages
-@@ -56,18 +56,18 @@
+@@ -62,18 +62,18 @@
  
  # If you have installed Lua 5.1 from the official tarball without changing
  # paths, this should do it.
@@ -46,16 +47,16 @@
  
  
  ##
-@@ -104,7 +104,7 @@
- # asprintf and vasprintf in the c library. (gnu libc has.)
- # If HAS_SYSTEM_ASPRINTF is not defined, an implementation
- # in sprintf_2.2/ is used.
+@@ -127,7 +127,7 @@
+ # You may uncomment this if you know that your system C libary provides
+ # asprintf and  vasprintf. (GNU libc does.) If HAS_SYSTEM_ASPRINTF is not
+ # defined, an implementation provided in libtu/sprintf_2.2/ is used. 
 -#HAS_SYSTEM_ASPRINTF=1
 +HAS_SYSTEM_ASPRINTF=1
  
- # If you're on an archaic system (such as relatively recent *BSD releases)
- # without even dummy multibyte/widechar and localisation support, you may 
-@@ -143,14 +143,14 @@
+ # The following setting is needed with GNU libc for clock_gettime and the
+ # monotonic clock. Other systems may not need it, or may not provide a
+@@ -169,14 +169,14 @@
  
  #C89_SOURCE=-ansi
  
diff --git a/x11-wm/ion3/files/20070902/202_all_fix-menus.patch b/x11-wm/ion3/files/20080207/202_all_fix-menus.patch
index c2d77c8..c2d77c8 100644
--- a/x11-wm/ion3/files/20070902/202_all_fix-menus.patch
+++ b/x11-wm/ion3/files/20080207/202_all_fix-menus.patch
diff --git a/x11-wm/ion3/files/20070902/205_all_ion-lock.patch b/x11-wm/ion3/files/20080207/205_all_ion-lock.patch
index dda2016..dda2016 100644
--- a/x11-wm/ion3/files/20070902/205_all_ion-lock.patch
+++ b/x11-wm/ion3/files/20080207/205_all_ion-lock.patch
diff --git a/x11-wm/ion3/files/20070902/208_all_as-needed.patch b/x11-wm/ion3/files/20080207/208_all_as-needed.patch
index 662a078..662a078 100644
--- a/x11-wm/ion3/files/20070902/208_all_as-needed.patch
+++ b/x11-wm/ion3/files/20080207/208_all_as-needed.patch
diff --git a/x11-wm/ion3/files/digest-ion3-20070720 b/x11-wm/ion3/files/digest-ion3-20070720
deleted file mode 100644
index fccc717..0000000
--- a/x11-wm/ion3/files/digest-ion3-20070720
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 cef18d7a4aa476b400ecf722c57f6e6a ion-3rc-20070720.tar.gz 655409
-RMD160 a97944850d88b81dd20d234f3f114e9f3038d0b3 ion-3rc-20070720.tar.gz 655409
-SHA256 c1d412444bbcbb541adab4efd9fecb131065f3c8c908b2fe9dd17707ac03df61 ion-3rc-20070720.tar.gz 655409
-MD5 42db17925e8e745c2385f1b42fa26f78 ion-doc-3rc-20070708.tar.gz 669854
-RMD160 ba3bdb7b4ca4331738faa0aa2501d662644d0a39 ion-doc-3rc-20070708.tar.gz 669854
-SHA256 d1651f219a43f413de618a7bf158ddbc42c2c3025807965271c97214bba10ef3 ion-doc-3rc-20070708.tar.gz 669854
diff --git a/x11-wm/ion3/files/digest-ion3-20070720-r1 b/x11-wm/ion3/files/digest-ion3-20070720-r1
deleted file mode 100644
index cfd9c1a..0000000
--- a/x11-wm/ion3/files/digest-ion3-20070720-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 cef18d7a4aa476b400ecf722c57f6e6a ion-3rc-20070720.tar.gz 655409
-RMD160 a97944850d88b81dd20d234f3f114e9f3038d0b3 ion-3rc-20070720.tar.gz 655409
-SHA256 c1d412444bbcbb541adab4efd9fecb131065f3c8c908b2fe9dd17707ac03df61 ion-3rc-20070720.tar.gz 655409
-MD5 27f2d86dda6f9afc9e7c439d85427cd0 ion-doc-3rc-20070720.tar.gz 669878
-RMD160 d485145fd8493bebe3c5076605c86d427c8105fb ion-doc-3rc-20070720.tar.gz 669878
-SHA256 6da15a64ac01c0e1df0548214dfb3bc5874006f31a2c84fe160127829301dd99 ion-doc-3rc-20070720.tar.gz 669878
diff --git a/x11-wm/ion3/files/digest-ion3-20070902 b/x11-wm/ion3/files/digest-ion3-20070902
deleted file mode 100644
index 6827700..0000000
--- a/x11-wm/ion3/files/digest-ion3-20070902
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 cdaff06fd9519c593f898a81ce01b5f9 ion-3rc-20070902.tar.gz 655566
-RMD160 abca8f424869cc78d8880c869981c796c8e7dd83 ion-3rc-20070902.tar.gz 655566
-SHA256 b42321986a84e16f95ad2e3d955749e0c3edaca0e7d202230c90fcdf5f064a18 ion-3rc-20070902.tar.gz 655566
-MD5 24c60a4a2d4eeb554dc8a3d76a9c637d ion-doc-3rc-20070902.tar.gz 670268
-RMD160 9d561a72cfcdeab5f4e4af42cb8b5f7e233a8f05 ion-doc-3rc-20070902.tar.gz 670268
-SHA256 a5f12b469c013c77dcc3c0a9d56f02009f974cb6f9b3b15bdda2b826145ed585 ion-doc-3rc-20070902.tar.gz 670268
diff --git a/x11-wm/ion3/files/digest-ion3-20071109 b/x11-wm/ion3/files/digest-ion3-20071109
deleted file mode 100644
index db7461b..0000000
--- a/x11-wm/ion3/files/digest-ion3-20071109
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 7f71cae5be800ccfa456380f3d45b2b5 ion-3rc-20071109.tar.gz 646945
-RMD160 b89b725ec1f508161e30126c26f8494bd7ccfd28 ion-3rc-20071109.tar.gz 646945
-SHA256 fdfb2fe6faa571942ec89b00ef64f88a4f48965ea20abc72cb7d5ad7b3ef6697 ion-3rc-20071109.tar.gz 646945
-MD5 746d87834564cbfa3333e1c0ddf08877 ion-doc-3rc-20071109.tar.gz 670886
-RMD160 3c30de69762d6567a322e46b7be348388e857e72 ion-doc-3rc-20071109.tar.gz 670886
-SHA256 0f4e2cfe529b371845ed7f72fba18a173f0610ba0e14f389eed40bf05db70c65 ion-doc-3rc-20071109.tar.gz 670886
diff --git a/x11-wm/ion3/files/ion3-scripts-20070902.tar.bz2 b/x11-wm/ion3/files/ion3-scripts-20070902.tar.bz2
deleted file mode 100644
index b54ad56..0000000
--- a/x11-wm/ion3/files/ion3-scripts-20070902.tar.bz2
+++ /dev/null
diff --git a/x11-wm/ion3/files/ion3-scripts-20071117.tar.bz2 b/x11-wm/ion3/files/ion3-scripts-20071117.tar.bz2
deleted file mode 100644
index ea3ae20..0000000
--- a/x11-wm/ion3/files/ion3-scripts-20071117.tar.bz2
+++ /dev/null
diff --git a/x11-wm/ion3/files/ion3-scripts-20080130.tar.bz2 b/x11-wm/ion3/files/ion3-scripts-20080130.tar.bz2
new file mode 100644
index 0000000..4793d7c
--- /dev/null
+++ b/x11-wm/ion3/files/ion3-scripts-20080130.tar.bz2
diff --git a/x11-wm/ion3/ion3-20071109.ebuild b/x11-wm/ion3/ion3-20071109.ebuild
deleted file mode 100644
index 3c162b3..0000000
--- a/x11-wm/ion3/ion3-20071109.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20070506-r1.ebuild,v 1.3 2007/06/03 15:08:02 mabi Exp $
-
-inherit eutils flag-o-matic
-
-MY_PV=${PV/_p/-}
-MY_PN=ion-3rc-${MY_PV}
-
-SCRIPTS_PV=20071117
-SCRIPTS_PN=ion3-scripts
-
-IONFLUX_PV=20070512
-IONFLUX_PN=ion3-mod-ionflux
-
-IONXRANDR_PV=20070410
-IONXRANDR_PN=ion3-mod-xrandr
-
-IONDOC_PV=20071109
-IONDOC_PN=ion-doc-3rc
-
-DESCRIPTION="A tiling tabbed window manager designed with keyboard users in mind"
-HOMEPAGE="http://www.iki.fi/tuomov/ion/"
-SRC_URI="http://iki.fi/tuomov/dl/${MY_PN}.tar.gz
-	doc?	( http://iki.fi/tuomov/dl/${IONDOC_PN}-${IONDOC_PV}.tar.gz )"
-
-LICENSE="LGPL-2.1+tuomov"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="unicode ion3-voidupstreamsupport-truetype doc"
-DEPEND="
-	|| (
-		(
-			x11-libs/libICE
-			x11-libs/libXext
-			x11-libs/libSM
-			ion3-voidupstreamsupport-truetype? ( x11-libs/libXft )
-		)
-		virtual/x11
-	)
-	dev-util/pkgconfig
-	app-misc/run-mailcap
-	>=dev-lang/lua-5.1.1
-	doc? ( dev-tex/latex2html
-			virtual/tetex )"
-
-S=${WORKDIR}/${MY_PN}
-
-SCRIPTS_DIRS="keybindings scripts statusbar statusd styles"
-MODULES="${IONXRANDR_PN}-${IONXRANDR_PV} ${IONFLUX_PN}-${IONFLUX_PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	ln -s "${FILESDIR}"/${SCRIPTS_PN}-${SCRIPTS_PV}.tar.bz2
-	unpack ./${SCRIPTS_PN}-${SCRIPTS_PV}.tar.bz2
-	ln -s "${FILESDIR}"/${IONXRANDR_PN}-${IONXRANDR_PV}.tar.bz2
-	unpack ./${IONXRANDR_PN}-${IONXRANDR_PV}.tar.bz2
-	ln -s "${FILESDIR}"/${IONFLUX_PN}-${IONFLUX_PV}.tar.bz2
-	unpack ./${IONFLUX_PN}-${IONFLUX_PV}.tar.bz2
-
-	cd ${S}
-	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" epatch
-	if (use ion3-voidupstreamsupport-truetype); then
-		epatch ${FILESDIR}/xft-ion3-${PV}.patch
-
-		sed -i -e "s:#USE_XFT=1:USE_XFT=1:" ${S}/system.mk
-		sed -i -e 's:\(#define ION_VERSION "3rc-20070608\):\1-voidupstreamsupport-xft-enabled:' ${S}/version.h
-	fi;
-
-	# Allow user CFLAGS
-	sed -i "s:\(CFLAGS=\)-g -Os\(.*\):\1\2 ${CFLAGS}:" system.mk
-
-	# Allow user LDFLAGS
-	sed -i "s:\(LDFLAGS=\)-g -Os\(.*\):\1\2 ${LDFLAGS}:" system.mk
-
-	# XOPEN_SOURCE does give _POSIX_MONOTONIC_CLOCK, but not CLOCK_MONOTONIC,
-	# thus compile will fail
-	sed -e '/CFLAGS +=.*XOPEN_SOURCE.*C99_SOURCE/s:$: $\(POSIX_SOURCE\):' \
-	    -i libmainloop/Makefile
-
-	# Don't strip ionflux
-	sed -i "s:-s::" "../${IONFLUX_PN}-${IONFLUX_PV}/ionflux/Makefile"
-
-	# Rewrite install directories to be prefixed by DESTDIR for sake of portage's sandbox
-	sed -i 's!\($(INSTALL\w*)\|rm -f\|ln -s\)\(.*\)\($(\w\+DIR)\)!\1\2$(DESTDIR)\3!g' Makefile */Makefile */*/Makefile build/rules.mk
-
-	for i in ${MODULES}
-	do
-		cd ${WORKDIR}/${i}
-		# Rewrite install directories to be prefixed by DESTDIR for sake of portage's sandbox
-		sed -i Makefile */Makefile \
-			-e 's!\($(INSTALL\w*)\|rm -f\|ln -s\)\(.*\)\($(\w\+DIR)\)!\1\2$(DESTDIR)\3!g'
-
-	done
-	cd ${S}
-
-	# Hey guys! Implicit rules apply to include statements also. Be more careful!
-	# Fix an implicit rule that will kill the installation by rewriting a .mk
-	# should configure be given just the right set of options.
-	sed -i 's!%: %.in!ion-completeman: %: %.in!g' utils/Makefile
-
-	# Fix prestripping of files
-	sed -i mod_statusbar/ion-statusd/Makefile utils/ion-completefile/Makefile \
-		-e 's: -s::'
-
-	# FIX for modules
-	cd ${WORKDIR}
-	ln -s ${MY_PN} ion-3
-}
-
-src_compile() {
-	local myconf=""
-
-	# xfree 
-	if has_version '>=x11-base/xfree-4.3.0'; then
-		sed -i -e "s:DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND:#DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND:" ${S}/system.mk
-	fi
-
-	# help out this arch as it can't handle certain shared library linkage
-	use hppa && sed -i -e "s:#PRELOAD_MODULES=1:PRELOAD_MODULES=1:" ${S}/system.mk
-
-	# unicode support
-	use unicode && sed -i -e "s:#DEFINES += -DCF_DE_USE_XUTF8:DEFINES += -DCF_DE_USE_XUTF8:" ${S}/system.mk
-
-	cd ${S}
-	make \
-		LIBDIR=/usr/$(get_libdir) \
-		DOCDIR=/usr/share/doc/${PF} || die
-
-	for i in ${MODULES}
-	do
-		cd ${WORKDIR}/${i}
-
-		make \
-			LIBDIR=/usr/$(get_libdir)
-	done
-
-	if ( use doc )
-	then
-		export MT_FEATURES=varfonts
-		mkdir -p ${T}/var/cache/fonts
-		export VARTEXFONTS=${T}/var/cache/fonts
-
-		cd ${WORKDIR}/${IONDOC_PN}-${IONDOC_PV}
-		make all
-		make all-pdf
-	fi
-}
-
-src_install() {
-
-	emake \
-		DESTDIR=${D} \
-		DOCDIR=/usr/share/doc/${PF} \
-	install || die
-
-	echo -e "#!/bin/sh\n/usr/bin/ion3" > ${T}/ion3
-	echo -e "#!/bin/sh\n/usr/bin/pwm3" > ${T}/pwm3
-	exeinto /etc/X11/Sessions
-	doexe ${T}/ion3 ${T}/pwm3
-
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/ion3.desktop ${FILESDIR}/pwm3.desktop
-
-	cd ${WORKDIR}/${SCRIPTS_PN}-${SCRIPTS_PV}
-	insinto /usr/share/ion3
-	find $SCRIPTS_DIRS -type f |\
-		while read FILE
-		do
-			doins $PWD/$FILE
-		done
-
-	for i in ${MODULES}
-	do
-		cd ${WORKDIR}/${i}
-
-		emake \
-			DESTDIR=${D} \
-			install || die
-
-	done
-
-	if ( use doc )
-	then
-		cd ${WORKDIR}/${IONDOC_PN}-${IONDOC_PV}
-		dodoc *.pdf
-	fi
-
-	sed -i -e '/dopath("mod_sp")/a\dopath("mod_xrandr")' ${D}/etc/X11/ion3/cfg_defaults.lua
-}
-
-pkg_postinst() {
-	elog "This version of ion3 contains no xinerama support (removed upstream)."
-	elog "Remember that USE='ion3-voidupstreamsupport-truetype' will render"
-	elog "upstream support for your installation of ion3 void."
-	elog "Thus, if you encouter a bug in ion-3, be sure to to reproduce it with a"
-	elog "vanilla build before reporting it upstream. You are welcome to report"
-	elog "any problem as a bug on http://bugs.gentoo.org."
-}
diff --git a/x11-wm/ion3/ion3-20070902.ebuild b/x11-wm/ion3/ion3-20080207.ebuild
index 0fe3cac..1e1ef39 100644
--- a/x11-wm/ion3/ion3-20070902.ebuild
+++ b/x11-wm/ion3/ion3-20080207.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20070506-r1.ebuild,v 1.3 2007/06/03 15:08:02 mabi Exp $
+# $Header: $
 
 inherit eutils flag-o-matic
 
 MY_PV=${PV/_p/-}
-MY_PN=ion-3rc-${MY_PV}
+MY_PN=ion-3-${MY_PV}
 
-SCRIPTS_PV=20070902
+SCRIPTS_PV=20080130
 SCRIPTS_PN=ion3-scripts
 
 IONFLUX_PV=20070512
@@ -16,8 +16,8 @@ IONFLUX_PN=ion3-mod-ionflux
 IONXRANDR_PV=20070410
 IONXRANDR_PN=ion3-mod-xrandr
 
-IONDOC_PV=20070902
-IONDOC_PN=ion-doc-3rc
+IONDOC_PV=20080207
+IONDOC_PN=ion-doc-3
 
 DESCRIPTION="A tiling tabbed window manager designed with keyboard users in mind"
 HOMEPAGE="http://www.iki.fi/tuomov/ion/"
@@ -83,7 +83,7 @@ src_unpack() {
 	sed -i "s:-s::" "../${IONFLUX_PN}-${IONFLUX_PV}/ionflux/Makefile"
 
 	# Rewrite install directories to be prefixed by DESTDIR for sake of portage's sandbox
-	sed -i 's!\($(INSTALL\w*)\|rm -f\|ln -s\)\(.*\)\($(\w\+DIR)\)!\1\2$(DESTDIR)\3!g' Makefile */Makefile */*/Makefile build/rules.mk
+	sed -i 's!\($(INSTALL\w*)\|rm -f\|ln -s\)\(.*\)\($(\w\+DIR[_]*)\)!\1\2$(DESTDIR)\3!g' Makefile */Makefile */*/Makefile build/rules.mk
 
 	for i in ${MODULES}
 	do
@@ -197,4 +197,5 @@ pkg_postinst() {
 	elog "Thus, if you encouter a bug in ion-3, be sure to to reproduce it with a"
 	elog "vanilla build before reporting it upstream. You are welcome to report"
 	elog "any problem as a bug on http://bugs.gentoo.org."
+	elog "This is the final, stable version of ion3. Enjoy."
 }