fixup and cleanup, see changelog

svn path=/; revision=3

14 files changed, 71 insertions, 473 deletions

diff --git a/ion3/ChangeLog b/ion3/ChangeLog
index 006260f..07fbdb5 100644
--- a/ion3/ChangeLog
+++ b/ion3/ChangeLog
@@ -2,6 +2,20 @@
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.55 2007/06/05 13:29:53 mabi Exp $
 
+  10 Jun 2007; Matti Bickel <mabi@gentoo.org> 
+  -files/20070318/201_all_fix-paths.patch,
+  -files/20070318/202_all_fix-menus.patch,
+  -files/20070318/205_all_ion-lock.patch,
+  -files/20070318/207_all_bindings-manpage.patch,
+  -files/20070318/208_all_as-needed.patch,
+  -ion3-20070318-r2.ebuild,
+  +files/ion3-scripts-20070608.tar.bz2,
+  +files/ion3-mod-xrandr-20070410.tar.bz2,
+  +files/ion3-mod-ionflux-20070512.tar.bz2,
+  ion3-20070608:
+  put tarballs in files/ as gentoo doesn't distribute them anymore, clean
+  version
+
 *ion3-20070608 (9 June 2007)
 
   09 June 2007; Matti Bickel <mabi@gentoo.org>
diff --git a/ion3/Manifest b/ion3/Manifest
index e28f165..ad05013 100644
--- a/ion3/Manifest
+++ b/ion3/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 20061223/201_all_fix-paths.patch 2578 RMD160 1e507b2b7493f94c9e63de2d1c5e7a4a370f2bbe SHA1 92cb162401d7e970a1429437bfeef9c9684f62fb SHA256 e1eca4fca542aeeb2b6dd39b7f082d49dc7c9b526bb23b668c72fab639c2c76c
 MD5 e9d2532398ca5bebda1b6e3758227006 files/20061223/201_all_fix-paths.patch 2578
 RMD160 1e507b2b7493f94c9e63de2d1c5e7a4a370f2bbe files/20061223/201_all_fix-paths.patch 2578
@@ -73,6 +70,22 @@ AUX 20070506/208_all_as-needed.patch 350 RMD160 d4a5d21442b8cdb618e116dd542389b2
 MD5 477892385b4dd0708761fe54886459d7 files/20070506/208_all_as-needed.patch 350
 RMD160 d4a5d21442b8cdb618e116dd542389b2c6a0d442 files/20070506/208_all_as-needed.patch 350
 SHA256 0bedd444e6384f35f6b37c4ec2848150f25ae1d1b93fe5062934887786cba893 files/20070506/208_all_as-needed.patch 350
