summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeemant Kulleen <seemant@gentoo.org>2006-02-10 14:50:35 +0000
committerSeemant Kulleen <seemant@gentoo.org>2006-02-10 14:50:35 +0000
commit779d0355deb6efc742eccce49ba05120945476c8 (patch)
tree617427d4a1cffb5491d345e97b643fdd43284495 /x11-terms
parentfix for bug #115037 (diff)
downloadgentoo-2-779d0355deb6efc742eccce49ba05120945476c8.tar.gz
gentoo-2-779d0355deb6efc742eccce49ba05120945476c8.tar.bz2
gentoo-2-779d0355deb6efc742eccce49ba05120945476c8.zip
Same fix ported forward
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'x11-terms')
-rw-r--r--x11-terms/xterm/ChangeLog6
-rw-r--r--x11-terms/xterm/xterm-207.ebuild4
-rw-r--r--x11-terms/xterm/xterm-208.ebuild16
3 files changed, 11 insertions, 15 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/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"