version bump

svn path=/; revision=7

9 files changed, 369 insertions, 0 deletions

diff --git a/x11-wm/ion3/ChangeLog b/x11-wm/ion3/ChangeLog
index 07fbdb5..ad85a40 100644
--- a/x11-wm/ion3/ChangeLog
+++ b/x11-wm/ion3/ChangeLog
@@ -2,6 +2,14 @@
 # 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 $
 
+  14 Jul 2007; Matti Bickel <mabi@gentoo.org>
+  +files/ion3-scripts-20070708.tar.bz2,
+  +files/20070708/201_all_fix-paths.patch,
+  +files/20070708/202_all_fix-menus.patch,
+  +files/20070708/205_all_ion-lock.patch,
+  +files/20070708/208_all_as-needed.patch, +ion3-20070708.ebuild:
+  version bump.
+
   10 Jun 2007; Matti Bickel <mabi@gentoo.org> 
   -files/20070318/201_all_fix-paths.patch,
   -files/20070318/202_all_fix-menus.patch,
diff --git a/x11-wm/ion3/Manifest b/x11-wm/ion3/Manifest
index ddd5cea..88e60a6 100644
--- a/x11-wm/ion3/Manifest
+++ b/x11-wm/ion3/Manifest
@@ -66,6 +66,22 @@ AUX 20070608/208_all_as-needed.patch 350 RMD160 d4a5d21442b8cdb618e116dd542389b2
 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 20070708/201_all_fix-paths.patch 2197 RMD160 0b8e10fec59bc47421e1a03c912c94cde4442282 SHA1 77f8b846aec55e48fbffb71306458c75baf806a5 SHA256 b22f7202f51ff7a5a775ed6cfa2cced23716a9ec5bad29538eab6632748802b6
+MD5 b6a97e57804b8c383f41ef27662d4cdb files/20070708/201_all_fix-paths.patch 2197
+RMD160 0b8e10fec59bc47421e1a03c912c94cde4442282 files/20070708/201_all_fix-paths.patch 2197
+SHA256 b22f7202f51ff7a5a775ed6cfa2cced23716a9ec5bad29538eab6632748802b6 files/20070708/201_all_fix-paths.patch 2197
+AUX 20070708/202_all_fix-menus.patch 990 RMD160 a49c2e8c44c4c7ddceae989a0637cb4ca51647f4 SHA1 ef72a6d5b100c8148d96f6718bc95a456a3b51eb SHA256 2f9404a884e28f9d7ff42ba6ae24df99436b7a9f3c75560282fb87daa9fdf9af
+MD5 aecae9e8f4e48e9b74532a3309643598 files/20070708/202_all_fix-menus.patch 990
+RMD160 a49c2e8c44c4c7ddceae989a0637cb4ca51647f4 files/20070708/202_all_fix-menus.patch 990
+SHA256 2f9404a884e28f9d7ff42ba6ae24df99436b7a9f3c75560282fb87daa9fdf9af files/20070708/202_all_fix-menus.patch 990
+AUX 20070708/205_all_ion-lock.patch 780 RMD160 9834836d55fb390f06d8e3c1ea821ef01c1a74b8 SHA1 6bd0278dd7d56fd9f1025fae8a00db24bf0e781f SHA256 ea4ad810355fab8a848e6506a6a2762b5ab9c37f28a7edac73030e6026bc3fae
+MD5 4f2dcedcbf6d885723d1b888f0aacb87 files/20070708/205_all_ion-lock.patch 780
+RMD160 9834836d55fb390f06d8e3c1ea821ef01c1a74b8 files/20070708/205_all_ion-lock.patch 780
+SHA256 ea4ad810355fab8a848e6506a6a2762b5ab9c37f28a7edac73030e6026bc3fae files/20070708/205_all_ion-lock.patch 780
+AUX 20070708/208_all_as-needed.patch 350 RMD160 d4a5d21442b8cdb618e116dd542389b2c6a0d442 SHA1 2a59201ad480f35e7553c4bd470c696fc5dc0436 SHA256 0bedd444e6384f35f6b37c4ec2848150f25ae1d1b93fe5062934887786cba893
+MD5 477892385b4dd0708761fe54886459d7 files/20070708/208_all_as-needed.patch 350
+RMD160 d4a5d21442b8cdb618e116dd542389b2c6a0d442 files/20070708/208_all_as-needed.patch 350
+SHA256 0bedd444e6384f35f6b37c4ec2848150f25ae1d1b93fe5062934887786cba893 files/20070708/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
@@ -86,6 +102,10 @@ AUX ion3-scripts-20070608.tar.bz2 101584 RMD160 5728f7923ecf121b923169d974717933
 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-scripts-20070708.tar.bz2 102282 RMD160 ec4b85a9362ed0ba0975eb9fef48527775f8962f SHA1 5b76ee9dcbbbf8d15eebc5ae015ae73dbf6e66ea SHA256 c7f4410796ae559610499250bfee7d214b6248d334d08852e3f54f3d163dea3d
