ppc64 stable wrt #339640

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

4 files changed, 8 insertions, 84 deletions

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index 39f78802e3cb..ff4c84af8cd7 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-terms/xterm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.299 2010/10/12 16:52:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.300 2010/11/05 20:35:14 ssuominen Exp $
+
+  05 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> xterm-262.ebuild:
+  ppc64 stable wrt #339640
 
   12 Oct 2010; Raúl Porcel <armin76@gentoo.org> xterm-262.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #339640
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 493615c62c9e..814055700ab9 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,6 +1,4 @@
-DIST xterm-250.tgz 889052 RMD160 f61dcfbb60d4645bb80ffdc5339d11a92885e895 SHA1 bf72e4ab4f6f7aeb27db9667df4a85e151546c90 SHA256 2dfdf63135f838d3ad11584f0da18360f993305733df4df3255b952067b4fb28
 DIST xterm-262.tgz 932831 RMD160 ef9693a682c6a90f5baf5153db82bd3a8fd4683f SHA1 3c8fc8f776e1b3bcf4973908b0c84cf5d4379a28 SHA256 4928567a27957aba63fa130859aa5d15df11fefe3d1bf9bfc204397abc546c5f
-EBUILD xterm-250.ebuild 1993 RMD160 8f3749f7ca24c6b7607f5bb3711f146aee53c093 SHA1 56c97a93bff7096ee1931698a4c98b00b2a0e79c SHA256 7aafca7adea95609663179993c87858f57b9b2d8fdfa27ada4fbfe9691e429e6
-EBUILD xterm-262.ebuild 2036 RMD160 c8675dfbe97251674cb4a2e08cfea59d45af9365 SHA1 126dde0b847e37e8a3c2438b830d27a2e38e11ad SHA256 b0ca72a577a509984f5980d6ff2b8912460f885378509cf0833f51168a1751b2
-MISC ChangeLog 39143 RMD160 d65f515046a6cf11a2b35be187979266e6eae242 SHA1 3c669ec946061acaefff4a7f1cc253967c6bdaae SHA256 c579ee90cbaad54896c4dcef64f9b38aa417a6d94dab704d5da0b62f3b58bb36
+EBUILD xterm-262.ebuild 2037 RMD160 6805a13b9a30ebbfd7ea5011b063b297f505874a SHA1 0ea4edbebc26b751652a61e01b1c9a32b7f576ef SHA256 036d7027e4d1dc2fb3340e1c3b584543d990ce94a95719a005c1f0d6658573c4
+MISC ChangeLog 39245 RMD160 861dc447b85354f6607e19fdfe82b3de43036852 SHA1 721ab74b9f2e21fd43950ca29a54f7e3cc822964 SHA256 70ef508854fa917260054e68f8b52470f8bf19f0ac14b73e1c5832a20720f524
 MISC metadata.xml 331 RMD160 32427445a48d438536862ab23680a3012a4ec123 SHA1 257df7d2ad3e04551657f215f71806af3df08501 SHA256 c2fa4045bcc7f1e04dc187c7a17e0a35e4b2e6aa058a5b139dae3e9529fcbff7
diff --git a/x11-terms/xterm/xterm-250.ebuild b/x11-terms/xterm/xterm-250.ebuild
deleted file mode 100644
index cf3b26b2a9ad..000000000000
--- a/x11-terms/xterm/xterm-250.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-250.ebuild,v 1.10 2010/01/19 20:35:59 armin76 Exp $
-
-EAPI=2
-inherit multilib
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="http://dickey.his.com/xterm/"
-SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="toolbar truetype unicode Xaw3d"
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libxkbfile
-	x11-libs/libXft
-	x11-libs/libXaw
-	x11-apps/xmessage
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/Xaw3d )
-	sys-libs/libutempter"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/font-misc-misc"
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto"
-
-pkg_setup() {
-	DEFAULTS_DIR=/usr/share/X11/app-defaults
-}
-
-src_configure() {
-	econf \
-		--libdir=/etc \
-		--x-libraries="${ROOT}usr/$(get_libdir)" \
-		--disable-full-tgetent \
-		--with-app-defaults=${DEFAULTS_DIR} \
-		--disable-setuid \
-		--disable-setgid \
-		--with-utempter \
-		--with-x \
-		$(use_with Xaw3d) \
-		--disable-imake \
-		--enable-256-color \
-		--enable-broken-osc \
-		--enable-broken-st \
-		$(use_enable truetype freetype) \
-		--enable-i18n \
-		--enable-load-vt-fonts \
-		--enable-logging \
-		$(use_enable toolbar) \
-		$(use_enable unicode mini-luit) \
-		$(use_enable unicode luit) \
-		--enable-wide-chars \
-		--enable-dabbrev \
-		--enable-warnings
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	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 -e "s:blue2$:blue:" "${D}"${DEFAULTS_DIR}/XTerm-color
-}
diff --git a/x11-terms/xterm/xterm-262.ebuild b/x11-terms/xterm/xterm-262.ebuild
index 6689495393f8..01178049ba5f 100644
--- a/x11-terms/xterm/xterm-262.ebuild
+++ b/x11-terms/xterm/xterm-262.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-262.ebuild,v 1.6 2010/10/12 16:52:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-262.ebuild,v 1.7 2010/11/05 20:35:14 ssuominen Exp $
 
 EAPI=2
 inherit multilib
@@ -11,7 +11,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 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="toolbar truetype unicode Xaw3d"
 
 COMMON_DEPEND="x11-libs/libX11