From: Seemant Kulleen <seemant@gentoo.org>
Date: Wed, 19 Oct 2005 14:54:27 +0000 (+0000)
Subject: remove postinst message about security, since that issue is old and dead.  Added... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1566994df75836eb90f92559945d41db7f4b05dc;p=gentoo.git

remove postinst message about security, since that issue is old and dead.  Added the doc use flag which is used to optionally create the ctlseqs.txt document, installed into /usr/share/doc.  The latter is at the request of Joe Wells in bug #108053
Package-Manager: portage-2.0.53_rc5
---

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index ad61c61f5cf3..bc101a471841 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.110 2005/10/19 14:44:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.111 2005/10/19 14:54:27 seemant Exp $
+
+  19 Oct 2005; Seemant Kulleen <seemant@gentoo.org> xterm-205.ebuild:
+  remove postinst message about security, since that issue is old and dead.
+  Added the doc use flag which is used to optionally create the ctlseqs.txt
+  document, installed into /usr/share/doc. The latter is at the request of Joe
+  Wells in bug #108053
 
 *xterm-205 (19 Oct 2005)
 
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index b395aaa09d07..c8d1d5827d58 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,7 +1,7 @@
-MD5 973ff69167dbc2a61bb7e7a0b4def2ae ChangeLog 16205
+MD5 b62fd6b8b3cce18ef47f2b68bb6ff967 ChangeLog 16530
 MD5 8c7c791e44946002c03410f9a6e9fc69 files/digest-xterm-204 58
 MD5 93bc9a4e8639a697e639b46636a802ba files/digest-xterm-205 58
 MD5 a5048a1a15d86d400d3e2dbaaa0ac1c8 files/xterm-LANG.patch 1698
 MD5 99f9752783bc8c4cc41c72ea1e465fec metadata.xml 294
 MD5 c42b2497dfa255b8bde0c64ad6c8b7a1 xterm-204.ebuild 2527
-MD5 84859aefaffb3f5aeca0d364ff0dbf9a xterm-205.ebuild 2542
+MD5 1e0d3b0e7a7017a9faecf4a8c3072ebb xterm-205.ebuild 2542
diff --git a/x11-terms/xterm/xterm-205.ebuild b/x11-terms/xterm/xterm-205.ebuild
index 489558614774..dcf4ef6a1230 100644
--- a/x11-terms/xterm/xterm-205.ebuild
+++ b/x11-terms/xterm/xterm-205.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-205.ebuild,v 1.1 2005/10/19 14:43:16 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-205.ebuild,v 1.2 2005/10/19 14:54:27 seemant Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
 LICENSE="X11"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="truetype Xaw3d unicode toolbar"
+IUSE="truetype Xaw3d unicode toolbar doc"
 
 RDEPEND="||( (
 		x11-libs/libX11
@@ -22,8 +22,9 @@ RDEPEND="||( (
 		x11-libs/libXft
 		x11-libs/libXaw )
 	virtual/x11 )
-	virtual/utempter
-	Xaw3d? ( x11-libs/Xaw3d )"
+	Xaw3d? ( x11-libs/Xaw3d )
+	doc? ( sys-apps/groff )
+	virtual/utempter"
 
 DEPEND="${RDEPEND}
 	||( x11-proto/xproto virtual/x11 )"
@@ -64,12 +65,16 @@ src_compile() {
 		`use_with Xaw3d` \
 		|| die
 
-	emake || 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*
+	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,
@@ -92,13 +97,3 @@ pkg_preinst() {
 	touch ${ROOT}/usr/share/terminfo/v/vs100
 	touch ${ROOT}/usr/share/terminfo/x/x*
 }
-
-
-pkg_postinst() {
-	echo
-	ewarn "Please make SURE to run etc-update, as that is where the latest"
-	ewarn "security fix is made"
-	echo
-	epause 5
-	ebeep
-}