Version bump (bug #460080).

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

5 files changed, 28 insertions, 174 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index e9f1b97e2e34..bd58d60edc19 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.235 2013/02/27 07:51:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.236 2013/03/03 15:56:56 jer Exp $
+
+*rxvt-unicode-9.17 (03 Mar 2013)
+
+  03 Mar 2013; Jeroen Roovers <jer@gentoo.org> -rxvt-unicode-9.15.ebuild,
+  -rxvt-unicode-9.15-r1.ebuild, +rxvt-unicode-9.17.ebuild, metadata.xml:
+  Version bump (bug #460080).
 
   27 Feb 2013; Mike Frysinger <vapier@gentoo.org> rxvt-unicode-9.16.ebuild:
   Add arm lovin.
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 561ddb84603e..0e468490f0ed 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -10,27 +10,16 @@ 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.14-secondary-wheel.patch 4980 SHA256 95965a8c245b5de04af2c1806718f38c3f8d320395991fffeb9a935e9bf37b76 SHA512 db46b50bb68a85c5819e7e8e23e764fee7bd9629c6976d90f11a1f5eaf20b67414cec4a0b48443fbe001f3b7baad5b0aa4630d4b2c2d83734bf7723fbc0095b5 WHIRLPOOL adf7249f677ee418767d2b841fdeb29424027ef72410db4c89445ab17b4999fae63385cded715e82bec44eb8dcd52f7f070adc3d7fea576d135416f1b2c3d564
 AUX rxvt-unicode-9.15-xsubpp.patch 632 SHA256 d65c0c1e403e019c882c6f95ebbe74098168795b6a9d44f4b5df82ff45bef864 SHA512 b02a7bb8642196aede63b6dd9f19b054fb4048132bb99a3bec6c2625c907289c98defb84f52b2721efe738821bbaa6e2d352f9bc6d5f1e511cacc45f70815b65 WHIRLPOOL 2c9fc89cb36d6c0f986210969db8e02930d2de369aecfa87b6112ef9edf4bf124e92a4e0a7d0de886d97e733f6c7fc8e51c2afc92be62894151e4b82f0d11eac
-DIST rxvt-unicode-9.15.tar.bz2 894764 SHA256 ec1aa2932da844979ed8140bd92223defb12042aa5e877e05ac31139ca81f2b1 SHA512 1095fb88502377fa669746bbe9a5597f0c748e2c01a468ce382e91236ed0e6f720f3ca7631f7105aa390afac09588b92cebd70589096b6a20f174c4297463b71 WHIRLPOOL 5dde1decd0df2e756986e3c444a1fe72cdd521025a6352e45ef997895fd3c7cecd548a42e0676c0c6e439d24d4e43a0011f07dd0f95919a77a0365ab2ec151b1
 DIST rxvt-unicode-9.16.tar.bz2 898089 SHA256 76bb15cdc8cc7709b01389727f7d818f1f401b6616121f0216165a4cb5e74874 SHA512 c22feec33176120944c58abb21c1e0508b5682bec4bde645e9c68735f9cf93e14e1a3b804374c6fd58f9032faa4cbf4fb2122a2307d0f2204e4b9b5a11427092 WHIRLPOOL d7597fbe2fc9e01b257ba3a086d09fbfc820d42955f874137e2244cf2c7ece5062c68faa545c0f3fb9310f9ade14fe551dbefafbb94d35e2908d785c13d12f45
-EBUILD rxvt-unicode-9.15-r1.ebuild 4145 SHA256 2ce799a7a111f99e2968c7092bee3fe355f277bd8134a52050efa4b05c92f312 SHA512 7c7ecb3f15b667e85da4c85f6c5e322dc60bf17305576a9cf1eb05ce3f2daa2bef71334b766b4fa2df156c6125132203288af7d01b46489f2f3121accb2fbb46 WHIRLPOOL 058b826380f060f7d2b79483dc7a1630494c6279eaaa358ae72730bea61ffb3da8e2315f7c8f7b47e71504eca1fd52c1d7f28eb1ad459152ea1678fea2742a3b
-EBUILD rxvt-unicode-9.15.ebuild 4083 SHA256 cdbe332d2dcbc4fe40160867f60dc046ca86c6620d6cf1628dbb9c25df57e333 SHA512 9be266e929b000793a921135a4af8c9e7b4fcfb02c910c8b364033149ebf923a0118eaa4977cdfc82131a6fbcc285494efba756c4540ecc99c1f6dc030988758 WHIRLPOOL 7762956af4a1a03bfc3830633aba4877cea3df149a5f8683846cc6271d0d49a23959e708bfc8c2c87189a8c14481ae55cb7a153bec036cbaf3b9e771212c20f6
+DIST rxvt-unicode-9.17.tar.bz2 898693 SHA256 de017b2b2a1a7182aeada99f605da33cbee18d450e07a7fdabef48da446521e4 SHA512 e7ba2614cf7f8027170a6adfddedd3fc7a63f219a76f92901b49b5a26295d5191200ac7c1dad1f1e7c90225c8fa2dced3022317e8e876425a57d067c3c0d84ee WHIRLPOOL 0cb36c8497a75311c425e85f6c4d4257d3cdf36633e551b32ac4cce1a045eb64e52229fe601181752c58adf56558c71358a82c7bd13d0613a1afbce92f33083d
 EBUILD rxvt-unicode-9.16.ebuild 3980 SHA256 27917d02392fb77effb2afad56bf5f0b85d95b7c73fb353f55fcea40c2e15d9e SHA512 3acd09a33bfd7cdf0d03d22ae6fdb002dffdf17bbd7b55986e756636129ceebd75e46eaef77c6235b5cf85bca994a21ec1ece9e4b606bf7651f7295ffddab96f WHIRLPOOL 4b098023e9127230480b20cec37e1cc1b6cd891ce36cb83f5c183386ab70392df9c4b162a83749868a4c82b0a476f5df014ff493bcc4ba77f7eba6b7f09e91e9
-MISC ChangeLog 35075 SHA256 baee94c94522ef98b441c22aae4b8aae876c730d606c1e49c129ab7284425c20 SHA512 82a59d0dde517a78e928e59b76fc3683ad8b1416925eadb6839f9d4d158e8bb72de947874460b1430aa9603aa7a5e05cacc3b87a0b2c28740579f6f5b6434257 WHIRLPOOL a1bb086773ceb7e5a7af39dfddbd7276f7b47014527b0b29649bf76cdf9ef6607586330b30b57301084e07d45e7fe157252fb535009da60f90bc8ae3a0196427
-MISC metadata.xml 1685 SHA256 e84843d6016d25a37df2299ac9868bc47aad5210d870b6fdc209f694a85114d5 SHA512 b27d967337b26ed5aeb537ad49cd84886f653184ec03400672ecdd36db3cb8f9d7de22e5642fc5d98b47d446585987ce53572e5cf14b3f848b8dd8199c2ab8b6 WHIRLPOOL 260b2fa9db859aea2e6162f89ab519a7c5c8b2b209e4f22ab612adfdfba3c0d3f341e6b9ae91fbe1aab8e68c7c42e363826b9b7becf14632d871de6eb70a35bb
+EBUILD rxvt-unicode-9.17.ebuild 3985 SHA256 4c40c338cce5fb850aab8666f410d9a7b11d2d906c2ff6d5af91d8e46e474a63 SHA512 806ae45b1ef2e8601d72d4b9c32ffbc4895395a2f561365c8c02de35adb693a11f7908164af5f7bb9a43a4db38d7a99381b5c86244509348fab8b0a2674c05b0 WHIRLPOOL cc3d70e10a4198b8b226d13bc2a76ad0d2f722cc5ee029b0e1e88387bf257f95fc54b58c096c1e5bfdc683ea0ff76237465576f1659ce9c99ecdab7f39bff281
+MISC ChangeLog 35284 SHA256 02e5cbdbdf6ef6a470bad18659f830d22543bb771e80656e78959119df3373a9 SHA512 d03022c4909c621f3cf50cf288c2cf5dff7535caccf8450787ffd369cd7c69db916fd3c1622d4957ff175780bece493caceaa8321f8ec1df4d31ad6e575e1f78 WHIRLPOOL a2d73d704afc7ee8b484d1e9e28403c09c60daf16dc871b4caed01d41ebf81dd7ea4c122f9093debdaf02194f75bca1f90234811600f4bd9f1b2a3d7e9606dcc
+MISC metadata.xml 1546 SHA256 3eac52e0b5c65511a502f392c3bae05f1fc37c52c2e2cfae84b71b385a98485f SHA512 14e49801741ae5c0a3dc295af7c1a2eb7023fdb0384d82b52f498f9cd3744a50311132218a3ea34bc5646d6a15e5ca5223fe8b0554cf4fbb4a1f21163178d726 WHIRLPOOL b28418f631d2ea99477bc037ccb1314512726ad954acb5caad1392f616a4be553e41528d612ba29219abbb89ecc64043e84a00e33eab1ffd507923d2198bab1c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRLbstAAoJELEHsLL7fEFW8PsP/1v3yoVbXlimDBUTDWvTcX5f
-sSuQYZSyoBbdH7V0Qb5VBPfjRNzwEnIUNHKLCsYatR5uS+TMxKLE5WNTFkQKyWQP
-S5cwItw4YkikEpUGgH1Kw2Kk5tNyLUZvivxcY6i4JoYkY51kcbOkiP/FtiBG2M6A
-kn44WyAA7PvOc+34FJjJUzxqH2mA0xb8gK/9eaJXkq3w6VWjY99oSPktqqZl1s7l
-TmpIeTrYzPOlIIgp29vba5ULOgZpPr2rRfXxa4jaT1aoxWBlqEEjNjDqaxBlgX6P
-h30IKfb9y0Yq2A06ThBE+j/gVV5UdM1AIjFJhn5Td9+Sdhw3v8ejFDHLOo+Rrvmh
-MTY/xU4A+za61oIGakUBl/abh8aX6zMpWf5u99nsXSi0YCZWl2hL5XJz/RDHMwCu
-4+WWXO2QugCfEhZ+7tvogNxIyINiWJHzQpwl5DzBBf2agejgwWiOfvcWlsE3UysG
-0NGBp62PN+GRLhgjWalymS2WeZgxt83wbyOeCB98RYVoIKk0KWyqLc9pXONzBLhX
-bzRDcwxzXZnfI2RHO00JkFJf33BpbvANcdb4RGeWWhw8GTu8+bxPFjEL8NkUqpOX
-Ix9zqZ1ZGI3U7pXCReVIo50D5A9gYCTNHOFYIibjoHbnWr1q44fa3GyarfWGcdxt
-h2Qupq5G3Pvr1DoA7wHt
-=+ALs
+iEYEAREIAAYFAlEzcvoACgkQVWmRsqeSphOZmACeJ7i7gMcygZWVDLcgX83tDqWU
+CswAn2kA+TdPE46j0hWfesCOjXmU8Luj
+=Trls
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
index b364b12e38c3..f8ee3a365953 100644
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -11,8 +11,6 @@
 </maintainer>
 <use>
 <flag name='256-color'>Enable 256 color support</flag>
-<flag name='afterimage'>Enable transparency support using
-<pkg>media-libs/libafterimage</pkg> (deprecated in 9.15, removed in 9.16)</flag>
 <flag name='alt-font-width'>Calculate the font width using a different method</flag>
 <flag name='blink'>Enable blinking text</flag>
 <flag name='buffer-on-clear'>Store visible output to history buffer when clearing the screen with ctrl-l.
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.15.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.15.ebuild
deleted file mode 100644
index 42eca17bccb6..000000000000
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.15.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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.ebuild,v 1.14 2012/05/21 18:08:18 xarthisius 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 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
-}
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.15-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.17.ebuild
index 3138ed9a35c9..e90e24fc088b 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.15-r1.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.17.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.2 2012/07/06 16:20:03 jer Exp $
-
-EAPI="4"
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.17.ebuild,v 1.1 2013/03/03 15:56:56 jer Exp $
 
+EAPI=4
 inherit autotools eutils
 
 DESCRIPTION="rxvt clone with xft and unicode support"
@@ -12,16 +11,15 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~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
+	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
-	afterimage? ( || ( media-libs/libafterimage x11-wm/afterstep ) )
 	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
 	media-libs/fontconfig
 	perl? ( dev-lang/perl )
@@ -37,6 +35,7 @@ DEPEND="
 	x11-proto/xproto
 "
 
+RESTRICT="test"
 REQUIRED_USE="vanilla? ( !alt-font-width !buffer-on-clear focused-urgency !secondary-wheel !wcwidth )"
 
 src_prepare() {
@@ -45,13 +44,10 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch \
 		"${FILESDIR}"/${PN}-9.15-xsubpp.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."
+		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
 
@@ -71,6 +67,8 @@ src_prepare() {
 		use buffer-on-clear && epatch "${FILESDIR}"/${PN}-9.14-clear.patch
 
 		use alt-font-width && epatch "${FILESDIR}"/${PN}-9.06-font-width.patch
+	else
+		epatch_user
 	fi
 
 	# kill the rxvt-unicode terminfo file - #192083
@@ -86,7 +84,6 @@ src_configure() {
 
 	econf --enable-everything \
 		$(use_enable 256-color) \
-		$(use_enable afterimage) \
 		$(use_enable blink text-blink) \
 		$(use_enable fading-colors fading) \
 		$(use_enable font-styles) \
@@ -108,11 +105,10 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	default
 
-	dodoc README.FAQ Changes
-	cd "${S}"/doc
-	dodoc README* changes.txt etc/* rxvt-tabbed
+	dodoc \
+		README.FAQ Changes doc/README* doc/changes.txt doc/etc/* doc/rxvt-tabbed
 
 	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
 		"System;TerminalEmulator"