Version bump

(Portage version: 2.1.2.2)

7 files changed, 421 insertions, 1 deletions

diff --git a/x11-wm/ion3/ChangeLog b/x11-wm/ion3/ChangeLog
index c36ab5f00c0c..f6e4bd7cea06 100644
--- a/x11-wm/ion3/ChangeLog
+++ b/x11-wm/ion3/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-wm/ion3
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.44 2007/02/21 22:37:55 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.45 2007/03/11 09:40:37 mabi Exp $
+
+*ion3-20070203 (11 Mar 2007)
+
+  11 Mar 2007; Matti Bickel <mabi@gentoo.org>
+  +files/20070203/201_all_fix-paths.patch,
+  +files/20070203/202_all_fix-menus.patch,
+  +files/20070203/205_all_ion-lock.patch,
+  +files/20070203/207_all_bindings-manpage.patch, +ion3-20070203.ebuild:
+  Version bump (warning: no xinerama, no xft support)
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-wm/ion3/files/20070203/201_all_fix-paths.patch b/x11-wm/ion3/files/20070203/201_all_fix-paths.patch
new file mode 100644
index 000000000000..7f8f228fed40
--- /dev/null
+++ b/x11-wm/ion3/files/20070203/201_all_fix-paths.patch
@@ -0,0 +1,90 @@
+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/x11-wm/ion3/files/20070203/202_all_fix-menus.patch b/x11-wm/ion3/files/20070203/202_all_fix-menus.patch
new file mode 100644
index 000000000000..f218a330ad31
--- /dev/null
+++ b/x11-wm/ion3/files/20070203/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
+@@ -324,7 +324,8 @@
+ -- Main menu
+ defmenu("mainmenu", {
+     submenu("Programs",         "appmenu"),
+-    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/20070203/205_all_ion-lock.patch b/x11-wm/ion3/files/20070203/205_all_ion-lock.patch
new file mode 100644
index 000000000000..dda201612800
--- /dev/null
+++ b/x11-wm/ion3/files/20070203/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/20070203/207_all_bindings-manpage.patch b/x11-wm/ion3/files/20070203/207_all_bindings-manpage.patch
new file mode 100644
index 000000000000..5fac5481cf71
--- /dev/null
+++ b/x11-wm/ion3/files/20070203/207_all_bindings-manpage.patch
@@ -0,0 +1,117 @@
+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/x11-wm/ion3/files/digest-ion3-20070203 b/x11-wm/ion3/files/digest-ion3-20070203
new file mode 100644
index 000000000000..f0accd1d5cf1
--- /dev/null
+++ b/x11-wm/ion3/files/digest-ion3-20070203
@@ -0,0 +1,9 @@
+MD5 15b8f253c9a62b97a9881d431908da2a ion-3ds-20070203.tar.gz 644970
+RMD160 5a208900986c9fa62912754f8a35f245165fc7c0 ion-3ds-20070203.tar.gz 644970
+SHA256 950a2d27123d105d06d807b705c9ed5f6c93541976451078fbbb19c2150d8058 ion-3ds-20070203.tar.gz 644970
+MD5 454d6eb52c2c7c3622582a97e8e89184 ion3-mod-xrandr-20061021.tar.bz2 10762
+RMD160 cca3f472e32b8aff1ce8af123c24e17574c1b197 ion3-mod-xrandr-20061021.tar.bz2 10762
+SHA256 cd2225a356ddfc6f02062bf23c1e90fa573661347ff185316aeae0e18eee72ef ion3-mod-xrandr-20061021.tar.bz2 10762
+MD5 b10c58fcab7da993ad4fd769ead6989a ion3-scripts_20070203.orig.tar.gz 123859
+RMD160 bd5f0085fadc36e5875b505dee4aa08204bf2f2b ion3-scripts_20070203.orig.tar.gz 123859
+SHA256 869e5947f9b8663a701c4748245fdc4abd7225df27d2ca4418f9563af7c5643e ion3-scripts_20070203.orig.tar.gz 123859
diff --git a/x11-wm/ion3/ion3-20070203.ebuild b/x11-wm/ion3/ion3-20070203.ebuild
new file mode 100644
index 000000000000..f67a30b279e0
--- /dev/null
+++ b/x11-wm/ion3/ion3-20070203.ebuild
@@ -0,0 +1,160 @@
+# 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-20070203.ebuild,v 1.1 2007/03/11 09:40:37 mabi Exp $
+
+inherit eutils
+
+MY_PV=${PV/_p/-}
+MY_PN=ion-3ds-${MY_PV}
+
+SCRIPTS_PV=20070203
+SCRIPTS_PN=ion3-scripts
+
+IONXRANDR_PV=20061021
+IONXRANDR_PN=ion3-mod-xrandr
+
+
+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://debian/pool/main/i/${SCRIPTS_PN}/${SCRIPTS_PN}_${SCRIPTS_PV}.orig.tar.gz
+	mirror://gentoo/${IONXRANDR_PN}-${IONXRANDR_PV}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="unicode"
+DEPEND="
+	|| (
+		(
+			x11-libs/libICE
+			x11-libs/libXext
+			x11-libs/libSM
+		)
+		virtual/x11
+	)
+	app-misc/run-mailcap
+	>=dev-lang/lua-5.1.1"
+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
+
+	# Rewrite install directories to be prefixed by DESTDIR for sake of portage's sandbox
+	sed -i Makefile */Makefile */*/Makefile build/rules.mk \
+		-e 's!\($(INSTALL\w*)\|rm -f\|ln -s\)\(.*\)\($(\w\+DIR)\)!\1\2$(DESTDIR)\3!g'
+
+	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 \
+			-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
+
+	cd ${S}/build/ac/
+	autoreconf -i --force
+
+	# 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
+		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
+}
+
+src_install() {
+
+	emake \
+		DESTDIR=${D} \
+	install || die
+
+	prepalldocs
+
+	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
+
+	echo 'dopath("mod_xrandr")' >> ${D}/etc/X11/ion3/cfg_modules.lua
+
+	mv ${D}/usr/share/doc/ion3 ${D}/usr/share/doc/${PF}
+}
+
+pkg_postinst() {
+	elog "Please note that this release does *not* include xinerama support
+	anymore."
+	elog "Support for that feature has been dropped upstream."
+	elog "Also, xft (via iontruetype) is gone, in a bid to close the gap to
+	upstream."
+}