EAPI 4, added REQUIRED_USE and a few new USE flags, fixed bug #365813

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

4 files changed, 35 insertions, 24 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index 8d0fedcd97a5..142d7385e4a3 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/rxvt-unicode
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.184 2011/05/19 17:41:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.185 2011/05/19 20:35:55 wired Exp $
+
+  19 May 2011; Alex Alexander <wired@gentoo.org> rxvt-unicode-9.11.ebuild,
+  metadata.xml:
+  EAPI 4, added REQUIRED_USE and a few new USE flags, fixed bug #365813
 
   19 May 2011; Jeroen Roovers <jer@gentoo.org> rxvt-unicode-9.11.ebuild,
   metadata.xml:
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index fec592ee4039..7cdb905c77ee 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch 1230 RMD160 eb580a34407a3c605e1fdffa3847d71fac16a860 SHA1 93afc24408ce263fb71d56c6ed191307b54716a6 SHA256 59eb0b72ef05be7e7d9071ec5f05a349359768daa3c5893b14917c50e5e10175
 AUX rxvt-unicode-9.06-font-width.patch 790 RMD160 f2ebc97c769dc3034c55d2ceb5d776e275c6c368 SHA1 dc3b4921ed8d0a54822f203747a1551817d9b60d SHA256 fc241d7c11b86f589f41a0f488e8f04875ca6ca937e57bc2347c19dff423a38a
@@ -14,13 +14,23 @@ EBUILD rxvt-unicode-9.07-r1.ebuild 3431 RMD160 3a52d506f22af8423f9669f3b3e917c79
 EBUILD rxvt-unicode-9.07-r2.ebuild 3453 RMD160 05134498e65a920e595e714d9621221a6cbe2bc3 SHA1 e24466bc8c988d69170180de3a832817fb936f23 SHA256 3e688768c66771ccc996e55cc253c086dd5f923ca2544ca8ab22f844e7ba2cb5
 EBUILD rxvt-unicode-9.09.ebuild 2366 RMD160 4d62ee3fdf37a5079744e14ff9800ba924afb6be SHA1 ab14ac5d94ef96fa041a6e3b43c3b7a5221faad7 SHA256 0e137a1fcf215e7a00460ec2c484a2e16261b69afba166783dbb7fa69c336835
 EBUILD rxvt-unicode-9.10.ebuild 2931 RMD160 780f2e5682862cf9439e938c4993b48f88a618ad SHA1 2d3bf597bad8f14c1919bad35e2ee5c18f310fa2 SHA256 df68786561af39cfbff3571168998d7c07220e2227850da2ba39fe417d51f233
-EBUILD rxvt-unicode-9.11.ebuild 3061 RMD160 e6fa8b2815cb49d7e0b2f4736029432d24ddab38 SHA1 70ff892f75d5209151158ede29cf009fe5ab2db5 SHA256 7deee191248c3989b640b76c7cbd15fe8f4b4d4d903fb18a1697c737fc301b52
-MISC ChangeLog 27758 RMD160 5c8d710f84c8f5bdcbaf30d29be8f176f18074bd SHA1 de0e6f73344339eda46863e1c1f425a00f7af436 SHA256 59ded1de3983518c33e64abef809748b1d27a75297f14625f85d7c339a967fea
-MISC metadata.xml 1238 RMD160 7fecf6169f733c617b50254374ffd9588ef745cd SHA1 2a921c99c336b154d370c4d987860a3ed908251e SHA256 5f64c58be41991555b3cf5e6c6bd59c3e713bfb01d07be83658e741b98732835
+EBUILD rxvt-unicode-9.11.ebuild 2866 RMD160 315e64cf337ba288c0ea9041e6d74362df5b97aa SHA1 c04f6eaa560688fae7a40f899a21ce9ea82c73b2 SHA256 09189d99057aa7a4c6c580334c448d90dc0b642f5ac6a07ae17cc2e3f6e8c12a
+MISC ChangeLog 27924 RMD160 bbb9e44c7165fe0cbe3f618e81560c835e165112 SHA1 50df6faf45c75c00ef49efc6a5f82228014ebe28 SHA256 c6bc9a2ebfd94128d873074bc503dce8d7d2fcf6a85de175d7eff183ea58d376
+MISC metadata.xml 1416 RMD160 1cdd4e875abd703d2b7934d54a5a3260c8e2a039 SHA1 af6e85c443cde21d664d61ffc08674eb1f46f559 SHA256 57e31ad3483dd6b51063be4e449eddce8c9046e92329e7bf004745ffb58426df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3VVlwACgkQVWmRsqeSphOfDwCff2DMN0Dmf7ai+XRO24V/GkYd
-Vc8An3kxwsTs/i70Nk/vZp4BgHANrD/J
-=xzJB
+iQIcBAEBCAAGBQJN1X9pAAoJEDZF8K7rm0r6sKYQAJJH6k+ZAAkkZOjReIr3Zg+b
+meq9SfQenKUIKeB1MmhxHBQ1U614VOvUcAP8+ydBjvo4xsCAFMl9dkVkI+oV/O80
+CMaMTdmOAcmKme1zV1N7LQgYd4NX2G7wYvYgEy5nBmS09Rg5AimfowenlXxU6aHk
+UwWMWqkapsidgTuTciaOPeMVNpBzoAXrTehqUtgpiwHQick+KZWOCv7m+FdCbZAh
+L42lmVcsAOjxmZp2YaZLEp4W2wT6Do5EscOjosW77XtIaQOLfiPpcjiNvt3EGlOm
+DOumkOp0Zrw+RBQDgWFOZ9oswqwUYWhFIfc7cLEWFR289LEN9H7Hsz/mTShN+2JA
+BK4jsZHPXOG8j+wC8my9lBuNd2zifYu0fSCS26mqV5gpwQdeaK6l5a3Gnki6rNA4
+5elePOUpnWkzS6shr+1Ca2E3XAyWI4SP4eRcz/nZCdcl7ItI/GGosdL8m9FXNmgy
+04KJFq4ReirhgpehOyc40xdyI9PSTr7vKKZIRojZiDFMLs1gjEK3cUoLW3XmEFVH
+bKl6kjZFaz6hPRfebexT2CZAzFg4X2om+ZSANuo3bwM1Tw9/8OXgHjCxYnX+L0uO
+a4vC+73ViI+I4C2JhLBZ17T/tsciXnG23kHuzHn65UmVkNAWutAyw4l7vdiqf130
+nHz6KijZhpxtU7UaqWtE
+=vH/B
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
index 1c9458c9ce78..c5ffed97df78 100644
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -14,8 +14,10 @@
 <flag name='256-color'>Enable 256 color support</flag>
 <flag name='afterimage'>Enable transparency support using
 <pkg>media-libs/libafterimage</pkg></flag>
