Rename binaries, directories, etc. from ion to ion3.

7 files changed, 188 insertions, 3 deletions

diff --git a/x11-wm/ion3/ChangeLog b/x11-wm/ion3/ChangeLog
index 01832300a151..4aca95c090a0 100644
--- a/x11-wm/ion3/ChangeLog
+++ b/x11-wm/ion3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/ion3
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.3 2004/04/07 22:44:56 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.4 2004/05/09 13:37:01 twp Exp $
+
+*ion3-20040316_p1-r1 (09 May 2004)
+
+  09 May 2004; <twp@gentoo.org> +files/ion3-20040316_p1-rename.patch,
+  +files/ion3.desktop, +files/pwm3.desktop, +ion3-20040316_p1-r1.ebuild:
+  Rename binaries, directories, etc. from ion to ion3.
 
   07 Apr 2004; Travis Tilley <lv@gentoo.org> ion3-20040316_p1.ebuild:
   added ~amd64 keyword
diff --git a/x11-wm/ion3/Manifest b/x11-wm/ion3/Manifest
index 02001b12e46d..454456de512b 100644
--- a/x11-wm/ion3/Manifest
+++ b/x11-wm/ion3/Manifest
@@ -1,6 +1,11 @@
-MD5 6557aff2f053348f80fab87c583b016d ChangeLog 525
 MD5 90e4d99f0dd6789520fb12abe3af4f9f ion3-20040316_p1.ebuild 1370
+MD5 6b34f9396e23725d3a5da8d2b8f881ef ion3-20040316_p1-r1.ebuild 1878
+MD5 6557aff2f053348f80fab87c583b016d ChangeLog 525
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 MD5 6f74d19623693aaf001c28fb5d2657be files/digest-ion3-20040316_p1 70
-MD5 aac436d9230b2b3cda72feb184295c1a files/ion.desktop 214
+MD5 e5e408ab1f83116c2138a26b20c86653 files/pwm3.desktop 170
+MD5 703068cb52061535f0eb30e5d9c4de2c files/ion3-20040316_p1-rename.patch 2248
 MD5 5e2a511f6530e0cee20b7e6dfbebc3e7 files/ion3-20040316-libtu-I.patch 357
