added some USE flags, bugs #346613 and #346553, including pixbuf for transparency support.

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

5 files changed, 78 insertions, 13 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index 2665fd87c935..a40878acacfa 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,11 @@
 # 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.173 2010/12/13 20:15:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.174 2010/12/22 19:09:51 wired Exp $
+
+  22 Dec 2010; Alex Alexander <wired@gentoo.org> rxvt-unicode-9.10.ebuild,
+  +files/rxvt-unicode-9.10-force-hints.patch, metadata.xml:
+  added some USE flags, bugs #346613 and #346553, including pixbuf for
+  transparency support.
 
 *rxvt-unicode-9.10 (13 Dec 2010)
 
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index f96bbfc1a120..81dc4555f81f 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,13 +1,34 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch 1411 RMD160 ee947f7243cc5969079f2799e7f93edccc7b699c SHA1 319016954c2c6a1b9d4a847c5c88debf3533da0b SHA256 b5c428d3a1150eca95aa4b2c67756ad12fefb7bbc6aa69e308ad011c4f8ad440
 AUX rxvt-unicode-9.06-font-width.patch 791 RMD160 c2e1a23d55376613806aec20cafc4795548be4c3 SHA1 00292f5f7e7274dbb3953410055c569fdebd8995 SHA256 f0bf83b43a8f6c599be9326859239f5bf10bd1c7c9a1f97ac9cb87086bf1500c
 AUX rxvt-unicode-9.06-no-urgency-if-focused.diff 482 RMD160 7d0a0257209beb58751e996e822a10d372a01d7e SHA1 7da560653290f6fd653be2dda396b19961f31c06 SHA256 f518571ae6c63110cc8b49f423c1cb864399335017ca17469df5e78a2f2aabc4
 AUX rxvt-unicode-9.06-popups-hangs.patch 643 RMD160 f35a7c7044602a855c59f80919eb24723bd6f015 SHA1 c3cb2cc796243cba4916d3bfa8bf3e6ee2ef0831 SHA256 ed232e0cca9ea642ba061c1008e724fd61d3821eb1a464ba42aa404d778c5e60
+AUX rxvt-unicode-9.10-force-hints.patch 379 RMD160 2fa77698717b9a4983e211750b86d474f656c01e SHA1 e209a23bfbc74f5fa58eda23299b342a5b60068a SHA256 5ade3cc4ac010679d51b3b1db47f45e920881b9404d091ad0220e25f5bd22e95
 DIST rxvt-unicode-9.07.tar.bz2 858616 RMD160 e20d30eac61bc56deac9da11b4d049fbac3f3b66 SHA1 0e623daa15c45ba3add622277d32493a97059619 SHA256 c5a0638ca8249968065076a6f17e6e499f31fdc9050f71aae4ea85cac6aac5a3
 DIST rxvt-unicode-9.09.tar.bz2 883665 RMD160 283ad875b355b51a81d35ba4de4930cf96aa677c SHA1 02ec1b5c9c1dff241bfc3b6d2c2a7e5c00aa47ad SHA256 2891131672b4e84cbee4a83fda7d033c5398b71f8dc7b9bf83d04d9ef1fc819c
 DIST rxvt-unicode-9.10.tar.bz2 884501 RMD160 15c9f61e7c6ad3f05c6bf20bedad2cd8d5f1d5e9 SHA1 54c896a4885b8984b0dfa652269c3c34c4d75f2d SHA256 1c238f7e545b1a8da81239b826fb2a7d196c73effbcbd211db7a50995a0a067a
 EBUILD rxvt-unicode-9.07-r1.ebuild 3431 RMD160 3a52d506f22af8423f9669f3b3e917c79a9faf00 SHA1 773f43ed8a1a06cd0d55ef102ef8f3b1d7bd8a43 SHA256 1256ba894e192c11c1cbbc6faf2616441dccc7f37bc67fdc113755d037031e8e
 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 2364 RMD160 5f0ec64a325ffc060dcc03cb12d5a20f52dc1b6e SHA1 cafb4a3fa625bb7a65b72e6aae3598c2c5c9bfda SHA256 e8c46ac07145154edebf30843214e8ae696bf605f25b5408533c21b83edc758f
