Remove force-hints patching thanks to kini and Brunera on #gentoo.

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

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index df64d1f21372677b8163bf8d30ff48a7236b96b8..5f2041b5f1eb89115a8d1ae5ce8e1c2648bbcc81 100644 (file)
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,9 @@
 # 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.194 2011/12/22 18:51:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.195 2011/12/23 17:37:18 jer Exp $
+
+  23 Dec 2011; Jeroen Roovers <jer@gentoo.org> rxvt-unicode-9.14.ebuild:
+  Remove force-hints patching thanks to kini and Brunera on #gentoo.
 
   22 Dec 2011; Jeroen Roovers <jer@gentoo.org> rxvt-unicode-9.10.ebuild:
   Fix older SRC_URI.

diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index ec9b56049ae37b0de9daa465e831a73dcc69c34a..c4b4d50a0619249c11f26f7bb0c4e60fbee41815 100644 (file)
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -16,13 +16,13 @@ EBUILD rxvt-unicode-9.10.ebuild 2934 RMD160 5f34865c53794a2debe2877747d045fb1168
 EBUILD rxvt-unicode-9.11.ebuild 2871 RMD160 6fef819db23a17017a88f6b276704cbb2579d05e SHA1 2944a42d555053445810385af0e3a7b49a287e2e SHA256 cdf5649f21d6e35259b3283fc283b39c11e5ace1d43f28c4716ef3f74f6ffcbe
 EBUILD rxvt-unicode-9.12-r1.ebuild 2964 RMD160 e41760cf478b548d264d88b007b433decc4908c3 SHA1 c4c8a8f8bf4b3ae04dcb75b7d00abb28193cb28f SHA256 73d2692ea5c445e6ecb6ef0e2ab236bb9ff6ba4bcc4519852b5c544202075a98
 EBUILD rxvt-unicode-9.12.ebuild 3174 RMD160 363b4a938e3671b8662c7bd5308c908f10c90938 SHA1 5e5dbc66d153a1f20d038347f5ea1431fa41c945 SHA256 5691d979d286cc4f309c8b565dfd0df92f10fe4d1830d72dbd75356d07bf42f1
-EBUILD rxvt-unicode-9.14.ebuild 3101 RMD160 286179de778d61396408e7d59fe20698a7bbfda4 SHA1 6f835d37f14af7af9890b0e3a9ea0f8ebdcfe714 SHA256 a197f1b5b99440b05e4cc0acc0c9d35ec47470d62b1832dd739abf0020839f8f
-MISC ChangeLog 29494 RMD160 8d7286def7df0333a655ff944cc5b76f145c4c89 SHA1 5f571a685768e5a31528ee6c4bb297644acb4c48 SHA256 8e82ac678a0fec34fda7263328de7d6090f854581f205d26e44d40ff7ac26d0f
+EBUILD rxvt-unicode-9.14.ebuild 2988 RMD160 92eb64aac4f675602a61bc8266f11d99a29453ed SHA1 1e4f527adfff973a05f133712a5234e8bc744a4e SHA256 df46259d175c458baac1d82316cac024dd6d14dea0eef1ff93692a68c6caa198
+MISC ChangeLog 29637 RMD160 44814adc46d440315bc63fc305ec643a3e29e1a5 SHA1 1d2a74ea4d80b1fd2e25ed14fdd8526f048e47a7 SHA256 8cffcf737d06f76c35e8bfc99d734e9b312b56147ee3ebb3300666f1b8519aa1
 MISC metadata.xml 1456 RMD160 ad3340891b35816f999aff3a87af7576f84d77ba SHA1 6a9e3e35b78aa441180d747bd032b9e5b2739433 SHA256 784ab1d27de4fcdf1315ea8100a26383d0af3ea3359cc899ea237b8f6b93e5c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7zfDAACgkQVWmRsqeSphNtAACfUB8KDx6c18UQPxN3TUleSIEY
-KV4An1JK55lqC0j0X/YWjtpEAQqBQD/9
-=BTNl
+iEYEARECAAYFAk70vFMACgkQVWmRsqeSphO4HQCdFr+MKsGtTpdkQIZEPNyuQTPi
+ggQAnjuW/S4ize4eNSp+pXayUbJE9rE2
+=Po7/
 -----END PGP SIGNATURE-----

diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.14.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.14.ebuild
index e89fe4dc934995cd7aaaa36597dd1147d0d08411..926c9f8201b16f471a0dbbafe8ebd7a30eb5ea20 100644 (file)
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.14.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.14.ebuild
@@ -1,6 +1,6 @@
 # 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.14.ebuild,v 1.1 2011/12/22 14:56:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.14.ebuild,v 1.2 2011/12/23 17:37:18 jer Exp $
 
 EAPI="4"
 
@@ -15,8 +15,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="
        256-color alt-font-width afterimage blink +focused-urgency fading-colors
-       +font-styles force-hints iso14755 +mousewheel +perl pixbuf
-       startup-notification truetype unicode3 +vanilla wcwidth
+       +font-styles iso14755 +mousewheel +perl pixbuf startup-notification truetype
+       unicode3 +vanilla wcwidth
 "
 
 RDEPEND="
@@ -37,7 +37,7 @@ DEPEND="
        x11-proto/xproto
 "
 
-REQUIRED_USE="vanilla? ( !alt-font-width focused-urgency !force-hints !wcwidth )"
+REQUIRED_USE="vanilla? ( !alt-font-width focused-urgency !wcwidth )"
 
 src_prepare() {
        # fix for prefix not installing properly
@@ -59,9 +59,6 @@ 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
                epatch "${FILESDIR}"/${PN}-9.05_no-MOTIF-WM-INFO.patch