Fixed quoting issues, and added xmessage as a dependency, since it is required for uxterm to function. Thanks to drizztbsd@gentoo.org for the note on that. And stabled 229 for sh, arm and s390.

Package-Manager: portage-2.1.3.19

7 files changed, 39 insertions, 133 deletions

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index e26da8bc71d6..76a17c99137b 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/xterm
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.219 2007/10/13 13:57:02 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.220 2007/11/09 21:30:11 seemant Exp $
+
+  09 Nov 2007; Seemant Kulleen <seemant@gentoo.org> xterm-225.ebuild,
+  -xterm-227.ebuild, xterm-228.ebuild, xterm-229.ebuild:
+  Fixed quoting issues, and added xmessage as a dependency, since it is
+  required for uxterm to function. Thanks to drizztbsd@gentoo.org for the note
+  on that.  And stabled 229 for sh, arm, and s390.
 
   13 Oct 2007; nixnut <nixnut@gentoo.org> xterm-229.ebuild:
   Stable on ppc wrt bug 194017
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 63c3ad2deb1d..3401e39b40c4 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -3,29 +3,24 @@ MD5 307a0970129ebdd2044f781e24dd434e files/xterm-app-defaults-ref.patch 572
 RMD160 c8f9acef7113e9e1ffa2987d51f9d03f50658116 files/xterm-app-defaults-ref.patch 572
 SHA256 41616cb3a3dd687b9c5e1e60ff0e5ebfc6a116f3e0de89c86705235ecfc6203f files/xterm-app-defaults-ref.patch 572
 DIST xterm-225.tgz 821717 RMD160 ceba9372d85ef1a74f3a2ebeb37199bc80949006 SHA1 55598c979da15fe219ddd07bfdd15eb08460026b SHA256 d21ca1b0c9f47da42944b1d1c06f50c7f8ac541cd6047edacfc5837e331af47e
-DIST xterm-227.tgz 836997 RMD160 e788c138434375007baf01d001411189adf3bb00 SHA1 301c2fd6bed42dd2cb8ebbde861e91e77b63f745 SHA256 37ec72c7ea051b0d0599a97e9c6f003a93e9f7c2cd3c997e285a2bbb50ca8a91
 DIST xterm-228.tgz 841482 RMD160 476e154ae349d72ce194d808c9398f83d6e57c6e SHA1 dcb0cd8adb43cd532027adb249040a389e3635ba SHA256 221b6f533e888a616cc7aad6734db180c0e1b19382f1af03b4876f89e3d74f2b
 DIST xterm-229.tgz 841542 RMD160 9ff9bd32536817cbb2498a172459428d417f1fa3 SHA1 483fef795ebee83c513f9a72373d9d16366163d0 SHA256 88b549271bd950f597e3c6faed63c8473ea1ae73d1448c3e51b2ad1f6c2988f1
