Add patch to not include DESTDIR in the paths for default resources files

specified in the man page, fix bug #132843. Change the directory for the
resources files on modular to the one used in the 7.0 release.

Package-Manager: portage-2.1_pre10-r4

5 files changed, 144 insertions, 15 deletions

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index 81f82caecfce..f696cf064aaf 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-terms/xterm
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.134 2006/05/03 14:22:36 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.135 2006/05/10 11:23:44 exg Exp $
+
+*xterm-212-r2 (10 May 2006)
+
+  10 May 2006; Emanuele Giaquinta <exg@gentoo.org>
+  +files/xterm-app-defaults-ref.patch, +xterm-212-r2.ebuild:
+  Add patch to not include DESTDIR in the paths for default resources files
+  specified in the man page, fix bug #132843. Change the directory for the
+  resources files on modular to the one used in the 7.0 release.
 
 *xterm-212-r1 (03 May 2006)
 
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 6d59e850277f..82495f1e22ef 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,10 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xterm-LANG.patch 1698 RMD160 8f442cbb3d39cd18645f656970d717c5bab84a2d SHA1 4ff6b11ac3ac8b590c7da294bd0c12dabd9013eb SHA256 b2e646c2f4c86cd8132a5a54a362363453f1f02a4f976751c41d7418b3d772c5 size 1698
 MD5 a5048a1a15d86d400d3e2dbaaa0ac1c8 files/xterm-LANG.patch 1698
 RMD160 8f442cbb3d39cd18645f656970d717c5bab84a2d files/xterm-LANG.patch 1698
 SHA256 b2e646c2f4c86cd8132a5a54a362363453f1f02a4f976751c41d7418b3d772c5 files/xterm-LANG.patch 1698
+AUX xterm-app-defaults-ref.patch 572 RMD160 c8f9acef7113e9e1ffa2987d51f9d03f50658116 SHA1 d80445dccc4a52bc22d118787929db937417ce50 SHA256 41616cb3a3dd687b9c5e1e60ff0e5ebfc6a116f3e0de89c86705235ecfc6203f size 572
+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-204.tgz 715433 size 715433
 DIST xterm-207.tgz 745083 RMD160 225aafce1de43212e0cd86da953e99a1a9121a05 SHA256 652f579171e6e8f73c13ab6b060d2447ae35ebfbd39a6002b7c05a1dfc0f7eb8 size 745083
 DIST xterm-210.tgz 761944 RMD160 65cfb18484d859365bac571b8d8b7da0762e91e7 SHA256 49cde913a5283ef837b442e74766b7926eceef42743fc82bc68cc1e5ee7eb30e size 761944
@@ -30,14 +31,18 @@ EBUILD xterm-212-r1.ebuild 2523 RMD160 fce9e36d0b3081e0b41f0cc685a87a172e5352c1
 MD5 d08344a6d7ebb2f3e00a58d58fb5eef4 xterm-212-r1.ebuild 2523
 RMD160 fce9e36d0b3081e0b41f0cc685a87a172e5352c1 xterm-212-r1.ebuild 2523
 SHA256 dbc976bfdc867ba5eb79581e0fcd6c954288924f509197a427e538fffbaa2b5a xterm-212-r1.ebuild 2523
+EBUILD xterm-212-r2.ebuild 2609 RMD160 2c50947d66cb1f977622d8a737f39a7a90c35aa2 SHA1 d87df87df2cb15e430bb8a567a47337c01ab2ff2 SHA256 ee96e9201f2c38076bb32ecb0ff65c10889db49c911b6168e8cc08528de960d3 size 2609
+MD5 b9ad299458c7f264c07d19d2cd493114 xterm-212-r2.ebuild 2609
+RMD160 2c50947d66cb1f977622d8a737f39a7a90c35aa2 xterm-212-r2.ebuild 2609
+SHA256 ee96e9201f2c38076bb32ecb0ff65c10889db49c911b6168e8cc08528de960d3 xterm-212-r2.ebuild 2609
 EBUILD xterm-212.ebuild 2648 RMD160 17c53b19e2a77d6d4bc9fee0b7fda94fac47778e SHA1 754d648ffc360374641cb2cb5bb68e8b2e379c62 SHA256 1332bc0b8756d5aa96484546ecbf0f3157b4305e67f6221f11e52a1b6c7feca2 size 2648
 MD5 79143e92b612b26d841e210fff1aa6be xterm-212.ebuild 2648
 RMD160 17c53b19e2a77d6d4bc9fee0b7fda94fac47778e xterm-212.ebuild 2648
 SHA256 1332bc0b8756d5aa96484546ecbf0f3157b4305e67f6221f11e52a1b6c7feca2 xterm-212.ebuild 2648
