Add patch to remove troublesome header, bump to r1 to close bug #169256

(Portage version: 2.1.2.1)

4 files changed, 31 insertions, 3 deletions

diff --git a/app-misc/srm/ChangeLog b/app-misc/srm/ChangeLog
index bc1b961d4a16..9b0823a3baad 100644
--- a/app-misc/srm/ChangeLog
+++ b/app-misc/srm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/srm
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/ChangeLog,v 1.9 2007/02/21 22:43:57 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/ChangeLog,v 1.10 2007/03/04 18:18:16 anant Exp $
+
+*srm-1.2.8-r1 (04 Mar 2007)
+
+  04 Mar 2007; <anant@gentoo.org> +files/srm-1.2.8-remove-mount.patch,
+  -srm-1.2.8.ebuild, +srm-1.2.8-r1.ebuild:
+  Add patch to remove troublesome header that prevented compilation, bump to r1;
+  this closes bug #169256
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-misc/srm/files/digest-srm-1.2.8 b/app-misc/srm/files/digest-srm-1.2.8-r1
index fc9ba2ad5a6f..fc9ba2ad5a6f 100644
--- a/app-misc/srm/files/digest-srm-1.2.8
+++ b/app-misc/srm/files/digest-srm-1.2.8-r1
diff --git a/app-misc/srm/files/srm-1.2.8-remove-mount.patch b/app-misc/srm/files/srm-1.2.8-remove-mount.patch
new file mode 100644
index 000000000000..0f3297a43a3f
--- /dev/null
+++ b/app-misc/srm/files/srm-1.2.8-remove-mount.patch
@@ -0,0 +1,13 @@
+--- src/sunlink.c	2007-03-05 03:01:00.000000000 +0530
++++ src/sunlink.c	2007-03-05 03:01:16.000000000 +0530
+@@ -20,9 +20,8 @@
+ #include <sys/vfs.h>
+ #endif
+ 
+-#if HAVE_SYS_PARAM_H && HAVE_SYS_MOUNT_H
++#if HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+-#include <sys/mount.h>
+ #endif
+ 
+ #include "srm.h"
diff --git a/app-misc/srm/srm-1.2.8.ebuild b/app-misc/srm/srm-1.2.8-r1.ebuild
index 5466ce12d791..c18853bb4962 100644
--- a/app-misc/srm/srm-1.2.8.ebuild
+++ b/app-misc/srm/srm-1.2.8-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/srm-1.2.8.ebuild,v 1.6 2005/01/01 15:24:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/srm-1.2.8-r1.ebuild,v 1.1 2007/03/04 18:18:16 anant Exp $
+
+inherit eutils
 
 DESCRIPTION="A command-line compatible rm which destroys file contents before unlinking."
 HOMEPAGE="http://sourceforge.net/projects/srm/"
@@ -17,6 +19,12 @@ DEPEND="virtual/libc
 RDEPEND="virtual/libc
 	!app-misc/secure-delete"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-remove-mount.patch
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc README Changes