+AUX 20070608/201_all_fix-paths.patch 2256 RMD160 2df4e395ea6a99e1ae669225477ff7b68d4f457e SHA1 14dd0131411f4c99f435877cf9fda2bb3e2310eb SHA256 e50a4f3d5ecb0c8f3fcaae41fc6ce9897b7aa26867168274fab111d06e4e0d62
+MD5 d3c7f70c793ae0c3ca0ed698a01734aa files/20070608/201_all_fix-paths.patch 2256
+RMD160 2df4e395ea6a99e1ae669225477ff7b68d4f457e files/20070608/201_all_fix-paths.patch 2256
+SHA256 e50a4f3d5ecb0c8f3fcaae41fc6ce9897b7aa26867168274fab111d06e4e0d62 files/20070608/201_all_fix-paths.patch 2256
+AUX 20070608/202_all_fix-menus.patch 990 RMD160 a49c2e8c44c4c7ddceae989a0637cb4ca51647f4 SHA1 ef72a6d5b100c8148d96f6718bc95a456a3b51eb SHA256 2f9404a884e28f9d7ff42ba6ae24df99436b7a9f3c75560282fb87daa9fdf9af
+MD5 aecae9e8f4e48e9b74532a3309643598 files/20070608/202_all_fix-menus.patch 990
+RMD160 a49c2e8c44c4c7ddceae989a0637cb4ca51647f4 files/20070608/202_all_fix-menus.patch 990
+SHA256 2f9404a884e28f9d7ff42ba6ae24df99436b7a9f3c75560282fb87daa9fdf9af files/20070608/202_all_fix-menus.patch 990
+AUX 20070608/205_all_ion-lock.patch 780 RMD160 9834836d55fb390f06d8e3c1ea821ef01c1a74b8 SHA1 6bd0278dd7d56fd9f1025fae8a00db24bf0e781f SHA256 ea4ad810355fab8a848e6506a6a2762b5ab9c37f28a7edac73030e6026bc3fae
+MD5 4f2dcedcbf6d885723d1b888f0aacb87 files/20070608/205_all_ion-lock.patch 780
+RMD160 9834836d55fb390f06d8e3c1ea821ef01c1a74b8 files/20070608/205_all_ion-lock.patch 780
+SHA256 ea4ad810355fab8a848e6506a6a2762b5ab9c37f28a7edac73030e6026bc3fae files/20070608/205_all_ion-lock.patch 780
+AUX 20070608/208_all_as-needed.patch 350 RMD160 d4a5d21442b8cdb618e116dd542389b2c6a0d442 SHA1 2a59201ad480f35e7553c4bd470c696fc5dc0436 SHA256 0bedd444e6384f35f6b37c4ec2848150f25ae1d1b93fe5062934887786cba893
+MD5 477892385b4dd0708761fe54886459d7 files/20070608/208_all_as-needed.patch 350
+RMD160 d4a5d21442b8cdb618e116dd542389b2c6a0d442 files/20070608/208_all_as-needed.patch 350
+SHA256 0bedd444e6384f35f6b37c4ec2848150f25ae1d1b93fe5062934887786cba893 files/20070608/208_all_as-needed.patch 350
 AUX ion3-20060317-truetype.patch 19704 RMD160 6a11b4d81926224171618c036b5597948e23d89a SHA1 c387e111c65d098793ef59d020225d3770688a2a SHA256 a1934d7ea40f959579b4b4b20f08bcbc9f037beb7e50737f8110273f7f5f58d5
 MD5 f77e47b00b912f3b0b6bb35a53f158a1 files/ion3-20060317-truetype.patch 19704
 RMD160 6a11b4d81926224171618c036b5597948e23d89a files/ion3-20060317-truetype.patch 19704
@@ -81,6 +94,18 @@ AUX ion3-20060326-truetype.patch 19704 RMD160 ca9b3ee77b0a61384006728cd8839d76f6
 MD5 137137dfcda1e2b062faec090c1c792d files/ion3-20060326-truetype.patch 19704
 RMD160 ca9b3ee77b0a61384006728cd8839d76f6957c13 files/ion3-20060326-truetype.patch 19704
 SHA256 3e241b25c938241e3f791203486fef17072ff46b1d77f54c8da7e23c2849c56d files/ion3-20060326-truetype.patch 19704
+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-20070608.tar.bz2 101584 RMD160 5728f7923ecf121b923169d97471793384babb0c SHA1 9ca87f26edbbd56d64dbca297533f3a04987929a SHA256 b50c767a77a1c8639141b483ebba2e6881ac2e8422d51b476c3850e3587a33a5
+MD5 ba98325b7a155b09cc76d27199625a12 files/ion3-scripts-20070608.tar.bz2 101584
+RMD160 5728f7923ecf121b923169d97471793384babb0c files/ion3-scripts-20070608.tar.bz2 101584
+SHA256 b50c767a77a1c8639141b483ebba2e6881ac2e8422d51b476c3850e3587a33a5 files/ion3-scripts-20070608.tar.bz2 101584
 AUX ion3.desktop 217 RMD160 438917d6c0370e7a368598ea611ec7658312627d SHA1 cf5cd1f09faf7530f8cb2f832a17c0cf893541c4 SHA256 4742797e200b956abf3d0b94d860aa7430c9f67a97f3640ef2c28168fa773bb9
 MD5 00450ed1292b72e2be71b9860c4db6ee files/ion3.desktop 217
 RMD160 438917d6c0370e7a368598ea611ec7658312627d files/ion3.desktop 217