-MISC ChangeLog 26112 RMD160 da77e31414e91d5c74602e92462698686f72ae95 SHA1 59c850e1dfdbbe7eb9b8ebbb6022b0ee0ce8dd85 SHA256 b66a76ca05ee1188d9dd41e1a85c62b2106093fac21c8ff9ff09a72312ce9718
-MISC metadata.xml 753 RMD160 3f94215b5f70c53106ba600a11d5ea7fe3f0ba5c SHA1 b55b54364b383b97fe4b2e8daadfee367387afb7 SHA256 5d55f79d6a1ae6d18322831839fd60049414b237f66c897862d958c7dd66a1bb
+EBUILD rxvt-unicode-9.10.ebuild 2895 RMD160 17d0e74c156130e3528919a059e7aa97ee9e0e04 SHA1 a9509282814f909977d0db3d2eac6aff7c7ebb63 SHA256 aedf6ba9ae41d897a66d7eb63984f4485541aa04a545732d24d030baa18c5f94
+MISC ChangeLog 26345 RMD160 c9c9e2ea8bd25dfd6845244d521294be8334db1c SHA1 61b7e36063695ad58457a0bd34abd3952f63b8be SHA256 3db3621e211b04ddd341c3d8ad3ba8a9a109c38486c2a58b16a51bc67ed5d73b
+MISC metadata.xml 1209 RMD160 c6fc433e3880d2c5473deaee88d0ef86d5682d0a SHA1 3596ac3c1079b37a81607a7b7c8ffca739b12f8a SHA256 66b66086f2d7e45ba971480bfffc81d2e15d2533d072aeccf4d6a5c261b0a184
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNEk49AAoJEDZF8K7rm0r6soMQAJ3CMPBh1tlemDmK7wLB7Jm+
+w/+xKlyNG3R/Nd6efJPvwA4XbkwgyqUziw6BIQGeUAPjabbb/UxZi/Vh38T2gAl/
+zvvBemB9+TaYYiviJrjEBJxBJx4tFL5gLlYDk43oLrHjwy+VYa+JG/ipHnED6JhE
+OLprfp5ck799ASzRRKhtuLXaKCCIxyYcPHE251ZioWyfgwyvde9VgGx0mdzD1wut
+oESllETgxD6968zDGsZdQWWxkCseIj5LA1NhpCS9yBlEBMcNVPaVcQDaz4p/CXbn
+fnNQ77cHv/KG2azi4lcPldPU0cziF4CRhwZA4W79eg22ZiXvssLF4olE9gACYVml
+x+T5T99JjWN1OpcmpWwMl1KEFva4h7mLBNaf2+Or6+kDPqreEseqDQvaCou6ipgR
+EdraXqG32Xd8x0Jb3+YqC1KKUeL52PSxnQRylSajaQ1DoDPM30fpzezuIPLAItco
+MUATCgLpwnj6li9v29EVEhMWexz3vMinnVdVrOsbOpHPN5AUj33dpGRml79peo2p
+Y+OiWxLhT+wBcAqZrSAc+3jRHLl58aNPvirjOfA57yxSSmJx9vwJdiM66IOh2KI6
+N4JobZvgBVuOib8lNGJe0/dJv2OJRg8vKhfDkjsS8Ed/rijfX8ulQ8pCDw4B8P+W
+5yE5fFonIMqKu8TXLP9m
+=ijvS
+-----END PGP SIGNATURE-----
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.10-force-hints.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.10-force-hints.patch
new file mode 100644
index 000000000000..0148ba95445e
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.10-force-hints.patch
@@ -0,0 +1,17 @@
+patch that forces hints on rxvt-unicode's geometry.
+
+for more info, read this Gentoo bug:
+http://bugs.gentoo.org/show_bug.cgi?id=346553
+--- src/main.C
++++ src/main.C
+@@ -644,6 +644,8 @@
+ 
+   ncol = width / fwidth;
+   nrow = height / fheight;
++  width = ncol * fwidth;
++  height = nrow * fheight;
+ }
+ 
+ /*----------------------------------------------------------------------*/
+
+
diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
index e3e355410072..f300e9174a8c 100644
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -12,10 +12,18 @@
   </maintainer>
   <use>
     <flag name='256-color'>Enable 256 color support</flag>
