Version bump.

4 files changed, 147 insertions, 1 deletions

diff --git a/x11-wm/ion2/ChangeLog b/x11-wm/ion2/ChangeLog
index 11ce921dd465..dbd725d66ae4 100644
--- a/x11-wm/ion2/ChangeLog
+++ b/x11-wm/ion2/ChangeLog
@@ -1,6 +1,9 @@
 # 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.9 2004/04/04 16:19:05 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ChangeLog,v 1.10 2004/04/07 20:57:59 twp Exp $
+
+  07 Apr 2004; Tom Payne <twp@gentoo.org> ion2-20040407.ebuild :
+  Version bump.
 
   31 Mar 2004; Tom Payne <twp@gentoo.oth> ion2-20040211-r3.ebuild :
   Rename binaries so it can co-exist with x11-wm/ion. Bug # 46225.
diff --git a/x11-wm/ion2/files/digest-ion2-20040407 b/x11-wm/ion2/files/digest-ion2-20040407
new file mode 100644
index 000000000000..cb58c604459f
--- /dev/null
+++ b/x11-wm/ion2/files/digest-ion2-20040407
@@ -0,0 +1 @@
+MD5 f27efbd06ab1c8ac26918bef6ed029e7 ion-2-20040407.tar.gz 389518
diff --git a/x11-wm/ion2/files/ion2-20040407-rename.patch b/x11-wm/ion2/files/ion2-20040407-rename.patch
new file mode 100644
index 000000000000..e6876db96ca5
--- /dev/null
+++ b/x11-wm/ion2/files/ion2-20040407-rename.patch
@@ -0,0 +1,52 @@
+diff -Naur ion-2-20040407/configure.ac ion-2/configure.ac
+--- ion-2-20040407/configure.ac	2004-04-07 09:15:37.000000000 +0200
++++ ion-2/configure.ac	2004-04-07 22:14:37.741378408 +0200
+@@ -5,7 +5,7 @@
+ AC_INIT([Ion Window Manager],
+         [2-20040407],
+         [tuomov@iki.fi],
+-        [ion])
++        [ion2])
+ AC_PREREQ([2.58])
+ AC_REVISION([$Revision: 1.1 $])
+ 
+diff -Naur ion-2-20040407/man/ion.1.in ion-2/man/ion.1.in
+--- ion-2-20040407/man/ion.1.in	2004-02-14 01:18:06.000000000 +0100
++++ ion-2/man/ion.1.in	2004-04-07 22:14:08.540817568 +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-20040407/man/pwm.1.in ion-2/man/pwm.1.in
+--- ion-2-20040407/man/pwm.1.in	2004-01-25 19:05:05.000000000 +0100
++++ ion-2/man/pwm.1.in	2004-04-07 22:14:18.730268536 +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 --git a/x11-wm/ion2/ion2-20040407.ebuild b/x11-wm/ion2/ion2-20040407.ebuild
new file mode 100644
index 000000000000..d4b5d6676896
--- /dev/null
+++ b/x11-wm/ion2/ion2-20040407.ebuild
@@ -0,0 +1,90 @@
+# 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-20040407.ebuild,v 1.1 2004/04/07 20:57:59 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-20040407-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
+
+}
+
+pkg_postinst() {
+	ewarn "Binaries and manual pages have been renamed to ion2"
+	ewarn "You might have to edit your .xsession/.xinitrc."
+}