fix two bugs with a simple trivial feature

(Portage version: 2.1_pre7-r5)

5 files changed, 115 insertions, 14 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index 10aedadf2fa5..4cac4fbe69af 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/rxvt-unicode
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.71 2006/03/31 19:44:01 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.72 2006/04/12 20:30:34 arj Exp $
+
+*rxvt-unicode-7.7-r2 (12 Apr 2006)
+
+  12 Apr 2006; Anders Rune Jensen <arj@gentoo.org> +rxvt-unicode-7.7-r2.ebuild:
+  Add one-line trivial scrolling patch. Fixes #114737 and #62371.
 
 *rxvt-unicode-7.7-r1 (31 Mar 2006)
 
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 58cdea541609..e30d1e999be4 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5e26d966ea963bacf37ba96be672db54 ChangeLog 11297
-RMD160 074618cd7067baefeb768c1402e27155428e0573 ChangeLog 11297
-SHA256 6b3579934e415a15d2641941389647cac20c7f746978fffa35c34d1ac0129a6b ChangeLog 11297
+MD5 bbe5afd97cbce500ab26a8d9ffc3f827 ChangeLog 11480
+RMD160 1d9bde4f96313603acce6aa93d0f4048105e9bad ChangeLog 11480
+SHA256 46b3f1f435bb3ea7928173968cbc405e5bc084cd6f1d2d6fba4f1b7399194b63 ChangeLog 11480
 MD5 ff186f769724f65b45dcedf2b9e7c9a3 files/digest-rxvt-unicode-3.0 69
 RMD160 f883534b49e9d7adac4e4501bb31cf0ab118d65a files/digest-rxvt-unicode-3.0 69
 SHA256 43aee00b8d8aa9258723409449e1bf57a400dde2535223d65fad85e538b35301 files/digest-rxvt-unicode-3.0 69
@@ -25,6 +22,9 @@ SHA256 e948878fea0092d9f3a73d5e4fe306eaa48b3a4dc74ae033232cc4cedae5c653 files/di
 MD5 9832649d7101430028f13bbd85abe3a7 files/digest-rxvt-unicode-7.7-r1 253
 RMD160 f99320e24dd3214e10c71f8633c0e7d3cf3df855 files/digest-rxvt-unicode-7.7-r1 253
 SHA256 9135aa40a90e30be6c88719a3e042338ba6b2ab82192637234843a7ca9ce322e files/digest-rxvt-unicode-7.7-r1 253
+MD5 9832649d7101430028f13bbd85abe3a7 files/digest-rxvt-unicode-7.7-r2 253
+RMD160 f99320e24dd3214e10c71f8633c0e7d3cf3df855 files/digest-rxvt-unicode-7.7-r2 253
+SHA256 9135aa40a90e30be6c88719a3e042338ba6b2ab82192637234843a7ca9ce322e files/digest-rxvt-unicode-7.7-r2 253
 MD5 27f475fce3946d48a23f36e0279a978c files/rxvt-unicode-2.3-font-fix.diff 431
 RMD160 1a5ea32112dd166e76905133c29672628ff99b9d files/rxvt-unicode-2.3-font-fix.diff 431
 SHA256 7274d9db13b42beabb2c438dc41868da62076d1dbd5b0db1cc8b3b2ea42d1c14 files/rxvt-unicode-2.3-font-fix.diff 431
@@ -34,6 +34,9 @@ SHA256 829ce5f219b4d394ebf238a214b072efe7af99e01717319b0dbc4aa87f50fad2 files/rx
 MD5 63548e76ee03f6dc4fee9e2239453ca1 files/rxvt-unicode-4.0-64bit.patch 728
 RMD160 86ad89860b77d8e89c4f817f6caf56786a15d1d0 files/rxvt-unicode-4.0-64bit.patch 728
 SHA256 d140c04f786df0fe597a746846c1f1e37f0f4061697bd8c4556e56a2d08d945e files/rxvt-unicode-4.0-64bit.patch 728
+MD5 b5338721e5a98c03b97543d91610e9f6 files/scrolling-one-line.patch 440
+RMD160 a796a5fb3412ba89049efa29bae52bbde2a6f80a files/scrolling-one-line.patch 440
+SHA256 41714925ddec020950a00350034c28c650e671b876c3138b5535732a337e77b5 files/scrolling-one-line.patch 440
 MD5 ae6f4504c04a4a030d1028340a2f4f9a metadata.xml 226
 RMD160 6f2bcba5e169f4219ce334fa4a3326d25c4e9955 metadata.xml 226
 SHA256 1bcb550b8b5c6c67b63898ecec6fbbf0d1e78c7b21a99776057c1eae946d0215 metadata.xml 226
