version bump + ebuild change

7 files changed, 42 insertions, 68 deletions

diff --git a/app-shells/bashish/ChangeLog b/app-shells/bashish/ChangeLog
index 91334e0a1aaf..c0f89b25339d 100644
--- a/app-shells/bashish/ChangeLog
+++ b/app-shells/bashish/ChangeLog
@@ -1,9 +1,11 @@
 # ChangeLog for app-shells/bashish
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bashish/ChangeLog,v 1.2 2003/06/12 23:42:50 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bashish/ChangeLog,v 1.3 2003/06/17 03:04:49 vapier Exp $
 
-  12 Jun 2003; <msterret@gentoo.org> bashish-1.9.19.ebuild:
-  add Header
+*bashish-1.9.21 (16 Jun 2003)
+
+  16 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Reworked the ebuild so that it uses the bashish install process.
 
 *bashish-1.9.19 (24 Apr 2003)
 
diff --git a/app-shells/bashish/Manifest b/app-shells/bashish/Manifest
index 3989c00fc266..a0f1452be3e0 100644
--- a/app-shells/bashish/Manifest
+++ b/app-shells/bashish/Manifest
@@ -1,3 +1,4 @@
-MD5 677bd4b5819772163122392b91b779a6 bashish-1.9.19.ebuild 1357
-MD5 49ea64cd89d7996dd604b4452aa964a6 ChangeLog 459
-MD5 6ce225c1c67736d4f4eb4e199f647637 files/digest-bashish-1.9.19 66
+MD5 be13d9a99e08f849c6aaa0151fc2e645 files/digest-bashish-1.9.21 66
+MD5 81feb15ed591ce02afc2217b9d11ace5 files/bashish.conf 61
+MD5 16ec58308d837b0555fad0cea1497c3b ChangeLog 534
+MD5 31d206ffa558c2d32321a9c9b86739e6 bashish-1.9.21.ebuild 762
diff --git a/app-shells/bashish/bashish-1.9.19.ebuild b/app-shells/bashish/bashish-1.9.19.ebuild
deleted file mode 100644
index 88d411bc429c..000000000000
--- a/app-shells/bashish/bashish-1.9.19.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2003 Thomas Eriksson.
-#
-# Distributed under the terms of the GNU General Public License v2
-#
-# Suggestions for improvements are mostly welcome, the sandbox were angry
-# with my home-brewn installer
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bashish/bashish-1.9.19.ebuild,v 1.3 2003/06/12 23:42:50 msterret Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Text console theme engine"
-HOMEPAGE="http://bashish.sourceforge.net"
-SRC_URI="mirror://sourceforge/bashish/${P}.tar.gz"
-SLOT=0
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc alpha sparc"
-
-
-src_install() {
-	into /usr
-	printf "\
-#!/bin/sh
-export BASHISH_USERDIR=\$HOME/.bashish/
-export BASHISHDIR=/usr/share/bashish/
-test -z "\$BASHISH_DISABLEUSERMODE" && if test -f \$BASHISH_USERDIR/modules/sh/usermode/main;then
-. \$BASHISH_USERDIR/modules/sh/usermode/main
-else
-. \$BASHISHDIR/modules/sh/usermode/main
-fi
-
-" 1> bashish
-
-	printf "\
-#!bashish.conf
-THEME="gentoo"
-DEFAULT_TERMINAL=""
-DEFAULT_SHELL=""
-" 1> bashish-root/modules/sh/conf/bashish.conf
-
-	dobin bashish
-	
-	## create documents
-	for i in bashish-root/doc/* ; do
-		test -f $i && dodoc $i
-	done
-
-	cd bashish-root
-
-	dodir /usr/share/bashish
-	
-	## create all directories
-	for i in $(find . -type d) ; do
-		dodir /usr/share/bashish/$i
-	done
-
-	## copy all files
-	for i in $(find . -type f) $(find . -type l); do
-		cp -d $i ${D}/usr/share/bashish/$i
-	done
-
-}
diff --git a/app-shells/bashish/bashish-1.9.21.ebuild b/app-shells/bashish/bashish-1.9.21.ebuild
new file mode 100644
index 000000000000..347ab7e8a58f
--- /dev/null
+++ b/app-shells/bashish/bashish-1.9.21.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2003 Thomas Eriksson.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bashish/bashish-1.9.21.ebuild,v 1.1 2003/06/17 03:04:49 vapier Exp $
+
+DESCRIPTION="Text console theme engine"
+HOMEPAGE="http://bashish.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bashish/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc alpha sparc"
+SLOT="0"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	cp InstallBashish{,.orig}
+	sed -e "s:read input:input=${D}/usr/share/bashish:" \
+	 -e "s:read yesno:yesno=n:" \
+		InstallBashish.orig > InstallBashish
+}
+
+src_install() {
+	dodir /usr/share/bashish
+	./InstallBashish || die
+	dobin bashish
+	insinto /usr/share/bashish/modules/sh/conf
+	doins ${FILESDIR}/bashish.conf
+}
diff --git a/app-shells/bashish/files/bashish.conf b/app-shells/bashish/files/bashish.conf
new file mode 100644
index 000000000000..1d3bc77897db
--- /dev/null
+++ b/app-shells/bashish/files/bashish.conf
@@ -0,0 +1,4 @@
+#!bashish.conf
+THEME=gentoo
+DEFAULT_TERMINAL=
+DEFAULT_SHELL=
diff --git a/app-shells/bashish/files/digest-bashish-1.9.19 b/app-shells/bashish/files/digest-bashish-1.9.19
deleted file mode 100644
index f78679ac7f45..000000000000
--- a/app-shells/bashish/files/digest-bashish-1.9.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 158ea88509a7f4ffa79131a916d09b80 bashish-1.9.19.tar.gz 693006
diff --git a/app-shells/bashish/files/digest-bashish-1.9.21 b/app-shells/bashish/files/digest-bashish-1.9.21
new file mode 100644
index 000000000000..d63dc781ce1d
--- /dev/null
+++ b/app-shells/bashish/files/digest-bashish-1.9.21
@@ -0,0 +1 @@
+MD5 64e4fdf7284f921bbc2b13535ba895a3 bashish-1.9.21.tar.gz 972071