Fix bug 238526 by putting patches behind !vanilla

Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.26.5 i686

4 files changed, 20 insertions, 15 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/Manifest b/x11-terms/rxvt-unicode/Manifest
index 9e199345fe09..59b85578a13a 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -3,7 +3,7 @@ AUX scrolling-one-line.patch 440 RMD160 a796a5fb3412ba89049efa29bae52bbde2a6f80a
 DIST rxvt-unicode-9.02.tar.bz2 862299 RMD160 72caf4a06ea3b32d1bbab3a5cd1fee4189571867 SHA1 f58a851ab4bf2da60a926a4885749302e73a92ed SHA256 234b9a3e3f88c4984b1e909f8028638fc3b61d801d8afaa9cd08154b1a480a31
 DIST rxvt-unicode-9.05.tar.bz2 865815 RMD160 0f4343a9aa0a8b26d10c6049c1afca2cc7569fc3 SHA1 758d57a88c3521f780bcd21c70d3995f53a2f6e3 SHA256 25a85d977c39aa7da615c3b375544e09168d7a5eaddd57c98b9848ca15dd7873
 EBUILD rxvt-unicode-9.02-r1.ebuild 1610 RMD160 b91b03ef38c033cf25400276c7f71aa33b6aa573 SHA1 d9366cd345df68b85c854d8cc971961cc899dd12 SHA256 df461ea77a1fc9b0463bcce1116eadf73564325de494a33d1458c479ccfebe23
-EBUILD rxvt-unicode-9.05-r1.ebuild 1775 RMD160 542882d36b1810aa59a486a2cb40de9655e3a85a SHA1 814cd40f3496adbf145d0a896fdbd305797d8a64 SHA256 e2bc679b5446364530188ad6823de1db618de6549d57bd0f1b0e222543bf324b
+EBUILD rxvt-unicode-9.05-r1.ebuild 1774 RMD160 7845ba056fbd07c26e01e3a9a63bf13af52c5575 SHA1 691910844d7d5e14d03feef719cf782a295e1f87 SHA256 25ae6bb80d0bfe05d59e72e6d6737a312fd6ac4c856cc6cc8bb3c297179a1571
 EBUILD rxvt-unicode-9.05.ebuild 1596 RMD160 655d73a3570b47c46c4a00ca321f54935c622636 SHA1 ad0611a7e878403f920685fd7cb4d1e59a9fdc98 SHA256 f51921006c18f79cb0674bb5213db40f147571888795ec99282373be6566549c
-MISC ChangeLog 17446 RMD160 d0b8a968521c1ed2dcae1d700b77ce905bcb2d66 SHA1 514fd999f4220dc5fd1833f1275166724b86a292 SHA256 ea99464565a4db7e33e7d3817f541996f81b3882944720351314f7c87f6e1316
-MISC metadata.xml 572 RMD160 429b7980619b0a2869d9a9525385d227a88bebe5 SHA1 97cae14e396d09d8c68e15146a1431441dc9856a SHA256 11f1ea560a6236bc72698ca58ee42f8bbbbba45455796d7d31fabf4603b3c99c
+MISC ChangeLog 17592 RMD160 a373d24e88f279027b4446f6aec498a6b84915de SHA1 1b982d2ca95f5c9b2fed4f6b9cd9c94575466101 SHA256 6c2245b9830ac2ab49b16ebdb746e5ccfc871351c50160ede2a17933e4c62c08
+MISC metadata.xml 409 RMD160 fae1344555ab555175fc903c26ad527facec7d71 SHA1 efb81b3ac4d0740238e680418a3e1d7cd7625c47 SHA256 865cdfd1feda302110881e328e949fdba4d13681de23c7692c74e02d2c9de186
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