@@ -97,10 +122,15 @@ AUX xft-ion3-20070506.patch 18375 RMD160 2510ae25502346f0347eafce8a313aac4db2a36
 MD5 68f3da20b45ec583347b5325d9062e19 files/xft-ion3-20070506.patch 18375
 RMD160 2510ae25502346f0347eafce8a313aac4db2a36c files/xft-ion3-20070506.patch 18375
 SHA256 1db26c1db08b9a87530ef29ad2538cf191bc5d08630cc776f1dbd61940eff21f files/xft-ion3-20070506.patch 18375
+AUX xft-ion3-20070608.patch 18375 RMD160 2510ae25502346f0347eafce8a313aac4db2a36c SHA1 ae75b297d6cf8c3f5dfd3793c22d754369f982bb SHA256 1db26c1db08b9a87530ef29ad2538cf191bc5d08630cc776f1dbd61940eff21f
+MD5 68f3da20b45ec583347b5325d9062e19 files/xft-ion3-20070608.patch 18375
+RMD160 2510ae25502346f0347eafce8a313aac4db2a36c files/xft-ion3-20070608.patch 18375
+SHA256 1db26c1db08b9a87530ef29ad2538cf191bc5d08630cc776f1dbd61940eff21f files/xft-ion3-20070608.patch 18375
 DIST ion-3ds-20060326.tar.gz 617533 RMD160 147e6ad20c69ca8fe5a80dcd57ce6002a2b3cde1 SHA1 5202322198071f7cee2aefc2bcc8bd0b3a08a490 SHA256 9f3c96c961e47c61e9c10b57de820b608b9d9fdaa43a893e63499b3f17231124
 DIST ion-3ds-20061223.tar.gz 649463 RMD160 dc61a012354a30f1a83b8b0970b8c09724ea4c9c SHA1 8bccf120ce27b26feb67a916ba61748e85e69733 SHA256 0970fef74de659de45813471560ebe2f97b893de7a238ea00755fcaeb9b7d89e
 DIST ion-3ds-20070318.tar.gz 657282 RMD160 a7cc9baea3624b0ed840fdc82fc5db2ac1018d9a SHA1 f352a1c7f6f465478141d538b2a4c3f3e81a4f30 SHA256 712da027fb12774f67d933d95a95452d98a5658617fc5515011ca79b6035258a
 DIST ion-3rc-20070506.tar.gz 640482 RMD160 b5dda6a7a48c1f3d433b2a2b1c37294ece79a259 SHA1 81071df77b720ebad5630bd15a4c6b6e0787caf0 SHA256 850dce3bd1be5d200fda5ba3e6085f397b35c720f7758dc5481bf503fe5d2f56
+DIST ion-3rc-20070608.tar.gz 655442 RMD160 41fd6d581e27770e63f7bc66122684d8c11667f2 SHA1 e6a8afa4b177bcd95d6dd79b7f8f8e268738c7bf SHA256 1ebad89f61c3ac58bd583cfe3a0cb71c5254679a9f35f46d954d6e72eada86e8
 DIST ion-doc-3rc-20070506.tar.gz 669471 RMD160 aa9e75b60c121d3cd62f60afed4592fe1bc0da87 SHA1 1991e12e4f72153f2e02c70910322317c73a7c01 SHA256 9dac4f5e69121b98cf6e5da455d6185f00605cf237f14fc4f8578446f622476e
 DIST ion3-doc-20070318.tar.bz2 38870 RMD160 5fc0225ad23f1c96b5e979d66185ea608372297d SHA1 93c14f675f5fba3212232ed127af4d4481716884 SHA256 22ca643ca5df67086f12d3f106b16094017477c41fd1ebd73d30607db206821b
 DIST ion3-mod-ionflux-20070512.tar.bz2 12770 RMD160 8e834de0c3048b676bc5c5d5454aedac09129eb3 SHA1 d482654557104adfbf6d184e44f87a993577720a SHA256 63c4902159923aa02921e39aa7746ca8819ba1c216efa8fa6384fd093f60d18c
