Stop trying to install non-existant docs, respect user USE flags, strip some unsafe flags (bug #68715).

(Portage version: 2.0.51.16)

4 files changed, 25 insertions, 9 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index f996820225ea..0db582f45e12 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/rxvt-unicode
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.43 2005/02/20 23:31:50 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.44 2005/02/27 00:08:45 latexer Exp $
+
+  26 Feb 2005; Peter Johanson <latexer@gentoo.org> rxvt-unicode-4.8.ebuild,
+  rxvt-unicode-5.1.ebuild, rxvt-unicode-5.2.ebuild:
+  Stop trying to install non-existant docs, respect user USE flags, strip some
+  unsafe flags (bug #68715).
 
 *rxvt-unicode-5.2 (20 Feb 2005)
 
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-4.8.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-4.8.ebuild
index 6c558463847b..da7142ab355d 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-4.8.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-4.8.ebuild,v 1.1 2005/01/29 21:44:30 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-4.8.ebuild,v 1.2 2005/02/27 00:08:45 latexer Exp $
 
 inherit 64-bit eutils
 
@@ -57,9 +57,9 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 
-	dodoc README.unicode Changes
+	dodoc README.FAQ Changes
 	cd ${S}/doc
-	dodoc README* changes.txt BUGS TODO etc/*
+	dodoc README* changes.txt etc/*
 }
 
 pkg_postinst() {
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-5.1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-5.1.ebuild
index c4db704aceeb..2f69ad13e84c 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-5.1.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-5.1.ebuild,v 1.1 2005/02/18 19:25:13 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-5.1.ebuild,v 1.2 2005/02/27 00:08:45 latexer Exp $
 
 inherit 64-bit eutils
 
@@ -25,6 +25,9 @@ src_unpack() {
 	sed -i -e \
 		"s~@TIC@ \(etc/rxvt\)~@TIC@ -o ${D}/${tdir} \1~" \
 		doc/Makefile.in
+	sed -i -e \
+		"s:-g -O3:${CFLAGS}" \
+		configure
 }
 
 src_compile() {
@@ -59,7 +62,7 @@ src_install() {
 
 	dodoc README.unicode Changes
 	cd ${S}/doc
-	dodoc README* changes.txt BUGS TODO etc/*
+	dodoc README* changes.txt etc/*
 }
 
 pkg_postinst() {
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-5.2.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-5.2.ebuild
index 557f7e1c3fd6..ce5952eb2d64 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-5.2.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-5.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-5.2.ebuild,v 1.1 2005/02/20 23:31:50 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-5.2.ebuild,v 1.2 2005/02/27 00:08:45 latexer Exp $
 
-inherit 64-bit eutils
+inherit 64-bit eutils flag-o-matic
 
 IUSE="xgetdefault tabs"
 
@@ -19,6 +19,11 @@ DEPEND="virtual/libc
 	dev-lang/perl
 	tabs? ( dev-perl/gtk2-perl )"
 
+pkg_preinst() {
+	filter-flags -mno-accumulate-outgoing-args
+	replace-flags -Os -O2
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -26,6 +31,9 @@ src_unpack() {
 	sed -i -e \
 		"s~@TIC@ \(etc/rxvt\)~@TIC@ -o ${D}/${tdir} \1~" \
 		doc/Makefile.in
+	sed -i -e \
+		"s:-g -O3:${CFLAGS}" \
+		configure
 }
 
 src_compile() {
@@ -66,7 +74,7 @@ src_install() {
 
 	dodoc README.FAQ Changes
 	cd ${S}/doc
-	dodoc README* changes.txt BUGS TODO etc/*
+	dodoc README* changes.txt etc/*
 
 	if useq tabs ; then
 		newbin rxvt-tabbed urxvt-tabbed