-EBUILD xterm-225.ebuild 2637 RMD160 3dc11022d67a13fbfc119712bd0bcbe0d62ad582 SHA1 98daf10a91cd8b98b846878c0d0f7aeb5dfdb423 SHA256 1aad9b8108c69bbad542870110d9e5fdcd6ed26fff1029c0f7982af33d96ab04
-MD5 f99ba2374635d9db2e9f3d25c0ce98c4 xterm-225.ebuild 2637
-RMD160 3dc11022d67a13fbfc119712bd0bcbe0d62ad582 xterm-225.ebuild 2637
-SHA256 1aad9b8108c69bbad542870110d9e5fdcd6ed26fff1029c0f7982af33d96ab04 xterm-225.ebuild 2637
-EBUILD xterm-227.ebuild 2641 RMD160 2afdeae9bd86e181dcd7e6637c37d9e93ab92823 SHA1 8689e881cc274795968c5df430ca944fde50829e SHA256 8694a94bb5d78f04732fde9595eacb19d8f90f8bf862a449db23afc01a95eff7
-MD5 7f3fc2ee651b315b9c1e0595d04b63a3 xterm-227.ebuild 2641
-RMD160 2afdeae9bd86e181dcd7e6637c37d9e93ab92823 xterm-227.ebuild 2641
-SHA256 8694a94bb5d78f04732fde9595eacb19d8f90f8bf862a449db23afc01a95eff7 xterm-227.ebuild 2641
-EBUILD xterm-228.ebuild 2641 RMD160 2e3b6f1a28ed77ce18608cd58ca8c0691935734f SHA1 7bc79533c36a0583e2e65af9d2c7c7906462190f SHA256 7013083adfd1237a17c4556d989ca453de76f0d64f98fcc4204c8c4a48844bd8
-MD5 e2ea4f7ba289b223fe68ba805e93caf7 xterm-228.ebuild 2641
-RMD160 2e3b6f1a28ed77ce18608cd58ca8c0691935734f xterm-228.ebuild 2641
-SHA256 7013083adfd1237a17c4556d989ca453de76f0d64f98fcc4204c8c4a48844bd8 xterm-228.ebuild 2641
-EBUILD xterm-229.ebuild 2640 RMD160 fba14a6ac72fa9f68fe4a61655902c4fdae0bd87 SHA1 e5cb88f7f67666f33e811297e8e56a0e64f66876 SHA256 aa62bb4eb892038fa03770fa12c7316f77341522f3f0cabeae049f7ce395fcd3
-MD5 bb5075a845c3d1bccb9979be82d81924 xterm-229.ebuild 2640
-RMD160 fba14a6ac72fa9f68fe4a61655902c4fdae0bd87 xterm-229.ebuild 2640
-SHA256 aa62bb4eb892038fa03770fa12c7316f77341522f3f0cabeae049f7ce395fcd3 xterm-229.ebuild 2640
-MISC ChangeLog 29984 RMD160 d18f3de229ad8f38f19d724106e564f02f47f056 SHA1 2b57f0954a45291d215a5496515fc3cf53e93a63 SHA256 2f137396cd30dc7ae4439f3a1794f8d14132420c13daa506ed0f63200791f4cb
-MD5 a728ae54c7ac69ef5324a8afd0a8ef82 ChangeLog 29984
-RMD160 d18f3de229ad8f38f19d724106e564f02f47f056 ChangeLog 29984
-SHA256 2f137396cd30dc7ae4439f3a1794f8d14132420c13daa506ed0f63200791f4cb ChangeLog 29984
+EBUILD xterm-225.ebuild 2663 RMD160 03817e2be1b2abb0f4c63996f0a98ec58a82168e SHA1 b6109cc7176f836e0a241ab0d306e2d5f4da9f28 SHA256 9000147906517edb219f37e6ddccf83e190045cb9ff4d9910b9f5b54a4900f42
+MD5 28b1791092575bece1e8d6a4fb5a85bb xterm-225.ebuild 2663
+RMD160 03817e2be1b2abb0f4c63996f0a98ec58a82168e xterm-225.ebuild 2663
+SHA256 9000147906517edb219f37e6ddccf83e190045cb9ff4d9910b9f5b54a4900f42 xterm-225.ebuild 2663
+EBUILD xterm-228.ebuild 2667 RMD160 d2d4e3fdd1c3f4c505f1bf4ea0333b9a028009bf SHA1 c644eb4d3d3cbe4e573f7d409642d19bb07c2160 SHA256 8777c4ba78dc864c605700187e36578ee748b892bb6fcda89976b271344d467d
+MD5 4ca300f1810b31627e5fb60cba37df84 xterm-228.ebuild 2667
+RMD160 d2d4e3fdd1c3f4c505f1bf4ea0333b9a028009bf xterm-228.ebuild 2667
+SHA256 8777c4ba78dc864c605700187e36578ee748b892bb6fcda89976b271344d467d xterm-228.ebuild 2667
+EBUILD xterm-229.ebuild 2663 RMD160 cf63f88d33cac4b79cb0c974e8bdfcabf9129425 SHA1 5b7a5c84a033f616b88e4c0f13c13d0b290acced SHA256 508f890a8a35f4302dc5175bf0e1c853002e32fafe06a645cbdb9a81b0cba1f5
+MD5 4d6b8e079b34b5b58ba00e8e165ba3a2 xterm-229.ebuild 2663
+RMD160 cf63f88d33cac4b79cb0c974e8bdfcabf9129425 xterm-229.ebuild 2663
+SHA256 508f890a8a35f4302dc5175bf0e1c853002e32fafe06a645cbdb9a81b0cba1f5 xterm-229.ebuild 2663
+MISC ChangeLog 30315 RMD160 e872c12eac945c8a9ea25f26c9f6483e1b5ef3bb SHA1 8840c617acd6655cfad49ee02eb072105bb892ac SHA256 66ff554c75e09fe0e2b218af7dbfd10c2ed36e424f27f5954b53835445b21129
+MD5 80cdcc08fc226f247248fef839925400 ChangeLog 30315
+RMD160 e872c12eac945c8a9ea25f26c9f6483e1b5ef3bb ChangeLog 30315
+SHA256 66ff554c75e09fe0e2b218af7dbfd10c2ed36e424f27f5954b53835445b21129 ChangeLog 30315
 MISC metadata.xml 371 RMD160 fe2fdf6360b4097ee3afda096a3af81d8324b17a SHA1 7884356406f9eda7aefd72c9684fe4d25ca10336 SHA256 ba33f48e5d7eb0768f01cb0991e8a6bd2b523421f8c5b5eab8ae4431f238c6e9
 MD5 a9eedd2611ab1512350c565e63d9a716 metadata.xml 371
 RMD160 fe2fdf6360b4097ee3afda096a3af81d8324b17a metadata.xml 371
