touchups

6 files changed, 6 insertions, 190 deletions

diff --git a/app-misc/twin/files/digest-twin-0.3.8-r1 b/app-misc/twin/files/digest-twin-0.3.8-r1
deleted file mode 100644
index 00b1796b0f1f..000000000000
--- a/app-misc/twin/files/digest-twin-0.3.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e1fd3579eb8647fce80fc80a44210526 twin-0.3.8.tar.gz 389733
diff --git a/app-misc/twin/files/digest-twin-0.4.4 b/app-misc/twin/files/digest-twin-0.4.4
deleted file mode 100644
index 193414facc54..000000000000
--- a/app-misc/twin/files/digest-twin-0.4.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 894c3de70d27c002d2c376e8f321bbc8 twin-0.4.4.tar.gz 884477
diff --git a/app-misc/twin/files/twin-0.3.8-r1-gentoo.diff b/app-misc/twin/files/twin-0.3.8-r1-gentoo.diff
deleted file mode 100644
index eeb978e1f4a5..000000000000
--- a/app-misc/twin/files/twin-0.3.8-r1-gentoo.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur twin-0.3.8/MakePaths twin-0.3.8-new/MakePaths
---- twin-0.3.8/MakePaths	Mon Feb 26 04:40:45 2001
-+++ twin-0.3.8-new/MakePaths	Tue Apr 24 23:03:24 2001
-@@ -2,10 +2,11 @@
- # set installation directories
- 
- sysconfdir = /etc
--prefix = /usr/local
-+prefix = /usr
- bindir = $(prefix)/bin
- libdir = $(prefix)/lib
- datadir = $(prefix)/share
-+docdir = $(datadir)/doc
- mandir = $(datadir)/man
- includedir = $(prefix)/include
- 
-diff -Naur twin-0.3.8/docs/Makefile twin-0.3.8-new/docs/Makefile
---- twin-0.3.8/docs/Makefile	Fri Feb 23 04:32:14 2001
-+++ twin-0.3.8-new/docs/Makefile	Tue Apr 24 23:04:21 2001
-@@ -42,6 +42,6 @@
- install:
- 	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
- 	$(INSTALL) twin.1 $(DESTDIR)$(mandir)/man1
--	$(INSTALL) -d $(DESTDIR)$(datadir)/twin/docs
--	$(INSTALL) $(DOCS) $(DESTDIR)$(datadir)/twin/docs
--	cd $(TOPDIR) && $(INSTALL) $(TOPDOCS) $(DESTDIR)$(datadir)/twin
-+	$(INSTALL) -d $(DESTDIR)$(docdir)/twin-0.3.8/docs
-+	$(INSTALL) $(DOCS) $(DESTDIR)$(docdir)/twin-0.3.8/docs
-+	cd $(TOPDIR) && $(INSTALL) $(TOPDOCS) $(DESTDIR)$(docdir)/twin-0.3.8
diff --git a/app-misc/twin/twin-0.3.8-r1.ebuild b/app-misc/twin/twin-0.3.8-r1.ebuild
deleted file mode 100644
index 9090d43ed445..000000000000
--- a/app-misc/twin/twin-0.3.8-r1.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/app-misc/twin/twin-0.3.8-r1.ebuild,v 1.15 2004/02/17 23:00:34 agriffis Exp $
-
-IUSE="X ggi"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A text-mode window environment"
-SRC_URI="mirror://sourceforge/twin/${P}.tar.gz
-	http://linuz.sns.it/~max/twin/${P}.tar.gz"
-HOMEPAGE="http://linuz.sns.it/~max/twin/"
-
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 ppc"
-
-DEPEND="X? ( virtual/x11 )
-	ggi? ( >=media-libs/libggi-1.9 )
-	>=sys-libs/gpm-1.19.3
-	>=sys-libs/ncurses-5.2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${PF}-gentoo.diff || die
-}
-
-src_compile() {
-	local conf
-	conf="\n\n\n\n\n""\n\n\n\n\n""\n\ny\n\n\n""\n\n\n\n"
-
-	use X \
-	   && conf=${conf}"y\n" \
-	   || conf=${conf}"n\n"
-
-	conf=${conf}"\n\n"
-	use ggi \
-	   && conf=${conf}"y\n" \
-	   || conf=${conf}"n\n"
-
-	conf=${conf}"\n\n""\n\n\n\nn\n"
-	echo -e "${conf}" > test
-	cat test | make config
-	rm test
-	make clean || die
-	make || die
-}
-
-src_install() {
-
-	dodir /usr/lib /usr/bin /usr/lib/ /usr/include /usr/include/Tw \
-		/usr/lib/twin/modules /usr/X11R6/lib/X11/fonts/misc
-
-	DESTDIR=${D} make install || die
-
-	use X && ( \
-		insinto /usr/X11R6/lib/X11/fonts/misc
-		doins fonts/vga.pcf.gz
-	)
-
-}
-
-pkg_postinst() {
-	use X && ( \
-		/usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
-		/usr/X11R6/bin/xset fp rehash
-	)
-}
-
-pkg_postrm() {
-	use X && ( \
-		/usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
-		/usr/X11R6/bin/xset fp rehash
-	)
-}
diff --git a/app-misc/twin/twin-0.4.4.ebuild b/app-misc/twin/twin-0.4.4.ebuild
deleted file mode 100644
index 4151935d74be..000000000000
--- a/app-misc/twin/twin-0.4.4.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/app-misc/twin/twin-0.4.4.ebuild,v 1.7 2004/02/17 23:00:34 agriffis Exp $
-
-DESCRIPTION="A text-mode window environment"
-SRC_URI="mirror://sourceforge/twin/${P}.tar.gz"
-HOMEPAGE="http://twin.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 ppc"
-IUSE="X gtk ggi"
-
-DEPEND="X? ( virtual/x11 )
-	ggi? ( >=media-libs/libggi-1.9 )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	>=sys-libs/gpm-1.19.3
-	>=sys-libs/ncurses-5.2"
-
-src_compile() {
-	local myconf
-
-	use X \
-		&& myconf="--with-x --enable-hw-x11=yes"
-
-	use ggi \
-		&& myconf="${myconf} --enable-hw-ggi=yes" \
-		|| myconf="${myconf} --enable-hw-ggi=no"
-
-	use gtk \
-		&& myconf="${myconf} --enable-tt-hw-gtk=yes" \
-		|| myconf="${myconf} --enable-tt-hw-gtk=no"
-
-	econf \
-		--enable-shlibs=yes \
-		--enable-modules=yes \
-		--enable-unicode=yes \
-		--enable-socket=yes \
-		--enable-socket-gz=yes \
-		--enable-socket-pthreads=yes \
-		--enable-socket-alien=yes \
-		--enable-h2-tty-termcap=yes \
-		--enable-term=yes \
-		${myconf}
-
-	make || die
-}
-
-src_install() {
-	einstall
-
-	if [ `use X` ] ; then
-		insinto /usr/X11R6/lib/X11/fonts/misc
-		doins fonts/vga.pcf.gz
-	fi
-
-	rm -rf ${D}/usr/share/twin/{BUGS,docs,COP*,READ*,Change*,INSTALL*}
-
-	dodoc BUGS COPYING* Change* README* TODO*
-	dodoc docs/*
-}
-
-pkg_postinst() {
-	if [ `use X` ] ; then
-		/usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
-		/usr/X11R6/bin/xset fp rehash
-	fi
-}
-
-pkg_postrm() {
-	if [ `use X` ] ; then
-		/usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
-		/usr/X11R6/bin/xset fp rehash
-	fi
-}
diff --git a/app-misc/twin/twin-0.4.5.ebuild b/app-misc/twin/twin-0.4.5.ebuild
index e76c619f9722..bb3cb85fa782 100644
--- a/app-misc/twin/twin-0.4.5.ebuild
+++ b/app-misc/twin/twin-0.4.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/twin/twin-0.4.5.ebuild,v 1.10 2004/02/17 23:00:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/twin/twin-0.4.5.ebuild,v 1.11 2004/02/17 23:48:08 vapier Exp $
 
 DESCRIPTION="A text-mode window environment"
-SRC_URI="mirror://sourceforge/twin/${P}.tar.gz"
 HOMEPAGE="http://twin.sourceforge.net/"
+SRC_URI="mirror://sourceforge/twin/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2 LGPL-2"
+SLOT="0"
 KEYWORDS="x86 sparc ~amd64 hppa alpha ia64"
 IUSE="X gtk ggi"
 
@@ -22,15 +22,12 @@ src_compile() {
 
 	use X \
 		&& myconf="--with-x --enable-hw-x11=yes"
-
 	use ggi \
 		&& myconf="${myconf} --enable-hw-ggi=yes" \
 		|| myconf="${myconf} --enable-hw-ggi=no"
-
 	use gtk \
 		&& myconf="${myconf} --enable-tt-hw-gtk=yes" \
 		|| myconf="${myconf} --enable-tt-hw-gtk=no"
-
 	econf \
 		--enable-shlibs=yes \
 		--enable-modules=yes \
@@ -41,13 +38,13 @@ src_compile() {
 		--enable-socket-alien=yes \
 		--enable-h2-tty-termcap=yes \
 		--enable-term=yes \
-		${myconf}
-
+		${myconf} \
+		|| die
 	make || die
 }
 
 src_install() {
-	einstall
+	einstall || die
 
 	if [ `use X` ] ; then
 		insinto /usr/X11R6/lib/X11/fonts/misc