change to use_enable syntax, and also disable calling imake, so that this builds with xorg as well

4 files changed, 30 insertions, 20 deletions

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index 276ab416f956..565ac9ecb9f6 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/xterm
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.4 2004/01/18 00:56:39 seemant Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.5 2004/04/07 22:57:00 seemant Exp $
+
+  07 Apr 2004; Seemant Kulleen <seemant@gentoo.org> xterm-179.ebuild,
+  xterm-184.ebuild:
+  change to use_enable syntax, and also disable calling imake, so that this
+  builds with xorg as well
 
 *xterm-184 (17 Jan 2004)
   
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 463d554daca1..d8e124c55f33 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,6 +1,6 @@
-MD5 accc55944c4db20d7b1bf1bd858d2183 xterm-184.ebuild 982
-MD5 a88fc8ff8c672808c6c1599550f32557 xterm-179.ebuild 861
-MD5 e65f25d56f960cab57d56817150f90bc ChangeLog 1021
+MD5 488a118531b4f284a6c0bc87aefa2299 xterm-184.ebuild 1111
+MD5 d805b60268b98d3ca1d37072a307c4ac xterm-179.ebuild 784
+MD5 b6123049e25a7272a9d2cedfbfea5591 ChangeLog 1215
 MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
 MD5 a2579a687debb13d3011931fad6249eb files/digest-xterm-179 58
 MD5 5c9025c4b70e8eb7494cfda9c86cec6c files/digest-xterm-184 58
diff --git a/x11-terms/xterm/xterm-179.ebuild b/x11-terms/xterm/xterm-179.ebuild
index 788afb42b636..18692f98a091 100644
--- a/x11-terms/xterm/xterm-179.ebuild
+++ b/x11-terms/xterm/xterm-179.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-179.ebuild,v 1.5 2004/02/22 22:42:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-179.ebuild,v 1.6 2004/04/07 22:57:00 seemant Exp $
 
 IUSE="truetype"
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
 
 SLOT="0"
 LICENSE="X11"
-KEYWORDS="~x86 ~ppc sparc ~alpha ~hppa ~mips ~amd64 ~ia64 ~ppc64"
+KEYWORDS="~x86 ~ppc sparc ~alpha ~hppa ~mips ~amd64 ~ia64"
 
 DEPEND="virtual/x11
 	sys-apps/utempter"
@@ -21,15 +21,12 @@ src_compile() {
 
 	local myconf
 
-	use truetype \
-		&& myconf="${myconf} --enable-freetype" \
-		|| myconf="${myconf} --disable-freetype"
-
 	econf \
 		--libdir=/etc \
 		--enable-wide-chars \
 		--with-utempter \
-		--enable-256-color || die
+		--enable-256-color \
+		`use_enable truetype freetype` || die
 	emake || die
 }
 
diff --git a/x11-terms/xterm/xterm-184.ebuild b/x11-terms/xterm/xterm-184.ebuild
index 4f13c7094232..5d81d408133a 100644
--- a/x11-terms/xterm/xterm-184.ebuild
+++ b/x11-terms/xterm/xterm-184.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-184.ebuild,v 1.5 2004/02/22 22:42:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-184.ebuild,v 1.6 2004/04/07 22:57:00 seemant Exp $
 
 IUSE="truetype"
 
@@ -11,28 +11,36 @@ SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
 
 SLOT="0"
 LICENSE="X11"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64 ~ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64"
 
 DEPEND="virtual/x11
 	sys-apps/utempter"
 
+src_unpack() {
+	unpack ${A}; cd ${S}
+
+	# Keep the blue from previous xterms, instead of the dodgerblue and
+	# steelblue
+	sed -i \
+		-e "s:DodgerBlue1:blue3:" \
+		-e "s:SteelBlue1:blue:" \
+		${S}/XTerm-col.ad
+}
+
 src_compile() {
 	local myconf
 
-	use truetype \
-		&& myconf="${myconf} --enable-freetype" \
-		|| myconf="${myconf} --disable-freetype"
-
 	econf \
+		`use_enable truetype freetype` \
 		--libdir=/etc \
 		--with-utempter \
+		--enable-88-color \
 		--enable-256-color \
 		--enable-load-vt-fonts \
 		--enable-toolbar \
 		--enable-luit \
 		--enable-wide-chars \
-		--enable-broken-st \
-		--enable-broken-osc \
+		--disable-imake \
 		|| die
 	emake || die
 }