@@ -58,10 +61,6 @@ SHA256 194699296b6e42b9287e8f2a575da8ff0655efdc0481ed55fdc41f498b9f3c8a rxvt-uni
 MD5 2235ce0b2da97bdcfd5aa9e1eceaf288 rxvt-unicode-7.7-r1.ebuild 1632
 RMD160 c9f1ad25edd3b97bedd1212ebf8886eb69418f74 rxvt-unicode-7.7-r1.ebuild 1632
 SHA256 1f3dfe30498d50148f597072982892bf1005ac80cc06f52f3d6a24b1c2ab50e9 rxvt-unicode-7.7-r1.ebuild 1632
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFELYXh2iXjgNjfe5sRAmN1AKCirw9jckRNkFOdznXAr1LucEU2SACgmOS7
-2n1qT4+dGfxFmgqfpUSd04A=
-=aHV6
------END PGP SIGNATURE-----
+MD5 fe62576fb49dc80cf97d2002daeffcd1 rxvt-unicode-7.7-r2.ebuild 1677
+RMD160 a2f60018c958607eb8a604e397fe4378f9b317a1 rxvt-unicode-7.7-r2.ebuild 1677
+SHA256 36c689eeb0c6bae9ad4c14d2d76845503d3fa0a36b3f1ec20bc51fe1967b6172 rxvt-unicode-7.7-r2.ebuild 1677
diff --git a/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-7.7-r2 b/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-7.7-r2
new file mode 100644
index 000000000000..6cf357c57ea8
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-7.7-r2
@@ -0,0 +1,3 @@
+MD5 68298390375da1b34f89a0aa634c9b20 rxvt-unicode-7.7.tar.bz2 876369
+RMD160 6dd55a7a71207e774239ca0c362ae35d2dc88237 rxvt-unicode-7.7.tar.bz2 876369
+SHA256 04ecd2577ee0c210df610b4a5d870f2bda57c80962fb5b51ae9c4a94098c726c rxvt-unicode-7.7.tar.bz2 876369
diff --git a/x11-terms/rxvt-unicode/files/scrolling-one-line.patch b/x11-terms/rxvt-unicode/files/scrolling-one-line.patch
new file mode 100644
index 000000000000..b2b776cf9f86
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/scrolling-one-line.patch
@@ -0,0 +1,13 @@
+--- src/feature.h	2004-08-25 06:16:06.000000000 +0200
++++ ../rxvt-mod/src/feature.h	2004-08-29 23:56:39.288708920 +0200
+@@ -184,8 +184,8 @@
+  * SCROLL_ON_* defines above.). 
+  * Also for modifier+Home/End keys to move to top/bottom
+  */
+-/* #define SCROLL_ON_UPDOWN_KEYS */
+-/* #define SCROLL_ON_HOMEEND_KEYS */
++#define SCROLL_ON_UPDOWN_KEYS
++#define SCROLL_ON_HOMEEND_KEYS
+ 
+ /*
+  * Allow unshifted Next/Prior keys to scroll forward/back
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-7.7-r2.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-7.7-r2.ebuild
new file mode 100644
index 000000000000..56d836f93265
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-7.7-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-7.7-r2.ebuild,v 1.1 2006/04/12 20:30:34 arj Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="rxvt clone with XFT and Unicode support"
+HOMEPAGE="http://software.schmorp.de/"
+SRC_URI="http://dist.schmorp.de/rxvt-unicode/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE="truetype perl"
+
+# see bug #115992 for modular x deps
+RDEPEND="
+	|| (
+		(
+			x11-libs/libX11
+			x11-libs/libXft
+			x11-libs/libXpm
+			x11-libs/libXrender
+		)
+		virtual/x11
+	)
+	dev-lang/perl
+	perl? ( sys-devel/libperl )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/libtool
+	|| (
+		(
+			x11-proto/xproto
+			x11-libs/libXt
+		)
+		virtual/x11
+	)"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	local tdir=/usr/share/terminfo
+	sed -i -e \
+		"s~@TIC@ \(etc/rxvt\)~@TIC@ -o ${D}/${tdir} \1~" \
+		doc/Makefile.in
+	sed -i -e \
+		"s:-g -O3:${CXXFLAGS}:" \
+		configure
+	epatch ${FILESDIR}/scrolling-one-line.patch
+}
+
+src_compile() {
+	econf \
+		--enable-everything \
+		$(use_enable truetype xft) \
+		$(use_enable perl) \
+		--disable-text-blink \
+		--disable-iso14755 \
+		|| die
+
+	emake || die
+
+	sed -i \
+		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
+		${S}/doc/rxvt-tabbed || die "tabs sed failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc README.FAQ Changes
+	cd "${S}"/doc
+	dodoc README* changes.txt etc/* rxvt-tabbed
+}
+
+pkg_postinst() {
+	einfo "urxvt now always uses TERM=rxvt-unicode so that the"
+	einfo "upstream-supplied terminfo files can be used."
+}
+