amd64 stable wrt #204356, remove old version, point users to correct documentation in pkg_postinst and remove some system depends.

(Portage version: 2.1.4_rc14)

4 files changed, 13 insertions, 40 deletions

diff --git a/app-misc/srm/ChangeLog b/app-misc/srm/ChangeLog
index b71f55680a06..6251d43d05af 100644
--- a/app-misc/srm/ChangeLog
+++ b/app-misc/srm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/srm
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/ChangeLog,v 1.12 2008/01/05 13:51:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/ChangeLog,v 1.13 2008/01/05 14:02:00 drac Exp $
+
+  05 Jan 2008; Samuli Suominen <drac@gentoo.org> -srm-1.2.7.ebuild,
+  srm-1.2.8-r1.ebuild:
+  amd64 stable wrt #204356, remove old version, point users to correct
+  documentation in pkg_postinst and remove some system depends.
 
   05 Jan 2008; Markus Meier <maekke@gentoo.org> srm-1.2.8-r1.ebuild:
   x86 stable, bug #204356
diff --git a/app-misc/srm/files/digest-srm-1.2.7 b/app-misc/srm/files/digest-srm-1.2.7
deleted file mode 100644
index 5cec3a9a2fdc..000000000000
--- a/app-misc/srm/files/digest-srm-1.2.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3889da9e4ebb18330fdbe2935294e024 srm-1.2.7.tar.gz 85838
-RMD160 d35ee17b8b423fd3efe8979421b3e1fe307e76db srm-1.2.7.tar.gz 85838
-SHA256 e2b3db3e872e9a2115d42d989a458053d45946e6cf2b68b85a1ade6cf9d3ffa6 srm-1.2.7.tar.gz 85838
diff --git a/app-misc/srm/srm-1.2.7.ebuild b/app-misc/srm/srm-1.2.7.ebuild
deleted file mode 100644
index bd0f83560fce..000000000000
--- a/app-misc/srm/srm-1.2.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/srm-1.2.7.ebuild,v 1.7 2005/01/01 15:24:55 eradicator Exp $
-
-DESCRIPTION="A command-line compatible rm which destroys file contents before unlinking."
-HOMEPAGE="http://sourceforge.net/projects/srm/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="X11"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-DEPEND="virtual/libc"
-RDEPEND="virtual/libc
-	!app-misc/secure-delete"
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README Changes
-}
-
-pkg_postinst() {
-	ewarn "Please notice that srm will not work as expected with any"
-	ewarn "journaled file system (e.g. reiserfs, ext3)."
-	ewarn "Please read /usr/share/doc/${P}/README.gz"
-}
diff --git a/app-misc/srm/srm-1.2.8-r1.ebuild b/app-misc/srm/srm-1.2.8-r1.ebuild
index 665e2166d43d..d24cc3b1b8e9 100644
--- a/app-misc/srm/srm-1.2.8-r1.ebuild
+++ b/app-misc/srm/srm-1.2.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r1.ebuild,v 1.2 2008/01/05 13:51:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/srm-1.2.8-r1.ebuild,v 1.3 2008/01/05 14:02:00 drac Exp $
 
 inherit eutils
 
@@ -10,14 +10,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="X11"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
-DEPEND="virtual/libc
-	sys-apps/gawk
-	sys-apps/grep"
-RDEPEND="virtual/libc
-	!app-misc/secure-delete"
+DEPEND="!app-misc/secure-delete"
 
 src_unpack() {
 	unpack ${A}
@@ -26,12 +22,14 @@ src_unpack() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed."
 	dodoc README Changes
 }
 
 pkg_postinst() {
+	local docsuffix=$(ecompress --suffix)
+
 	ewarn "Please notice that srm will not work as expected with any"
 	ewarn "journaled file system (e.g. reiserfs, ext3)."
-	ewarn "Please read /usr/share/doc/${PF}/README.gz"
+	ewarn "Please read /usr/share/doc/${PF}/README${docsuffix}"
 }