+MD5 0f4166b2330577eb60e7c3027a327c73 files/ion3-scripts-20070708.tar.bz2 102282
+RMD160 ec4b85a9362ed0ba0975eb9fef48527775f8962f files/ion3-scripts-20070708.tar.bz2 102282
+SHA256 c7f4410796ae559610499250bfee7d214b6248d334d08852e3f54f3d163dea3d files/ion3-scripts-20070708.tar.bz2 102282
 AUX ion3.desktop 217 RMD160 438917d6c0370e7a368598ea611ec7658312627d SHA1 cf5cd1f09faf7530f8cb2f832a17c0cf893541c4 SHA256 4742797e200b956abf3d0b94d860aa7430c9f67a97f3640ef2c28168fa773bb9
 MD5 00450ed1292b72e2be71b9860c4db6ee files/ion3.desktop 217
 RMD160 438917d6c0370e7a368598ea611ec7658312627d files/ion3.desktop 217
@@ -110,7 +130,9 @@ DIST ion-3ds-20060326.tar.gz 617533 RMD160 147e6ad20c69ca8fe5a80dcd57ce6002a2b3c
 DIST ion-3ds-20061223.tar.gz 649463 RMD160 dc61a012354a30f1a83b8b0970b8c09724ea4c9c SHA1 8bccf120ce27b26feb67a916ba61748e85e69733 SHA256 0970fef74de659de45813471560ebe2f97b893de7a238ea00755fcaeb9b7d89e
 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-3rc-20070708.tar.gz 655000 RMD160 85947dc1b1dd7abd4304a42e2e946a7641cda8c4 SHA1 84bc9871d9f3c6f37d614d7e9eb54021d3e866e5 SHA256 f59eafbda1f13d5d21129c222a4c64b9ce7a4e7b3f9fd93bb739dfd5af1fca0f
 DIST ion-doc-3rc-20070506.tar.gz 669471 RMD160 aa9e75b60c121d3cd62f60afed4592fe1bc0da87 SHA1 1991e12e4f72153f2e02c70910322317c73a7c01 SHA256 9dac4f5e69121b98cf6e5da455d6185f00605cf237f14fc4f8578446f622476e
+DIST ion-doc-3rc-20070708.tar.gz 669854 RMD160 ba3bdb7b4ca4331738faa0aa2501d662644d0a39 SHA1 87d7b67684c9054d1d55fb15dd4a182d4a5b7f33 SHA256 d1651f219a43f413de618a7bf158ddbc42c2c3025807965271c97214bba10ef3
 DIST ion3-mod-ionflux-20070512.tar.bz2 12770 RMD160 8e834de0c3048b676bc5c5d5454aedac09129eb3 SHA1 d482654557104adfbf6d184e44f87a993577720a SHA256 63c4902159923aa02921e39aa7746ca8819ba1c216efa8fa6384fd093f60d18c
 DIST ion3-mod-ionflux_20061022.orig.tar.gz 14847 RMD160 86bcc2a260f3e37d613bcebd66f37616e56d3926 SHA1 64d56a158de66cd15b03dfdccc8162509432fa01 SHA256 f9fd872d2d5b35f882d9a9161dee52fd5b2bb346c46f9e6cc30922dcda99c935
 DIST ion3-mod-xrandr-20061021.tar.bz2 10762 RMD160 cca3f472e32b8aff1ce8af123c24e17574c1b197 SHA1 9c36bc4be2a97f6a9256054ffbb946ad7dc6965a SHA256 cd2225a356ddfc6f02062bf23c1e90fa573661347ff185316aeae0e18eee72ef
