Version bump. Removed old versions.

7 files changed, 19 insertions, 117 deletions

diff --git a/x11-wm/ion2/ChangeLog b/x11-wm/ion2/ChangeLog
index 1149e25519ed..ecb93db73608 100644
--- a/x11-wm/ion2/ChangeLog
+++ b/x11-wm/ion2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/ion2
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ChangeLog,v 1.16 2004/06/28 23:51:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ChangeLog,v 1.17 2004/07/31 12:21:10 twp Exp $
+
+*ion2-20040729 (31 Jul 2004)
+
+  31 Jul 2004; <twp@gentoo.org> -ion2-20040211-r2.ebuild,
+  -ion2-20040211-r3.ebuild, +ion2-20040729.ebuild:
+  Version bump. Removed old versions.
 
   28 Jun 2004; Aron Griffis <agriffis@gentoo.org> ion2-20040211-r2.ebuild,
   ion2-20040211-r3.ebuild:
diff --git a/x11-wm/ion2/Manifest b/x11-wm/ion2/Manifest
index c215a90143f5..e5f848398578 100644
--- a/x11-wm/ion2/Manifest
+++ b/x11-wm/ion2/Manifest
@@ -1,17 +1,15 @@
-MD5 acfde7120ea41519a565df8ed270d815 ion2-20040211-r2.ebuild 1880
 MD5 ccd23a8e9a07d0988746978878e0084c ion2-20040601.ebuild 1910
 MD5 11b697af975c95aac2476f3aa0b50745 ion2-20040407.ebuild 2047
-MD5 b624f745b55c44424866b7f75f9aac5b ion2-20040211-r3.ebuild 2339
-MD5 6d2776d9aedea7268b7bc072c2875d78 ChangeLog 1948
+MD5 3eba91646ac2801890b4e082973b7eef ion2-20040729.ebuild 1906
+MD5 0c2deab6401b56ecd82d9d8e7cd7157d ChangeLog 2121
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 MD5 75fdff828b88dd9c4dd69be914357bbf files/ion2-20040407-rename.patch 1272
 MD5 0b7705816fa1d59203e2ebd35db2632d files/ion2-20040207-20040211.patch 8684
 MD5 7057ed0ec950ad5f77b47a32dbcb4fb4 files/ion2-20040601-rename.patch 1720
 MD5 b859933d50477325c39aef05f4040cce files/digest-ion2-20040407 66
 MD5 6cccbee40afc6bbeeb8d39ca052f184c files/digest-ion2-20040601 66
+MD5 59a0157884665387039b7de882e85f1c files/digest-ion2-20040729 66
 MD5 ed5496e76f679ff7e17e2056ca5e0273 files/ion2-20040207-rename.patch 1220
 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-20040211-r2 b/x11-wm/ion2/files/digest-ion2-20040211-r2
deleted file mode 100644
index 403f80c42ca4..000000000000
--- a/x11-wm/ion2/files/digest-ion2-20040211-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d20cde38bdc15e7e4824cf1140440f51 ion-2-20040207.tar.gz 376466
diff --git a/x11-wm/ion2/files/digest-ion2-20040211-r3 b/x11-wm/ion2/files/digest-ion2-20040211-r3
deleted file mode 100644
index 403f80c42ca4..000000000000
--- a/x11-wm/ion2/files/digest-ion2-20040211-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d20cde38bdc15e7e4824cf1140440f51 ion-2-20040207.tar.gz 376466
diff --git a/x11-wm/ion2/files/digest-ion2-20040729 b/x11-wm/ion2/files/digest-ion2-20040729
new file mode 100644
index 000000000000..fd49e44d2445
--- /dev/null
+++ b/x11-wm/ion2/files/digest-ion2-20040729
@@ -0,0 +1 @@
+MD5 d7d98baa41635c1989e423adf76eb2ac ion-2-20040729.tar.gz 399367
diff --git a/x11-wm/ion2/ion2-20040211-r2.ebuild b/x11-wm/ion2/ion2-20040211-r2.ebuild
deleted file mode 100644
index 3d6a9742516d..000000000000
--- a/x11-wm/ion2/ion2-20040211-r2.ebuild
+++ /dev/null
@@ -1,86 +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/ion2/ion2-20040211-r2.ebuild,v 1.8 2004/06/28 23:51:47 agriffis 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/dl/ion-2-20040207.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~mips ppc ~sparc x86"
-IUSE="truetype xinerama"
-DEPEND="virtual/x11
-	app-misc/run-mailcap
-	>=dev-lang/lua-5.0.1_beta20031003
-	>=sys-devel/libtool-1.4.3
-	>=sys-apps/sed-4"
-S=${WORKDIR}/ion-2-20040207
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-
-	epatch ${FILESDIR}/ion2-20040207-20040211.patch
-
-	if use truetype; then
-		mkdir xftde
-		cp de/{*.c,*.h,Makefile} xftde
-		( cd xftde && epatch ${FILESDIR}/xftde-20040207.patch )
-		sed -i modulelist.mk \
-			-e 's/^\(MODULE_LIST =\)/\1 xftde/g'
-	fi
-
-}
-
-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
-
-	insinto /usr/include/ion
-	doins *.h *.mk mkexports.lua
-	for i in de floatws ioncore ionws luaextl menu query; do
-		insinto /usr/include/ion/${i}
-		doins ${i}/*.h
-	done
-	insinto /usr/include/ion/libtu
-	doins libtu/include/libtu/*
-
-	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}/ion2.desktop
-
-}
diff --git a/x11-wm/ion2/ion2-20040211-r3.ebuild b/x11-wm/ion2/ion2-20040729.ebuild
index 384de9fd3528..3b7228c9384c 100644
--- a/x11-wm/ion2/ion2-20040211-r3.ebuild
+++ b/x11-wm/ion2/ion2-20040729.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ion2-20040211-r3.ebuild,v 1.5 2004/06/28 23:51:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ion2-20040729.ebuild,v 1.1 2004/07/31 12:21:10 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/dl/ion-2-20040207.tar.gz"
+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="truetype xinerama"
+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
-	>=sys-apps/sed-4"
-S=${WORKDIR}/ion-2-20040207
+	!<=x11-wm/ion2-20040211-r2"
+S=${WORKDIR}/ion-2-${PV}
 
 src_unpack() {
 
@@ -25,16 +24,7 @@ src_unpack() {
 
 	cd ${S}
 
-	epatch ${FILESDIR}/ion2-20040207-20040211.patch
-	epatch ${FILESDIR}/ion2-20040207-rename.patch
-
-	if use truetype; then
-		mkdir xftde
-		cp de/{*.c,*.h,Makefile} xftde
-		( cd xftde && epatch ${FILESDIR}/xftde-20040207.patch )
-		sed -i modulelist.mk \
-			-e 's/^\(MODULE_LIST =\)/\1 xftde/g'
-	fi
+	epatch ${FILESDIR}/ion2-20040601-rename.patch
 
 }
 
@@ -82,7 +72,7 @@ src_install() {
 		doins ${i}/*.h
 	done
 	insinto /usr/include/ion2/libtu
-	doins libtu/include/libtu/*
+	doins libtu/*.h
 
 	echo -e "#!/bin/sh\n/usr/bin/ion2" > ${T}/ion2
 	echo -e "#!/bin/sh\n/usr/bin/pwm2" > ${T}/pwm2
@@ -93,8 +83,3 @@ src_install() {
 	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."
-}