summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeemant Kulleen <seemant@gentoo.org>2006-01-15 18:58:19 +0000
committerSeemant Kulleen <seemant@gentoo.org>2006-01-15 18:58:19 +0000
commit1896529b6b615f752e718b1af3f521979c272c87 (patch)
tree72dbdebfaf1f087441b05475fcd06b54adb4635d
parent0.9.4 version bump for bug 119056. (diff)
downloadgentoo-2-1896529b6b615f752e718b1af3f521979c272c87.tar.gz
gentoo-2-1896529b6b615f752e718b1af3f521979c272c87.tar.bz2
gentoo-2-1896529b6b615f752e718b1af3f521979c272c87.zip
Version bump -- fixes bug #113604 by Colin MAcdonald
(Portage version: 2.1_pre3-r1)
-rw-r--r--x11-terms/xterm/ChangeLog9
-rw-r--r--x11-terms/xterm/Manifest12
-rw-r--r--x11-terms/xterm/files/digest-xterm-2081
-rw-r--r--x11-terms/xterm/xterm-208.ebuild115
4 files changed, 125 insertions, 12 deletions
diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index c70d5edd5d18..ec60f221c60d 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-terms/xterm
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.114 2005/12/14 06:49:42 cardoe Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.115 2006/01/15 18:58:19 seemant Exp $
+
+*xterm-208 (15 Jan 2006)
+
+ 15 Jan 2006; Seemant Kulleen <seemant@gentoo.org> +xterm-208.ebuild:
+ Version bump -- fixes bug #113604 by Colin MAcdonald
14 Dec 2005; Doug Goldstein <cardoe@gentoo.org> ChangeLog:
Fixed my typo in modular X depends.
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index c39ba0e5a15b..e2a58f066625 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 571f330d6bbcd51544b1d8b324433f91 ChangeLog 16952
MD5 8c7c791e44946002c03410f9a6e9fc69 files/digest-xterm-204 58
MD5 93bc9a4e8639a697e639b46636a802ba files/digest-xterm-205 58
MD5 f5ee205af95a801f901ea6ce2764bf3d files/digest-xterm-207 58
+MD5 4b2c84f62ff017e1c868ace1cd2f4394 files/digest-xterm-208 58
MD5 a5048a1a15d86d400d3e2dbaaa0ac1c8 files/xterm-LANG.patch 1698
MD5 99f9752783bc8c4cc41c72ea1e465fec metadata.xml 294
MD5 444f8b10a7261b2ce95b3e13a05cf505 xterm-204.ebuild 2530
MD5 b81aba8c5f8681724f3df0367cbe2dcc xterm-205.ebuild 2544
MD5 18722a09846e871acbda574d821f1359 xterm-207.ebuild 2950
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDv3WX2+ySkm8kpY0RApC0AKChpvBVoekmsR+fXOhZ6pNIX5Q3PQCgwNvR
-NMjiF68NUxboB54esY+qqXw=
-=3vU/
------END PGP SIGNATURE-----
+MD5 18722a09846e871acbda574d821f1359 xterm-208.ebuild 2950
diff --git a/x11-terms/xterm/files/digest-xterm-208 b/x11-terms/xterm/files/digest-xterm-208
new file mode 100644
index 000000000000..a667a0898376
--- /dev/null
+++ b/x11-terms/xterm/files/digest-xterm-208
@@ -0,0 +1 @@
+MD5 a062d0b398918015d07c31ecdcc5111a xterm-208.tgz 749755
diff --git a/x11-terms/xterm/xterm-208.ebuild b/x11-terms/xterm/xterm-208.ebuild
new file mode 100644
index 000000000000..3add94b0a833
--- /dev/null
+++ b/x11-terms/xterm/xterm-208.ebuild
@@ -0,0 +1,115 @@
+# 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 $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="http://dickey.his.com/xterm/"
+SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="X11"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="truetype Xaw3d unicode toolbar doc"
+
+RDEPEND="|| ( ( x11-libs/libX11
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/libXmu
+ x11-libs/libxkbfile
+ x11-libs/libXft
+ x11-libs/libXaw )
+ virtual/x11 )
+ Xaw3d? ( x11-libs/Xaw3d )
+ doc? ( sys-apps/groff )
+ virtual/utempter"
+
+DEPEND="${RDEPEND}
+ || ( x11-proto/xproto virtual/x11 )"
+
+pkg_setup() {
+ if has_version ">=x11-base/xorg-x11-7.0.0_rc1"; then
+ einfo "Found $(best_version x11-base/xorg-x11)."
+ NEWAPPDEFAULTS=1
+ DEFAULTS_DIR="/usr/$(get_libdir)/X11/app-defaults"
+ else
+ einfo "Not found xorg-x11 version 7."
+ NEWAPPDEFAULTS=0
+ DEFAULTS_DIR="/etc/X11/app-defaults"
+ fi
+}
+
+
+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 \
+ --with-utempter \
+ --disable-setuid \
+ --disable-full-tgetent \
+ --disable-imake \
+ --enable-ansi-color \
+ --enable-88-color \
+ --enable-256-color \
+ --enable-broken-osc \
+ --enable-broken-st \
+ --enable-load-vt-fonts \
+ --enable-i18n \
+ --enable-wide-chars \
+ --enable-doublechars \
+ --enable-warnings \
+ --enable-tcap-query \
+ --enable-logging \
+ --enable-dabbrev \
+ `use_enable toolbar` \
+ `use_enable truetype freetype` \
+ `use_enable unicode luit` `use_enable unicode mini-luit` \
+ `use_with Xaw3d` \
+ ${myconf} || die
+
+ emake || die "failed to compile xterm"
+
+ if use doc ; then
+ make ctlseqs.txt || die "failed to make documentation file"
+ fi
+}
+
+src_install() {
+ make DESTDIR=${D} install || die
+ dodoc README* INSTALL* ctlseqs.txt
+
+ # Fix permissions -- it grabs them from live system, and they can
+ # be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+ # respectively (#69510).
+ # (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+ fperms 0755 /usr/bin/xterm
+
+ # restore the navy blue
+ sed -i "s:blue2$:blue:" ${D}/etc/X11/app-defaults/XTerm-color
+
+ # Fix for bug #91453 at Thomas Dickey's suggestion:
+ echo "*allowWindowOps: false" >> ${D}/${DEFAULTS_DIR}/XTerm
+ echo "*allowWindowOps: false" >> ${D}/${DEFAULTS_DIR}/UXTerm
+
+}
+
+pkg_preinst() {
+ # Prevent the terminfo files from being removed. These collide with ncurses
+ # provided terminfo files. So, now no more package collisions, yay!
+ touch ${ROOT}/usr/share/terminfo/v/vs100
+ touch ${ROOT}/usr/share/terminfo/x/x*
+}