Make blinking text optional thanks to jussx (bug #321655).

Package-Manager: portage-2.2_rc67/cvs/Linux i686

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index 464d7d727afb05183e2f090a6d25b8982ba6511a..f4b524d8cdd2081d668a9ab7c2f0823f327df02d 100644 (file)
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/rxvt-unicode
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.166 2010/05/24 17:34:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.167 2010/05/31 01:45:06 jer Exp $
+
+*rxvt-unicode-9.07-r2 (31 May 2010)
+
+  31 May 2010; Jeroen Roovers <jer@gentoo.org> +rxvt-unicode-9.07-r2.ebuild,
+  metadata.xml:
+  Make blinking text optional thanks to jussx (bug #321655).
 
   24 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   rxvt-unicode-9.07-r1.ebuild:

diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index e1c953787c84231949153cee19a7061a0e22eb8c..98a90a0dfad39228df33243fcae03301a1876b91 100644 (file)
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -4,6 +4,7 @@ AUX rxvt-unicode-9.06-no-urgency-if-focused.diff 482 RMD160 7d0a0257209beb58751e
 AUX rxvt-unicode-9.06-popups-hangs.patch 643 RMD160 f35a7c7044602a855c59f80919eb24723bd6f015 SHA1 c3cb2cc796243cba4916d3bfa8bf3e6ee2ef0831 SHA256 ed232e0cca9ea642ba061c1008e724fd61d3821eb1a464ba42aa404d778c5e60
 DIST rxvt-unicode-9.07.tar.bz2 858616 RMD160 e20d30eac61bc56deac9da11b4d049fbac3f3b66 SHA1 0e623daa15c45ba3add622277d32493a97059619 SHA256 c5a0638ca8249968065076a6f17e6e499f31fdc9050f71aae4ea85cac6aac5a3
 EBUILD rxvt-unicode-9.07-r1.ebuild 3414 RMD160 bc1a6ae8ed16ba591e9b91e39ce99800cc4c0176 SHA1 f506b1255ec0ec0401fee8c75ff138c749297b1c SHA256 e4b494c4f1bd3c3c3139e0a7cd19aee2d556cf62594d1378d990a54c1a4f5e6a
+EBUILD rxvt-unicode-9.07-r2.ebuild 3427 RMD160 340e3d538a9fd8f8e951a408abbfbc5e9c45fbee SHA1 1330c1615b803bf3290730147a2e3c255279fad0 SHA256 4036e1f876c692ab6c6392d08be4ddf4d4960d46bf80b79e3855545672eb8aa9
 EBUILD rxvt-unicode-9.07.ebuild 3335 RMD160 3ee15c05c041de56174ca3d999cb30bf0134ac2a SHA1 474a15806a88c9f78dfef04eb2e245bf19870ea5 SHA256 7ffcd7ff227ec785719c3e309b4681d24780717229fca528f52b121367e1feb7
-MISC ChangeLog 24977 RMD160 0aebe9d362b72131125eb7d252095e4d1e33f689 SHA1 7f96cb7d956778a94568899397e10f479ddbb65a SHA256 0a44adaf83b9968dd3ff4751c566ce8ee6b2e85f43598c07fde37673350afb65
-MISC metadata.xml 647 RMD160 81b8288b4f7d17517cbff10749951f3005666c67 SHA1 f5b99785199ebac42e4eb2079d6fd689a0974d73 SHA256 164c4a15822dcea424dfb249196e2037bb6827c5a87544829dc5d1277753f9ac
+MISC ChangeLog 25162 RMD160 4564c8fbeb3c6266da49b1527a521c32cb8982b6 SHA1 c5ba33e8bc03341715d06fc63c7f9aebd27a431c SHA256 215afd2762d5788ad85af9a7cb671526254cacc8a801da3e620b348a203f43d5
+MISC metadata.xml 694 RMD160 49489b6862f4e28c7f50d1ae257c8318d8c04e77 SHA1 0cd080a74aff66e2c226230e941462eddc1aaf2e SHA256 09c79360a82ad3da8447be3f673c725f59e6e4019fd364d1fe815bf593976f53

diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
index eb9773e2f2671e816777f0b529a5ca643f3f8abd..36bc39cda30c01469b617015b5d9624b98e5f709 100644 (file)
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -12,9 +12,10 @@
   </maintainer>
   <use>
        <flag name='afterimage'>Enable support for
-               <pkg>media-libs/libafterimage</pkg> </flag>
+               <pkg>media-libs/libafterimage</pkg></flag>
     <flag name='iso14755'>Enable ISO-14755 support</flag>
-    <flag name='xterm-color'>Enable xterm 256 color support</flag>
+       <flag name='blink'>Enable blinking text</flag>
     <flag name='wcwidth'>Enable wide char width support</flag>
+    <flag name='xterm-color'>Enable xterm 256 color support</flag>
   </use>
 </pkgmetadata>

diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.07-r2.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.07-r2.ebuild
new file mode 100644 (file)
index 0000000..29cf8eb
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.07-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2010 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.07-r2.ebuild,v 1.1 2010/05/31 01:45:06 jer Exp $
+
+EAPI="2"
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="rxvt clone with xft and unicode support"
+HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
+SRC_URI="http://dist.schmorp.de/rxvt-unicode/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="afterimage iso14755 perl blink truetype xterm-color +vanilla wcwidth"
+
+# see bug #115992 for modular x deps
+RDEPEND="x11-libs/libX11
+       x11-libs/libXft
+       afterimage? ( media-libs/libafterimage )
+       x11-libs/libXrender
+       perl? ( dev-lang/perl )
+       >=sys-libs/ncurses-5.7-r3"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig
+       x11-proto/xproto"
+
+src_prepare() {
+       if { use xterm-color || use wcwidth; }; then
+               ewarn "You enabled xterm-color or wcwidth or both."
+               ewarn "Please note that neither of them are supported by upstream."
+               ewarn "You are at your own if you run into problems."
+               ebeep 5
+       fi
+
+       local tdir=/usr/share/terminfo
+       if use xterm-color; then
+               epatch doc/urxvt-8.2-256color.patch
+               sed -e \
+                       's/^\(rxvt-unicode\)/\1256/;s/colors#88/colors#256/;s/pairs#256/pairs#32767/' \
+                       doc/etc/rxvt-unicode.terminfo > doc/etc/rxvt-unicode256.terminfo
+               sed -i -e \
+                       "s~^\(\s\+@TIC@.*\)~\1\n\t@TIC@ -o "${D}"/${tdir} \$(srcdir)/etc/rxvt-unicode256.terminfo~" \
+                       doc/Makefile.in
+       fi
+
+       # kill the rxvt-unicode terminfo file - #192083
+       sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in ||
+               die "sed failed"
+
+       use wcwidth && epatch doc/wcwidth.patch
+
+       # bug #240165
+       epatch "${FILESDIR}"/${PN}-9.06-no-urgency-if-focused.diff
+
+       # ncurses will provide rxvt-unicode terminfo, so we don't install them again
+       # see bug #192083
+       #
+       # According to my tests this is not (yet?) true, so keep it prepared and
+       # disabled  until it's needed again.
+       #if has_version '<sys-libs/ncurses-5.7'; then
+       sed -i -e \
+               "s~@TIC@ \(\$(srcdir)/etc/rxvt\)~@TIC@ -o "${D}"/${tdir} \1~" \
+               doc/Makefile.in
+       #else
+       #       # Remove everything except if we have rxvt-unicode256
+       #       sed -i -e \
+       #               '/rxvt-unicode256/p;/@TIC@/d' \
+       #               doc/Makefile.in
+       #fi
+
+       # bug #263638
+       epatch "${FILESDIR}"/${PN}-9.06-popups-hangs.patch
+
+       # bug #237271
+       if ! use vanilla; then
+               ewarn "You are going to include third-party bug fixes/features."
+               ewarn "They came without any warranty and are not supported by the"
+               ewarn "Gentoo community."
+               ebeep 5
+               epatch "${FILESDIR}"/${PN}-9.05_no-MOTIF-WM-INFO.patch
+               epatch "${FILESDIR}"/${PN}-9.06-font-width.patch
+       fi
+
+       eautoreconf
+}
+
+src_configure() {
+       local myconf=''
+
+       use iso14755 || myconf='--disable-iso14755'
+       use xterm-color && myconf="$myconf --enable-xterm-colors=256"
+
+       econf --enable-everything \
+               $(use_enable truetype xft) \
+               $(use_enable afterimage) \
+               $(use_enable perl) \
+               $(use_enable blink text-blink) \
+               ${myconf}
+}
+
+src_compile() {
+       emake || die "emake failed"
+
+       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."
+}