@@ -33,9 +28,6 @@ SHA256 ba33f48e5d7eb0768f01cb0991e8a6bd2b523421f8c5b5eab8ae4431f238c6e9 metadata
 MD5 fc38708dd9fac58d8ba31af68059c636 files/digest-xterm-225 220
 RMD160 260dd29cdc9d4b300fbcf2d30693e9e6a570f9a0 files/digest-xterm-225 220
 SHA256 e374de5a4d36dadbc150092e2ff29736318e428da81b9501151b7de4c982a32c files/digest-xterm-225 220
-MD5 067a2bf280b6270f419837b92cbb55e9 files/digest-xterm-227 220
-RMD160 dc4ce0b903c1c13d727add684c8a40260437b3fa files/digest-xterm-227 220
-SHA256 0e1dee29074625f4e066ef79772c4cb5b2cc0f863d859b9c3752a721b9e8a730 files/digest-xterm-227 220
 MD5 7c3fcbf6c28fe192b843d02eaffa903f files/digest-xterm-228 220
 RMD160 06696b82f37b8b04ca32a61c407b2b0a19d5724c files/digest-xterm-228 220
 SHA256 88b711cdef1a4d2cbb9740a3b977b802042b4bd84b955b7e89fbda5a640f80e4 files/digest-xterm-228 220
diff --git a/x11-terms/xterm/files/digest-xterm-227 b/x11-terms/xterm/files/digest-xterm-227
deleted file mode 100644
index b95ccdc161b4..000000000000
--- a/x11-terms/xterm/files/digest-xterm-227
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6a2be9a63735fc8127e9098012361695 xterm-227.tgz 836997
-RMD160 e788c138434375007baf01d001411189adf3bb00 xterm-227.tgz 836997
-SHA256 37ec72c7ea051b0d0599a97e9c6f003a93e9f7c2cd3c997e285a2bbb50ca8a91 xterm-227.tgz 836997
diff --git a/x11-terms/xterm/xterm-225.ebuild b/x11-terms/xterm/xterm-225.ebuild
index e58f9c5c3d47..5c1d14c088de 100644
--- a/x11-terms/xterm/xterm-225.ebuild
+++ b/x11-terms/xterm/xterm-225.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-225.ebuild,v 1.9 2007/06/11 02:23:13 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-225.ebuild,v 1.10 2007/11/09 21:30:11 seemant Exp $
 
 inherit flag-o-matic
 
@@ -20,6 +20,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libxkbfile
 	x11-libs/libXft
 	x11-libs/libXaw
+	x11-apps/xmessage
 	unicode? ( x11-apps/luit )
 	Xaw3d? ( x11-libs/Xaw3d )
 	sys-libs/libutempter"
