Applied --as-needed patch. Thanks to Jory A. Pratt <geekypenguin@gmail.com>. This closes bug #131670. Removed -r2.

(Portage version: 2.1.1-r1)
 (Unsigned Manifest commit)

3 files changed, 12 insertions, 121 deletions

diff --git a/x11-terms/rxvt/Manifest b/x11-terms/rxvt/Manifest
index 8c9da7f7820e..e73a5cbd1bb0 100644
--- a/x11-terms/rxvt/Manifest
+++ b/x11-terms/rxvt/Manifest
@@ -1,3 +1,7 @@
+AUX rxvt-2.7.10-asneeded.patch 631 RMD160 7d66f1b7770f58cc8e4195f1e6d8993eef91b293 SHA1 3155c8ad80570e8e6aa106aae2046dccad7cee60 SHA256 a0e1c98c38affd0f1bf7275927719c488f997d456596c9557cf7484b1c31f69d
+MD5 ca6e57935a817657c9ab9ad7a977695c files/rxvt-2.7.10-asneeded.patch 631
+RMD160 7d66f1b7770f58cc8e4195f1e6d8993eef91b293 files/rxvt-2.7.10-asneeded.patch 631
+SHA256 a0e1c98c38affd0f1bf7275927719c488f997d456596c9557cf7484b1c31f69d files/rxvt-2.7.10-asneeded.patch 631
 AUX rxvt-2.7.10-azz4.diff 5072 RMD160 90688e1cd9c2515ab7620488152f20dc45e01a40 SHA1 d4f97e34b20460a51c3e33a10d8e03e2f7c4b80a SHA256 7add72e2b7c28b7f21c12e66a32e3434df866ae2b02b429776f37f39925a2da2
 MD5 a38b2f365a55cad915e1e503466ab029 files/rxvt-2.7.10-azz4.diff 5072
 RMD160 90688e1cd9c2515ab7620488152f20dc45e01a40 files/rxvt-2.7.10-azz4.diff 5072
@@ -12,25 +16,18 @@ RMD160 ee65e783fbda978ca2b9c0e0193fa036caa93972 files/rxvt-2.7.10-rk.patch 2772
 SHA256 03cd5fa32fa6cab6516a1b9d99957e1c81496849bba926414a3af1941e0deb33 files/rxvt-2.7.10-rk.patch 2772
 DIST rxvt-2.7.10-xim-fix.patch.gz 602 RMD160 282479993e369b6d6dff8b41c3757c335e35fd47 SHA1 4875ed33354a93eb3fb9dea59cfffddd1ca4b260 SHA256 09ba6a98927e0f60defc399acc0b0d4debfb95d69035d99c1aa779315c2573e9
 DIST rxvt-2.7.10.tar.gz 595073 RMD160 1bea3ff456b4f9ddce187b3e3a0ac11a7363c8eb SHA1 dabb960d94703d4f81e9a9a50749210a2977ef2b SHA256 616ad56502820264e6933d07bc4eb752aa6940ec14add6e780ffccf15f38d449
