Same fix ported forward

Package-Manager: portage-2.1_pre4-r1

4 files changed, 20 insertions, 24 deletions

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index f60843607dc6..67cf1cd26851 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/xterm
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.124 2006/02/10 14:44:54 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.125 2006/02/10 14:50:35 seemant Exp $
+
+  10 Feb 2006; Seemant Kulleen <seemant@gentoo.org> xterm-207.ebuild,
+  xterm-208.ebuild:
+  Same fix ported forward
 
   10 Feb 2006; Seemant Kulleen <seemant@gentoo.org> xterm-207.ebuild:
   fix for bug #115037
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 0820651fc3ee..f39b04c3d628 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,6 +1,6 @@
-MD5 d38d7dd2b68b793c8d0459d0f2208f2f ChangeLog 17951
-RMD160 75c9e71e4adee7e72036cb6be69aa254428f4c38 ChangeLog 17951
-SHA256 d5b24220a491f1b090935efd4f13844256e90c001f0a3b8d030330bb217a35d8 ChangeLog 17951
+MD5 9ed0cd7511bf8d816cf2c13a5a061029 ChangeLog 18068
+RMD160 7a19a13c12234b7ca27f79f20e839b2153f2743f ChangeLog 18068
+SHA256 2fa1b3666d1e9ee34efc846f100cbd372ac856eb347869ce6e671730caa9304a ChangeLog 18068
 MD5 8c7c791e44946002c03410f9a6e9fc69 files/digest-xterm-204 58
 RMD160 e9ecd1ef9454b58a3f4e42afb31f3e4dd8610bd9 files/digest-xterm-204 58
 SHA256 8df2cf980b114cea6fe97747bb45e68d9eafee4a4d0b34a60cc06ed4da14cb5c files/digest-xterm-204 58
@@ -19,9 +19,9 @@ SHA256 dcdc774dce06e16698d41013cfcc1e7eaa7a2d1491cd79c790a1eecd80bff128 metadata
 MD5 444f8b10a7261b2ce95b3e13a05cf505 xterm-204.ebuild 2530
 RMD160 eaf282efc07e5ac5580222ff84a5dda28a39f948 xterm-204.ebuild 2530
 SHA256 934ee1a2ff7c80added70a81bc4cd498cb49635b5720553253d684e513bccdbe xterm-204.ebuild 2530
-MD5 750b6d70b479ac3c5f43e0bf9e91437f xterm-207.ebuild 2822
-RMD160 cf0b44c95911ba4ffe004ffebfd762c6f5a56ea4 xterm-207.ebuild 2822
-SHA256 57e5b4dc9e785c4f0f38de8b93979a928da4049810ba8d9c5857227b1cb5e99b xterm-207.ebuild 2822
-MD5 99579b460e4bebc8ec3bcbfa36f0062c xterm-208.ebuild 2951
-RMD160 5235f711d18126ce1e83fc4ae6c2671adbe715b9 xterm-208.ebuild 2951
-SHA256 c1ff1c718b7826b4b10d7e38ed071d5b3d05e8f15050d5db08a4d2201c7dfd4f xterm-208.ebuild 2951
+MD5 e06943b90ca57b7290ee7ba54a627eaf xterm-207.ebuild 2812
+RMD160 c3ea1dd7973b724cf9f894d183569ca4bf47818c xterm-207.ebuild 2812
+SHA256 5b7cefe19febb996f7ee38dc7a6cb5a36ec722bd8458b4c5809e2f9277534421 xterm-207.ebuild 2812
+MD5 7303382aa2c6cb6f70850378a353903e xterm-208.ebuild 2822
+RMD160 ba365490fa3fcb99821e2ee09a5c7a4d45aca881 xterm-208.ebuild 2822
+SHA256 21a5ff012466cd00bb7d59d338c3ba9a0f46f1dc50b03634ba57a8cbc57321ee xterm-208.ebuild 2822
diff --git a/x11-terms/xterm/xterm-207.ebuild b/x11-terms/xterm/xterm-207.ebuild
index 11abaa88095c..95980968a520 100644
--- a/x11-terms/xterm/xterm-207.ebuild
+++ b/x11-terms/xterm/xterm-207.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-207.ebuild,v 1.13 2006/02/10 14:44:54 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-207.ebuild,v 1.14 2006/02/10 14:50:35 seemant Exp $
 
 inherit eutils flag-o-matic
 
@@ -71,7 +71,7 @@ src_compile() {
 		`use_enable truetype freetype` \
 		`use_enable unicode luit` `use_enable unicode mini-luit` \
 		`use_with Xaw3d` \
-		${myconf} || die
+		|| die
 
 	emake || die "failed to compile xterm"
 
diff --git a/x11-terms/xterm/xterm-208.ebuild b/x11-terms/xterm/xterm-208.ebuild
index 3add94b0a833..d4cd7b2a165d 100644
--- a/x11-terms/xterm/xterm-208.ebuild
+++ b/x11-terms/xterm/xterm-208.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-208.ebuild,v 1.1 2006/01/15 18:58:19 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-208.ebuild,v 1.2 2006/02/10 14:50:35 seemant Exp $
 
 inherit eutils flag-o-matic
 
@@ -45,16 +45,6 @@ src_compile() {
 
 	filter-flags "-fstack-protector"
 
-	local myconf
-
-	if [ ${NEWAPPDEFAULTS} = 1 ] ; then
-		myconf="--enable-narrowproto"
-	else
-		myconf="--disable-narrowproto"
-	fi
-
-	myconf="${myconf} --with-app-defaults=${DEFAULTS_DIR}"
-
 	econf \
 		--libdir=/etc \
 		--with-x \
@@ -62,6 +52,7 @@ src_compile() {
 		--disable-setuid \
 		--disable-full-tgetent \
 		--disable-imake \
+		--disable-narrowproto \
 		--enable-ansi-color \
 		--enable-88-color \
 		--enable-256-color \
@@ -75,11 +66,12 @@ src_compile() {
 		--enable-tcap-query \
 		--enable-logging \
 		--enable-dabbrev \
+		--with-app-defaults=${DEFAULTS_DIR} \
 		`use_enable toolbar` \
 		`use_enable truetype freetype` \
 		`use_enable unicode luit` `use_enable unicode mini-luit` \
 		`use_with Xaw3d` \
-		${myconf} || die
+		|| die
 
 	emake || die "failed to compile xterm"