+MD5 00450ed1292b72e2be71b9860c4db6ee files/ion3.desktop 217
+MD5 aac436d9230b2b3cda72feb184295c1a files/ion.desktop 214
+MD5 6f74d19623693aaf001c28fb5d2657be files/digest-ion3-20040316_p1-r1 70
diff --git a/x11-wm/ion3/files/digest-ion3-20040316_p1-r1 b/x11-wm/ion3/files/digest-ion3-20040316_p1-r1
new file mode 100644
index 000000000000..d393e373d369
--- /dev/null
+++ b/x11-wm/ion3/files/digest-ion3-20040316_p1-r1
@@ -0,0 +1 @@
+MD5 d15889f8e5a5731f376543d237d2be46 ion-3ds-20040316-1.tar.gz 414541
diff --git a/x11-wm/ion3/files/ion3-20040316_p1-rename.patch b/x11-wm/ion3/files/ion3-20040316_p1-rename.patch
new file mode 100644
index 000000000000..14ccefd21ae3
--- /dev/null
+++ b/x11-wm/ion3/files/ion3-20040316_p1-rename.patch
@@ -0,0 +1,73 @@
+diff -Naur ion-3ds-20040316-1/configure.ac ion/configure.ac
+--- ion-3ds-20040316-1/configure.ac	2004-03-16 21:43:59.000000000 +0100
++++ ion/configure.ac	2004-05-08 19:18:14.976007088 +0200
+@@ -5,7 +5,7 @@
+ AC_INIT([Ion Window Manager],
+         [ION_VERSION],
+         [tuomov@iki.fi],
+-        [ion])
++        [ion3])
+ AC_PREREQ([2.58])
+ AC_REVISION([$Revision: 1.1 $])
+ 
+diff -Naur ion-3ds-20040316-1/man/ion.1.in ion/man/ion.1.in
+--- ion-3ds-20040316-1/man/ion.1.in	2004-02-14 23:11:37.000000000 +0100
++++ ion/man/ion.1.in	2004-05-08 19:18:14.978006784 +0200
+@@ -2,7 +2,7 @@
+ .SH NAME
+ Ion - an X11 window manager
+ .SH SYNOPSIS
+-.B ion
++.B ion3
+ .I "[options]"
+ .SH "DESCRIPTION"
+ 
+@@ -432,7 +432,7 @@
+ .PP
+ .I DOCDIR/
+ .PP
+-\fIX(7x)\fP, \fIpwm(1)\fP, \fIjoe(1)\fP
++\fIX(7x)\fP, \fIpwm3(1)\fP, \fIjoe(1)\fP
+ 
+ .SH AUTHOR
+ Ion was written by Tuomo Valkonen <tuomov at iki.fi>.
+diff -Naur ion-3ds-20040316-1/man/pwm.1.in ion/man/pwm.1.in
+--- ion-3ds-20040316-1/man/pwm.1.in	2004-02-10 11:35:04.000000000 +0100
++++ ion/man/pwm.1.in	2004-05-08 19:18:14.979006632 +0200
+@@ -2,7 +2,7 @@
+ .SH NAME
+ PWM - An X11 window manager
+ .SH SYNOPSIS
+-.B pwm
++.B pwm3
+ .I "[options]"
+ .SH "DESCRIPTION"
+ 
+@@ -75,5 +75,5 @@
+ .SH SEE ALSO
+ 
+ For more information, see
+-\fIion(1)\fP.
++\fIion3(1)\fP.
+ 
+diff -Naur ion-3ds-20040316-1/mod_query/querylib.lua ion/mod_query/querylib.lua
+--- ion-3ds-20040316-1/mod_query/querylib.lua	2004-03-15 00:40:22.000000000 +0100
++++ ion/mod_query/querylib.lua	2004-05-08 19:20:58.235187920 +0200
+@@ -541,7 +541,7 @@
+ -- \file{ion-completeman} is used to complete manual pages.
+ function querylib.query_man(mplex)
+     local script=querylib.lookup_script_warn(mplex, "ion-man")
+-    querylib.do_query_execwith(mplex, "Manual page (ion):", "ion",
++    querylib.do_query_execwith(mplex, "Manual page (ion3):", "ion3",
+                                script, querylib.man_completor)
+ end
+ 
+diff -Naur ion-3ds-20040316-1/share/ion-man.in ion/share/ion-man.in
+--- ion-3ds-20040316-1/share/ion-man.in	2004-02-11 02:25:27.000000000 +0100
++++ ion/share/ion-man.in	2004-05-08 19:20:07.350923504 +0200
+@@ -1,4 +1,4 @@
+ #!/bin/sh
+-topic=ion
++topic=ion3
+ test $# -ge 1 && topic=$*
+ exec @SHAREDIR@/ion-runinxterm -T "$topic manual" man $topic
diff --git a/x11-wm/ion3/files/ion3.desktop b/x11-wm/ion3/files/ion3.desktop
new file mode 100644
index 000000000000..ba4103ec1953
--- /dev/null
+++ b/x11-wm/ion3/files/ion3.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Ion3
+Comment=A tiling tabbed window manager designed with keyboard users in mind.
+Exec=ion3
+TryExec=ion3
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
diff --git a/x11-wm/ion3/files/pwm3.desktop b/x11-wm/ion3/files/pwm3.desktop
new file mode 100644
index 000000000000..072f169fbca6
--- /dev/null
+++ b/x11-wm/ion3/files/pwm3.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=PWM3
+Comment=An X11 window manager
+Exec=pwm3
+TryExec=pwm3
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
diff --git a/x11-wm/ion3/ion3-20040316_p1-r1.ebuild b/x11-wm/ion3/ion3-20040316_p1-r1.ebuild
new file mode 100644
index 000000000000..472aa56dfba2
--- /dev/null
+++ b/x11-wm/ion3/ion3-20040316_p1-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20040316_p1-r1.ebuild,v 1.1 2004/05/09 13:37:01 twp Exp $
+
+inherit eutils
+
+MY_PV=${PV/_p/-}
+MY_PN=ion-3ds-${MY_PV}
+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/dl/${MY_PN}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~ppc ~sparc ~x86 ~amd64"
+IUSE="xinerama"
+DEPEND="virtual/x11
+	app-misc/run-mailcap
+	>=dev-lang/lua-5.0.2
+	>=sys-devel/libtool-1.4.3
+	!x11-wm/ion3-svn"
+S=${WORKDIR}/${MY_PN}
+
+src_compile() {
+
+	epatch ${FILESDIR}/ion3-20040316_p1-rename.patch
+
+	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/ion3 \
+		SHAREDIR=${D}/usr/share/ion3 \
+		MANDIR=${D}/usr/share/man \
+		DOCDIR=${D}/usr/share/doc/${PF} \
+		install || die
+
+	mv ${D}/usr/bin/ion ${D}/usr/bin/ion3
+	mv ${D}/usr/bin/pwm ${D}/usr/bin/pwm3
+	mv ${D}/usr/share/man/man1/ion.1 ${D}/usr/share/man/man1/ion3.1
+	mv ${D}/usr/share/man/man1/pwm.1 ${D}/usr/share/man/man1/pwm3.1
+
+	prepalldocs
+
+	insinto /usr/include/ion3
+	doins *.h *.mk mkexports.lua
+	for i in de ioncore luaextl mod_floatws mod_ionws mod_menu mod_query mod_sm mod_sp; do
+		insinto /usr/include/ion3/${i}
+		doins ${i}/*.h
+	done
+
+	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
+
+}
+
+pkg_postinst() {
+	ewarn Binaries, directories, etc. have been renamed from ion to ion3.
+	ewarn You might need to update your configuration files.
+}