@@ -128,10 +158,14 @@ EBUILD ion3-20070506-r1.ebuild 5213 RMD160 e875b068c509e7beef53433026a3f6e066c33
 MD5 ae60013d4557315112a038ff7f8753d8 ion3-20070506-r1.ebuild 5213
 RMD160 e875b068c509e7beef53433026a3f6e066c33738 ion3-20070506-r1.ebuild 5213
 SHA256 b7b387296ff6a0c4a4cddb0eb5eb6ffb81b90ab143e148002a59cec917ceff9f ion3-20070506-r1.ebuild 5213
-MISC ChangeLog 9375 RMD160 08bf33112717263c0b4e558bc50e6f9b236b37be SHA1 bde18842f3f475ce6a9b733c874c238c9f7718a2 SHA256 46973185aea6b11feede86351bd8d1f101e5ae44281d55a81007fa6549ee1161
-MD5 2c9769f447da0af131114862138619c3 ChangeLog 9375
-RMD160 08bf33112717263c0b4e558bc50e6f9b236b37be ChangeLog 9375
-SHA256 46973185aea6b11feede86351bd8d1f101e5ae44281d55a81007fa6549ee1161 ChangeLog 9375
+EBUILD ion3-20070608.ebuild 5434 RMD160 3bbf0f46ba4a474507f5b00a112f73cd5fb13fad SHA1 10b18b11ac81d449206c5c6f41b1f828672a2a08 SHA256 07571dbe75cecf227671348c4b5bfa9f5439af6ef2a7c506aa571ef7208af25f
+MD5 d125b643c6e7fedd3fd39b3eee26590c ion3-20070608.ebuild 5434
+RMD160 3bbf0f46ba4a474507f5b00a112f73cd5fb13fad ion3-20070608.ebuild 5434
+SHA256 07571dbe75cecf227671348c4b5bfa9f5439af6ef2a7c506aa571ef7208af25f ion3-20070608.ebuild 5434
+MISC ChangeLog 9850 RMD160 2d02dca582ba21592d93feb589df0220320e4738 SHA1 039815cc991293ed6f13950e86456f4b85f8aaa7 SHA256 93880b6400b79ae9a0b75390bec37d503d856764f0add77b00ea1ca5b61b52e2
+MD5 1ff1b338cb3335cf5ff28ff2224f7ca4 ChangeLog 9850
+RMD160 2d02dca582ba21592d93feb589df0220320e4738 ChangeLog 9850
+SHA256 93880b6400b79ae9a0b75390bec37d503d856764f0add77b00ea1ca5b61b52e2 ChangeLog 9850
 MISC metadata.xml 248 RMD160 7e7a4fe276728c6c4d6d0face7f0708dae9776d7 SHA1 b16dc683091d4a7cee7f9b8a6d6034a257df80b0 SHA256 3f6027d293a7bd953fd444ba8a1345ca6b9c00c28b35e8328386b9635d8eb71f
 MD5 c4aada614ade13541606f0901dffd61f metadata.xml 248
 RMD160 7e7a4fe276728c6c4d6d0face7f0708dae9776d7 metadata.xml 248
