Cleanup. Version bump by upstream.

(Portage version: 2.1.4.4)

3 files changed, 12 insertions, 71 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index 09d4cc9c9e54..d618f22dcf51 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/rxvt-unicode
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.103 2008/03/12 16:16:48 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.104 2008/03/20 20:45:02 killerfox Exp $
+
+*rxvt-unicode-9.02 (20 Mar 2008)
+
+  20 Mar 2008; René Nussbaumer <killerfox@gentoo.org>
+  -rxvt-unicode-8.1.ebuild, -rxvt-unicode-8.2.ebuild,
+  +rxvt-unicode-9.02.ebuild:
+  Cleanup. Version bump by upstream.
 
   12 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Peter Johanson (latexer, #206688) from metadata.xml.
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-8.1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-8.1.ebuild
deleted file mode 100644
index 158247f7b795..000000000000
--- a/x11-terms/rxvt-unicode/rxvt-unicode-8.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-8.1.ebuild,v 1.10 2007/07/22 05:53:44 dberkholz Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="rxvt clone with XFT and Unicode support"
-HOMEPAGE="http://software.schmorp.de/"
-SRC_URI="http://dist.schmorp.de/rxvt-unicode/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="truetype perl iso14755"
-
-# see bug #115992 for modular x deps
-RDEPEND="x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrender
-	perl? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	local tdir=/usr/share/terminfo
-	sed -i -e \
-		"s~@TIC@ \(etc/rxvt\)~@TIC@ -o ${D}/${tdir} \1~" \
-		doc/Makefile.in
-}
-
-src_compile() {
-	myconf=''
-
-	use iso14755 || myconf='--disable-iso14755'
-
-	econf \
-		--enable-everything \
-		$(use_enable truetype xft) \
-		$(use_enable perl) \
-		--disable-text-blink \
-		${myconf} \
-		|| die
-
-	emake || die
-
-	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
-}
-
-pkg_postinst() {
-	einfo "urxvt now always uses TERM=rxvt-unicode so that the"
-	einfo "upstream-supplied terminfo files can be used."
-}
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-8.2.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.02.ebuild
index fc2e67f39d73..a1d544a30cb8 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-8.2.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.02.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-8.2.ebuild,v 1.4 2007/07/22 05:53:44 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.02.ebuild,v 1.1 2008/03/20 20:45:02 killerfox Exp $
 
 inherit flag-o-matic
 
@@ -16,7 +16,7 @@ IUSE="truetype perl iso14755"
 # see bug #115992 for modular x deps
 RDEPEND="x11-libs/libX11
 	x11-libs/libXft
-	x11-libs/libXpm
+	media-libs/libafterimage
 	x11-libs/libXrender
 	perl? ( dev-lang/perl )"
 DEPEND="${RDEPEND}
@@ -49,7 +49,7 @@ src_compile() {
 
 	sed -i \
 		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
-		${S}/doc/rxvt-tabbed || die "tabs sed failed"
+		"${S}"/doc/rxvt-tabbed || die "tabs sed failed"
 }
 
 src_install() {