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

Package-Manager: portage-2.1.4_rc14

5 files changed, 21 insertions, 66 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/Manifest b/app-misc/srm/Manifest
index f4679befac5f..f92e9daa8b55 100644
--- a/app-misc/srm/Manifest
+++ b/app-misc/srm/Manifest
@@ -1,38 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX srm-1.2.8-remove-mount.patch 298 RMD160 a94da1b7abff7cdc26bb53d3b37bcf0768febf36 SHA1 1851503a2919521bcf2998c387bc594f85f16acf SHA256 73272bca010b1282dea4dad4adeb1c466bbcce556dc43baa67d0111990ba778b
 MD5 ef52598e488576f19699b3f5c77ab464 files/srm-1.2.8-remove-mount.patch 298
 RMD160 a94da1b7abff7cdc26bb53d3b37bcf0768febf36 files/srm-1.2.8-remove-mount.patch 298
 SHA256 73272bca010b1282dea4dad4adeb1c466bbcce556dc43baa67d0111990ba778b files/srm-1.2.8-remove-mount.patch 298
-DIST srm-1.2.7.tar.gz 85838 RMD160 d35ee17b8b423fd3efe8979421b3e1fe307e76db SHA1 d6667ef4d4843e10ec7a310979b2132b85d224e3 SHA256 e2b3db3e872e9a2115d42d989a458053d45946e6cf2b68b85a1ade6cf9d3ffa6
 DIST srm-1.2.8.tar.gz 88067 RMD160 d1ce5fe2ec13e45c5620e6a71c1f2dfcb49ab1bc SHA1 8b7aafc95b3ef67e2c737030567222bf50082188 SHA256 3be77158b62873659de9d458f87993537c93bbd32a86d5543290a0cf4ab24f61
-EBUILD srm-1.2.7.ebuild 818 RMD160 537825e9aae68b581c1666e476161f25c524e87a SHA1 6128bcf3862260fcb88f7bb44c1743ec0f929ae7 SHA256 e6ce237049f080a3453cb51e71e2d45bdc55fa8d26971c36d82d5703f4ac009f
-MD5 746ccf2ddd060f86e54a54ac336351ba srm-1.2.7.ebuild 818
-RMD160 537825e9aae68b581c1666e476161f25c524e87a srm-1.2.7.ebuild 818
-SHA256 e6ce237049f080a3453cb51e71e2d45bdc55fa8d26971c36d82d5703f4ac009f srm-1.2.7.ebuild 818
-EBUILD srm-1.2.8-r1.ebuild 958 RMD160 dae460ad4e4da018f32cf91967105f24102f9425 SHA1 2871f6496d1eb37d7cb7ea68034ee9a0124f6699 SHA256 49ba0091ff4970362abf4d3053ce228a4e12d3c31d649cb4218abab9b8a08176
-MD5 03b6a202c9895d07a67cddf781631672 srm-1.2.8-r1.ebuild 958
-RMD160 dae460ad4e4da018f32cf91967105f24102f9425 srm-1.2.8-r1.ebuild 958
-SHA256 49ba0091ff4970362abf4d3053ce228a4e12d3c31d649cb4218abab9b8a08176 srm-1.2.8-r1.ebuild 958
-MISC ChangeLog 1487 RMD160 082e39ff68cdbb623b95c2e71e0858d0f15e41ca SHA1 20e6ad741e4184bab69a86d8ed17539add00b031 SHA256 42a4989f107c0f2d2bc6c1079a9e9dea8ff634c77a240036a6dcf8d57954c3d7
-MD5 22813f8bfd9616435b16cc3ffe640556 ChangeLog 1487
-RMD160 082e39ff68cdbb623b95c2e71e0858d0f15e41ca ChangeLog 1487
-SHA256 42a4989f107c0f2d2bc6c1079a9e9dea8ff634c77a240036a6dcf8d57954c3d7 ChangeLog 1487
+EBUILD srm-1.2.8-r1.ebuild 940 RMD160 b748b3d7982dd3e7ef24b2b7330e9daa30ec9754 SHA1 9bdb156c2221abffbd14eb08c442cbdae85152dc SHA256 585517f4f559206675069b2e49c7642bf2a52bcfc6c561d9b9570bb3c6ec3cf5
+MD5 9c394db4073b8d6454436820ecfe8e21 srm-1.2.8-r1.ebuild 940
+RMD160 b748b3d7982dd3e7ef24b2b7330e9daa30ec9754 srm-1.2.8-r1.ebuild 940
+SHA256 585517f4f559206675069b2e49c7642bf2a52bcfc6c561d9b9570bb3c6ec3cf5 srm-1.2.8-r1.ebuild 940
+MISC ChangeLog 1712 RMD160 95c546d20c98d30ef8b348ab0e5fc5523d448651 SHA1 58e9acbd3c72de887c4621969580c2a8c8d07003 SHA256 ac395a62147c5358f2470446a655f1f4b954bdbaf331ee987841e2648cab98dd
+MD5 b0cd1af00f7ecb202205824c46be46f6 ChangeLog 1712
+RMD160 95c546d20c98d30ef8b348ab0e5fc5523d448651 ChangeLog 1712
+SHA256 ac395a62147c5358f2470446a655f1f4b954bdbaf331ee987841e2648cab98dd ChangeLog 1712
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
 MD5 38cacf4270b8a100918bf328ed9154d3 metadata.xml 314
 RMD160 25181cde297628576a9545bea3a76601485bfaf3 metadata.xml 314
 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7 metadata.xml 314
-MD5 3350c3410bc7adc1d2611258df39e750 files/digest-srm-1.2.7 226
-RMD160 521fa9874ecdee7a2d708536f87d95981030c3e9 files/digest-srm-1.2.7 226
-SHA256 09fcee2d57a95c553077a40f03d07a6939886bbd01df544340b5fa3f3b356cc5 files/digest-srm-1.2.7 226
 MD5 877589152b78cec9fec66ce2d5e07676 files/digest-srm-1.2.8-r1 226
 RMD160 37dc29e153e2a38004c24ac3d46e8629a6786ba9 files/digest-srm-1.2.8-r1 226
 SHA256 3423b3e24e976cac29ad393ab1d09f9722d2e3c247941fd8b89e6d58e8d72868 files/digest-srm-1.2.8-r1 226
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
-
-iEYEARECAAYFAkd/i5MACgkQkKaRLQcq0GLc/wCfc8QyfdqrtQ7hQ4aEd4miJZq8
-HJkAniK2pT+HDVnKmbuX8ruQEXmirkOA
-=SGVA
------END PGP SIGNATURE-----
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}"
 }