diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2008-09-24 00:54:46 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2008-09-24 00:54:46 +0000 |
| commit | 2df2493ba6c31d31b2565fb3a87d88008c80f310 (patch) | |
| tree | 707282d80b718242d0ee3ea7a2c572aa1126445b /x11-terms | |
| parent | Fix git-sources mask (diff) | |
| download | gentoo-2-2df2493ba6c31d31b2565fb3a87d88008c80f310.tar.gz gentoo-2-2df2493ba6c31d31b2565fb3a87d88008c80f310.tar.bz2 gentoo-2-2df2493ba6c31d31b2565fb3a87d88008c80f310.zip | |
Fix bug 238526 by putting patches behind !vanilla
(Portage version: 2.2_rc9/cvs/Linux 2.6.26.5 i686)
Diffstat (limited to 'x11-terms')
| -rw-r--r-- | x11-terms/rxvt-unicode/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-terms/rxvt-unicode/metadata.xml | 2 | ||||
| -rw-r--r-- | x11-terms/rxvt-unicode/rxvt-unicode-9.05-r1.ebuild | 21 |
3 files changed, 17 insertions, 12 deletions
diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog index e449fe7f6443..b43666d42938 100644 --- a/x11-terms/rxvt-unicode/ChangeLog +++ b/x11-terms/rxvt-unicode/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-terms/rxvt-unicode # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.114 2008/09/23 22:53:34 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.115 2008/09/24 00:54:46 yngwin Exp $ + + 24 Sep 2008; Ben de Groot <yngwin@gentoo.org> metadata.xml, + rxvt-unicode-9.05-r1.ebuild: + Fix bug 238526 by putting patches behind !vanilla *rxvt-unicode-9.05-r1 (23 Sep 2008) diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml index 98e9c3b2d8b7..b123dd05bd6e 100644 --- a/x11-terms/rxvt-unicode/metadata.xml +++ b/x11-terms/rxvt-unicode/metadata.xml @@ -10,7 +10,5 @@ <pkg>media-libs/libafterimage</pkg> </flag> <flag name='iso14755'>Enable ISO-14755 support</flag> - <flag name='256color'>Enable 256 color display, instead of just 88</flag> - <flag name='widechar'>Enable the wide character width patch from upstream</flag> </use> </pkgmetadata> diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.05-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.05-r1.ebuild index f1116d1f503c..1fe19038b7d8 100644 --- a/x11-terms/rxvt-unicode/rxvt-unicode-9.05-r1.ebuild +++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.05-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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.05-r1.ebuild,v 1.1 2008/09/23 22:53:34 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.05-r1.ebuild,v 1.2 2008/09/24 00:54:46 yngwin Exp $ inherit autotools flag-o-matic @@ -11,7 +11,7 @@ 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="truetype perl iso14755 afterimage 256color widechar" +IUSE="truetype perl iso14755 afterimage vanilla" # see bug #115992 for modular x deps RDEPEND="x11-libs/libX11 @@ -26,12 +26,17 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} cd "${S}" + + if ! use vanilla ; then + epatch doc/urxvt-8.2-256color.patch + epatch doc/wcwidth.patch + fi + local tdir=/usr/share/terminfo - use 256color && epatch doc/urxvt-8.2-256color.patch - use widechar && epatch doc/wcwidth.patch sed -i -e \ "s~@TIC@ \(\$(srcdir)/etc/rxvt\)~@TIC@ -o ${D}/${tdir} \1~" \ doc/Makefile.in + eautoreconf } @@ -39,16 +44,14 @@ src_compile() { myconf='' use iso14755 || myconf='--disable-iso14755' + use vanilla || myconf="$myconf --enable-xterm-colors=256" - econf \ - --enable-everything \ + econf --enable-everything \ $(use_enable truetype xft) \ $(use_enable afterimage) \ $(use_enable perl) \ - $(use_enable 256color xterm-colors=256) \ --disable-text-blink \ - ${myconf} \ - || die + ${myconf} || die emake || die |