Add System category to desktop file by Jekyll Wu (bug #421515). Remove unused USE flag description.

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

4 files changed, 152 insertions, 20 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index 58b842eebbb5..b28412879051 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/rxvt-unicode
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.220 2012/05/21 18:08:18 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.221 2012/06/18 02:42:57 jer Exp $
+
+*rxvt-unicode-9.15-r1 (18 Jun 2012)
+
+  18 Jun 2012; Jeroen Roovers <jer@gentoo.org> +rxvt-unicode-9.15-r1.ebuild,
+  metadata.xml:
+  Add System category to desktop file by Jekyll Wu (bug #421515). Remove unused
+  USE flag description.
 
   21 May 2012; Kacper Kowalik <xarthisius@gentoo.org> rxvt-unicode-9.15.ebuild:
   Add missing inheritance of eutils.eclass
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index a9fa6921838d..dddcb98d9c58 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX macosx-clipboard 1859 RMD160 fe551d0aaf8c4f116bba00a067c4c5f8263a0211 SHA1 1957f60603e46519e4dd05812fd2982971731874 SHA256 343ee4d62b59406bf64d095815ee3140c53569e1759e9aefa0841a7d6ea9815e
 AUX rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch 1230 RMD160 eb580a34407a3c605e1fdffa3847d71fac16a860 SHA1 93afc24408ce263fb71d56c6ed191307b54716a6 SHA256 59eb0b72ef05be7e7d9071ec5f05a349359768daa3c5893b14917c50e5e10175
@@ -10,23 +10,14 @@ AUX rxvt-unicode-9.06-popups-hangs.patch 447 RMD160 634460478e418bef029af6254c6f
 AUX rxvt-unicode-9.14-clear.patch 937 RMD160 67cce3167961bb87dc4368ce6038d795240d05be SHA1 290cc304fb616ba9462b6d4a250b0772de020344 SHA256 c1010b15d74f56671351e8314264d76f638230e94d4e334691af29a9353a9540
 AUX rxvt-unicode-9.14-secondary-wheel.patch 4980 RMD160 8cbed4eb9adb9b88ebbfaf217ed1bdea6cd5b75c SHA1 1506bd5ec93f8e81fe3d4b7491104e873bd1d85e SHA256 95965a8c245b5de04af2c1806718f38c3f8d320395991fffeb9a935e9bf37b76
 DIST rxvt-unicode-9.15.tar.bz2 894764 RMD160 80b33c123edee498f267147b5c2361a81c42f160 SHA1 e6fdf091860ecb458730dc68b0176f67f207a2f7 SHA256 ec1aa2932da844979ed8140bd92223defb12042aa5e877e05ac31139ca81f2b1
+EBUILD rxvt-unicode-9.15-r1.ebuild 4099 RMD160 d9b5666505db01b2e7af7329b0384609bbe9ea71 SHA1 97f7c3a7b7aef4940feb0ed2af8e3a304541821a SHA256 8bd5d3935b4b17bc8cb7dd4917a4862e36451bfd8141db256977c0c684f42e95
 EBUILD rxvt-unicode-9.15.ebuild 4083 RMD160 4c1e4f8274efeb33ececa8bac89a8c58f278b7a4 SHA1 3b511bc09ce6b6ca516c481999dc8de2ab3af4bf SHA256 cdbe332d2dcbc4fe40160867f60dc046ca86c6620d6cf1628dbb9c25df57e333
-MISC ChangeLog 33065 RMD160 c60ac1b4160f233e816b3f403ddfec4af0d106f0 SHA1 35f513f8d1ba56de40f7660d4f0dd3b59f012e5c SHA256 c2be5c639c5d896ac5ba81986f9f410242eeecfaab861ff883a3d3d2d728bb73
-MISC metadata.xml 1795 RMD160 88fff7bcf1bf6087c27ff17de05d41098d45f1d1 SHA1 2f9c069fb115ef6d354fdb6c23e6aa50ebf82d48 SHA256 982e58009da7aaedb1def2a85a5b2f47ea7ffbca83cc7c17c44aeeca0322e358
+MISC ChangeLog 33293 RMD160 b40ca1ae8872583201c4331c5fe8e78c692e8a5d SHA1 7a3be4b7bc67ea34ee27320887742bee038e7736 SHA256 b57d747715c9975b5bc67a06a466ddb7bcec809f0c9edad02af3f5ca9fb18d1f
+MISC metadata.xml 1668 RMD160 23638ff21fedc7b698b5b96328ed91b7af7b2b11 SHA1 bec51a8cebcb262119d6c284e80fff2b1af959e9 SHA256 d90d31c74a366e549469822eca424aaba34d903d570df4d8fc073f4f9834c135
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPuoSbAAoJEF0huFKJUZL5GDoP+wWOYxD0BoY9iLK93HUEg6J/
-cFDM/2pOSOgPj7zdCMw3Oh7c+hyJ0tnja3JLYNgc8C8/Nm1ETWuar8gnsxLrkoa2
-G0/56lFVZ7fhoxURFQD08JrWYCbScQ0gwhTjzSzKjJY2Gt5rSxo/eB2yYHOu++Fz
-FZg3HsBJkeGieEtCtq0rkeRVwl5JzGC8Exy6QP3oka3lnMnh33JyegkH33SPpHTM
-YCumj8C8pPAfS9Cu02D2VGLkmzSqhQiLd1Fpm2fpeo9/OZ70B3evU8lxCmdQb4li
-rNCD52RSZ8IuZPuksLmswpt/3VhshNJieGXF6MFupjrsfAeejzunKNgtpWznfv1+
-S7WUxHS9FiRRL088hiqiLitczvyrhWMsJ4qmUr9Aps/j6n7yp9koqmzYSEYGPJkf
-MNqcHMZqzzx9Lt6SFVn3bIWNMacWSCwaP5ZqHJ/faqwH2ZXWlhncKryJ94ivrBwK
-4CX4gBLeiKS9MVTnXHA8YqE38X2HJpLW2Zh3+8KU5YbM+xhzQ0gp3JHKbhga5wUA
-GAPX6QV/PxC28PX2ghzBMLSIjkT9dIvJFcD7IVo0AFsZahqhXmqyg8arP6fvLKyK
-NdtELnUoVN1HIco7fnkeWceNpGFt77lprnmvI7VPTvW3M4N3cV8I+EZHqzPr10rb
-1BmJuC6Qu1Z5XhnSansG
-=JWuX
+iEYEARECAAYFAk/elbsACgkQVWmRsqeSphN7vwCfXzALfNRoFfjtO6gllhDSaU5Y
+x3kAnjEaxS6ACyoeWN6jO63JkeRPD+oK
+=OYan
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
index b59615812233..04cf017d894b 100644
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -20,8 +20,6 @@
 <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>
 <flag name='iso14755'>Enable ISO-14755 support</flag>
 <flag name='mousewheel'>Enable scrolling via mouse wheel or buttons 4 and 5</flag>
 <flag name='perl'>Enable perl script support. You can still disable this at runtime with -pe ""</flag>
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.15-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.15-r1.ebuild
new file mode 100644
index 000000000000..26ea7acd49e3
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.15-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2012 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.15-r1.ebuild,v 1.1 2012/06/18 02:42:57 jer Exp $
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="rxvt clone with xft and unicode support"
+HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="
+	256-color alt-font-width afterimage blink buffer-on-clear +focused-urgency
+	fading-colors +font-styles iso14755 +mousewheel +perl pixbuf secondary-wheel
+	startup-notification xft unicode3 +vanilla wcwidth
+"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.7-r6
+	afterimage? ( || ( media-libs/libafterimage x11-wm/afterstep ) )
+	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
+	media-libs/fontconfig
+	perl? ( dev-lang/perl )
+	pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
+	startup-notification? ( x11-libs/startup-notification )
+	x11-libs/libX11
+	x11-libs/libXrender
+	xft? ( x11-libs/libXft )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto
+"
+
+REQUIRED_USE="vanilla? ( !alt-font-width !buffer-on-clear focused-urgency !secondary-wheel !wcwidth )"
+
+src_prepare() {
+	# fix for prefix not installing properly
+	epatch "${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
+
+	if ! use afterimage && ! use pixbuf; then
+		einfo " + If you want transparency support, please enable either the *pixbuf*"
+		einfo "   or the *afterimage* USE flag. Enabling both will default to pixbuf."
+	fi
+
+	if ! use vanilla; then
+		ewarn " + You are going to include unsupported third-party bug fixes/features."
+
+		use wcwidth && epatch doc/wcwidth.patch
+
+		# bug #240165
+		use focused-urgency || epatch "${FILESDIR}"/${PN}-9.06-no-urgency-if-focused.diff
+
+		# bug #263638
+		epatch "${FILESDIR}"/${PN}-9.06-popups-hangs.patch
+
+		# bug #237271
+		epatch "${FILESDIR}"/${PN}-9.05_no-MOTIF-WM-INFO.patch
+
+		# support for wheel scrolling on secondary screens
+		use secondary-wheel && epatch "${FILESDIR}"/${PN}-9.14-secondary-wheel.patch
+
+		# ctrl-l buffer fix
+		use buffer-on-clear && epatch "${FILESDIR}"/${PN}-9.14-clear.patch
+
+		use alt-font-width && epatch "${FILESDIR}"/${PN}-9.06-font-width.patch
+	fi
+
+	# kill the rxvt-unicode terminfo file - #192083
+	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=''
+
+	use iso14755 || myconf='--disable-iso14755'
+
+	econf --enable-everything \
+		$(use_enable 256-color) \
+		$(use_enable afterimage) \
+		$(use_enable blink text-blink) \
+		$(use_enable fading-colors fading) \
+		$(use_enable font-styles) \
+		$(use_enable mousewheel) \
+		$(use_enable perl) \
+		$(use_enable pixbuf) \
+		$(use_enable startup-notification) \
+		$(use_enable xft) \
+		$(use_enable unicode3) \
+		${myconf}
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	sed -i \
+		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
+		"${S}"/doc/rxvt-tabbed || die "tabs sed failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc README.FAQ Changes
+	cd "${S}"/doc
+	dodoc README* changes.txt etc/* rxvt-tabbed
+
+	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
+		"System;TerminalEmulator"
+}
+
+pkg_postinst() {
+	if use buffer-on-clear; then
+		ewarn "You have enabled the buffer-on-clear USE flag."
+		ewarn "Please note that, although this works well for most prompts,"
+		ewarn "there have been cases with fancy prompts, like bug #397829,"
+		ewarn "where it caused issues. Proceed with caution."
+		ewarn "  (keep this terminal open until you make sure it works)"
+	fi
+	if use secondary-wheel; then
+		elog "You have enabled the secondary-wheel USE flag."
+		elog "This allows you to scroll in secondary screens"
+		elog "(like mutt's message list/view) using the mouse wheel."
+		elog
+		elog "To actually enable the feature you have to add"
+		elog "  URxvt*secondaryWheel: true"
+		elog "in your ~/.Xdefaults file"
+	fi
+}