Dont install terminfo file anymore; let ncurses handle it #146616 by Bob Thomas.

(Portage version: 2.1.2)

5 files changed, 24 insertions, 37 deletions

diff --git a/x11-terms/eterm/ChangeLog b/x11-terms/eterm/ChangeLog
index 40ea4d414ede..d559cf9aebd1 100644
--- a/x11-terms/eterm/ChangeLog
+++ b/x11-terms/eterm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/eterm
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.39 2006/10/23 18:38:32 blubb Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.40 2007/01/19 04:36:55 vapier Exp $
+
+  19 Jan 2007; Mike Frysinger <vapier@gentoo.org> eterm-0.9.3-r4.ebuild,
+  eterm-0.9.4.ebuild, eterm-9999.ebuild:
+  Dont install terminfo file anymore; let ncurses handle it #146616 by Bob
+  Thomas.
 
   23 Oct 2006; Simon Stelling <blubb@gentoo.org> eterm-0.9.4.ebuild:
   make usage of sse2 optimizations optional on amd64
diff --git a/x11-terms/eterm/eterm-0.9.3-r4.ebuild b/x11-terms/eterm/eterm-0.9.3-r4.ebuild
index a9c601b673fa..4a44f4a36605 100644
--- a/x11-terms/eterm/eterm-0.9.3-r4.ebuild
+++ b/x11-terms/eterm/eterm-0.9.3-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.3-r4.ebuild,v 1.9 2006/10/14 19:22:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.3-r4.ebuild,v 1.10 2007/01/19 04:36:55 vapier Exp $
 
 inherit eutils
 
@@ -37,16 +37,13 @@ src_unpack() {
 }
 
 src_compile() {
-	local mymmx
-	use x86 \
-		&& mymmx="$(use_enable mmx)" \
-		|| mymmx="--disable-mmx"
+	export TIC="true"
 	econf \
 		$(use_enable escreen) \
 		$(use_enable etwin) \
 		--with-imlib \
 		--enable-trans \
-		${mymmx} \
+		$(use_enable mmx) \
 		$(use_enable unicode multi-charset) \
 		--with-delete=execute \
 		--with-backspace=auto \
@@ -55,10 +52,7 @@ src_compile() {
 }
 
 src_install() {
-	make \
-		TIC="tic -o ${D}/usr/share/terminfo" \
-		DESTDIR="${D}" \
-		install || die "install failed"
+	emake DESTDIR="${D}" install || die "install failed"
 	dodoc ChangeLog README ReleaseNotes
 	use escreen && dodoc doc/README.Escreen
 	dodoc bg/README.backgrounds
diff --git a/x11-terms/eterm/eterm-0.9.4.ebuild b/x11-terms/eterm/eterm-0.9.4.ebuild
index 1026f5052a42..fa7557769692 100644
--- a/x11-terms/eterm/eterm-0.9.4.ebuild
+++ b/x11-terms/eterm/eterm-0.9.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.4.ebuild,v 1.3 2006/10/23 18:38:32 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.4.ebuild,v 1.4 2007/01/19 04:36:55 vapier Exp $
 
 inherit eutils
 
@@ -32,17 +32,14 @@ src_unpack() {
 }
 
 src_compile() {
-	local mysse2
-	use amd64 \
-		&& mysse2="$(use_enable sse2)" \
-		|| mysse2="--disable-sse2"
+	export TIC="true"
 	econf \
 		$(use_enable escreen) \
 		$(use_enable etwin) \
 		--with-imlib \
 		--enable-trans \
 		$(use_enable mmx) \
-		${mysse2} \
+		$(use_enable sse2) \
 		$(use_enable unicode multi-charset) \
 		--with-delete=execute \
 		--with-backspace=auto \
@@ -51,10 +48,7 @@ src_compile() {
 }
 
 src_install() {
-	make \
-		TIC="tic -o ${D}/usr/share/terminfo" \
-		DESTDIR="${D}" \
-		install || die "install failed"
+	emake DESTDIR="${D}" install || die "install failed"
 	dodoc ChangeLog README ReleaseNotes
 	use escreen && dodoc doc/README.Escreen
 	dodoc bg/README.backgrounds
diff --git a/x11-terms/eterm/eterm-9999.ebuild b/x11-terms/eterm/eterm-9999.ebuild
index 9a08bee88d5c..a2944e972cab 100644
--- a/x11-terms/eterm/eterm-9999.ebuild
+++ b/x11-terms/eterm/eterm-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-9999.ebuild,v 1.7 2006/05/11 03:23:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-9999.ebuild,v 1.8 2007/01/19 04:36:55 vapier Exp $
 
 #ECVS_SERVER="cvs.sourceforge.net:/cvsroot/enlightenment"
 ECVS_SERVER="anoncvs.enlightenment.org:/var/cvs/e"
@@ -19,7 +19,7 @@ SRC_URI=""
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="-*"
-IUSE="escreen etwin mmx unicode"
+IUSE="escreen etwin minimal mmx sse2 unicode"
 
 DEPEND="|| ( ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto ) virtual/x11 )
 	>=x11-libs/libast-0.6.1
@@ -36,16 +36,14 @@ src_unpack() {
 }
 
 src_compile() {
-	local mymmx
-	use x86 \
-		&& mymmx="$(use_enable mmx)" \
-		|| mymmx="--disable-mmx"
+	export TIC="true"
 	econf \
 		$(use_enable escreen) \
 		$(use_enable etwin) \
 		--with-imlib \
 		--enable-trans \
-		${mymmx} \
+		$(use_enable mmx) \
+		$(use_enable sse2) \
 		$(use_enable unicode multi-charset) \
 		--with-delete=execute \
 		--with-backspace=auto \
@@ -54,10 +52,7 @@ src_compile() {
 }
 
 src_install() {
-	make \
-		TIC="tic -o ${D}/usr/share/terminfo" \
-		DESTDIR="${D}" \
-		install || die "install failed"
+	emake DESTDIR="${D}" install || die "install failed"
 	dodoc ChangeLog README ReleaseNotes
 	use escreen && dodoc doc/README.Escreen
 	dodoc bg/README.backgrounds
diff --git a/x11-terms/eterm/files/digest-eterm-9999 b/x11-terms/eterm/files/digest-eterm-9999
index 8b137891791f..e69de29bb2d1 100644
--- a/x11-terms/eterm/files/digest-eterm-9999
+++ b/x11-terms/eterm/files/digest-eterm-9999
@@ -1 +0,0 @@
-