-MISC ChangeLog 19299 RMD160 49b3becfd83ad49725f312ed970128930005c2b8 SHA1 bef5e1f1ad36628e131e5461eb3e52582fc4b0d4 SHA256 ff273d81ce0d82a74de02c7da2b99129d519bdb845a4d81c0255382c3be89957 size 19299
-MD5 7872a7948b0c8365f43552ce64f5f456 ChangeLog 19299
-RMD160 49b3becfd83ad49725f312ed970128930005c2b8 ChangeLog 19299
-SHA256 ff273d81ce0d82a74de02c7da2b99129d519bdb845a4d81c0255382c3be89957 ChangeLog 19299
+MISC ChangeLog 19657 RMD160 fd3dee2bdb31a75c406f8b14313883c458671912 SHA1 5892b2b53be142d0cade1ecf7cb321ff160361a6 SHA256 a5d230d023f52dc4f629c5f898a86a59533194a14f2119a6b470c7dc1a46599b size 19657
+MD5 9541a9e96850b95012e5df08a83c63cf ChangeLog 19657
+RMD160 fd3dee2bdb31a75c406f8b14313883c458671912 ChangeLog 19657
+SHA256 a5d230d023f52dc4f629c5f898a86a59533194a14f2119a6b470c7dc1a46599b ChangeLog 19657
 MISC metadata.xml 509 RMD160 8260071117978c13f534adbaa2c080d5834420d7 SHA1 9edccd3fe2d180a92790068b5cdde8f47c7c4a3a SHA256 c4cf8fd894af68e5c7249d22885de0dd20b681dc636686d43c3bce7074fdf692 size 509
 MD5 0f56141a57f7925bd8470488fa51c330 metadata.xml 509
 RMD160 8260071117978c13f534adbaa2c080d5834420d7 metadata.xml 509
@@ -60,10 +65,6 @@ SHA256 9a597d9971e64390dba0f5fb1cc744df257cfce836447560a831d2b02e6dde13 files/di
 MD5 515d0610099473c1e3d2d46d4b9f46f3 files/digest-xterm-212-r1 220
 RMD160 64ac702cd771d4a38712041dd15c16366d90602d files/digest-xterm-212-r1 220
 SHA256 9a597d9971e64390dba0f5fb1cc744df257cfce836447560a831d2b02e6dde13 files/digest-xterm-212-r1 220
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEWLwX2iXjgNjfe5sRArcwAJ9O9voMkRbdMbED7+PyBf8yUg3g7QCguYyG
-Oy4w6oLcpHyhXo5qMewUo80=
-=2njw
------END PGP SIGNATURE-----
+MD5 515d0610099473c1e3d2d46d4b9f46f3 files/digest-xterm-212-r2 220
+RMD160 64ac702cd771d4a38712041dd15c16366d90602d files/digest-xterm-212-r2 220
+SHA256 9a597d9971e64390dba0f5fb1cc744df257cfce836447560a831d2b02e6dde13 files/digest-xterm-212-r2 220
diff --git a/x11-terms/xterm/files/digest-xterm-212-r2 b/x11-terms/xterm/files/digest-xterm-212-r2
new file mode 100644
index 000000000000..6d07057d24f9
--- /dev/null
+++ b/x11-terms/xterm/files/digest-xterm-212-r2
@@ -0,0 +1,3 @@
+MD5 d39ec47dbf846e0e7dddb354280c4074 xterm-212.tgz 764465
+RMD160 2808cdf3f550ef9df7e83a4844f3f4f64f0508a1 xterm-212.tgz 764465
+SHA256 bfd201600c0f0f3c3d9dcfe32fde1db333307a87a4453084bf55a7aa97b3b6ae xterm-212.tgz 764465
diff --git a/x11-terms/xterm/files/xterm-app-defaults-ref.patch b/x11-terms/xterm/files/xterm-app-defaults-ref.patch
new file mode 100644
index 000000000000..423bdb8b2044
--- /dev/null
+++ b/x11-terms/xterm/files/xterm-app-defaults-ref.patch
@@ -0,0 +1,11 @@
+--- 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-212-r2.ebuild b/x11-terms/xterm/xterm-212-r2.ebuild
new file mode 100644
index 000000000000..dcd46e21e34e
--- /dev/null
+++ b/x11-terms/xterm/xterm-212-r2.ebuild
@@ -0,0 +1,106 @@
+# 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-212-r2.ebuild,v 1.1 2006/05/10 11:23:44 exg 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 doc"
+
+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 ) )
+	virtual/x11 )
+	Xaw3d? ( x11-libs/Xaw3d )
+	virtual/utempter"
+
+DEPEND="${RDEPEND}
+	doc? ( sys-apps/groff )
+	|| ( x11-proto/xproto virtual/x11 )"
+
+pkg_setup() {
+	if has_version "x11-libs/libX11"; then
+		DEFAULTS_DIR="/usr/share/X11/app-defaults"
+	else
+		DEFAULTS_DIR="/etc/X11/app-defaults"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/xterm-app-defaults-ref.patch
+}
+
+src_compile() {
+	filter-flags "-fstack-protector"
+
+	local myconf=""
+
+	if has_version "x11-libs/libX11"; then
+		myconf="--disable-narrowproto"
+	fi
+
+	econf \
+		--libdir=/etc \
+		--with-x \
+		--with-utempter \
+		--disable-setuid \
+		--disable-full-tgetent \
+		--disable-imake \
+		--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) \
+		${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}${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
+}