-EBUILD rxvt-2.7.10-r2.ebuild 2209 RMD160 779d108607787b990e8b3fd4879338574e3bf2bd SHA1 7c34220ea0fbff3f4dc313a59c70ac364973ef08 SHA256 e3dccdf38659a9f138eaab807c5a163b18e54642c6fa8087678236813c7a09b5
-MD5 979dd46387c86188aa4c67ede9d5674f rxvt-2.7.10-r2.ebuild 2209
-RMD160 779d108607787b990e8b3fd4879338574e3bf2bd rxvt-2.7.10-r2.ebuild 2209
-SHA256 e3dccdf38659a9f138eaab807c5a163b18e54642c6fa8087678236813c7a09b5 rxvt-2.7.10-r2.ebuild 2209
-EBUILD rxvt-2.7.10-r3.ebuild 2297 RMD160 ba409580daa2493c9a03acfd12f0b36ab53277d9 SHA1 ba9db643f4ef37170c586294020c6f02a05fe924 SHA256 5bdb83a0851767264df0d755af8b181ca591e3deca2284e0bec281370333ae70
-MD5 fcf036aed806bb26f13648ad6c7f7abd rxvt-2.7.10-r3.ebuild 2297
-RMD160 ba409580daa2493c9a03acfd12f0b36ab53277d9 rxvt-2.7.10-r3.ebuild 2297
-SHA256 5bdb83a0851767264df0d755af8b181ca591e3deca2284e0bec281370333ae70 rxvt-2.7.10-r3.ebuild 2297
-MISC ChangeLog 8244 RMD160 c6d01da70c2266b8bdb019befdada2d6e18abeaf SHA1 e4aa7f368b39cef279cdbae69e7048f90dd480bb SHA256 3234abe791b8192df4bbd5d2a74a82da2e791ca32a6253503b42423ffb5820fd
-MD5 0acad8fd03580020728b5f7f0fba2fd6 ChangeLog 8244
-RMD160 c6d01da70c2266b8bdb019befdada2d6e18abeaf ChangeLog 8244
-SHA256 3234abe791b8192df4bbd5d2a74a82da2e791ca32a6253503b42423ffb5820fd ChangeLog 8244
+EBUILD rxvt-2.7.10-r3.ebuild 2339 RMD160 54df1d70cb3aa372bd7ea7459ab16906a71e332d SHA1 64ca8616471da0d9657291f442e7758d4f9a184c SHA256 11cd0f36034589b9553e45e27281b5f990acecb441f0e969b7dd9985fa4431b8
+MD5 3529e1e16674c5c15d75df3695b6c736 rxvt-2.7.10-r3.ebuild 2339
+RMD160 54df1d70cb3aa372bd7ea7459ab16906a71e332d rxvt-2.7.10-r3.ebuild 2339
+SHA256 11cd0f36034589b9553e45e27281b5f990acecb441f0e969b7dd9985fa4431b8 rxvt-2.7.10-r3.ebuild 2339
+MISC ChangeLog 8501 RMD160 a8cf6c5123ed412740109ed4021eaded0e0c5552 SHA1 7b8a121fb9737ea1e425bb5652b736c3510b66e4 SHA256 a05c624ea777cd87edfb67da6f431c425540c94889014e70cae1faf93c9bbf28
+MD5 0d8287ab9942dc3946bd6dca1a47d22b ChangeLog 8501
+RMD160 a8cf6c5123ed412740109ed4021eaded0e0c5552 ChangeLog 8501
+SHA256 a05c624ea777cd87edfb67da6f431c425540c94889014e70cae1faf93c9bbf28 ChangeLog 8501
 MISC metadata.xml 491 RMD160 9bc13335a5f53f12bcfae1b9b16901900d05e636 SHA1 049b8a302ee1d0ea58196951ac838cc99a6f8952 SHA256 156572ced8352defac748d70b0ff923b6ee3603ddf09496a9580594d296d3e07
 MD5 cd46a87805d1d53c2c0e5f9d9169b9ae metadata.xml 491
 RMD160 9bc13335a5f53f12bcfae1b9b16901900d05e636 metadata.xml 491
 SHA256 156572ced8352defac748d70b0ff923b6ee3603ddf09496a9580594d296d3e07 metadata.xml 491
-MD5 20a170fdeebeaf0a09915509d994298a files/digest-rxvt-2.7.10-r2 491
-RMD160 548be348e9c4b9fea6ca5c1e19e92bff4096efca files/digest-rxvt-2.7.10-r2 491
-SHA256 dc4fd3dee4446bea58a0de19ad32ac4d56643e23515ec2f64b75f345656d23a8 files/digest-rxvt-2.7.10-r2 491
 MD5 20a170fdeebeaf0a09915509d994298a files/digest-rxvt-2.7.10-r3 491
 RMD160 548be348e9c4b9fea6ca5c1e19e92bff4096efca files/digest-rxvt-2.7.10-r3 491
 SHA256 dc4fd3dee4446bea58a0de19ad32ac4d56643e23515ec2f64b75f345656d23a8 files/digest-rxvt-2.7.10-r3 491
