Version bump

5 files changed, 167 insertions, 9 deletions

diff --git a/x11-wm/ion2/ChangeLog b/x11-wm/ion2/ChangeLog
index a5a360f0a532..28a6a10427a6 100644
--- a/x11-wm/ion2/ChangeLog
+++ b/x11-wm/ion2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/ion2
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ChangeLog,v 1.12 2004/04/27 09:33:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ChangeLog,v 1.13 2004/06/01 17:25:41 twp Exp $
+
+*ion2-20040601 (01 Jun 2004)
+
+  01 Jun 2004; <twp@gentoo.org> +ion2-20040601.ebuild:
+  Version bump
 
   10 Apr 2004; Tom Payne <twp@gentoo.org> ion2-20040407.ebuild :
   Stable on x86.
diff --git a/x11-wm/ion2/Manifest b/x11-wm/ion2/Manifest
index d762df821d48..24ec18998a19 100644
--- a/x11-wm/ion2/Manifest
+++ b/x11-wm/ion2/Manifest
@@ -1,14 +1,17 @@
-MD5 b617ea0366190a010e7899d959de7e44 ChangeLog 1604
 MD5 6c697a4404ad66334d25822c4be239a2 ion2-20040211-r2.ebuild 1877
-MD5 fd1da68fee2f1fbf9e681b99d27a34f3 ion2-20040211-r3.ebuild 2336
+MD5 715abb5daccbe9fc6837dca0ec177fb1 ion2-20040601.ebuild 1919
 MD5 c1b1e76fa2c33495abf9ae6001eaba8c ion2-20040407.ebuild 2056
+MD5 fd1da68fee2f1fbf9e681b99d27a34f3 ion2-20040211-r3.ebuild 2336
+MD5 b617ea0366190a010e7899d959de7e44 ChangeLog 1604
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
-MD5 91e9228c6c714b8031f826c8523a2274 files/digest-ion2-20040211-r2 66
-MD5 91e9228c6c714b8031f826c8523a2274 files/digest-ion2-20040211-r3 66
-MD5 b859933d50477325c39aef05f4040cce files/digest-ion2-20040407 66
+MD5 75fdff828b88dd9c4dd69be914357bbf files/ion2-20040407-rename.patch 1272
 MD5 0b7705816fa1d59203e2ebd35db2632d files/ion2-20040207-20040211.patch 8684
+MD5 b55d904229df9c77375c94ac665c2440 files/ion2-20040601-rename.patch 1721
+MD5 b859933d50477325c39aef05f4040cce files/digest-ion2-20040407 66
+MD5 6cccbee40afc6bbeeb8d39ca052f184c files/digest-ion2-20040601 66
 MD5 ed5496e76f679ff7e17e2056ca5e0273 files/ion2-20040207-rename.patch 1220
-MD5 75fdff828b88dd9c4dd69be914357bbf files/ion2-20040407-rename.patch 1272
-MD5 fba46fa26a6acc7159f6eb942abc002d files/ion2.desktop 217
-MD5 fece066216c6fcfa1936d068bd6ca998 files/pwm2.desktop 170
 MD5 16c6e0f00bd204d2f612b781d7b73f54 files/xftde-20040207.patch 18552
