made the clear patch optional (buffer-on-clear USE flag) because it seems to break...

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

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index 20d4f0951aa15e9189489870ddbd2ffc7804d21e..8fb6aa6c9a9b2627fc2c78b5c34dcc5e6c536d8a 100644 (file)
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/rxvt-unicode
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.199 2012/01/04 18:02:50 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.200 2012/01/07 12:31:48 wired Exp $
+
+  07 Jan 2012; Alex Alexander <wired@gentoo.org> rxvt-unicode-9.14.ebuild,
+  metadata.xml:
+  made the clear patch optional (buffer-on-clear USE flag) because it seems to
+  break some prompts - bug #397829
 
   04 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   rxvt-unicode-9.12-r1.ebuild:

diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 326f769488aa5de52ddbe19ea2fcaf8c3db33a91..a45d3441300559b7c9fcb4f611eef88bacd0233c 100644 (file)
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -18,13 +18,23 @@ EBUILD rxvt-unicode-9.10.ebuild 2934 RMD160 5f34865c53794a2debe2877747d045fb1168
 EBUILD rxvt-unicode-9.11.ebuild 2871 RMD160 6fef819db23a17017a88f6b276704cbb2579d05e SHA1 2944a42d555053445810385af0e3a7b49a287e2e SHA256 cdf5649f21d6e35259b3283fc283b39c11e5ace1d43f28c4716ef3f74f6ffcbe
 EBUILD rxvt-unicode-9.12-r1.ebuild 2968 RMD160 7d32acc32aa5a9d8c3ce43921825a2f34ad08515 SHA1 8b81b1bb8cbeb17c812028b1b4705dd4d0bfba1d SHA256 07a192706fc22b0fff02be148b0910c5b1f74dd271db3a8e40cab7511ffcb35c
 EBUILD rxvt-unicode-9.12.ebuild 3174 RMD160 363b4a938e3671b8662c7bd5308c908f10c90938 SHA1 5e5dbc66d153a1f20d038347f5ea1431fa41c945 SHA256 5691d979d286cc4f309c8b565dfd0df92f10fe4d1830d72dbd75356d07bf42f1
-EBUILD rxvt-unicode-9.14.ebuild 3579 RMD160 1d7b8f2349f118513ca167d4f0687d9604da6ee1 SHA1 f88192bbb905aa8a7c523073c7bb1918f3a47668 SHA256 52f15af4bc790688830d13ec8ac7cd28ad2bfc01ab28ab9cb9870956b6d45b3b
-MISC ChangeLog 30379 RMD160 72d39553af4d1c9471dcd3feb3c990f3bb79c8e1 SHA1 5d66adb73a9911e9cbb146e255a5c41b3d9ce2fb SHA256 4b6a81a35ca01c08ef71ff83c22187787bbbcdeba018c0b87864cfa13ab3a7a4
-MISC metadata.xml 1626 RMD160 5ebe4085231dfe378aa5a1f53277b324ea6b85d5 SHA1 ae8828bd4e93b1a010f538a58c816fb89b7979d2 SHA256 7d8475cdb7e945b3f20acc73f7d3952ff5f03b4efb310c18930b6cea6c596b1f
+EBUILD rxvt-unicode-9.14.ebuild 3990 RMD160 213bbd9649c80957d9fc087b81e6f84c7e789f7a SHA1 89558beaffe25fb9ca88e4ee07f8f138712862a8 SHA256 e0fe32b66aea71a662b021a5655cec1eaa9e70c466b2f1307c1c588491e0e40e
+MISC ChangeLog 30580 RMD160 0cde53215607e80d7821b4a8cd29b338b1858f67 SHA1 2852e91156403da8ac3296b9779345147a9af298 SHA256 f8964dc6b5d0587af1880ad41793700d3b737118c6aa511addc82d98de43cc3c
+MISC metadata.xml 1795 RMD160 88fff7bcf1bf6087c27ff17de05d41098d45f1d1 SHA1 2f9c069fb115ef6d354fdb6c23e6aa50ebf82d48 SHA256 982e58009da7aaedb1def2a85a5b2f47ea7ffbca83cc7c17c44aeeca0322e358
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk8ElFAACgkQuUQtlDBCeQKNQQCeNNQe0xJzfFP3t2b5QdhAzbQz
-wxgAn2znRpVSxJGCLJ3zMXoOful9Ct6W
-=3/71
+iQIcBAEBCgAGBQJPCDt+AAoJEDZF8K7rm0r6zT0P+wcp4/XihS4ZXiPG8icCZXnH
+LKPwNEy6D06dkz95JXj+PuTwsH/LHyaxZb+0vFjqGu6RbMKApUfU1hoOglUFWyBw
+vOE3edl8SyaSbxZa6H5PwuVyvYFV1pahIUHU+5M4Sfex18TFaGyFMwqT75m/8X8u
+AhPFlPpViO2ff5uE+xeJ3BTD6zvNs8xjFxdIy66n/6l/NaGtS+mJ2+rES/38kzuT
+zeGMnuXpQEPvYnwz3tyvt5PDPMihDahf9d9FHYWVwp40AkXuqhuZV9y7kBlMIaS3
+fRg+TkFJ23chPiWJTLIZ7gDgZ3kI1RvtOXKXhebVkNQsn3r4k2tsVMce6pMVwEcD
+pYmx/Wgl77o4MVNsNvT8P7zZD5wPe1aD5y1wNKmUK02TPbq9Ht6qjsyIXXrrhTyK
+9i77ySmvdgheccgOc5ces2ypghjrPT/NPPECIH0iLRO5Zh6tCmjN/C4I0B18vwZE
+DcpjPzhWNrnxHBZlJesikihqnHa81BtMv9BzXGQMBrc0N1PW288JJiZkLyAGpK8I
+noNQkyomzlowLm87+oG2RlUWN7/LKDJI2TpJaM3+w9CwkxCEPfZx9pL8l8Rx1Kf8
+IEHbILR3g6hhRkPCiPeZCGhBw0QmewG3ZEboGSSF+QTnbUqUr3orRRiYXfjUuplu
+/1f4tzzTbS5Vw/A9tqbp
+=q7kO
 -----END PGP SIGNATURE-----

diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
index ba4ea3c8b2967506c938049249b5791f3ccac4ac..b5961581223388506335fd3fc984a0045e0ca8be 100644 (file)
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -15,6 +15,8 @@
 <pkg>media-libs/libafterimage</pkg> (deprecated in 9.14)</flag>
 <flag name='alt-font-width'>Calculate the font width using a different method</flag>
 <flag name='blink'>Enable blinking text</flag>
+<flag name='buffer-on-clear'>Store visible output to history buffer when clearing the screen with ctrl-l.
+       Read https://bbs.archlinux.org/viewtopic.php?id=129302</flag>
 <flag name='fading-colors'>Enable colors fading when off focus</flag>
 <flag name='focused-urgency'>Enable the urgent flag when a terminal window is focused</flag>
 <flag name='font-styles'>Enable support for bold and italic fonts</flag>

diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.14.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.14.ebuild
index f68202870964530f7809793bd4f7fdcbfa77a672..63d050ca7da44fb742bcc805b846b4f32950784e 100644 (file)
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.14.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.14.ebuild,v 1.3 2012/01/02 13:25:59 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.14.ebuild,v 1.4 2012/01/07 12:31:48 wired Exp $
 
 EAPI="4"
 
@@ -14,8 +14,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="
-       256-color alt-font-width afterimage blink +focused-urgency fading-colors
-       +font-styles iso14755 +mousewheel +perl pixbuf secondary-wheel
+       256-color alt-font-width afterimage blink buffer-on-clear +focused-urgency
+       fading-colors +font-styles iso14755 +mousewheel +perl pixbuf secondary-wheel
        startup-notification truetype unicode3 +vanilla wcwidth
 "
 
@@ -37,7 +37,7 @@ DEPEND="
        x11-proto/xproto
 "
 
-REQUIRED_USE="vanilla? ( !alt-font-width focused-urgency !secondary-wheel !wcwidth )"
+REQUIRED_USE="vanilla? ( !alt-font-width !buffer-on-clear focused-urgency !secondary-wheel !wcwidth )"
 
 src_prepare() {
        # fix for prefix not installing properly
@@ -66,7 +66,7 @@ src_prepare() {
                use secondary-wheel && epatch "${FILESDIR}"/${P}-secondary-wheel.patch
 
                # ctrl-l buffer fix
-               epatch "${FILESDIR}"/${P}-clear.patch
+               use buffer-on-clear && epatch "${FILESDIR}"/${P}-clear.patch
 
                use alt-font-width && epatch "${FILESDIR}"/${PN}-9.06-font-width.patch
        fi
@@ -114,6 +114,13 @@ src_install() {
 }
 
 pkg_postinst() {
+       if use buffer-on-clear; then
+               ewarn "You have enabled the buffer-on-clear USE flag."
+               ewarn "Please note that, although this works well for most prompts,"
+               ewarn "there have been cases with fancy prompts, like bug #397829,"
+               ewarn "where it caused issues. Proceed with caution."
+               ewarn "  (keep this terminal open until you make sure it works)"
+       fi
        if use secondary-wheel; then
                elog "You have enabled the secondary-wheel USE flag."
                elog "This allows you to scroll in secondary screens"