(#119719) RM needs to use 'rm -f' to ensure non-interactivity.

(Portage version: 2.1_pre4-r1)

4 files changed, 51 insertions, 3 deletions

diff --git a/x11-misc/gccmakedep/ChangeLog b/x11-misc/gccmakedep/ChangeLog
index 30e94f51e0aa..2adeee8fbfb8 100644
--- a/x11-misc/gccmakedep/ChangeLog
+++ b/x11-misc/gccmakedep/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/gccmakedep
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gccmakedep/ChangeLog,v 1.8 2006/02/02 20:00:00 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gccmakedep/ChangeLog,v 1.9 2006/02/06 19:33:24 spyderous Exp $
+
+*gccmakedep-1.0.1-r1 (06 Feb 2006)
+
+  06 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/force-rm.patch, -gccmakedep-1.0.1.ebuild,
+  +gccmakedep-1.0.1-r1.ebuild:
+  (#119719) RM needs to use 'rm -f' to ensure non-interactivity.
 
   02 Feb 2006; <nixnut@gentoo.org> gccmakedep-1.0.1.ebuild:
   Added ~ppc keyword. bug 120289
diff --git a/x11-misc/gccmakedep/files/digest-gccmakedep-1.0.1 b/x11-misc/gccmakedep/files/digest-gccmakedep-1.0.1-r1
index 3d7f9cdef357..3d7f9cdef357 100644
--- a/x11-misc/gccmakedep/files/digest-gccmakedep-1.0.1
+++ b/x11-misc/gccmakedep/files/digest-gccmakedep-1.0.1-r1
diff --git a/x11-misc/gccmakedep/files/force-rm.patch b/x11-misc/gccmakedep/files/force-rm.patch
new file mode 100644
index 000000000000..151fcc90bcf8
--- /dev/null
+++ b/x11-misc/gccmakedep/files/force-rm.patch
@@ -0,0 +1,39 @@
+Index: gccmakedep/ChangeLog
+===================================================================
+RCS file: /cvs/xorg/util/gccmakedep/ChangeLog,v
+retrieving revision 1.4
+retrieving revision 1.6
+diff -u -b -B -r1.4 -r1.6
+--- gccmakedep/ChangeLog	21 Dec 2005 02:30:07 -0000	1.4
++++ gccmakedep/ChangeLog	6 Feb 2006 18:16:58 -0000	1.6
+@@ -1,3 +1,13 @@
++2006-02-06  Donnie Berkholz  <spyderous@gentoo.org>
++
++	* Makefile.am:
++	RM needed some more quoting.
++
++2006-02-06  Donnie Berkholz  <spyderous@gentoo.org>
++
++	* Makefile.am:
++	RM should be 'rm -f' for monolithic compatibility.
++
+ 2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+ 
+ 	* configure.ac:
+Index: gccmakedep/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/util/gccmakedep/Makefile.am,v
+retrieving revision 1.3
+retrieving revision 1.5
+diff -u -b -B -r1.3 -r1.5
+--- gccmakedep/Makefile.am	9 Dec 2005 03:45:24 -0000	1.3
++++ gccmakedep/Makefile.am	6 Feb 2006 18:16:59 -0000	1.5
+@@ -26,7 +26,7 @@
+ 
+ DEFS = \
+ 	-DCCCMD=$(CC)\
+-	-DRMCMD="rm"\
++	-DRMCMD='"rm -f"'\
+ 	-DLNCMD="ln"\
+ 	-DMVCMD="mv"
+ 
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.1.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.1-r1.ebuild
index 47ecd4543c2d..1bbddb56b981 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.1.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gccmakedep/gccmakedep-1.0.1.ebuild,v 1.5 2006/02/02 20:00:00 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gccmakedep/gccmakedep-1.0.1-r1.ebuild,v 1.1 2006/02/06 19:33:24 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+SNAPSHOT="yes"
 
 inherit x-modular
 
@@ -12,3 +12,5 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
 RDEPEND=""
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
+
+PATCHES="${FILESDIR}/force-rm.patch"