@@ -134,6 +156,10 @@ EBUILD ion3-20070608.ebuild 5434 RMD160 3bbf0f46ba4a474507f5b00a112f73cd5fb13fad
 MD5 d125b643c6e7fedd3fd39b3eee26590c ion3-20070608.ebuild 5434
 RMD160 3bbf0f46ba4a474507f5b00a112f73cd5fb13fad ion3-20070608.ebuild 5434
 SHA256 07571dbe75cecf227671348c4b5bfa9f5439af6ef2a7c506aa571ef7208af25f ion3-20070608.ebuild 5434
+EBUILD ion3-20070708.ebuild 5446 RMD160 560fe571f06a74385afb6c3f048c64fb3e99adbe SHA1 85976379a772ff790cf69ca01c2a71e272e5b85b SHA256 c44b076872f3192bd199833f1acb22d7424a20980ed6638bb4db81820bba6bf9
+MD5 34490fddfd411cd28dc2112b2a070484 ion3-20070708.ebuild 5446
+RMD160 560fe571f06a74385afb6c3f048c64fb3e99adbe ion3-20070708.ebuild 5446
+SHA256 c44b076872f3192bd199833f1acb22d7424a20980ed6638bb4db81820bba6bf9 ion3-20070708.ebuild 5446
 MISC ChangeLog 10375 RMD160 44831fa4cab66a4d68210b8db0ab5230abd85a2a SHA1 06862403b7059e75b320ebffa42b28c37faad5ac SHA256 5417271e93f60b0d73bb2eb096a9df4d285443a0325c573aad192c6c036ddc88
 MD5 47915c62e470adb2d18c8577cb0e9f01 ChangeLog 10375
 RMD160 44831fa4cab66a4d68210b8db0ab5230abd85a2a ChangeLog 10375
@@ -142,6 +168,10 @@ MISC metadata.xml 248 RMD160 7e7a4fe276728c6c4d6d0face7f0708dae9776d7 SHA1 b16dc
 MD5 c4aada614ade13541606f0901dffd61f metadata.xml 248
 RMD160 7e7a4fe276728c6c4d6d0face7f0708dae9776d7 metadata.xml 248
 SHA256 3f6027d293a7bd953fd444ba8a1345ca6b9c00c28b35e8328386b9635d8eb71f metadata.xml 248
+MISC report 824 RMD160 da1afd944e9fbebeb5cc7e20a0ce2fd950c4248d SHA1 d3d4e3e43506f6c26e431afa1dbafc79fecbe4f1 SHA256 2bc6211212c40a632a642589825de13663647b47f63dafdebaffa9c7c3cca866
+MD5 4e254db688b0f0337ffae5c3f937e605 report 824
+RMD160 da1afd944e9fbebeb5cc7e20a0ce2fd950c4248d report 824
+SHA256 2bc6211212c40a632a642589825de13663647b47f63dafdebaffa9c7c3cca866 report 824
 MD5 27ad3490f271ac787c7c59dcee131a73 files/digest-ion3-20060326 250
 RMD160 ee5cd1057ee8e32b8e30b05fb8e036082dbdf47d files/digest-ion3-20060326 250
 SHA256 43e4165551f43f347ae8bd8beb5a8fe24f29c39d4273107bd541c271c89eef6c files/digest-ion3-20060326 250
