desktop/ion: Miscellaneous script cleanup.

This commit changes the download link, documents the reason(s)
for that in README, modifies the xinitrc script to start with
ck-launch-session if needed, and adds an xsession file for
gui login managers.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

6 files changed, 29 insertions, 11 deletions

diff --git a/desktop/ion/README b/desktop/ion/README
index 4add64e8ea..3cb4ab814c 100644
--- a/desktop/ion/README
+++ b/desktop/ion/README
@@ -9,3 +9,9 @@ too, which starts Ion with floating workspaces as the default, thus replacing
 the PWM window manager.
 
 This requires lua.
+
+Please note that the author of Ion stopped all development and support for
+this tool - even its web page has been taken offline.
+
+A community effort started a forked project called "notion", which can be
+found at http://notion.sourceforge.net/
diff --git a/desktop/ion/ion.SlackBuild b/desktop/ion/ion.SlackBuild
index c08283b608..78db9cc92a 100644
--- a/desktop/ion/ion.SlackBuild
+++ b/desktop/ion/ion.SlackBuild
@@ -58,7 +58,7 @@ chmod -R u+w,go+r-w,a-s .
 sed -e "s%@VERSION@%$VERSION%g" -e "s%@LIBDIRSUFFIX@%$LIBDIRSUFFIX%g" \
   $CWD/system.mk.diff | patch -p1
 
-make OPTS="$SLKCFLAGS" -j1
+make OPTS="$SLKCFLAGS"
 
 # The Makefile doesn't support DESTDIR :/
 make install \
@@ -76,13 +76,13 @@ make install \
 # running on x86_64.
 install -D -m 0755 $CWD/xinitrc.ion $PKG/etc/X11/xinit/xinitrc.ion
 
+# Add ion3 as a valid session in login managers
+install -D -m 0755 $CWD/ion3.desktop $PKG/usr/share/xsessions/ion3.desktop
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/desktop/ion/ion.info b/desktop/ion/ion.info
index f4e1e9dff7..bf6dadffdc 100644
--- a/desktop/ion/ion.info
+++ b/desktop/ion/ion.info
@@ -1,10 +1,10 @@
 PRGNAM="ion"
-VERSION="3-20090110"
+VERSION="3_20090110"
 HOMEPAGE="http://iki.fi/tuomov/ion/"
-DOWNLOAD="http://iki.fi/tuomov/dl/ion-3-20090110.tar.gz"
+DOWNLOAD="http://gajon.org/otherstuff/ion-3-20090110.tar.gz"
 MD5SUM="1f17be1e87187b4af7de047187cc4930"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Jorge Gajon"
 EMAIL="gajon@gajon.org"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"
diff --git a/desktop/ion/ion3.desktop b/desktop/ion/ion3.desktop
new file mode 100644
index 0000000000..19b722f913
--- /dev/null
+++ b/desktop/ion/ion3.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Ion3
+Comment=The Ion3 Window Manager
+Exec=/etc/X11/xinit/xinitrc.ion
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
diff --git a/desktop/ion/slack-desc b/desktop/ion/slack-desc
index ea44f8e02f..ba8a1138b8 100644
--- a/desktop/ion/slack-desc
+++ b/desktop/ion/slack-desc
@@ -15,5 +15,5 @@ ion: between them. Ion was designed primarily as an efficient and
 ion: unobtrusive window manager for users who prefer the keyboard.
 ion:
 ion: Homepage: http://iki.fi/tuomov/ion/
-ion:
-ion:
+ion: Note: the author stopped all development and support for Ion, and the
+ion: web page above was taken off-line.
diff --git a/desktop/ion/xinitrc.ion b/desktop/ion/xinitrc.ion
index 8fde6918aa..7c205b5d66 100644
--- a/desktop/ion/xinitrc.ion
+++ b/desktop/ion/xinitrc.ion
@@ -11,4 +11,9 @@ test -f $sysmodmap && xmodmap $sysmodmap
 test -f $userresources && xrdb -merge $userresources
 test -f $usermodmap && xmodmap $usermodmap
 
-exec ion3
+if [ -z $DESKTOP_SESSION ]; then
+	exec ck-launch-session ion3
+else
+	exec ion3
+fi
+