+<flag name='alt-font-width'>Calculate the font width using a different method</flag>
 <flag name='blink'>Enable blinking text</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>
 <flag name='force-hints'>Force WM hints on rxvt-unicode's geometry. Read
 	http://bugs.gentoo.org/show_bug.cgi?id=346553</flag>
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.11.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.11.ebuild
index 5c5c3f7bf453..1f621a778e1e 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.11.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.11.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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.11.ebuild,v 1.2 2011/05/19 17:41:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.11.ebuild,v 1.3 2011/05/19 20:35:55 wired Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit autotools
 
@@ -14,8 +14,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
-	256-color afterimage blink fading-colors +font-styles force-hints iso14755
-	+mousewheel perl pixbuf truetype unicode3 +vanilla wcwidth
+	256-color alt-font-width afterimage blink +focused-urgency fading-colors
+	+font-styles force-hints iso14755 +mousewheel perl pixbuf truetype unicode3
+	+vanilla wcwidth
 "
 
 RDEPEND="x11-libs/libX11
@@ -29,6 +30,8 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	x11-proto/xproto"
 
+REQUIRED_USE="vanilla? ( !alt-font-width focused-urgency !force-hints !wcwidth )"
+
 src_prepare() {
 	if ! use afterimage && ! use pixbuf; then
 		einfo " + If you want transparency support, please enable either the *pixbuf*"
@@ -39,18 +42,12 @@ src_prepare() {
 		ewarn " + You have enabled the vanilla USE flag."
 		ewarn "   This means no USE flag controlled patches will be applied."
 	else
-		if use wcwidth || use force-hints; then
-			ewarn " + You enabled wcwidth or force-hints or both."
-			ewarn "   Please note that these are not supported by upstream."
-			ewarn "   You are at your own if you run into problems."
-		fi
-
-		local tdir=/usr/share/terminfo
+		ewarn " + You are going to include unsupported third-party bug fixes/features."
 
 		use wcwidth && epatch doc/wcwidth.patch
 
 		# bug #240165
-		epatch "${FILESDIR}"/${PN}-9.06-no-urgency-if-focused.diff
+		use focused-urgency || epatch "${FILESDIR}"/${PN}-9.06-no-urgency-if-focused.diff
 
 		# bug #263638
 		epatch "${FILESDIR}"/${PN}-9.06-popups-hangs.patch
@@ -59,11 +56,9 @@ src_prepare() {
 		use force-hints && epatch "${FILESDIR}"/${PN}-9.10-force-hints.patch
 
 		# bug #237271
-		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."
 		epatch "${FILESDIR}"/${PN}-9.05_no-MOTIF-WM-INFO.patch
-		epatch "${FILESDIR}"/${PN}-9.06-font-width.patch
+
+		use alt-font-width && epatch "${FILESDIR}"/${PN}-9.06-font-width.patch
 	fi
 
 	# kill the rxvt-unicode terminfo file - #192083