8 files changed, 6 insertions, 300 deletions
diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index 674d52699cbb..7aa6b4f201ec 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/xterm
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.224 2008/01/31 03:21:28 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.225 2008/01/31 03:23:38 dberkholz Exp $
+
+  31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/xterm-app-defaults-ref.patch, -xterm-225.ebuild, -xterm-228.ebuild,
+  -xterm-231.ebuild:
+  Clean up.
 
 *xterm-232 (31 Jan 2008)
 
diff --git a/x11-terms/xterm/files/digest-xterm-225 b/x11-terms/xterm/files/digest-xterm-225
deleted file mode 100644
index e5c9416a702c..000000000000
--- a/x11-terms/xterm/files/digest-xterm-225
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dbd31341a9ccb982647416e8d27b0f00 xterm-225.tgz 821717
-RMD160 ceba9372d85ef1a74f3a2ebeb37199bc80949006 xterm-225.tgz 821717
-SHA256 d21ca1b0c9f47da42944b1d1c06f50c7f8ac541cd6047edacfc5837e331af47e xterm-225.tgz 821717
diff --git a/x11-terms/xterm/files/digest-xterm-228 b/x11-terms/xterm/files/digest-xterm-228
deleted file mode 100644
index 214aab173d43..000000000000
--- a/x11-terms/xterm/files/digest-xterm-228
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 35e0b1bfc9351519b3705d102cf24241 xterm-228.tgz 841482
-RMD160 476e154ae349d72ce194d808c9398f83d6e57c6e xterm-228.tgz 841482
-SHA256 221b6f533e888a616cc7aad6734db180c0e1b19382f1af03b4876f89e3d74f2b xterm-228.tgz 841482
diff --git a/x11-terms/xterm/files/digest-xterm-231 b/x11-terms/xterm/files/digest-xterm-231
deleted file mode 100644
index 523b73837ece..000000000000
--- a/x11-terms/xterm/files/digest-xterm-231
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b767d702e1464e16802b90c2187252c6 xterm-231.tgz 850863
-RMD160 b2c2d232623334e10ea7993c2396ac0c5db113bf xterm-231.tgz 850863
-SHA256 598b2595826f823f78e6eff9d46e905927634d8a36b435d36b504ddca62d9f62 xterm-231.tgz 850863
diff --git a/x11-terms/xterm/files/xterm-app-defaults-ref.patch b/x11-terms/xterm/files/xterm-app-defaults-ref.patch
deleted file mode 100644
index 423bdb8b2044..000000000000
--- a/x11-terms/xterm/files/xterm-app-defaults-ref.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.old	2006-05-10 07:18:24.000000000 +0200
-+++ Makefile.in	2006-05-10 07:18:56.000000000 +0200
-@@ -168,7 +168,7 @@
- install \
- install-man \
- install-full :: $(MANDIR)
--	$(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/xterm.man    $(MANDIR)/$(actual_xterm).$(manext)  $(APPSDIR)
-+	$(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/xterm.man    $(MANDIR)/$(actual_xterm).$(manext)  $(appsdir)
- 	$(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/resize.man   $(MANDIR)/$(actual_resize).$(manext) $(APPSDIR)
- 
- @no_appsdir@install \
diff --git a/x11-terms/xterm/xterm-225.ebuild b/x11-terms/xterm/xterm-225.ebuild
deleted file mode 100644
index 5c1d14c088de..000000000000
--- a/x11-terms/xterm/xterm-225.ebuild
+++ /dev/null
@@ -1,93 +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-225.ebuild,v 1.10 2007/11/09 21:30:11 seemant 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
-	x11-apps/xmessage
-	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
deleted file mode 100644
index 348bd5a61c4b..000000000000
--- a/x11-terms/xterm/xterm-228.ebuild
+++ /dev/null
@@ -1,93 +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-228.ebuild,v 1.5 2007/11/09 21:30:11 seemant 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
-	x11-apps/xmessage
-	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-231.ebuild b/x11-terms/xterm/xterm-231.ebuild
deleted file mode 100644
index 66b2200d40f3..000000000000
--- a/x11-terms/xterm/xterm-231.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-231.ebuild,v 1.1 2008/01/11 08:06:45 dberkholz 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
-	x11-apps/xmessage
-	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
-}