etwin support fixed #28086

4 files changed, 10 insertions, 62 deletions

diff --git a/x11-terms/eterm/ChangeLog b/x11-terms/eterm/ChangeLog
index 55d19bc73419..f762b5ac7dcd 100644
--- a/x11-terms/eterm/ChangeLog
+++ b/x11-terms/eterm/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for x11-terms/eterm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.19 2003/08/14 03:44:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.20 2003/09/07 03:23:28 vapier Exp $
 
 *eterm-0.9.2-r5 (13 Aug 2003)
 
+  06 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add missing IUSE and add DEPEND for etwin if user wants twin support #28086.
+
   13 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
   Add patch to support ansi 16 colors ... already been added upstream #26547.
 
diff --git a/x11-terms/eterm/eterm-0.9.2-r4.ebuild b/x11-terms/eterm/eterm-0.9.2-r4.ebuild
deleted file mode 100644
index 4904c04f433c..000000000000
--- a/x11-terms/eterm/eterm-0.9.2-r4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.2-r4.ebuild,v 1.8 2003/08/14 03:31:27 vapier Exp $
-
-MY_PN=${PN/et/Et}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A vt102 terminal emulator for X"
-HOMEPAGE="http://www.eterm.org/"
-SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz
-	 http://www.eterm.org/download/${MY_PN}-bg-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
-
-DEPEND="virtual/x11
-	>=x11-libs/libast-0.5
-	media-libs/imlib2
-	>=sys-devel/binutils-2.13*"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd ${S}
-	unpack ${MY_PN}-bg-${PV}.tar.gz
-}
-
-src_compile() {
-	# always disable mmx because binutils 2.11.92+ seems to be broken for this package
-	local myconf="--disable-mmx --with-gnu-ld"
-
-	econf \
-		--with-imlib \
-		--enable-trans \
-		--with-x \
-		--enable-multi-charset \
-		--with-delete=execute \
-		--with-backspace=auto \
-		--enable-escreen \
-		--enable-etwin \
-		${myconf}
-
-	emake || die
-}
-
-src_install() {
-	dodir /usr/share/terminfo
-	make \
-		DESTDIR=${D} \
-		TIC="tic -o ${D}/usr/share/terminfo" \
-		install || die
-
-	dodoc COPYING ChangeLog README ReleaseNotes
-	dodoc bg/README.backgrounds
-}
diff --git a/x11-terms/eterm/eterm-0.9.2-r5.ebuild b/x11-terms/eterm/eterm-0.9.2-r5.ebuild
index f5e87b759a1a..3aa9d45d0add 100644
--- a/x11-terms/eterm/eterm-0.9.2-r5.ebuild
+++ b/x11-terms/eterm/eterm-0.9.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.2-r5.ebuild,v 1.1 2003/08/14 03:44:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.2-r5.ebuild,v 1.2 2003/09/07 03:23:28 vapier Exp $
 
 inherit eutils
 
@@ -15,18 +15,20 @@ SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha"
+IUSE="mmx etwin"
 
 DEPEND="virtual/x11
 	>=x11-libs/libast-0.5
 	media-libs/imlib2
-	>=sys-devel/binutils-2.13*"
+	>=sys-devel/binutils-2.13*
+	etwin? ( app-misc/twin )"
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	cd ${S}
 	unpack ${MY_PN}-bg-${PV}.tar.gz
-	cd ${S}
 	epatch ${FILESDIR}/${PV}-ansi16.patch
+	sed -i 's:Tw/Tw_1\.h:Tw/Tw1.h:' src/libscream.c
 }
 
 src_compile() {
@@ -38,7 +40,7 @@ src_compile() {
 		--with-delete=execute \
 		--with-backspace=auto \
 		--enable-escreen \
-		--enable-etwin \
+		`use_enable etwin` \
 		`use_enable mmx` \
 		|| die "conf failed"
 	emake || die "make failed"
diff --git a/x11-terms/eterm/files/digest-eterm-0.9.2-r4 b/x11-terms/eterm/files/digest-eterm-0.9.2-r4
deleted file mode 100644
index 04c1c525781f..000000000000
--- a/x11-terms/eterm/files/digest-eterm-0.9.2-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e8c82cf52b25fdd51d16ff76b993ba68 Eterm-0.9.2.tar.gz 662636
-MD5 fb465e84f24de348e31bb9fd4d430071 Eterm-bg-0.9.2.tar.gz 379832