Version bump, remove old versions.

7 files changed, 15 insertions, 93 deletions

diff --git a/x11-wm/ion3/ChangeLog b/x11-wm/ion3/ChangeLog
index 0f61f38b2d0d..4f69ed44c2d0 100644
--- a/x11-wm/ion3/ChangeLog
+++ b/x11-wm/ion3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/ion3
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.7 2004/09/06 18:55:40 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.8 2004/10/05 08:47:14 twp Exp $
+
+*ion3-20041005 (05 Oct 2004)
+
+  05 Oct 2004; Tom Payne <twp@gentoo.org> -ion3-20040316_p1-r1.ebuild,
+  -ion3-20040316_p1.ebuild, +ion3-20041005.ebuild:
+  Version bump, remove old versions.
 
 *ion3-20040906 (06 Sep 2004)
 
diff --git a/x11-wm/ion3/Manifest b/x11-wm/ion3/Manifest
index 118d63bbd48b..1af38723d05b 100644
--- a/x11-wm/ion3/Manifest
+++ b/x11-wm/ion3/Manifest
@@ -1,13 +1,11 @@
-MD5 f1b34d98e54cfd12071d9b1a1297a832 ion3-20040316_p1.ebuild 1367
+MD5 6cebf1203ea19cf2422ad193738ec313 ion3-20041005.ebuild 1481
 MD5 c5a457654cef1fd61d9ec2258b00fb20 ion3-20040906.ebuild 1657
-MD5 9f4cccf97f66c9aaa81b31427b40f80d ion3-20040316_p1-r1.ebuild 2081
-MD5 04f78ee6a44d3d14342d3b1b40e21cff ChangeLog 971
+MD5 f6060f544ccc1dc679eac038d92ffa64 ChangeLog 1161
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
-MD5 6f74d19623693aaf001c28fb5d2657be files/digest-ion3-20040316_p1 70
 MD5 e5e408ab1f83116c2138a26b20c86653 files/pwm3.desktop 170
 MD5 09b215ad9f8569d0285311935897785a files/ion3-20040316_p1-rename.patch 2248
 MD5 5e2a511f6530e0cee20b7e6dfbebc3e7 files/ion3-20040316-libtu-I.patch 357
 MD5 0e1e0675cbe6c598285db1ba294fa634 files/digest-ion3-20040906 68
+MD5 77c936250963ebe695b1d532a1f2c679 files/digest-ion3-20041005 68
 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 b/x11-wm/ion3/files/digest-ion3-20040316_p1
deleted file mode 100644
index d393e373d369..000000000000
--- a/x11-wm/ion3/files/digest-ion3-20040316_p1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d15889f8e5a5731f376543d237d2be46 ion-3ds-20040316-1.tar.gz 414541
diff --git a/x11-wm/ion3/files/digest-ion3-20040316_p1-r1 b/x11-wm/ion3/files/digest-ion3-20040316_p1-r1
deleted file mode 100644
index d393e373d369..000000000000
--- a/x11-wm/ion3/files/digest-ion3-20040316_p1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d15889f8e5a5731f376543d237d2be46 ion-3ds-20040316-1.tar.gz 414541
diff --git a/x11-wm/ion3/files/digest-ion3-20041005 b/x11-wm/ion3/files/digest-ion3-20041005
new file mode 100644
index 000000000000..4aa4725cc27e
--- /dev/null
+++ b/x11-wm/ion3/files/digest-ion3-20041005
@@ -0,0 +1 @@
+MD5 51a0d72275585e4d8da5c3318499b878 ion-3ds-20041005.tar.gz 520439
diff --git a/x11-wm/ion3/ion3-20040316_p1.ebuild b/x11-wm/ion3/ion3-20040316_p1.ebuild
deleted file mode 100644
index aa6515809333..000000000000
--- a/x11-wm/ion3/ion3-20040316_p1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20040316_p1.ebuild,v 1.3 2004/06/24 23:42:27 agriffis 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
-	!x11-wm/ion
-	!x11-wm/ion-devel
-	!x11-wm/ion2"
-S=${WORKDIR}/${MY_PN}
-
-src_compile() {
-
-	local myconf=""
-
-	if has_version '>=x11-base/xfree-4.3.0'; then
-		myconf="${myconf} --disable-xfree86-textprop-bug-workaround"
-	fi
-
-	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/ion \
-		SHAREDIR=${D}/usr/share/ion \
-		MANDIR=${D}/usr/share/man \
-		DOCDIR=${D}/usr/share/doc/${PF} \
-		install || die
-
-	prepalldocs
-
-	echo -e "#!/bin/sh\n/usr/bin/ion" > ${T}/ion
-	echo -e "#!/bin/sh\n/usr/bin/pwm" > ${T}/pwm
-	exeinto /etc/X11/Sessions
-	doexe ${T}/ion ${T}/pwm
-
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/ion.desktop
-
-}
diff --git a/x11-wm/ion3/ion3-20040316_p1-r1.ebuild b/x11-wm/ion3/ion3-20041005.ebuild
index c99626464deb..841af9b86ca4 100644
--- a/x11-wm/ion3/ion3-20040316_p1-r1.ebuild
+++ b/x11-wm/ion3/ion3-20041005.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.3 2004/09/05 18:40:11 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20041005.ebuild,v 1.1 2004/10/05 08:47:14 twp Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ 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"
+SRC_URI="http://modeemi.cs.tut.fi/~tuomov/ion/dl/${MY_PN}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~ppc ~sparc ~x86 ~amd64 ~hppa"
@@ -16,13 +16,12 @@ 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
+	autoreconf
 
 	local myconf=""
 
@@ -30,8 +29,6 @@ src_compile() {
 		myconf="${myconf} --disable-xfree86-textprop-bug-workaround"
 	fi
 
-	autoreconf
-
 	use hppa && myconf="${myconf} --disable-shared"
 
 	econf \
@@ -52,22 +49,11 @@ src_install() {
 		SHAREDIR=${D}/usr/share/ion3 \
 		MANDIR=${D}/usr/share/man \
 		DOCDIR=${D}/usr/share/doc/${PF} \
+		LOCALEDIR=${D}/usr/share/locale \
 		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
@@ -77,8 +63,3 @@ src_install() {
 	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.
-}