diff --git a/x11-terms/rxvt/files/digest-rxvt-2.7.10-r2 b/x11-terms/rxvt/files/digest-rxvt-2.7.10-r2
deleted file mode 100644
index a6ea18800599..000000000000
--- a/x11-terms/rxvt/files/digest-rxvt-2.7.10-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 299ecbc322232d4031c02c72981fb193 rxvt-2.7.10-xim-fix.patch.gz 602
-RMD160 282479993e369b6d6dff8b41c3757c335e35fd47 rxvt-2.7.10-xim-fix.patch.gz 602
-SHA256 09ba6a98927e0f60defc399acc0b0d4debfb95d69035d99c1aa779315c2573e9 rxvt-2.7.10-xim-fix.patch.gz 602
-MD5 302c5c455e64047b02d1ef19ff749141 rxvt-2.7.10.tar.gz 595073
-RMD160 1bea3ff456b4f9ddce187b3e3a0ac11a7363c8eb rxvt-2.7.10.tar.gz 595073
-SHA256 616ad56502820264e6933d07bc4eb752aa6940ec14add6e780ffccf15f38d449 rxvt-2.7.10.tar.gz 595073
diff --git a/x11-terms/rxvt/rxvt-2.7.10-r2.ebuild b/x11-terms/rxvt/rxvt-2.7.10-r2.ebuild
deleted file mode 100644
index 4e893fd2f4c1..000000000000
--- a/x11-terms/rxvt/rxvt-2.7.10-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.7.10-r2.ebuild,v 1.9 2006/07/28 13:46:19 usata Exp $
-
-inherit eutils flag-o-matic libtool
-
-DESCRIPTION="rxvt -- nice small x11 terminal"
-HOMEPAGE="http://www.rxvt.org/
-	http://www.giga.it.okayama-u.ac.jp/~ishihara/opensource/"
-SRC_URI="mirror://sourceforge/rxvt/${P}.tar.gz
-	http://www.giga.it.okayama-u.ac.jp/~ishihara/opensource/${P}-xim-fix.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~mips ppc ppc64 sparc x86"
-IUSE="motif cjk xgetdefault linuxkeys"
-
-RDEPEND="virtual/libc
-	|| ( (
-		x11-libs/libX11
-		x11-libs/libXpm
-		x11-libs/libXext
-		)
-		virtual/x11
-	)
-	motif? ( x11-libs/openmotif )"
-DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xproto
-		)
-		virtual/x11
-	)"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	use motif && epatch ${FILESDIR}/${P}-azz4.diff
-	use cjk && epatch ${DISTDIR}/${P}-xim-fix.patch.gz
-	use linguas_ja && epatch ${FILESDIR}/${P}-rk.patch
-
-	uclibctoolize
-}
-
-src_compile() {
-
-	local term
-	if [ -n "${RXVT_TERM}" ] ; then
-		term="${RXVT_TERM}"
-	else
-		term="rxvt"
-	fi
-
-	# bug #22325
-	use linuxkeys && append-flags -DLINUX_KEYS
-	append-ldflags -Wl,-z,now
-
-	econf \
-		--enable-everything \
-		--enable-rxvt-scroll \
-		--enable-next-scroll \
-		--enable-xterm-scroll \
-		--enable-transparency \
-		--enable-xpm-background \
-		--enable-utmp \
-		--enable-wtmp \
-		--enable-mousewheel \
-		--enable-slipwheeling \
-		--enable-smart-resize \
-		--enable-256-color \
-		--enable-menubar \
-		--enable-languages \
-		--enable-xim \
-		--enable-shared \
-		--enable-keepscrolling \
-		--with-term=${term} \
-		$(use_enable xgetdefault) || die
-
-	emake || die
-}
-
-src_install() {
-
-	einstall mandir=${D}/usr/share/man/man1 || die
-
-	cd ${S}/doc
-	dodoc README* *.txt BUGS FAQ
-	dohtml *.html
-}
-
-pkg_postinst() {
-
-	einfo
-	einfo "If you want to change default TERM variable other than rxvt,"
-	einfo "set RXVT_TERM environment variable and then emerge rxvt."
-	einfo "Especially, if you use rxvt under monochrome X you might need to run"
-	einfo "\t RXVT_TERM=rxvt-basic emerge rxvt"
-	einfo "otherwise curses based program will not work."
-	einfo
-}