@@ -76,11 +77,11 @@ src_install() {
 	fperms 0755 /usr/bin/xterm
 
 	# restore the navy blue
-	sed -i "s:blue2$:blue:" ${D}${DEFAULTS_DIR}/XTerm-color
+	sed -i "s:blue2$:blue:" "${D}"${DEFAULTS_DIR}/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
+	echo "*allowWindowOps: 	false" >> "${D}"/${DEFAULTS_DIR}/XTerm
+	echo "*allowWindowOps: 	false" >> "${D}"/${DEFAULTS_DIR}/UXTerm
 }
 
 pkg_postinst() {
diff --git a/x11-terms/xterm/xterm-227.ebuild b/x11-terms/xterm/xterm-227.ebuild
deleted file mode 100644
index bebe558c52b9..000000000000
--- a/x11-terms/xterm/xterm-227.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-227.ebuild,v 1.4 2007/08/25 14:00:53 vapier Exp $
-
-inherit 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 s390 sh sparc x86 ~x86-fbsd"
-IUSE="truetype Xaw3d unicode toolbar paste64"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libxkbfile
-	x11-libs/libXft
-	x11-libs/libXaw
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/Xaw3d )
-	sys-libs/libutempter"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-pkg_setup() {
-	DEFAULTS_DIR="/usr/share/X11/app-defaults"
-}
-
-src_compile() {
-	filter-flags "-fstack-protector"
-	replace-flags "-Os" "-O2" # work around gcc-4.1.1-r[01] bugs
-
-	econf --libdir=/etc \
-		--with-x \
-		--with-utempter \
-		--disable-setuid \
-		--disable-full-tgetent \
-		--disable-imake \
-		--disable-narrowproto \
-		--enable-ansi-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 \
-		--with-app-defaults=${DEFAULTS_DIR} \
-		$(use_enable toolbar) \
-		$(use_enable truetype freetype) \
-		$(use_enable unicode luit) $(use_enable unicode mini-luit) \
-		$(use_with Xaw3d) \
-		$(use_enable paste64)
-
-	emake || die "emake failed."
-}
-
-# Parallel make causes File exists error and dies. Forcing -j1 for now.
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed."
-	dodoc README{,.i18n} ctlseqs.txt
-	dohtml xterm.log.html
-
-	# 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}${DEFAULTS_DIR}/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_postinst() {
-	if use paste64 ; then
-		elog "bracketed paste mode requires the allowWindowOps resource to be true"
-		elog "which is false by default for security reasons (see bug #91453)."
-		elog "To be able to use it add 'allowWindowOps: true' to your resources"
-	fi
-}
diff --git a/x11-terms/xterm/xterm-228.ebuild b/x11-terms/xterm/xterm-228.ebuild
index 03b95c756cfa..348bd5a61c4b 100644
--- a/x11-terms/xterm/xterm-228.ebuild
+++ b/x11-terms/xterm/xterm-228.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-228.ebuild,v 1.4 2007/09/08 04:15:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-228.ebuild,v 1.5 2007/11/09 21:30:11 seemant Exp $
 
 inherit flag-o-matic
 
@@ -20,6 +20,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libxkbfile
 	x11-libs/libXft
 	x11-libs/libXaw
+	x11-apps/xmessage
 	unicode? ( x11-apps/luit )
 	Xaw3d? ( x11-libs/Xaw3d )
 	sys-libs/libutempter"
@@ -76,11 +77,11 @@ src_install() {
 	fperms 0755 /usr/bin/xterm
 
 	# restore the navy blue
-	sed -i "s:blue2$:blue:" ${D}${DEFAULTS_DIR}/XTerm-color
+	sed -i "s:blue2$:blue:" "${D}"${DEFAULTS_DIR}/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
+	echo "*allowWindowOps: 	false" >> "${D}"/${DEFAULTS_DIR}/XTerm
+	echo "*allowWindowOps: 	false" >> "${D}"/${DEFAULTS_DIR}/UXTerm
 }
 
 pkg_postinst() {
diff --git a/x11-terms/xterm/xterm-229.ebuild b/x11-terms/xterm/xterm-229.ebuild
index 3f40f51b3fbd..023d64d2b406 100644
--- a/x11-terms/xterm/xterm-229.ebuild
+++ b/x11-terms/xterm/xterm-229.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-229.ebuild,v 1.7 2007/10/13 13:57:02 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-229.ebuild,v 1.8 2007/11/09 21:30:11 seemant Exp $
 
 inherit flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
 
 LICENSE="X11"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="truetype Xaw3d unicode toolbar paste64"
 
 RDEPEND="x11-libs/libX11
@@ -20,6 +20,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libxkbfile
 	x11-libs/libXft
 	x11-libs/libXaw
+	x11-apps/xmessage
 	unicode? ( x11-apps/luit )
 	Xaw3d? ( x11-libs/Xaw3d )
 	sys-libs/libutempter"
@@ -76,11 +77,11 @@ src_install() {
 	fperms 0755 /usr/bin/xterm
 
 	# restore the navy blue
-	sed -i "s:blue2$:blue:" ${D}${DEFAULTS_DIR}/XTerm-color
+	sed -i "s:blue2$:blue:" "${D}"${DEFAULTS_DIR}/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
+	echo "*allowWindowOps: 	false" >> "${D}"/${DEFAULTS_DIR}/XTerm
+	echo "*allowWindowOps: 	false" >> "${D}"/${DEFAULTS_DIR}/UXTerm
 }
 
 pkg_postinst() {