summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmanuele Giaquinta <exg@gentoo.org>2006-03-21 21:24:06 +0000
committerEmanuele Giaquinta <exg@gentoo.org>2006-03-21 21:24:06 +0000
commit348fef5df5875e357ae67908fe5f2958595e4f99 (patch)
treebad6f2b6b67a7e4b74e1b6526cfc4a553dbe94a2 /x11-terms/xterm
parentVersion bumped. (diff)
downloadhistorical-348fef5df5875e357ae67908fe5f2958595e4f99.tar.gz
historical-348fef5df5875e357ae67908fe5f2958595e4f99.tar.bz2
historical-348fef5df5875e357ae67908fe5f2958595e4f99.zip
Correct last fix.
Package-Manager: portage-2.1_pre6-r5
Diffstat (limited to 'x11-terms/xterm')
-rw-r--r--x11-terms/xterm/ChangeLog4
-rw-r--r--x11-terms/xterm/Manifest18
-rw-r--r--x11-terms/xterm/xterm-211.ebuild10
3 files changed, 19 insertions, 13 deletions
diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index f699027ee22b..da7390c120a3 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,9 +1,9 @@
# 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.129 2006/03/21 15:29:04 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.130 2006/03/21 21:24:06 exg Exp $
21 Mar 2006; Emanuele Giaquinta <exg@gentoo.org> xterm-211.ebuild:
- Enable NARROW proto to fix scrollbar breakage on modular X, bug #115037.
+ Use narrow prototypes on monolithic X; fix scrollbar breakage, bug #115037.
21 Mar 2006; Emanuele Giaquinta <exg@gentoo.org> xterm-211.ebuild:
Fixed sed for modular X, bug #126110.
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index c1b146f747d2..f5bc810a22d5 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,9 +1,9 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 d6a3d170efbf2655cf999d6d54ac621e ChangeLog 18584
-RMD160 0c298a615f897fc5bfcc01d84f2e9c5fb1fd31f5 ChangeLog 18584
-SHA256 7bc185709d03f4482d282c87b8f13764a22311ec01e0c38c5d7026fdac0151ed ChangeLog 18584
+MD5 a0b879e981765810ea9432e25fb07b9e ChangeLog 18587
+RMD160 bd939fc25c030f1fab04490c0d42beacf6d1b4e9 ChangeLog 18587
+SHA256 fed93964178980bffceb27289d623294c351315575f01935e030eae9b4be6362 ChangeLog 18587
MD5 8c7c791e44946002c03410f9a6e9fc69 files/digest-xterm-204 58
RMD160 e9ecd1ef9454b58a3f4e42afb31f3e4dd8610bd9 files/digest-xterm-204 58
SHA256 8df2cf980b114cea6fe97747bb45e68d9eafee4a4d0b34a60cc06ed4da14cb5c files/digest-xterm-204 58
@@ -31,13 +31,13 @@ SHA256 5b7cefe19febb996f7ee38dc7a6cb5a36ec722bd8458b4c5809e2f9277534421 xterm-20
MD5 fe0cdd974da11d36d81a3096f2fee9ec xterm-210.ebuild 2570
RMD160 994e91ed8f39de3af9d3413458ce67ef22def9f5 xterm-210.ebuild 2570
SHA256 f0fcccf26b047856011fe6c7417e675e039537ef8088c29901543855f6635039 xterm-210.ebuild 2570
-MD5 2db48e4b3aa1842a5219fe5be2213ec8 xterm-211.ebuild 2563
-RMD160 d5ebe941347a5625e18d2cd02314085680628b72 xterm-211.ebuild 2563
-SHA256 60789e019002ecb1ae0884a008850a7f0093a5dcde64bdc750ad9334289707da xterm-211.ebuild 2563
+MD5 9a9fa7c7e223d6ab09b69adcbf2fda6d xterm-211.ebuild 2662
+RMD160 3bbb9350fc49f37bcdc677c31225df19568d6291 xterm-211.ebuild 2662
+SHA256 10a158c0747627c6dff1522af899a8b17ae30916ebac4f62d88e8e2f0cf61326 xterm-211.ebuild 2662
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
-iD8DBQFEIBu/2iXjgNjfe5sRAmcjAJwKnmoJGDwW+cFuokWGIX2OmFZCDgCgsS68
-J58y6Z845CcgHAFJLUCBUcs=
-=+XwT
+iD8DBQFEIG7M2iXjgNjfe5sRAp4tAJ90uGWmFTcpSpO6IdXn4g+fn1vLbACfcEny
+0JHOBdFNz2ixKFpEZiwZhbQ=
+=r7QB
-----END PGP SIGNATURE-----
diff --git a/x11-terms/xterm/xterm-211.ebuild b/x11-terms/xterm/xterm-211.ebuild
index b2a87674924b..5de268a6110d 100644
--- a/x11-terms/xterm/xterm-211.ebuild
+++ b/x11-terms/xterm/xterm-211.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-211.ebuild,v 1.3 2006/03/21 15:29:04 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-211.ebuild,v 1.4 2006/03/21 21:24:06 exg Exp $
inherit eutils flag-o-matic
@@ -45,6 +45,12 @@ src_compile() {
filter-flags "-fstack-protector"
+ local myconf=""
+
+ if has_version ">=x11-base/xorg-x11-7.0.0_rc1"; then
+ myconf="--disable-narrowproto"
+ fi
+
econf \
--libdir=/etc \
--with-x \
@@ -52,7 +58,6 @@ src_compile() {
--disable-setuid \
--disable-full-tgetent \
--disable-imake \
- --enable-narrowproto \
--enable-ansi-color \
--enable-88-color \
--enable-256-color \
@@ -71,6 +76,7 @@ src_compile() {
`use_enable truetype freetype` \
`use_enable unicode luit` `use_enable unicode mini-luit` \
`use_with Xaw3d` \
+ ${myconf} \
|| die
emake || die "failed to compile xterm"