-	<flag name='afterimage'>Enable support for
+	<flag name='afterimage'>Enable transparency support using
 		<pkg>media-libs/libafterimage</pkg></flag>
-    <flag name='iso14755'>Enable ISO-14755 support</flag>
 	<flag name='blink'>Enable blinking text</flag>
+	<flag name='fading-colors'>Enable colors fading when off focus</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>
+    <flag name='iso14755'>Enable ISO-14755 support</flag>
+	<flag name='pixbuf'>Enable transparency support using
+		gtk's pixbuf</flag>
+	<flag name='unicode3'>Use 21 instead of 16 bits to represent
+		unicode characters</flag>
     <flag name='wcwidth'>Enable wide char width support</flag>
     <flag name='xterm-color'>Enable xterm 256 color support</flag>
   </use>
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.10.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.10.ebuild
index 919bdbf9415f..a273227d9cba 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.10.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.10.ebuild
@@ -1,6 +1,6 @@
 # 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.10.ebuild,v 1.1 2010/12/13 20:15:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.10.ebuild,v 1.2 2010/12/22 19:09:51 wired Exp $
 
 EAPI="3"
 
@@ -13,20 +13,28 @@ 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="256-color afterimage iso14755 perl blink truetype +vanilla wcwidth"
+IUSE="256-color afterimage blink fading-colors +font-styles force-hints iso14755 perl pixbuf truetype unicode3 +vanilla wcwidth"
 
 # see bug #115992 for modular x deps
 RDEPEND="x11-libs/libX11
 	x11-libs/libXft
-	afterimage? ( || ( media-libs/libafterimage x11-wm/afterstep ) )
 	x11-libs/libXrender
+	>=sys-libs/ncurses-5.7-r6
+	afterimage? ( || ( media-libs/libafterimage x11-wm/afterstep ) )
 	perl? ( dev-lang/perl )
-	>=sys-libs/ncurses-5.7-r6"
+	pixbuf? ( || ( >=x11-libs/gdk-pixbuf-2.21 <=x11-libs/gtk+-2.21 ) )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	x11-proto/xproto"
 
 src_prepare() {
+	if ! use afterimage && ! use pixbuf; then
+		einfo
+		einfo "If you want transparency support, please enable either the *pixbuf*"
+		einfo "or the *afterimage* USE flag. Enabling both will default to pixbuf."
+		einfo
+	fi
+
 	if use wcwidth; then
 		ewarn "You enabled wcwidth."
 		ewarn "Please note that this is not supported by upstream."
@@ -47,6 +55,9 @@ src_prepare() {
 	# bug #263638
 	epatch "${FILESDIR}"/${PN}-9.06-popups-hangs.patch
 
+	# bug #346553
+	use force-hints && epatch "${FILESDIR}"/${PN}-9.10-force-hints.patch
+
 	# bug #237271
 	if ! use vanilla; then
 		ewarn "You are going to include third-party bug fixes/features."
@@ -65,12 +76,15 @@ src_configure() {
 	use iso14755 || myconf='--disable-iso14755'
 
 	econf --enable-everything \
-		--disable-pixbuf \
-		$(use_enable truetype xft) \
 		$(use_enable 256-color) \
 		$(use_enable afterimage) \
-		$(use_enable perl) \
 		$(use_enable blink text-blink) \
+		$(use_enable fading-colors fading) \
+		$(use_enable font-styles) \
+		$(use_enable perl) \
+		$(use_enable pixbuf) \
+		$(use_enable truetype xft) \
+		$(use_enable unicode3) \
 		${myconf}
 }