Install ion2.desktop for gdm, remove old versions.

7 files changed, 25 insertions, 85 deletions

diff --git a/x11-wm/ion2/ChangeLog b/x11-wm/ion2/ChangeLog
index 795efd84baf1..b91ac9a703af 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.3 2004/02/28 10:02:12 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ChangeLog,v 1.4 2004/03/14 12:22:01 twp Exp $
+
+  14 Mar 2004; Tom Payne <twp@gentoo.org> ion2-20040211-r2.ebuild, ion2-20040207.ebuild, ion2-20040211.ebuild :
+  Install ion2.desktop for gdm, remove old versions.
 
 *ion2-20040211-r1 (28 Feb 2004)
 
diff --git a/x11-wm/ion2/Manifest b/x11-wm/ion2/Manifest
index f058f88c6ba7..3cba896bb5da 100644
--- a/x11-wm/ion2/Manifest
+++ b/x11-wm/ion2/Manifest
@@ -1,10 +1,9 @@
-MD5 c04e5d6c0dd7b8e28ba0ed878b9dde83 ion2-20040207.ebuild 1701
-MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
-MD5 c8b4e67a767a19665b27f011426beef1 ChangeLog 620
-MD5 9be7f2e2e5b76586305b2c2c8107d942 ion2-20040211.ebuild 1773
+MD5 549a25bb2c2749709c9b23d2253e074d ion2-20040211-r2.ebuild 1853
 MD5 78dce7c7df1298db481e360e1ec6063e ion2-20040211-r1.ebuild 1790
-MD5 16c6e0f00bd204d2f612b781d7b73f54 files/xftde-20040207.patch 18552
-MD5 91e9228c6c714b8031f826c8523a2274 files/digest-ion2-20040207 66
+MD5 d47fe509dd330f2f3464ed128a70787e ChangeLog 786
+MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 MD5 0b7705816fa1d59203e2ebd35db2632d files/ion2-20040207-20040211.patch 8684
-MD5 91e9228c6c714b8031f826c8523a2274 files/digest-ion2-20040211 66
+MD5 16c6e0f00bd204d2f612b781d7b73f54 files/xftde-20040207.patch 18552
+MD5 aac436d9230b2b3cda72feb184295c1a files/ion2.desktop 214
 MD5 91e9228c6c714b8031f826c8523a2274 files/digest-ion2-20040211-r1 66
+MD5 91e9228c6c714b8031f826c8523a2274 files/digest-ion2-20040211-r2 66
diff --git a/x11-wm/ion2/files/digest-ion2-20040211 b/x11-wm/ion2/files/digest-ion2-20040211
deleted file mode 100644
index 403f80c42ca4..000000000000
--- a/x11-wm/ion2/files/digest-ion2-20040211
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d20cde38bdc15e7e4824cf1140440f51 ion-2-20040207.tar.gz 376466
diff --git a/x11-wm/ion2/files/digest-ion2-20040207 b/x11-wm/ion2/files/digest-ion2-20040211-r2
index 403f80c42ca4..403f80c42ca4 100644
--- a/x11-wm/ion2/files/digest-ion2-20040207
+++ b/x11-wm/ion2/files/digest-ion2-20040211-r2
diff --git a/x11-wm/ion2/files/ion2.desktop b/x11-wm/ion2/files/ion2.desktop
new file mode 100644
index 000000000000..95f54aadbe4b
--- /dev/null
+++ b/x11-wm/ion2/files/ion2.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Ion
+Comment=A tiling tabbed window manager designed with keyboard users in mind.
+Exec=ion
+TryExec=ion
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
diff --git a/x11-wm/ion2/ion2-20040207.ebuild b/x11-wm/ion2/ion2-20040207.ebuild
deleted file mode 100644
index 6ded79c03196..000000000000
--- a/x11-wm/ion2/ion2-20040207.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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-20040207.ebuild,v 1.1 2004/02/10 23:27:38 twp Exp $
-
-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-${PV}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="truetype xinerama"
-DEPEND="virtual/x11
-	app-misc/run-mailcap
-	>=dev-lang/lua-5.0.1_beta20031003"
-S=${WORKDIR}/ion-2-${PV}
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-
-	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
-
-	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
-
-}
diff --git a/x11-wm/ion2/ion2-20040211.ebuild b/x11-wm/ion2/ion2-20040211-r2.ebuild
index 3f38f9287277..2023a844c018 100644
--- a/x11-wm/ion2/ion2-20040211.ebuild
+++ b/x11-wm/ion2/ion2-20040211-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-20040211.ebuild,v 1.1 2004/02/11 10:15:38 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ion2-20040211-r2.ebuild,v 1.1 2004/03/14 12:22:01 twp Exp $
 
 inherit eutils
 
@@ -62,6 +62,8 @@ src_install() {
 		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
@@ -76,4 +78,7 @@ src_install() {
 	exeinto /etc/X11/Sessions
 	doexe ${T}/ion ${T}/pwm
 
+	insinto /usr/share/xsessions
+	doins ${FILESDIR}/ion2.desktop
+
 }