typo fix, remove useless sed expressions, and chmod u+w to allow to compile with userpriv -- the first and last thanks to: Cory Visi <cory@visi.name> in bug #36065

3 files changed, 26 insertions, 18 deletions

diff --git a/app-misc/secure-delete/ChangeLog b/app-misc/secure-delete/ChangeLog
index c8b2bc37758f..f6a824225c59 100644
--- a/app-misc/secure-delete/ChangeLog
+++ b/app-misc/secure-delete/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/secure-delete
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/secure-delete/ChangeLog,v 1.4 2003/09/17 13:49:35 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/secure-delete/ChangeLog,v 1.5 2003/12/30 11:52:33 seemant Exp $
+
+  30 Dec 2003; Seemant Kulleen <seemant@gentoo.org> secure-delete-3.0.ebuild:
+  typo fix, remove useless sed expressions, and chmod u+w to allow to compile
+  with userpriv -- the first and last thanks to: Cory Visi <cory@visi.name> in
+  bug #36065
 
 *secure-delete-3.0 (17 Sep 2003)
 
diff --git a/app-misc/secure-delete/Manifest b/app-misc/secure-delete/Manifest
index 8a93c29eedac..5ecec101f40f 100644
--- a/app-misc/secure-delete/Manifest
+++ b/app-misc/secure-delete/Manifest
@@ -1,5 +1,5 @@
-MD5 ac8c80108a613cb0d6510c7ef43e6fc5 ChangeLog 702
 MD5 0a27fdb35fd636a90389543b6ff53cea secure-delete-2.3.ebuild 1141
-MD5 802d03a9e1eaefa722e2229cef45cae3 secure-delete-3.0.ebuild 1126
+MD5 94f2e4ee54dcaa057fcc721d2458cec6 secure-delete-3.0.ebuild 1110
+MD5 c687d1b1d05aef12c74c03fdcbf08a61 ChangeLog 954
 MD5 2acdb58717304e1f14e0b04ba5a95fb3 files/digest-secure-delete-2.3 68
 MD5 1bee983c8785c87d868a02f06c49e29d files/digest-secure-delete-3.0 68
diff --git a/app-misc/secure-delete/secure-delete-3.0.ebuild b/app-misc/secure-delete/secure-delete-3.0.ebuild
index c0befbafd03a..fe55e50f1e82 100644
--- a/app-misc/secure-delete/secure-delete-3.0.ebuild
+++ b/app-misc/secure-delete/secure-delete-3.0.ebuild
@@ -1,26 +1,23 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/secure-delete/secure-delete-3.0.ebuild,v 1.2 2003/10/27 15:42:41 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/secure-delete/secure-delete-3.0.ebuild,v 1.3 2003/12/30 11:52:33 seemant Exp $
 
+MY_P=${PN//-/_}-${PV}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="Secure file/disk/swap/memory erasure utlities"
 HOMEPAGE="http://www.thc.org/"
-SRC_URI="http://www.thc.org/releases/${PN//-/_}-${PV}.tar.gz"
-LICENSE="GPL-2"
+SRC_URI="http://www.thc.org/releases/${MY_P}.tar.gz"
+
 SLOT="0"
-KEYWORDS="x86"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~amd64 ~ia64 ~ppc64"
+
 DEPEND=">=sys-apps/sed-4"
 
-S="${WORKDIR}/${PN//-/_}-${PV}"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
-
-	sed -i \
-		-e "s|^OPT=-O2|OPT=${CFLAGS} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64|" \
-		-e "s|^INSTALL_DIR=.*|INSTALL_DIR=${D}/usr/bin|" \
-		-e "s|^MAN_DIR=.*|MAN_DIR=${D}/usr/share/man|" \
-		-e "s|^DOC_DIR=.*|DOC_DIR=${D}/usr/share/doc/${PF}|" \
-		Makefile
+	chmod u+w .
 
 	sed -i \
 		-e 's|mktemp|mkstemp|g' \
@@ -28,15 +25,21 @@ src_unpack() {
 }
 
 src_compile() {
-	make || die "compile problem"
+	make OPT="${CFLAGS} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" || die
 }
 
 src_install() {
-	make install || die
+	make \
+		INSTALL_DIR=${D}/usr/bin \
+		MAN_DIR=${D}/usr/share/man \
+		DOC_DIR=${D}/usr/share/doc/${PF} \
+		install || die "compile problem"
+
 	dodoc secure_delete.doc usenix6-gutmann.doc
 }
 
 pkg_postinst() {
-	einfo "sfill and srm are useless on journalling filesystems, such as reiserfs or XFS."
+	einfo "sfill and srm are useless on journaling filesystems,"
+	einfo "such as reiserfs or XFS."
 	einfo "See documentation for more information."
 }