@@ -148,10 +182,6 @@ SHA256 b2181757e7912e1c67e67d7f3e4200e3cf9b8c4d2eea0ff964f2e92e6e3ea66d files/di
 MD5 d738828fdba8dec081e12431ad73be86 files/digest-ion3-20070506-r1 1331
 RMD160 2bb97783b8262b0ec65a9dcd75d359dc3ef1a2e3 files/digest-ion3-20070506-r1 1331
 SHA256 f2b7c50a3bf973359aa6e899f99fede7ebdd3698b2e93918d9f5e1306ef6ae19 files/digest-ion3-20070506-r1 1331
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFGZWX1fNMcoUhJ7GwRApHgAJ48DE5NCY1YTiWNJ+4pJRlD5WBrAgCfSDvk
-ScaMMSRXIsoYXDuwP/Mt0OA=
-=U76L
------END PGP SIGNATURE-----
+MD5 d9224226ab2e1fe595374de99c915783 files/digest-ion3-20070608 512
+RMD160 a3ab13d5eb784001a522c16efb6b0555534b02f2 files/digest-ion3-20070608 512
+SHA256 8969af66aa32f5e7c6845105a35b7529b8b46d9d8b46e7e5cb9bad1e24eb4f9b files/digest-ion3-20070608 512
diff --git a/ion3/files/20070318/201_all_fix-paths.patch b/ion3/files/20070318/201_all_fix-paths.patch
deleted file mode 100644
index 7f8f228..0000000
--- a/ion3/files/20070318/201_all_fix-paths.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Nur ion-3ds-20060519.orig/system.mk ion-3ds-20060519/system.mk
---- ion-3ds-20060519.orig/system.mk	2006-05-18 18:06:53.000000000 -0500
-+++ ion-3ds-20060519/system.mk	2006-05-18 23:51:23.000000000 -0500
-@@ -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
-@@ -27,11 +27,11 @@
- # Nothing at the moment
- LIBDIR=$(PREFIX)/lib
- # Modules
--MODULEDIR=$(LIBDIR)/ion3/mod
-+MODULEDIR=$(LIBDIR)/ion3/mod
- # Compiled Lua source code
- LCDIR=$(LIBDIR)/ion3/lc
- # ion-completefile (does not belong in SHAREDIR being a binary file)
--EXTRABINDIR=$(LIBDIR)/ion3/bin
-+EXTRABINDIR=$(LIBDIR)/ion3/bin
- # For ion-completeman system-wide cache
- VARDIR=/var/cache/ion3
- # Message catalogs
-@@ -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=`which lua5.1`
--#LUAC=`which luac5.1`
-+LUA_LIBS=`pkg-config --libs lua`
-+LUA_INCLUDES=`pkg-config --cflags lua`
-+LUA=`which lua`
-+LUAC=`which luac`
- 
- 
- ##
-@@ -107,7 +107,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)
-@@ -144,14 +144,14 @@
- 
- #C89_SOURCE=-ansi
- 
--#POSIX_SOURCE=-D_POSIX_SOURCE
-+POSIX_SOURCE=-D_POSIX_SOURCE
- 
- # 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/ion3/files/20070318/202_all_fix-menus.patch b/ion3/files/20070318/202_all_fix-menus.patch
deleted file mode 100644
index c2d77c8..0000000
--- a/ion3/files/20070318/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/ion3/files/20070318/205_all_ion-lock.patch b/ion3/files/20070318/205_all_ion-lock.patch
deleted file mode 100644
index dda2016..0000000
--- a/ion3/files/20070318/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/ion3/files/20070318/207_all_bindings-manpage.patch b/ion3/files/20070318/207_all_bindings-manpage.patch
deleted file mode 100644
index 5fac548..0000000
--- a/ion3/files/20070318/207_all_bindings-manpage.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -Nur ion3-20061020.orig/man/ion3.cs.in ion3-20061020/man/ion3.cs.in
---- ion3-20061020.orig/man/ion3.cs.in	2006-10-20 17:43:37.000000000 +0200
-+++ ion3-20061020/man/ion3.cs.in	2006-10-23 20:42:12.000000000 +0200
-@@ -81,6 +81,10 @@
- 
- .SS Globální přiřazení
- 
-+BINDINGS:WFrame
-+
-+.SS Přiřazení pro přesun/změnu velikosti
-+
- BINDINGS:WScreen
- 
- .SS Přiřazení pro práci s nejvyššími rámy a obrazovkami a jejich potomky
-diff -Nur ion3-20061020.orig/man/ion3.fi.in ion3-20061020/man/ion3.fi.in
---- ion3-20061020.orig/man/ion3.fi.in	2006-10-20 17:43:36.000000000 +0200
-+++ ion3-20061020/man/ion3.fi.in	2006-10-23 20:42:12.000000000 +0200
-@@ -84,6 +84,10 @@
- 
- .SS Yleisesti saatavilla olevat sidonnat
- 
-+BINDINGS:WFrame
-+
-+.SS Siirto ja koonmuutostilan sidonnat
-+
- BINDINGS:WScreen
- 
- .SS Näytöillä tai ylimmän tason kehyksissä toimivat sidonnat
-diff -Nur ion3-20061020.orig/man/ion3.in ion3-20061020/man/ion3.in
---- ion3-20061020.orig/man/ion3.in	2006-10-20 17:43:36.000000000 +0200
-+++ ion3-20061020/man/ion3.in	2006-10-23 20:42:12.000000000 +0200
-@@ -82,6 +82,10 @@
- 
- .SS Globally available bindings
- 
-+BINDINGS:WFrame
-+
-+.SS Move/resize mode bindings
-+
- BINDINGS:WScreen
- 
- .SS Bindings operating on top-level frames and screens and their children
-diff -Nur ion3-20061020.orig/man/pwm3.cs.in ion3-20061020/man/pwm3.cs.in
---- ion3-20061020.orig/man/pwm3.cs.in	2006-10-20 17:43:36.000000000 +0200
-+++ ion3-20061020/man/pwm3.cs.in	2006-10-23 20:42:12.000000000 +0200
-@@ -56,6 +56,10 @@
- 
- .SS Globální přiřazení
- 
-+BINDINGS:WFrame
-+
-+.SS Přiřazení pro přesun/změnu velikosti
-+
- BINDINGS:WScreen
- 
- .".SS Přiřazení pro práci s rámy, obrazovkami a jejich potomky
-@@ -64,10 +68,6 @@
- 
- .SS Přiřazení pro práci s rámy a jejich potomky
- 
--BINDINGS:WFrame
--
--.SS Přiřazení pro přesun/změnu velikosti
--
- BINDINGS:WMoveresMode
- 
- .SS Přiřazení pro plovoucí pracovní plochy [mod_floatws]
-diff -Nur ion3-20061020.orig/man/pwm3.fi.in ion3-20061020/man/pwm3.fi.in
---- ion3-20061020.orig/man/pwm3.fi.in	2006-10-20 17:43:36.000000000 +0200
-+++ ion3-20061020/man/pwm3.fi.in	2006-10-23 20:42:12.000000000 +0200
-@@ -57,6 +57,10 @@
- 
- .SS Yleisesti saatavilla olevat sidonnat
- 
-+BINDINGS:WFrame
-+
-+.SS Siirto ja koonmuutostilan sidonnat
-+
- BINDINGS:WScreen
- 
- .\".SS Kehyksiä ja näyttöjä, sekä niiden lapsia käsittelevät sidonnat
-@@ -65,10 +69,6 @@
- 
- .SS Kehyksiä, sekä niiden lapsia käsittelevät sidonnat
- 
--BINDINGS:WFrame
--
--.SS Siirto ja koonmuutostilan sidonnat
--
- BINDINGS:WMoveresMode
- 
- .SS Kelluvien työpöytien ja kehyksien sidonnat [mod_floatws]
-diff -Nur ion3-20061020.orig/man/pwm3.in ion3-20061020/man/pwm3.in
---- ion3-20061020.orig/man/pwm3.in	2006-10-20 17:43:36.000000000 +0200
-+++ ion3-20061020/man/pwm3.in	2006-10-23 20:42:12.000000000 +0200
-@@ -57,6 +57,10 @@
- 
- .SS Globally available bindings
- 
-+BINDINGS:WFrame
-+
-+.SS Move/resize mode bindings
-+
- BINDINGS:WScreen
- 
- .".SS Bindings operating on both frames and screens and their children
-@@ -65,10 +69,6 @@
- 
- .SS Bindings operating on frames and their children
- 
--BINDINGS:WFrame
--
--.SS Move/resize mode bindings
--
- BINDINGS:WMoveresMode
- 
- .SS Bindings for floating workspaces and frames [mod_floatws]
diff --git a/ion3/files/20070318/208_all_as-needed.patch b/ion3/files/20070318/208_all_as-needed.patch
deleted file mode 100644
index 662a078..0000000
--- a/ion3/files/20070318/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/ion3/files/digest-ion3-20070318-r2 b/ion3/files/digest-ion3-20070318-r2
deleted file mode 100644
index b233dc8..0000000
--- a/ion3/files/digest-ion3-20070318-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 f02264ab7ecc990c2cd322f57a5e8a4d ion-3ds-20070318.tar.gz 657282
-RMD160 a7cc9baea3624b0ed840fdc82fc5db2ac1018d9a ion-3ds-20070318.tar.gz 657282
-SHA256 712da027fb12774f67d933d95a95452d98a5658617fc5515011ca79b6035258a ion-3ds-20070318.tar.gz 657282
-MD5 b6ec641eac93eb32a97de4baf02f4da0 ion3-doc-20070318.tar.bz2 38870
-RMD160 5fc0225ad23f1c96b5e979d66185ea608372297d ion3-doc-20070318.tar.bz2 38870
-SHA256 22ca643ca5df67086f12d3f106b16094017477c41fd1ebd73d30607db206821b ion3-doc-20070318.tar.bz2 38870
-MD5 4ce492ba5311d74328655923386868ee ion3-mod-xrandr-20070220.tar.bz2 10822
-RMD160 680714961af7e6b81896c4d989baded5ea4c5222 ion3-mod-xrandr-20070220.tar.bz2 10822
-SHA256 858a72ad203fb98f3cea672809a2cdfd7cb87cfa744e622e5a04d2f87cc1ae38 ion3-mod-xrandr-20070220.tar.bz2 10822
-MD5 47c6573679eead6183c49bdbc660aedd ion3-scripts-20070322.tar.bz2 101212
-RMD160 101a6dd933b5b9b495ca4607a7e0d48d48a9c409 ion3-scripts-20070322.tar.bz2 101212
-SHA256 6864d75f2f7ca021368b52051c297f5590047257ca39d0332af65c7fef0f8d39 ion3-scripts-20070322.tar.bz2 101212
diff --git a/ion3/files/digest-ion3-20070608 b/ion3/files/digest-ion3-20070608
new file mode 100644
index 0000000..0afc069
--- /dev/null
+++ b/ion3/files/digest-ion3-20070608
@@ -0,0 +1,6 @@
+MD5 ba02edff5d4726104f98fa70b6cd96d8 ion-3rc-20070608.tar.gz 655442
+RMD160 41fd6d581e27770e63f7bc66122684d8c11667f2 ion-3rc-20070608.tar.gz 655442
+SHA256 1ebad89f61c3ac58bd583cfe3a0cb71c5254679a9f35f46d954d6e72eada86e8 ion-3rc-20070608.tar.gz 655442
+MD5 45dc4b83f2badbade8389953b3c49da7 ion-doc-3rc-20070506.tar.gz 669471
+RMD160 aa9e75b60c121d3cd62f60afed4592fe1bc0da87 ion-doc-3rc-20070506.tar.gz 669471
+SHA256 9dac4f5e69121b98cf6e5da455d6185f00605cf237f14fc4f8578446f622476e ion-doc-3rc-20070506.tar.gz 669471
diff --git a/ion3/files/ion3-mod-ionflux-20070512.tar.bz2 b/ion3/files/ion3-mod-ionflux-20070512.tar.bz2
new file mode 100644
index 0000000..7d451ba
--- /dev/null
+++ b/ion3/files/ion3-mod-ionflux-20070512.tar.bz2
diff --git a/ion3/files/ion3-mod-xrandr-20070410.tar.bz2 b/ion3/files/ion3-mod-xrandr-20070410.tar.bz2
new file mode 100644
index 0000000..6183481
--- /dev/null
+++ b/ion3/files/ion3-mod-xrandr-20070410.tar.bz2
diff --git a/ion3/files/ion3-scripts-20070608.tar.bz2 b/ion3/files/ion3-scripts-20070608.tar.bz2
new file mode 100644
index 0000000..949a24d
--- /dev/null
+++ b/ion3/files/ion3-scripts-20070608.tar.bz2
diff --git a/ion3/ion3-20070318-r2.ebuild b/ion3/ion3-20070318-r2.ebuild
deleted file mode 100644
index bda0a67..0000000
--- a/ion3/ion3-20070318-r2.ebuild
+++ /dev/null
@@ -1,190 +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-20070318-r2.ebuild,v 1.2 2007/06/05 13:29:53 mabi Exp $
-
-inherit eutils flag-o-matic
-
-MY_PV=${PV/_p/-}
-MY_PN=ion-3ds-${MY_PV}
-
-SCRIPTS_PV=20070322
-SCRIPTS_PN=ion3-scripts
-
-IONFLUX_PV=20061022
-IONFLUX_PN=ion3-mod-ionflux
-
-IONXRANDR_PV=20070220
-IONXRANDR_PN=ion3-mod-xrandr
-
-IONDOC_PV=20070318
-IONDOC_PN=ion3-doc
-
-
-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
-	mirror://gentoo/${SCRIPTS_PN}-${SCRIPTS_PV}.tar.bz2
-	mirror://gentoo/${IONXRANDR_PN}-${IONXRANDR_PV}.tar.bz2
-	doc?	( mirror://gentoo/${IONDOC_PN}-${IONDOC_PV}.tar.bz2 )"
-
-LICENSE="LGPL-2.1"
-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}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" epatch
-	use ion3-voidupstreamsupport-truetype && epatch ${FILESDIR}/xft-ion3-${PV}.patch
-
-	# 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 the docpath
-	#sed -i system.mk build/ac/system-ac.mk.in \
-	#	-e "s:\(DOCDIR=@datadir@/doc/\)@PACKAGE_TARNAME@:\1${PF}:"
-
-	cd ${S}/build/ac/
-	autoreconf -i --force
-
-	# FIX for modules
-	cd ${WORKDIR}
-	ln -s ${MY_PN} ion-3
-}
-
-src_compile() {
-	local myconf=""
-
-	myconf="${myconf} `use_enable ion3-voidupstreamsupport-truetype xft`"
-
-	# xfree 
-	if has_version '>=x11-base/xfree-4.3.0'; then
-		myconf="${myconf} --disable-xfree86-textprop-bug-workaround"
-	fi
-
-	# help out this arch as it can't handle certain shared library linkage
-	use hppa && myconf="${myconf} --disable-shared"
-
-	# unicode support
-	use unicode && myconf="${myconf} --enable-Xutf8"
-
-	cd build/ac/
-	econf \
-		${myconf} \
-		--sysconfdir=/etc/X11 \
-
-	cd ${S}
-	make \
-		DOCDIR=/usr/share/doc/${PF} || die
-
-	for i in ${MODULES}
-	do
-	cd ${WORKDIR}/${i}
-
-	emake \
-		prefix=/usr \
-		ETCDIR=/etc/X11/ion3 \
-		SHAREDIR=/usr/share/ion3 \
-		MANDIR=/usr/share/man \
-		DOCDIR=/usr/share/doc/${PF} \
-		LOCALEDIR=/usr/share/locale \
-		LIBDIR=/usr/lib \
-		MODULEDIR=/usr/lib/ion3/mod \
-		LCDIR=/usr/lib/ion3/lc \
-		VARDIR=/var/cache/ion3
-	done
-
-	if ( use doc )
-	then
-		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)."
-}
diff --git a/ion3/ion3-20070608.ebuild b/ion3/ion3-20070608.ebuild
index 0c2dd04..61ad152 100644
--- a/ion3/ion3-20070608.ebuild
+++ b/ion3/ion3-20070608.ebuild
@@ -22,9 +22,6 @@ 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
-	mirror://gentoo/${SCRIPTS_PN}-${SCRIPTS_PV}.tar.bz2
-	mirror://gentoo/${IONXRANDR_PN}-${IONXRANDR_PV}.tar.bz2
-	mirror://gentoo/${IONFLUX_PN}-${IONFLUX_PV}.tar.bz2
 	doc?	( http://iki.fi/tuomov/dl/${IONDOC_PN}-${IONDOC_PV}.tar.gz )"
 
 LICENSE="LGPL-2.1+tuomov"
@@ -55,6 +52,13 @@ MODULES="${IONXRANDR_PN}-${IONXRANDR_PV} ${IONFLUX_PN}-${IONFLUX_PV}"
 src_unpack() {
 	unpack ${A}
 
+	ln -s "${FILESDIR}"/ion3-scripts-20070608.tar.bz2
+	unpack ./ion3-scripts-20070608.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