Version bump (bug #536572).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 160 insertions, 6 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index 205d55eea856..fe2c03b93b30 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/rxvt-unicode
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.266 2014/09/24 07:00:49 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.267 2015/01/14 14:46:57 jer Exp $
+
+*rxvt-unicode-9.21 (14 Jan 2015)
+
+  14 Jan 2015; Jeroen Roovers <jer@gentoo.org> +rxvt-unicode-9.21.ebuild,
+  +files/rxvt-unicode-9.21-xsubpp.patch:
+  Version bump (bug #536572).
 
   24 Sep 2014; Jeroen Roovers <jer@gentoo.org> rxvt-unicode-9.20.ebuild:
   EAPI bump, depend on dev-lang/perl:= (bug #523582).
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index c07491dc46a1..d72d4b98a9e5 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -9,14 +9,17 @@ AUX rxvt-unicode-9.06-popups-hangs.patch 447 SHA256 34126249d44f55aa74e7b0929994
 AUX rxvt-unicode-9.14-clear.patch 937 SHA256 c1010b15d74f56671351e8314264d76f638230e94d4e334691af29a9353a9540 SHA512 fcec6a10359939b6aa9263c5e175893477115ea0e28971283859d3c891fa8f66247dea908883bc712aa044648ef2abb8749697229ea8375dbbc2ca851b0ae527 WHIRLPOOL a3f430b81d46d55c15173ea94d5f30c87b3d023ae1e4d767ef64f36253006d41bad3b3620bea156be23be976fe5f4142aa518ced531e335a8c118bb38cb773e4
 AUX rxvt-unicode-9.15-xsubpp.patch 632 SHA256 d65c0c1e403e019c882c6f95ebbe74098168795b6a9d44f4b5df82ff45bef864 SHA512 b02a7bb8642196aede63b6dd9f19b054fb4048132bb99a3bec6c2625c907289c98defb84f52b2721efe738821bbaa6e2d352f9bc6d5f1e511cacc45f70815b65 WHIRLPOOL 2c9fc89cb36d6c0f986210969db8e02930d2de369aecfa87b6112ef9edf4bf124e92a4e0a7d0de886d97e733f6c7fc8e51c2afc92be62894151e4b82f0d11eac
 AUX rxvt-unicode-9.19-secondary-wheel.patch 5009 SHA256 1fcc9ecb433fe4ab7568d2ac66199ad112b2f5d685489b7f5fd8b4a9dbf3827a SHA512 adf2b3e48041fddec1ebd617e5d15226d40bfa55e9fb57af3d70084ef44d1110641f393921932c0613a03fe9cba34cf78f0e022b56c522610fc5cd8e24ec0db9 WHIRLPOOL 3a7d0231f843b3949cbfe274c4d95bc8d0041e9258b2cad04a9ec39155d5ed6ed3957453c1a6980e47d133a94cc2fc504e4bddfdb74e0b9345b9d34390a8c07a
+AUX rxvt-unicode-9.21-xsubpp.patch 640 SHA256 845d753be1c61a881344700f4b5b2e4e21f2d49f04f5c80350d4c8d7f2834992 SHA512 70f4c5cb7b6a440f009f693c4dc2f8595051e198250d375cd18704c35059596d77938a3d062740bd26f947bfebdb67ea7d46f59f8cbf08fc73193a62267723ec WHIRLPOOL af26cf6e4da79ee73f4d346bb410a863d075223e4ab410532ac41c3de5ea6188ba6a3fb06183065c429d2335caae932a5e46f0071a55e2ba920dcf13260e67b0
 DIST rxvt-unicode-9.20.tar.bz2 916598 SHA256 e73e13fe64b59fd3c8e6e20c00f149d388741f141b8155e4700d3ed40aa94b4e SHA512 39e1574f7b7034c07ab2e836bb77e0fb0536830df873cc54e6c7583be5e20d36dea3fe0fc889283f163530c77534a3a55de227ee0a8f03564d0f030e60461ff9 WHIRLPOOL a9388b39a0e59375dd56fe03d071d520249fcce98db4ad9ffe8a86aa1ab0a4b132b3fe00d4499bd8c285d327dfc08b3de874b2e7004a487395d5b2872fe63a1b
+DIST rxvt-unicode-9.21.tar.bz2 925293 SHA256 75270ed72bc5895a64a1d7392bf45a622204192371c3965bd3dd978dc088956b SHA512 d50adf6b1e6ae3b13492b4f40455d3a56bb174a7c6db4d4525a1277736994adfb74a2cd1e7d3e8a8cfdc4509a9ae32c05a627829e295dc1bd4a5ba7cc2f80776 WHIRLPOOL 92499cfa0ca154d3cbe1d7b6525e01de6a5d14677a28c605a6b676c88f1d9bc0f6cd663a1f1d8b003ac7cc46a9c6fbe49ff9adc7b3dd63eb345c80de9038a6ad
 EBUILD rxvt-unicode-9.20.ebuild 3987 SHA256 3e30b665c0ef033972a8ab5bb2e04a496db8b42155a43913c61462956ba25fe4 SHA512 9da37a928dcb05f239507d91d4f69b461568c00bf2f71285ec58ee12b47ce3081f7f9ad07015afa24f67b8124515a50d1e66e4d5822aec71544efe8db80e9d6d WHIRLPOOL bfdaf59d5fc92e0bdff9d6dbfe826b52ed1ef06e66cac1dd817b06e6eb8a0e9f6c10e92dadcbbdf2e5d559df251603dd92c2c9d9b5239e0a6ff67ddbe06f27d0
-MISC ChangeLog 38914 SHA256 21e3a861fb5928722c9e62669b1476cb4bc1aa83bbd1310c77b208201eb252e9 SHA512 1cf267dd53dd44dfa7cd90be9edd4682a74bcf84f328291e6eddd31ef216d7b64fb81a6ee5e60385600b0522b566d7f23ca2d2ef5214c84c739aab354dc635f1 WHIRLPOOL dfd76e0120ffff92323608d9b9a9075a26940419956b22188221fecf03c73f683069dbfd2a49a87f62824b0b31b09bc85db36781abdd3c0df8896f5513254bc4
+EBUILD rxvt-unicode-9.21.ebuild 3995 SHA256 9c3ee0483f8fc4e94025938e5f08cd12ac65a63ec1b461da57ee21da40d6462d SHA512 974393bfb62e2cec747ca962936162f1b6e26a7c269ceed56267b69edaa3777b4502beb0a57665524701398bf57a48297d05ee0c4b370f49a8133df9194da23a WHIRLPOOL 341d21ff9c0606acc28b719e3aa0f5e68516649251eb4770a3f3932c83537a27942a3987d437c35cee35bd0a3c48ee9596cb9486c4a501491c5966bcf08cdcd7
+MISC ChangeLog 39094 SHA256 67cf0234f56dcdbee46a9b6822221e52cd09d0aa2b2d1a82911bf43e3e20fff2 SHA512 e3ad3f6c97275a9a99a30f43d051f71d279b584ffc59fc480baa9a8e3860d93f8d56fd3ff4a7774de9970826ebe9b5c2d4c4315a0fe57e509fea8d433ec6feaa WHIRLPOOL 4dc8385bfe8446240c2f2f85281bfbf11788f9717f55cd1620ce56a38a8f39664f2738a9744f21160069d7a0df2cda403a936482b386a15420116994b5838e03
 MISC metadata.xml 1636 SHA256 5e8498232601990ace2e1e4db6ebc972a844fd882de2f20970aec732d56f141b SHA512 f5f3356f0a04fd085820079a89664e0c1d77a7d92672fec8aff1553c23258ff82197a2ada605d3911ef1b3d9db665cfc6c07781fe164a3ba05b1c0c5dd3be52e WHIRLPOOL 2fbb49aaa249402a25b8b5ff98e24d3c359492229aa6d139906bb501b29632978a82cd6a9153ef6e3af07c6c575131e674a925cb83cf775fd9a98d6c0cb6ab7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQibCIACgkQVWmRsqeSphOBAQCeJED+Iyqu1yHTpGQT9LHnEO4U
-qFUAn1/uw0KLHQ9Mybo3MzQ9gTETTMUj
-=2fqX
+iEYEAREIAAYFAlS2gWIACgkQVWmRsqeSphP0ewCfY4TCA/dVFh9RF9LfGLdCKKSK
+D8gAnR+MshC7pxGlCI5Px4hrjEPUjhjC
+=rr2v
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.21-xsubpp.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.21-xsubpp.patch
new file mode 100644
index 000000000000..1d71e96c86dd
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.21-xsubpp.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -136,7 +136,7 @@
+ 	$(PERL) -MExtUtils::Embed -e xsinit -- -std urxvt
+ 
+ rxvtperl.C: rxvtperl.xs iom_perl.h iom_perl.xs typemap typemap.iom
+-	PERL="$(PERL)" $(PERL) @PERLPRIVLIBEXP@/ExtUtils/xsubpp -C++ -typemap @PERLPRIVLIBEXP@/ExtUtils/typemap -typemap 'typemap.iom' -typemap 'typemap' -prototypes $(srcdir)/rxvtperl.xs >$@
++	PERL="$(PERL)" $(PERL) /usr/bin/xsubpp -C++ -typemap @PERLPRIVLIBEXP@/ExtUtils/typemap -typemap 'typemap.iom' -typemap 'typemap' -prototypes $(srcdir)/rxvtperl.xs >$@
+ 
+ rxvtperl.o: rxvtperl.C perlxsi.c
+ 	$(COMPILE) $(PERLFLAGS) -DLIBDIR="\"$(libdir)/urxvt\"" -c $<
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
new file mode 100644
index 000000000000..08413994c049
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 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.21.ebuild,v 1.1 2015/01/14 14:46:57 jer Exp $
+
+EAPI=5
+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/Attic/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="
+	256-color alt-font-width 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
+	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
+"
+
+RESTRICT="test"
+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 \
+		"${FILESDIR}"/${PN}-9.21-xsubpp.patch
+
+	if ! use vanilla; then
+		ewarn "You are going to include unsupported third-party bug fixes/features."
+		ewarn "If you want even more control over patches, then set USE=vanilla"
+		ewarn "and store your patch set in /etc/portage/patches/${CATEGORY}/${PF}/"
+
+		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.19-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"
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=''
+
+	use iso14755 || myconf='--disable-iso14755'
+
+	econf --enable-everything \
+		$(use_enable 256-color) \
+		$(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() {
+	default
+
+	dodoc \
+		README.FAQ Changes doc/README* doc/changes.txt doc/etc/* doc/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 or nano) 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
+}