@@ -154,3 +184,6 @@ SHA256 f2b7c50a3bf973359aa6e899f99fede7ebdd3698b2e93918d9f5e1306ef6ae19 files/di
 MD5 d9224226ab2e1fe595374de99c915783 files/digest-ion3-20070608 512
 RMD160 a3ab13d5eb784001a522c16efb6b0555534b02f2 files/digest-ion3-20070608 512
 SHA256 8969af66aa32f5e7c6845105a35b7529b8b46d9d8b46e7e5cb9bad1e24eb4f9b files/digest-ion3-20070608 512
+MD5 3ffec47cb8b65c8e02313e8a8d03c622 files/digest-ion3-20070708 512
+RMD160 51f55c28e35e3a4fdeae926975f7acedf94bea23 files/digest-ion3-20070708 512
+SHA256 1a120da49a0ed72f7cc75e49eff70fb1df0b5810f6ee221f7d7280f92129abb0 files/digest-ion3-20070708 512
diff --git a/x11-wm/ion3/files/20070708/201_all_fix-paths.patch b/x11-wm/ion3/files/20070708/201_all_fix-paths.patch
new file mode 100644
index 0000000..cb27bfc
--- /dev/null
+++ b/x11-wm/ion3/files/20070708/201_all_fix-paths.patch
@@ -0,0 +1,75 @@
+--- 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/20070708/202_all_fix-menus.patch b/x11-wm/ion3/files/20070708/202_all_fix-menus.patch
new file mode 100644
index 0000000..c2d77c8
--- /dev/null
+++ b/x11-wm/ion3/files/20070708/202_all_fix-menus.patch
@@ -0,0 +1,13 @@
+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/20070708/205_all_ion-lock.patch b/x11-wm/ion3/files/20070708/205_all_ion-lock.patch
new file mode 100644
index 0000000..dda2016
--- /dev/null
+++ b/x11-wm/ion3/files/20070708/205_all_ion-lock.patch
@@ -0,0 +1,22 @@
+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/20070708/208_all_as-needed.patch b/x11-wm/ion3/files/20070708/208_all_as-needed.patch
new file mode 100644
index 0000000..662a078
--- /dev/null
+++ b/x11-wm/ion3/files/20070708/208_all_as-needed.patch
@@ -0,0 +1,12 @@
+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/digest-ion3-20070708 b/x11-wm/ion3/files/digest-ion3-20070708
new file mode 100644
index 0000000..0f91241
--- /dev/null
+++ b/x11-wm/ion3/files/digest-ion3-20070708
@@ -0,0 +1,6 @@
+MD5 c9782f343d0c50bef81573644eb7e176 ion-3rc-20070708.tar.gz 655000
+RMD160 85947dc1b1dd7abd4304a42e2e946a7641cda8c4 ion-3rc-20070708.tar.gz 655000
+SHA256 f59eafbda1f13d5d21129c222a4c64b9ce7a4e7b3f9fd93bb739dfd5af1fca0f ion-3rc-20070708.tar.gz 655000
+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/ion3-scripts-20070708.tar.bz2 b/x11-wm/ion3/files/ion3-scripts-20070708.tar.bz2
new file mode 100644
index 0000000..f805089
--- /dev/null
+++ b/x11-wm/ion3/files/ion3-scripts-20070708.tar.bz2
diff --git a/x11-wm/ion3/ion3-20070708.ebuild b/x11-wm/ion3/ion3-20070708.ebuild
new file mode 100644
index 0000000..b4ab164
--- /dev/null
+++ b/x11-wm/ion3/ion3-20070708.ebuild
@@ -0,0 +1,200 @@
+# 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=20070708
+SCRIPTS_PN=ion3-scripts
+
+IONFLUX_PV=20070512
+IONFLUX_PN=ion3-mod-ionflux
+
+IONXRANDR_PV=20070410
+IONXRANDR_PN=ion3-mod-xrandr
+
+IONDOC_PV=20070708
+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."
+}