+MD5 fece066216c6fcfa1936d068bd6ca998 files/pwm2.desktop 170
+MD5 fba46fa26a6acc7159f6eb942abc002d files/ion2.desktop 217
+MD5 91e9228c6c714b8031f826c8523a2274 files/digest-ion2-20040211-r2 66
+MD5 91e9228c6c714b8031f826c8523a2274 files/digest-ion2-20040211-r3 66
diff --git a/x11-wm/ion2/files/digest-ion2-20040601 b/x11-wm/ion2/files/digest-ion2-20040601
new file mode 100644
index 000000000000..bdfb4da45372
--- /dev/null
+++ b/x11-wm/ion2/files/digest-ion2-20040601
@@ -0,0 +1 @@
+MD5 5b2489a48bba865818a3990d49381ce8 ion-2-20040601.tar.gz 398860
diff --git a/x11-wm/ion2/files/ion2-20040601-rename.patch b/x11-wm/ion2/files/ion2-20040601-rename.patch
new file mode 100644
index 000000000000..1abc46ab6cf3
--- /dev/null
+++ b/x11-wm/ion2/files/ion2-20040601-rename.patch
@@ -0,0 +1,64 @@
+diff -Naur ion-2-20040601/configure.ac ion-2/configure.ac
+--- ion-2-20040601/configure.ac	2004-06-01 16:35:22.000000000 +0200
++++ ion-2/configure.ac	2004-06-01 19:10:46.642167184 +0200
+@@ -5,7 +5,7 @@
+ AC_INIT([Ion Window Manager],
+         [2-20040601],
+         [tuomov@iki.fi],
+-        [ion])
++        [ion2])
+ AC_PREREQ([2.58])
+ AC_REVISION([$Revision: 1.1 $])
+ 
+diff -Naur ion-2-20040601/man/ion.1.in ion-2/man/ion.1.in
+--- ion-2-20040601/man/ion.1.in	2004-02-14 01:18:06.000000000 +0100
++++ ion-2/man/ion.1.in	2004-06-01 19:10:46.643167032 +0200
+@@ -2,7 +2,7 @@
+ .SH NAME
+ Ion - an X11 window manager
+ .SH SYNOPSIS
+-.B ion
++.B ion2
+ .I "[options]"
+ .SH "DESCRIPTION"
+ 
+@@ -432,7 +432,7 @@
+ .PP
+ .I DOCDIR/
+ .PP
+-\fIX(7x)\fP, \fIpwm(1)\fP, \fIjoe(1)\fP
++\fIX(7x)\fP, \fIpwm2(1)\fP, \fIjoe(1)\fP
+ 
+ .SH AUTHOR
+ Ion was written by Tuomo Valkonen <tuomov at iki.fi>.
+diff -Naur ion-2-20040601/man/pwm.1.in ion-2/man/pwm.1.in
+--- ion-2-20040601/man/pwm.1.in	2004-01-25 19:05:05.000000000 +0100
++++ ion-2/man/pwm.1.in	2004-06-01 19:10:46.644166880 +0200
+@@ -2,7 +2,7 @@
+ .SH NAME
+ PWM - An X11 window manager
+ .SH SYNOPSIS
+-.B pwm
++.B pwm2
+ .I "[options]"
+ .SH "DESCRIPTION"
+ 
+@@ -75,5 +75,5 @@
+ .SH SEE ALSO
+ 
+ For more information, see
+-\fIion(1)\fP.
++\fIion2(1)\fP.
+ 
+diff -Naur ion-2-20040601/query/querylib.lua ion-2/query/querylib.lua
+--- ion-2-20040601/query/querylib.lua	2004-02-16 18:58:47.000000000 +0100
++++ ion-2/query/querylib.lua	2004-06-01 19:11:53.621984704 +0200
+@@ -585,7 +585,7 @@
+ --}
+ --\end{verbatim}
+ querylib.query_man=querylib.make_execwith_fn(
+-    "Manual page (ion):", "ion",
++    "Manual page (ion2):", "ion2",
+     querylib.make_script_lookup_fn("ion-man"),
+     querylib.man_completor
+ )
diff --git a/x11-wm/ion2/ion2-20040601.ebuild b/x11-wm/ion2/ion2-20040601.ebuild
new file mode 100644
index 000000000000..ba588e9aba91
--- /dev/null
+++ b/x11-wm/ion2/ion2-20040601.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ion2-20040601.ebuild,v 1.1 2004/06/01 17:25:41 twp Exp $
+
+inherit eutils
+
+DESCRIPTION="A tiling tabbed window manager designed with keyboard users in mind"
+HOMEPAGE="http://www.iki.fi/tuomov/ion/"
+SRC_URI="http://modeemi.fi/~tuomov/ion/dl/ion-2-${PV}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~mips ppc ~sparc ~x86"
+IUSE="xinerama"
+DEPEND="virtual/x11
+	app-misc/run-mailcap
+	>=dev-lang/lua-5.0.2
+	>=sys-devel/libtool-1.4.3
+	!<=x11-wm/ion2-20040211-r2"
+S=${WORKDIR}/ion-2-${PV}
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+
+	epatch ${FILESDIR}/ion2-20040601-rename.patch
+
+}
+
+src_compile() {
+
+	local myconf=""
+
+	if has_version '>=x11-base/xfree-4.3.0'; then
+		myconf="${myconf} --disable-xfree86-textprop-bug-workaround"
+	fi
+
+	autoreconf
+
+	econf \
+		--sysconfdir=/etc/X11 \
+		`use_enable xinerama` \
+		${myconf} || die
+
+	emake \
+		DOCDIR=/usr/share/doc/${PF} || die
+
+}
+
+src_install() {
+
+	make \
+		prefix=${D}/usr \
+		ETCDIR=${D}/etc/X11/ion2 \
+		SHAREDIR=${D}/usr/share/ion2 \
+		MANDIR=${D}/usr/share/man \
+		DOCDIR=${D}/usr/share/doc/${PF} \
+		install || die
+
+	mv ${D}/usr/bin/ion ${D}/usr/bin/ion2
+	mv ${D}/usr/bin/pwm ${D}/usr/bin/pwm2
+	mv ${D}/usr/share/man/man1/ion.1 ${D}/usr/share/man/man1/ion2.1
+	mv ${D}/usr/share/man/man1/pwm.1 ${D}/usr/share/man/man1/pwm2.1
+
+	prepalldocs
+
+	insinto /usr/include/ion2
+	doins *.h *.mk mkexports.lua
+	for i in de floatws ioncore ionws luaextl menu query; do
+		insinto /usr/include/ion2/${i}
+		doins ${i}/*.h
+	done
+	insinto /usr/include/ion2/libtu
+	doins libtu/*.h
+
+	echo -e "#!/bin/sh\n/usr/bin/ion2" > ${T}/ion2
+	echo -e "#!/bin/sh\n/usr/bin/pwm2" > ${T}/pwm2
+	exeinto /etc/X11/Sessions
+	doexe ${T}/ion2 ${T}/pwm2
+
+	insinto /usr/share/xsessions
+	doins ${FILESDIR}/ion2.desktop ${FILESDIR}/pwm2.desktop
+
+}